From 9ecbd9c52db46233c88f5cb767df920908fe1bf5 Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Fri, 28 Apr 2023 03:40:41 +0100 Subject: [PATCH] Updated GoatAI to Trigger Attack Animations --- Content/Animations/GoatAttack/GoatAttack.uasset | 3 --- Content/Animations/GoatAttack/GoatAttack_Anim.uasset | 4 ++-- Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset | 3 --- Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset | 3 --- Content/Animations/GoatWalking/GoatWalking.uasset | 4 ++-- Content/Assets/Characters/Merchant/AMerchant.uasset | 4 ++-- Content/BlueprintAI/AI/AIBruh.uasset | 4 ++-- Content/Dialogue/SM_Merchant_Blueprint.uasset | 4 ++-- Content/Levels/Build.umap | 2 +- .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 3 +++ 10 files changed, 14 insertions(+), 20 deletions(-) delete mode 100644 Content/Animations/GoatAttack/GoatAttack.uasset delete mode 100644 Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset delete mode 100644 Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset diff --git a/Content/Animations/GoatAttack/GoatAttack.uasset b/Content/Animations/GoatAttack/GoatAttack.uasset deleted file mode 100644 index 71dcde3..0000000 --- a/Content/Animations/GoatAttack/GoatAttack.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c7efc4cbc1eebb9db455784e254a694d49c41030127a1ac702d4c96d2ce50b5 -size 802272 diff --git a/Content/Animations/GoatAttack/GoatAttack_Anim.uasset b/Content/Animations/GoatAttack/GoatAttack_Anim.uasset index 3798c88..fc4b219 100644 --- a/Content/Animations/GoatAttack/GoatAttack_Anim.uasset +++ b/Content/Animations/GoatAttack/GoatAttack_Anim.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:59fb833ff5bbcb082987e0e4ded4d51ca9569d48b364265fac925a91580ba41e -size 328561 +oid sha256:b22331e11353d5f7d914b7f1196152d02be8fcbfa5cdcc2637063027785e3b5b +size 330720 diff --git a/Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset b/Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset deleted file mode 100644 index 90a802d..0000000 --- a/Content/Animations/GoatAttack/GoatAttack_PhysicsAsset.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f000c5908b6b6b005c85b03892d21d76e735e7de5acbc315485418b1669ac501 -size 42115 diff --git a/Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset b/Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset deleted file mode 100644 index 331e371..0000000 --- a/Content/Animations/GoatAttack/GoatAttack_Skeleton.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:08d0cce97b31c342df5ea318f15fb1492c3f3bfeccfee45762333b823a649f43 -size 90649 diff --git a/Content/Animations/GoatWalking/GoatWalking.uasset b/Content/Animations/GoatWalking/GoatWalking.uasset index c52b648..35d9a56 100644 --- a/Content/Animations/GoatWalking/GoatWalking.uasset +++ b/Content/Animations/GoatWalking/GoatWalking.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6eaa59f853e08787a46796e5aaa3c44f7b93e63323d789a5816b0511c1387465 -size 152840 +oid sha256:21455666821b3c2d2ba4e51f07704282b56aa3b740c15a036cb073096f151a30 +size 201106 diff --git a/Content/Assets/Characters/Merchant/AMerchant.uasset b/Content/Assets/Characters/Merchant/AMerchant.uasset index aa7e512..e39f4ca 100644 --- a/Content/Assets/Characters/Merchant/AMerchant.uasset +++ b/Content/Assets/Characters/Merchant/AMerchant.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6d7fa2d294c6da401163bf56820e13a4edfa4aa2913b379d55ac9db44e062a2 -size 31331 +oid sha256:dfd31ff659a23fe62ed9dd69bcf5a4c79ef917400e90740025d13ea40228bf6c +size 31278 diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index c8240f5..b2f12a4 100644 --- a/Content/BlueprintAI/AI/AIBruh.uasset +++ b/Content/BlueprintAI/AI/AIBruh.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bd12271db44443c4d00ffd6789ae450536539979339432708dc75d93e4601393 -size 87186 +oid sha256:56040367e8248290b1d058fe961f8a676ff22e2455de7469e84d9f2ede960476 +size 100408 diff --git a/Content/Dialogue/SM_Merchant_Blueprint.uasset b/Content/Dialogue/SM_Merchant_Blueprint.uasset index 7f53fb4..ef9248a 100644 --- a/Content/Dialogue/SM_Merchant_Blueprint.uasset +++ b/Content/Dialogue/SM_Merchant_Blueprint.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:34c7200153d576ae20a4ab16a0a37e5bd569d51447fefaa16f7ef427a5a6be69 -size 74804 +oid sha256:64d2de7d92a9621be3eb839d2db194ce680e976fb66a6adafec0dc719d27861d +size 74751 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 8c4c57a..ff27586 100644 --- a/Content/Levels/Build.umap +++ b/Content/Levels/Build.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abf9918332a183f044bc4a97ce773130a6343cccc816415e4077f0bf50592456 +oid sha256:5198c462a0d128c6563652c330f9d9b3a3ae8e9a46065d5019e4eb0491a3f564 size 3486173 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 6411d09..c2f9917 100644 --- 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 }