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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Bastien 2025-03-14 15:32:43 +01:00
commit 99624315cc
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/LegumeMix/Private/Player/LMHitBox.cpp
View File

@ -14,11 +14,15 @@ ULMHitBox::ULMHitBox()
void ULMHitBox::OnHit(const FLMBulletInfo& BulletInfo, const FHitResult& Hit) void ULMHitBox::OnHit(const FLMBulletInfo& BulletInfo, const FHitResult& Hit)
{ {
const float Damage = BulletInfo.Damage;
const double Distance = FVector::Distance(BulletInfo.Origin, GetComponentLocation()); const double Distance = FVector::Distance(BulletInfo.Origin, GetComponentLocation());
const float TotalDamage = CalculateDamage(Damage, Distance, BulletInfo.Falloff, BulletInfo.MaxDistance); const float TotalDamage = CalculateDamage(BulletInfo.Damage, Distance, BulletInfo.Falloff, BulletInfo.MaxDistance);
OnHitBoxHit.Broadcast(this, TotalDamage, BulletInfo.Origin, Hit); OnHitSimple(TotalDamage, BulletInfo.Origin, Hit);
}
void ULMHitBox::OnHitSimple(float const Damage, FVector const Origin, const FHitResult& Hit)
{
OnHitBoxHit.Broadcast(this, Damage, Origin, Hit);
} }
bool ULMHitBox::CanBeHitByTeam(const ETeam Team) const bool ULMHitBox::CanBeHitByTeam(const ETeam Team) const

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

@ -20,7 +20,12 @@ class LEGUMEMIX_API ULMHitBox : public UCapsuleComponent
public: public:
ULMHitBox(); ULMHitBox();
UFUNCTION(BlueprintCallable, Category=Legumix)
void OnHit(const FLMBulletInfo& BulletInfo, const FHitResult& Hit); void OnHit(const FLMBulletInfo& BulletInfo, const FHitResult& Hit);
UFUNCTION(BlueprintCallable, Category=Legumix)
void OnHitSimple(float const Damage, FVector const Origin, const FHitResult& Hit);
void SetHealthComponent(ULMHealthComponent* NewHealthComponent) { HealthComponent = NewHealthComponent; } void SetHealthComponent(ULMHealthComponent* NewHealthComponent) { HealthComponent = NewHealthComponent; }
bool CanBeHitByTeam(ETeam Team) const; bool CanBeHitByTeam(ETeam Team) const;