ICAN_4JV/LegumeMix
ICAN_4JV/LegumeMix
Archived
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implemented weapon hit sounds (normal + critical)

Browse Source
This commit is contained in:
TjgL 2025-04-17 00:10:06 +02:00
parent 284b9c135d
commit ae400c39e5
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Legumix/Player/BP_Play.uasset (Stored with Git LFS)
View File

Binary file not shown.

5
Source/LegumeMix/Private/Player/LMPlayer.cpp
View File

@ -158,6 +158,7 @@ void ALMPlayer::FireBullets(const FLMBulletInfo Settings)
FVector ShotVector; FVector ShotVector;
FHitResult OutHit = FHitResult(); FHitResult OutHit = FHitResult();
bool HitSomething = false; bool HitSomething = false;
float HighestDamageModifier = 0.f;
OnFire(); OnFire();
@ -192,6 +193,8 @@ void ALMPlayer::FireBullets(const FLMBulletInfo Settings)
HitSomething = true; HitSomething = true;
HitBox->OnHit(Settings, OutHit); HitBox->OnHit(Settings, OutHit);
if (HitBox->GetDamageModifier() > HighestDamageModifier)
HighestDamageModifier = HitBox->GetDamageModifier();
} }
else else
{ {
@ -201,7 +204,7 @@ void ALMPlayer::FireBullets(const FLMBulletInfo Settings)
if (HitSomething) if (HitSomething)
{ {
OnEnnemyHit(); OnEnnemyHit(HighestDamageModifier);
} }
} }

2
Source/LegumeMix/Public/Player/LMHitBox.h
View File

@ -35,6 +35,8 @@ public:
UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category=Legumix) UFUNCTION(BlueprintCallable, BlueprintNativeEvent, Category=Legumix)
float CalculateDamage(float Damage, float Distance, UCurveFloat* Falloff, float MaxDistance); float CalculateDamage(float Damage, float Distance, UCurveFloat* Falloff, float MaxDistance);
float GetDamageModifier() const { return DamageModifier; }
public: public:
/** Delegate called when the hitbox is hit. /** Delegate called when the hitbox is hit.
* @param HitBox: The Hitbox that was hit. * @param HitBox: The Hitbox that was hit.

2
Source/LegumeMix/Public/Player/LMPlayer.h
View File

@ -97,7 +97,7 @@ public:
void OnAmmoPickup(); void OnAmmoPickup();
UFUNCTION(BlueprintImplementableEvent) UFUNCTION(BlueprintImplementableEvent)
void OnEnnemyHit(); void OnEnnemyHit(float DamageModifier);
UFUNCTION(BlueprintImplementableEvent, Category=Legumix) UFUNCTION(BlueprintImplementableEvent, Category=Legumix)
void OnFire(); void OnFire();