diff --git a/Content/BlueprintAI/AI/AIBruh.uasset b/Content/BlueprintAI/AI/AIBruh.uasset index 76dd09b..a9a00e6 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:75d30bedf300db8a7c00ff9308dfc923b1be37ea1347267ef4c33ce816af5da3 -size 100575 +oid sha256:e93371bef9b1ae4091b4c5f4ae55c3d28167ac2c6e3102f726c25e99d155f8cc +size 101895 diff --git a/Content/BlueprintAI/AI/AIBruh_Boss.uasset b/Content/BlueprintAI/AI/AIBruh_Boss.uasset new file mode 100644 index 0000000..00aac1b --- /dev/null +++ b/Content/BlueprintAI/AI/AIBruh_Boss.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:600c30d8cfffeb399ae308793d67257063718b291827de710b1ee1a57c1bc4f7 +size 99698 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 475e82d..e2549fb 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:7d3d3c4b6af61858a637820f41944fff55d0091fccd573ed0dda5b6d9d5ee1a0 -size 158954 +oid sha256:4cfb8f22195ddc24190aac87fde22f1ae8d7a945ec921c4425f3b17160d63362 +size 158940 diff --git a/Content/Levels/Build.umap b/Content/Levels/Build.umap index b35a727..9fa2aeb 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:ef7435ba7bfeca25fb2d326365c6f7a8ef7b32178afe2ae5dd01afe2516b196c +oid sha256:fbb36c23e4f4d09192012e059ae1d686f872c7ca73722c824000f7a252d52e75 size 3486173 diff --git a/Content/Levels/Enemy_Test.umap b/Content/Levels/Enemy_Test.umap index dd9f0b4..4c5b352 100644 --- a/Content/Levels/Enemy_Test.umap +++ b/Content/Levels/Enemy_Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:038806e56bb359a5c6f1c3e98f797f27edd84969f8067249fbcf9bba096ff607 -size 40980 +oid sha256:753de9294e7e0b871ed0f04cddc57c4fee9dde06c222b6d7fa64f02f93de358c +size 43316 diff --git a/Content/Levels/Top_layer_level.umap b/Content/Levels/Top_layer_level.umap index c48f748..6328772 100644 --- a/Content/Levels/Top_layer_level.umap +++ b/Content/Levels/Top_layer_level.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c0a29be4cf2240bc85bd3868e8914ab03d30ab0eed0231d753c4c47e36fa8472 -size 245275 +oid sha256:dedd979f41fe8e3cd615aa11ff545a2fc6daf6a70ee3abc9ac6fc058bd017478 +size 244897 diff --git a/Content/Levels/Tutorial.umap b/Content/Levels/Tutorial.umap index 39c57fc..3a74606 100644 --- a/Content/Levels/Tutorial.umap +++ b/Content/Levels/Tutorial.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:994bb21c989e8eecdb514f9b0685f6ce0c1bc9fc8f8dcbf715c7bf9eaebf64ac -size 270120 +oid sha256:7b008b10c12d0295dba3131c677d6ff129a9808f353a27ceedf67fbd266012e1 +size 269742 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp index 26f93fc..3557479 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/TurnBaseCombatV2.cpp @@ -388,7 +388,9 @@ void ATurnBaseCombatV2::DamageEnemy(int Damage, FString DamageType) void ATurnBaseCombatV2::UpdateProgressBars() const { - EnemyHealthBar->SetPercent(*EnemyHealth / 100.0f); + FProperty* MaxHealthProperty = EnemyActor->GetClass()->FindPropertyByName(FName("MaxHealth")); + int32* EnemyMaxHealthPtr = MaxHealthProperty->ContainerPtrToValuePtr(EnemyActor); + EnemyHealthBar->SetPercent(static_cast(*EnemyHealth) / static_cast(*EnemyMaxHealthPtr)); } float ATurnBaseCombatV2::CalculateEscapePercentage() const