Updated GoatAI to Trigger Attack Animations

2023-04-28 03:40:41 +01:00 · 2023-04-28 03:40:41 +01:00 · 9ecbd9c52d
commit 9ecbd9c52d
parent 744b24c8c1
10 changed files with 14 additions and 20 deletions
--- a/Content/Animations/GoatAttack/GoatAttack.uasset
+++ b/Content/Animations/GoatAttack/GoatAttack.uasset
--- a/Content/Animations/GoatAttack/GoatAttack_Anim.uasset
+++ b/Content/Animations/GoatAttack/GoatAttack_Anim.uasset
--- a/Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset
+++ b/Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset
--- a/Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset
+++ b/Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset
--- a/Content/Animations/GoatWalking/GoatWalking.uasset
+++ b/Content/Animations/GoatWalking/GoatWalking.uasset
--- a/Content/Assets/Characters/Merchant/AMerchant.uasset
+++ b/Content/Assets/Characters/Merchant/AMerchant.uasset
--- a/Content/BlueprintAI/AI/AIBruh.uasset
+++ b/Content/BlueprintAI/AI/AIBruh.uasset
--- a/Content/Dialogue/SM_Merchant_Blueprint.uasset
+++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset
--- a/Content/Levels/Build.umap
+++ b/Content/Levels/Build.umap
--- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
+++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp
@ -357,6 +357,9 @@ void ATurnBaseCombatV2::DamagePlayer(int Damage, FString DamageType)
 	const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot"));
 	PlayerActor->CallFunctionByNameWithArguments(*Command, AR, nullptr, true);
 	RedVignetteMaterialInstance->SetScalarParameterValue(FName("BlendWeight"), 1.0f);
+
+	const FString Command2 = FString::Printf(TEXT("TriggerAttackAnimation"));
+	EnemyActor->CallFunctionByNameWithArguments(*Command2, AR, nullptr, true);
 	//Ends Combat if either the player or enemy is dead
 }