From ebfc6f0b61121c8e244389914bc3d1667bfbd2be Mon Sep 17 00:00:00 2001 From: TjgL Date: Fri, 24 Jan 2025 21:20:19 +0100 Subject: [PATCH] Added ammo ui refresh on ammo pickup --- Config/DefaultEngine.ini | 3 +++ Content/Legumix/Ennemy/BP_HitBox_Head.uasset | 2 +- Content/Legumix/Player/BP_Play.uasset | 4 ++-- Content/Legumix/Weapon/BP_Ammo.uasset | 4 ++-- Content/Legumix/Weapon/Revolver/BP_Revolver.uasset | 4 ++-- Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset | 4 ++-- Source/LegumeMix/Private/Player/LMPlayer.cpp | 3 ++- Source/LegumeMix/Public/Player/LMPlayer.h | 2 ++ 8 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Config/DefaultEngine.ini b/Config/DefaultEngine.ini index 0b7008a..5ffa066 100644 --- a/Config/DefaultEngine.ini +++ b/Config/DefaultEngine.ini @@ -158,3 +158,6 @@ ManualIPAddress= +CollisionChannelRedirects=(OldName="VehicleMovement",NewName="Vehicle") +CollisionChannelRedirects=(OldName="PawnMovement",NewName="Pawn") +[/Script/UnrealEd.CookerSettings] +bCookOnTheFlyForLaunchOn=True + diff --git a/Content/Legumix/Ennemy/BP_HitBox_Head.uasset b/Content/Legumix/Ennemy/BP_HitBox_Head.uasset index 87e0b00..8721ef8 100644 --- a/Content/Legumix/Ennemy/BP_HitBox_Head.uasset +++ b/Content/Legumix/Ennemy/BP_HitBox_Head.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23997e7c69881a3245d0b9460265fd8a930eb4db74f1341c9426702465028553 +oid sha256:20f31b91addc80e2a14794be9ca0f7be6b8a5b65447234ee2038a7a8155d0b0c size 17154 diff --git a/Content/Legumix/Player/BP_Play.uasset b/Content/Legumix/Player/BP_Play.uasset index 50f85be..f3813cf 100644 --- a/Content/Legumix/Player/BP_Play.uasset +++ b/Content/Legumix/Player/BP_Play.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d33fb3d583b26fe2280e7a18d4d290dff5d8ab81fd61d2c00ce4342f411e51a7 -size 88178 +oid sha256:5aa74ea2eb4bf3efb54f12818deed44f3e66c3affd22059e97b6de236026d3e3 +size 90105 diff --git a/Content/Legumix/Weapon/BP_Ammo.uasset b/Content/Legumix/Weapon/BP_Ammo.uasset index 67df7d4..2931d44 100644 --- a/Content/Legumix/Weapon/BP_Ammo.uasset +++ b/Content/Legumix/Weapon/BP_Ammo.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7c05e55130308441515ad0dd36070015a59d36d0cd874aea6f533082a4603e29 -size 33124 +oid sha256:a965ccb554c95da00351d7cd0b97341a423e5db8a02946f455caae593fac8f1b +size 33627 diff --git a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset index 25ecd2e..0880497 100644 --- a/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset +++ b/Content/Legumix/Weapon/Revolver/BP_Revolver.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0fcdd22901c3e780e6dd405d8f09bc7dffeb15ec2da7f0103adf4a253f4b77c8 -size 57420 +oid sha256:e5636f963c1928155266a34619aa083f98d026f483543cbd4887d8fcc5f25d2b +size 56497 diff --git a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset index fa3de52..9ed606c 100644 --- a/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset +++ b/Content/Legumix/Weapon/Shotgun/BP_Shotgun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ee277b97db6e41a88b1881c97f10352040b92a750b60d39633d1cfe70789b77 -size 56079 +oid sha256:9ebec6fb3bea1fe8ff3a35ad5eb7f7dfe5f963d9e37cd7463694494425d21144 +size 55787 diff --git a/Source/LegumeMix/Private/Player/LMPlayer.cpp b/Source/LegumeMix/Private/Player/LMPlayer.cpp index 38bf943..f4e6c03 100644 --- a/Source/LegumeMix/Private/Player/LMPlayer.cpp +++ b/Source/LegumeMix/Private/Player/LMPlayer.cpp @@ -40,9 +40,10 @@ void ALMPlayer::PickUpAmmo(ALMAmmo* Ammo) if (GEngine) { FString AmmoAmount = FString::Printf(TEXT("Quantité de munition : %i"), Ammo->GetAmmoAmount()); - GEngine->AddOnScreenDebugMessage(1, 30.f, FColor::Red, AmmoAmount); + GEngine->AddOnScreenDebugMessage(INDEX_NONE, 30.f, FColor::Red, AmmoAmount); } WeaponManager->AddAmmoType(Ammo->GetAmmoType(), Ammo->GetAmmoAmount()); + OnAmmoPickup(); } int ALMPlayer::GetAmmoCount(const EAmmoType AmmoType) const diff --git a/Source/LegumeMix/Public/Player/LMPlayer.h b/Source/LegumeMix/Public/Player/LMPlayer.h index f404d6c..f671990 100644 --- a/Source/LegumeMix/Public/Player/LMPlayer.h +++ b/Source/LegumeMix/Public/Player/LMPlayer.h @@ -71,6 +71,8 @@ public: void WeaponReloaded(); UFUNCTION(BlueprintCallable, BlueprintImplementableEvent) void WeaponSwitched(); + UFUNCTION(BlueprintCallable, BlueprintImplementableEvent) + void OnAmmoPickup(); UFUNCTION(BlueprintImplementableEvent) void OnEnnemyHit();