diff --git a/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BP_FrostGiantBoss.uasset b/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BP_FrostGiantBoss.uasset index c1318a85..decdbf0b 100644 Binary files a/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BP_FrostGiantBoss.uasset and b/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BP_FrostGiantBoss.uasset differ diff --git a/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BT_FrostGiant.uasset b/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BT_FrostGiant.uasset index f887e932..8bb041c7 100644 Binary files a/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BT_FrostGiant.uasset and b/Content/CombatSystem/Blueprints/AI/FrostGiantBoss/BT_FrostGiant.uasset differ diff --git a/Content/CombatSystem/Blueprints/Animnotifies/PlayerWorldCameraShake_AN.uasset b/Content/CombatSystem/Blueprints/Animnotifies/PlayerWorldCameraShake_AN.uasset new file mode 100644 index 00000000..cd96fce3 Binary files /dev/null and b/Content/CombatSystem/Blueprints/Animnotifies/PlayerWorldCameraShake_AN.uasset differ diff --git a/Content/CombatSystem/Blueprints/CameraShake/BP_CameraShakeMedium.uasset b/Content/CombatSystem/Blueprints/CameraShake/BP_CameraShakeMedium.uasset new file mode 100644 index 00000000..9b441e6f Binary files /dev/null and b/Content/CombatSystem/Blueprints/CameraShake/BP_CameraShakeMedium.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset index e3478eb3..05d75f34 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/Attacks/ExoGame_FrostGiant_Attck_Melee_Combo_Montage.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death_.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death_.uasset index 7414d069..22a26488 100644 Binary files a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death_.uasset and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death_.uasset differ diff --git a/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death__Montage.uasset b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death__Montage.uasset new file mode 100644 index 00000000..ef1dfd8c Binary files /dev/null and b/Content/InfinityBladeAdversaries/Enemy/Enemy_Frost_Giant/Enemy_Frost_Giant_All_Animation/ExoGame_Troll_Death__Montage.uasset differ diff --git a/Content/Maps/IceLandMap.umap b/Content/Maps/IceLandMap.umap index f011bfcb..dd50a291 100644 Binary files a/Content/Maps/IceLandMap.umap and b/Content/Maps/IceLandMap.umap differ diff --git a/Source/D1/AI/MasterAI.cpp b/Source/D1/AI/MasterAI.cpp index 7f2e3198..ec658245 100644 --- a/Source/D1/AI/MasterAI.cpp +++ b/Source/D1/AI/MasterAI.cpp @@ -694,6 +694,8 @@ void AMasterAI::SetDead(bool Condition) return; bIsDead = Condition; + + StateManagerComponent->SetCurrentState(FCombatGameplayTags::Get().Character_State_Dead); AAIController* aiController = Cast(GetController()); if(aiController) { diff --git a/Source/D1/AI/MasterAI.h b/Source/D1/AI/MasterAI.h index 3a464456..82efae23 100644 --- a/Source/D1/AI/MasterAI.h +++ b/Source/D1/AI/MasterAI.h @@ -136,9 +136,9 @@ private: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hit", meta = (AllowPrivateAccess = "true")) FName PelvisBoneName; - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hit", meta = (AllowPrivateAccess = "true")) + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Effects|Hit", meta = (AllowPrivateAccess = "true")) TObjectPtr HitSound; - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Hit", meta = (AllowPrivateAccess = "true")) + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Effects|Hit", meta = (AllowPrivateAccess = "true")) TObjectPtr HitEmitter; UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "MovementSpeed", meta = (AllowPrivateAccess = "true"))