From 5682929e82fda9ad5b14c3fb024654711017e82c Mon Sep 17 00:00:00 2001 From: PHILIP White Date: Mon, 15 May 2023 03:05:02 +0100 Subject: [PATCH] Added Enemy Attack Noises --- Content/BlueprintAI/AI/AIBruh.uasset | 4 ++-- Content/BlueprintAI/AI/AIBruh_Boss.uasset | 4 ++-- Content/Blueprints/Combat_UI/CMS_Hurt.uasset | 3 +++ Content/Blueprints/Combat_UI/CombatCharacter.uasset | 4 ++-- Content/Levels/Build.umap | 4 ++-- Content/Music/Blue/SFX/Sear.uasset | 4 ++-- .../the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp | 2 +- 7 files changed, 14 insertions(+), 11 deletions(-) create mode 100644 Content/Blueprints/Combat_UI/CMS_Hurt.uasset diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index 10ecbdd..595d979 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:e4b7f843317f8e181ee86c1b83a2f9d143139463046759f7fbda55ccbbf6c329 -size 100629 +oid sha256:8530c7aee1cfd3b7306408adbd39ac757acaed21cc66f7661a8f070d9c6115d9 +size 120798 diff --git a/Content/BlueprintAI/AI/AIBruh_Boss.uasset b/Content/BlueprintAI/AI/AIBruh_Boss.uasset index 5104866..1d0166d 100644 --- a/Content/BlueprintAI/AI/AIBruh_Boss.uasset +++ b/Content/BlueprintAI/AI/AIBruh_Boss.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d03f0af1757f114a2875d362f74f74ff03eef7d38c072b12532261c236fb2031 -size 240450 +oid sha256:4b74016e20577e0ac935ddd2120bc0811b1c3aaa678beb04ab54d429b77b9fa6 +size 263008 diff --git a/Content/Blueprints/Combat_UI/CMS_Hurt.uasset b/Content/Blueprints/Combat_UI/CMS_Hurt.uasset new file mode 100644 index 0000000..880a387 --- /dev/null +++ b/Content/Blueprints/Combat_UI/CMS_Hurt.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0dff2a27ded9255b19182a1c64bd3cceb3131782d54043ac35becea6813e6b13 +size 6401 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 4f3adb0..91d03ce 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:397039c41845f2bd6a475b1d7a2c3d7b88bface6e53187f96538a26c464e5843 -size 246891 +oid sha256:879d2ea464cd053d202470c0d41de6a680434643871727ac22b9d3b66a3dc67a +size 256873 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index 5a3e7f9..e1cec48 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:21000243f172125a1b7be84757719553c33f59fc55914b39cfa4e0d1a510da6f -size 5613956 +oid sha256:4f452f3d126fe74e356ff524c9f5787e4e49ba9c990fe813822e38cdafbae805 +size 5613995 diff --git a/Content/Music/Blue/SFX/Sear.uasset b/Content/Music/Blue/SFX/Sear.uasset index 059f447..52d340d 100644 --- a/Content/Music/Blue/SFX/Sear.uasset +++ b/Content/Music/Blue/SFX/Sear.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:356348fc30411cb47bcc3efbbdd5a12adb99db7d99c91ac2249d8599e1a5f864 -size 257924 +oid sha256:841aa4d052768612d8bb6118e8eb6ba6aad051ff54b985bf6ae65d412c4412fb +size 257968 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 6f72002..1033f4f 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -459,7 +459,7 @@ void ATurnBaseCombatV2::DamagePlayer(int Damage, const FString& DamageType) DeathScreenWidget->AddToViewport(); return; } - const FString Command = FString::Printf(TEXT("PlayCameraShakeShoot")); + const FString Command = FString::Printf(TEXT("PlayCameraShakeHurt")); PlayerActor->CallFunctionByNameWithArguments(*Command, AR, nullptr, true); RedVignetteMaterialInstance->SetScalarParameterValue(FName("BlendWeight"), 1.0f);