Merge branch 'master' of https://git.tlimon.fr/ICAN_4JV/LegumeMix

.gitignore

@@ -47,8 +47,8 @@ SourceArt/**/*.png
 SourceArt/**/*.tga
 
 # Binary Files
-#Binaries/*
+Binaries/*
-#Plugins/**/Binaries/*
+Plugins/**/Binaries/*
 
 # Builds
 Build/*

Source/LegumeMix/Private/LMWaveManager.cpp

@@ -2,7 +2,6 @@
 
 #include "LMWaveManager.h"
 
-#include "IPropertyTable.h"
 #include "Components/CapsuleComponent.h"
 #include "Enemy/LMEnemy.h"
 

Source/LegumeMix/Private/Player/LMHealthComponent.cpp

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

Source/LegumeMix/Private/Player/LMHitBox.cpp

@@ -14,11 +14,15 @@ ULMHitBox::ULMHitBox()
 
 void ULMHitBox::OnHit(const FLMBulletInfo& BulletInfo, const FHitResult& Hit)
 {
-	const float Damage = BulletInfo.Damage;
 	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

Source/LegumeMix/Private/Player/LMMovementComponent.cpp

@@ -154,7 +154,6 @@ bool ULMMovementComponent::IsCustomMovementMode(ECustomMovementModes InCustomMov
 
 void ULMMovementComponent::EnterSlide()
 {
-	UE_LOG(LogTemp, Error, TEXT("Entering Slide"));
 	bWantsToCrouch = true;
 	Velocity += Velocity.GetSafeNormal2D() * SlideEnterImpulse;
 	SetMovementMode(EMovementMode::MOVE_Custom, ECustomMovementModes::ECMM_Sliding);
@@ -162,7 +161,6 @@ void ULMMovementComponent::EnterSlide()
 
 void ULMMovementComponent::ExitSlide()
 {
-	UE_LOG(LogTemp, Error, TEXT("Exiting Slide"));
 	bWantsToCrouch = false;
 
 	FQuat NewRotation = FRotationMatrix::MakeFromXZ(UpdatedComponent->GetForwardVector().GetSafeNormal2D(), FVector::UpVector).ToQuat();

Source/LegumeMix/Private/Weapon/LMRevolver.cpp

@@ -30,7 +30,6 @@ void ALMRevolver::PrimaryFire()
 		return;
 	}
 	
-	PlayEvent(FireEvent);
 	PlayAnimation(PrimaryFireAnimation);
 	Player->PlayAnimation(PrimaryFireArmsAnimation);
 

Source/LegumeMix/Private/Weapon/LMShotgun.cpp

@@ -30,8 +30,8 @@ void ALMShotgun::PrimaryFire()
 		return;
 	}
 	
-	PlayEvent(FireEvent);
 	PlayAnimation(PrimaryFireAnimation);
+	Player->PlayAnimation(PrimaryFireArmsAnimation);
 
 	const FVector Origin = Player->GetWeaponFiringOrigin();
 	const FVector Direction = Player->GetAimVector();

Source/LegumeMix/Private/Weapon/LMWeaponBase.cpp

@@ -100,12 +100,13 @@ bool ALMWeaponBase::DefaultReload()
 	if (ClipAmmo >= MaxClip)
 		return false;
 
+	// TODO: replace with anim notifies
 	PlayEvent(ReloadSound);
 	PlayAnimation(ReloadAnimation);
+	Player->PlayAnimation(ReloadArmsAnimation);
 
 	State = EWeaponState::EWS_Reloading;
 
-	// TODO: Use Animations
 	OnDefaultReload();
 	GetWorldTimerManager().SetTimer(ReloadTimer, this, &ALMWeaponBase::AllowRefire, ReloadDelay);
 	Player->OnReload();

Source/LegumeMix/Public/Player/LMHealthComponent.h

@@ -17,6 +17,7 @@ class LEGUMEMIX_API ULMHealthComponent : public UActorComponent
 
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE_TwoParams(FOnHealthChangedSignature, float, Health, float, Damage);
 	DECLARE_DYNAMIC_MULTICAST_DELEGATE(FOnDeathSignature);
+	DECLARE_DYNAMIC_MULTICAST_DELEGATE_ThreeParams(FOnHitSignature, float, Damage, const FVector&, Origin, const FHitResult&, HitInfo);
 
 public:
 	ULMHealthComponent();
@@ -78,8 +79,8 @@ public:
 	 * @param Origin The origin of the damage.
 	 * @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.

Source/LegumeMix/Public/Player/LMHitBox.h

@@ -20,7 +20,12 @@ class LEGUMEMIX_API ULMHitBox : public UCapsuleComponent
 
 public:
 	ULMHitBox();
+	UFUNCTION(BlueprintCallable, Category=Legumix)
 	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; }
 	bool CanBeHitByTeam(ETeam Team) const;
 

Source/LegumeMix/Public/Weapon/LMWeaponBase.h

@@ -72,10 +72,6 @@ protected: /* Weapon Data */
 	FTimerHandle FireTimer;
 	FTimerHandle ReloadTimer;
 
-	/** The sound to play when firing. */
-	UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds")
-	TObjectPtr<UFMODEvent> FireEvent;
-
 	UPROPERTY(EditAnywhere, BlueprintReadWrite,Category="Legumix|Sounds")
 	TObjectPtr<UFMODEvent> ReloadSound;