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 
# Conflicts:
#	Content/Legumix/Ennemy/RangeEnemy/BP_DistantEnemy.uasset
This commit is contained in:
Emilie Schott 2025-03-14 16:01:56 +01:00
commit ec440f74f9
6 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Content/Legumix/Ennemy/BP_HealthComponent.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

2
Source/LegumeMix/Private/Player/LMHealthComponent.cpp
View File

@ -58,7 +58,7 @@ void ULMHealthComponent::Kill()
void ULMHealthComponent::HitBoxHit(ULMHitBox* HitBox, const float Damage, const FVector& Origin, const FHitResult& HitInfo) void ULMHealthComponent::HitBoxHit(ULMHitBox* HitBox, const float Damage, const FVector& Origin, const FHitResult& HitInfo)
{ {
TakeDamage(Damage); TakeDamage(Damage);
OnHit(Damage, Origin, HitInfo); OnHit.Broadcast(Damage, Origin, HitInfo);
} }

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/LMHealthComponent.h
View File

@ -17,6 +17,7 @@ class LEGUMEMIX_API ULMHealthComponent : public UActorComponent
DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnHealthChangedSignature, float, Health, float, Damage); DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnHealthChangedSignature, float, Health, float, Damage);
DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnDeathSignature); DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnDeathSignature);
DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnHitSignature, float, Damage, const FVector&, Origin, const FHitResult&, HitInfo);
public: public:
ULMHealthComponent(); ULMHealthComponent();
@ -78,8 +79,8 @@ public:
* @param Origin The origin of the damage. * @param Origin The origin of the damage.
* @param HitInfo The collisions informations. * @param HitInfo The collisions informations.
*/ */
UFUNCTION(BlueprintImplementableEvent, Category=Legumix, meta=(Keywords = "Refill")) UPROPERTY(BlueprintCallable, BlueprintAssignable, Category=Legumix)
void OnHit(float Damage, const FVector& Origin, const FHitResult& HitInfo); FOnHitSignature OnHit;
/** /**
* Completely refill the health of the component. * Completely refill the health of the component.

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;