#235 Added shoot effect on armored character (#245)

xthebat · Mar 10, 2024 · 4811637 · 4811637
1 parent c7361d0
commit 4811637
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 10 deletions.
diff --git a/Config/DefaultGame.ini b/Config/DefaultGame.ini
@@ -23,6 +23,9 @@ bIsPrintHitScanInfo=0
 CameraVerticalSpeedLag=0.000000
 NetGraph=1
 bIsAutoSelectWeapon=0
+bIsInfiniteAmmo=0
+bIsCheatsEnabled=0
+bIsSelfAimEnabled=0
 Volume=0.200000
 UnUsedEnum=Everything
 UnUsedStruct=(IntField0=3,FloatField1=0.000000)

diff --git a/Content/Maps/warmup.umap b/Content/Maps/warmup.umap
diff --git a/Content/Physicals/PM_Character.uasset b/Content/Physicals/PM_Character.uasset
diff --git a/Source/Cloud9/Character/Cloud9Character.cpp b/Source/Cloud9/Character/Cloud9Character.cpp
@@ -323,8 +323,6 @@ float ACloud9Character::InternalTakePointDamage(
 	let BoneName = PointDamageEvent.HitInfo.BoneName;
 	Damage = Super::InternalTakePointDamage(Damage, PointDamageEvent, EventInstigator, DamageCauser);
 
-	let Armor = HealthComponent->GetArmor();
-
 	if (let Weapon = Cast<ACloud9WeaponFirearm>(DamageCauser))
 	{
 		let WeaponInfo = Weapon->GetWeaponInfo();
@@ -334,12 +332,12 @@ float ACloud9Character::InternalTakePointDamage(
 		if (HeadBoneNames.Contains(BoneName))
 		{
 			Damage *= WeaponInfo->HeadshotMultiplier;
-			HitInArmor = true;
+			HitInArmor = HealthComponent->HasHelmet();
 		}
 		else if (UpperBodyBoneNames.Contains(BoneName))
 		{
 			Damage *= WeaponInfo->UpperBodyMultiplier;
-			HitInArmor = true;
+			HitInArmor = HealthComponent->IsArmored();
 		}
 		else if (LowerBodyBoneNames.Contains(BoneName))
 		{
@@ -350,9 +348,10 @@ float ACloud9Character::InternalTakePointDamage(
 			Damage *= WeaponInfo->LegMultiplier;
 		}
 
-		if (Armor != 0.0f and HitInArmor)
+		if (HitInArmor)
 		{
 			Damage *= WeaponInfo->ArmorPenetration * ArmorCoefficient;
+			HealthComponent->TakeArmorDamage(Damage / 2);
 		}
 
 		let Distance = FVector::DistSquared(DamageCauser->GetActorLocation(), GetActorLocation());

diff --git a/Source/Cloud9/Character/Components/Cloud9HealthComponent.cpp b/Source/Cloud9/Character/Components/Cloud9HealthComponent.cpp
@@ -167,7 +167,6 @@ void UCloud9HealthComponent::OnTakePointDamage(
 	AActor* DamageCauser)
 {
 	TakeHealthDamage(Damage);
-	TakeArmorDamage(0.0f); // TODO: Add armor damage calc
 	AddAttackerScore(InstigatedBy);
 }
 
@@ -181,6 +180,5 @@ void UCloud9HealthComponent::OnTakeRadialDamage(
 	AActor* DamageCauser)
 {
 	TakeHealthDamage(Damage);
-	TakeArmorDamage(0.0f); // TODO: Add armor damage calc
 	AddAttackerScore(InstigatedBy);
 }
diff --git a/Source/Cloud9/Character/Components/Cloud9HealthComponent.h b/Source/Cloud9/Character/Components/Cloud9HealthComponent.h
@@ -83,6 +83,7 @@ class CLOUD9_API UCloud9HealthComponent : public UActorComponent
 
 	float GetHealth() const { return Health; }
 	float GetArmor() const { return Armor; }
+	bool IsArmored() const { return Armor > 0.0f; }
 	bool HasHelmet() const { return bHasHelmet; }
 	bool IsAlive() const { return bIsAlive; }
 

diff --git a/Source/Cloud9/Physicals/Cloud9PhysicalMaterial.cpp b/Source/Cloud9/Physicals/Cloud9PhysicalMaterial.cpp
@@ -88,4 +88,7 @@ bool UCloud9PhysicalMaterial::TestBackgroundDecalProbability() const
 	return FMath::RandRange(0.0f, 1.0f) < FirearmBackgroundDecalProbability;
 }
 
-UNiagaraSystem* UCloud9PhysicalMaterial::GetRandomFirearmSquib() const { return GetRandomItem(FirearmEffects); }
+UNiagaraSystem* UCloud9PhysicalMaterial::GetRandomFirearmSquib(bool IsAlternative) const
+{
+	return IsAlternative ? GetRandomItem(FirearmAltEffects) : GetRandomItem(FirearmEffects);
+}
diff --git a/Source/Cloud9/Physicals/Cloud9PhysicalMaterial.h b/Source/Cloud9/Physicals/Cloud9PhysicalMaterial.h
@@ -18,7 +18,7 @@ class CLOUD9_API UCloud9PhysicalMaterial : public UPhysicalMaterial
 	UCloud9PhysicalMaterial();
 
 	UMaterialInterface* GetRandomFirearmDecal() const;
-	UNiagaraSystem* GetRandomFirearmSquib() const;
+	UNiagaraSystem* GetRandomFirearmSquib(bool IsAlternative) const;
 
 	UMaterialInterface* GetRandomBackgroundDecal() const;
 	FVector GetBackgroundDecalSize() const;
@@ -48,6 +48,8 @@ class CLOUD9_API UCloud9PhysicalMaterial : public UPhysicalMaterial
 	UPROPERTY(EditDefaultsOnly, Category="Firearm Hit Effect")
 	TSet<UNiagaraSystem*> FirearmEffects;
 
+	UPROPERTY(EditDefaultsOnly, Category="Firearm Hit Effect")
+	TSet<UNiagaraSystem*> FirearmAltEffects;
 
 	UPROPERTY(EditDefaultsOnly, Category="Firearm Background Decal")
 	TSet<UMaterialInterface*> FirearmBackgroundDecals;

diff --git a/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp b/Source/Cloud9/Weapon/Classes/Cloud9WeaponFirearm.cpp
@@ -35,6 +35,7 @@
 #include "Cloud9/Contollers/Cloud9PlayerController.h"
 #include "Cloud9/Character/Cloud9Character.h"
 #include "Cloud9/Character/Components/Cloud9AnimationComponent.h"
+#include "Cloud9/Character/Components/Cloud9HealthComponent.h"
 #include "Cloud9/Character/Components/Cloud9InventoryComponent.h"
 #include "Cloud9/Character/Damages/FirearmDamageType.h"
 #include "Cloud9/Game/Cloud9DeveloperSettings.h"
@@ -470,7 +471,22 @@ EFirearmFireStatus ACloud9WeaponFirearm::Fire(
 
 			if (let PhysicalMaterial = Cast<UCloud9PhysicalMaterial>(LineHit.PhysMaterial); IsValid(PhysicalMaterial))
 			{
-				if (let FirearmSquib = PhysicalMaterial->GetRandomFirearmSquib(); IsValid(FirearmSquib))
+				if (let HealthComponent = DamagedActor->FindComponentByClass<UCloud9HealthComponent>();
+					IsValid(HealthComponent) and HealthComponent->IsArmored())
+				{
+					if (let FirearmSquib = PhysicalMaterial->GetRandomFirearmSquib(true); IsValid(FirearmSquib))
+					{
+						UNiagaraFunctionLibrary::SpawnSystemAtLocation(
+							GetWorld(),
+							FirearmSquib,
+							LineHit.Location,
+							LineHit.Normal.Rotation(),
+							FVector::OneVector,
+							true);
+					}
+				}
+
+				if (let FirearmSquib = PhysicalMaterial->GetRandomFirearmSquib(false); IsValid(FirearmSquib))
 				{
 					UNiagaraFunctionLibrary::SpawnSystemAtLocation(
 						GetWorld(),