From 652d630ccbbbde1edf6cfadfb0f18f937228a702 Mon Sep 17 00:00:00 2001 From: charnet3d Date: Tue, 12 Mar 2024 03:38:53 +0000 Subject: [PATCH] Section 16: Khaimera - Lecture 322 Health Pickup --- Content/Health/M_Pickup_Health.uasset | 3 ++ Content/Health/SM_Pickup_Health.uasset | 3 ++ .../Meshes/AnimBP_Khaimera_Rigging.uasset | 4 +-- .../Heroes/Khaimera/Meshes/Khaimera.uasset | 4 +-- .../Khaimera/Meshes/Khaimera_Skeleton.uasset | 4 +-- .../Mesh/Khaimera_Halloween.uasset | 4 +-- .../CS_Snake/Mesh/Khaimera_Snakekiller.uasset | 4 +-- .../T1_Bengal/Mesh/Khaimera_Bengal.uasset | 4 +-- .../Mesh/Khaimera_WhiteTiger.uasset | 4 +-- .../GruxPelt/Meshes/Khaimera_GruxPelt.uasset | 4 +-- .../Sounds/Pickups/HealthPickupCue.uasset | 3 ++ .../Sounds/Pickups/sw_Pickup_Ammo.uasset | 3 ++ .../Sounds/Pickups/sw_Pickup_Health.uasset | 3 ++ Content/_Game/Enemies/EnemyBP.uasset | 3 -- .../_Game/Enemies/EnemyBeetleMoltenBP.uasset | 3 -- Content/_Game/Enemies/EnemyBeetleRedBP.uasset | 3 -- .../_Game/Enemies/EnemyChestPlateBP.uasset | 3 -- Content/_Game/Enemies/EnemyGruxBP.uasset | 3 -- .../Enemies/EnemyGruxBeetleMoltenBP.uasset | 3 -- .../_Game/Enemies/EnemyGruxBeetleRedBP.uasset | 3 -- .../Enemies/EnemyGruxChestPlateBP.uasset | 3 -- .../_Game/Enemies/EnemyGruxHalloweenBP.uasset | 3 -- Content/_Game/Enemies/EnemyGruxQilinBP.uasset | 3 -- .../_Game/Enemies/EnemyGruxWarChiefBP.uasset | 3 -- Content/_Game/Enemies/EnemyHalloweenBP.uasset | 3 -- Content/_Game/Enemies/EnemyWarChiefBP.uasset | 3 -- .../Grux/Animations/EnemyAttack.uasset | 3 -- .../Enemies/Grux/Animations/EnemyDeath.uasset | 3 -- .../Enemies/Grux/Animations/EnemyHit.uasset | 3 -- .../Enemies/Grux/Animations/GruxAttack.uasset | 3 ++ .../Enemies/Grux/Animations/GruxDeath.uasset | 3 ++ .../Enemies/Grux/Animations/GruxHit.uasset | 3 ++ Content/_Game/Enemies/Grux/EnemyGruxBP.uasset | 4 +-- .../Grux/EnemyGruxBeetleMoltenBP.uasset | 4 +-- .../Enemies/Grux/EnemyGruxBeetleRedBP.uasset | 4 +-- .../Enemies/Grux/EnemyGruxChestPlateBP.uasset | 4 +-- .../Enemies/Grux/EnemyGruxHalloweenBP.uasset | 4 +-- .../Enemies/Grux/EnemyGruxQilinBP.uasset | 4 +-- .../Enemies/Grux/EnemyGruxWarChiefBP.uasset | 4 +-- Content/_Game/Enemies/Grux/GruxAnimBP.uasset | 4 +-- Content/_Game/Enemies/GruxAnimBP.uasset | 3 -- .../Khaimera/Animations/Death_B.uasset | 3 ++ .../Khaimera/Animations/Death_B_end.uasset | 3 ++ .../Khaimera/Animations/HS_Idle.uasset | 3 ++ .../Khaimera/Animations/HitReact_Front.uasset | 3 ++ .../Khaimera/Animations/Jog_Fwd.uasset | 3 ++ .../Khaimera/Animations/KhaimeraAttack.uasset | 3 ++ .../Khaimera/Animations/KhaimeraDeath.uasset | 3 ++ .../Khaimera/Animations/KhaimeraHit.uasset | 3 ++ .../Animations/Khaimera_Idle2Run.uasset | 3 ++ .../Khaimera/Animations/Melee_A.uasset | 3 ++ .../Khaimera/Animations/Melee_A_Fast.uasset | 3 ++ .../Khaimera/Animations/Melee_B.uasset | 3 ++ .../Khaimera/Animations/Melee_B_Fast.uasset | 3 ++ .../Enemies/Khaimera/EnemyKhaimeraBP.uasset | 4 +-- .../Khaimera/EnemyKhaimeraBengalBP.uasset | 3 ++ .../Khaimera/EnemyKhaimeraGruxPeltBP.uasset | 3 ++ .../Khaimera/EnemyKhaimeraHalloweenBP.uasset | 3 ++ .../EnemyKhaimeraSnakeKillerBP.uasset | 3 ++ .../Khaimera/EnemyKhaimeraWhiteTigerBP.uasset | 3 ++ .../Enemies/Khaimera/KhaimeraAnimBP.uasset | 3 ++ .../_Game/Enemies/Khaimera/testmontage.uasset | 3 -- Content/_Game/Explosives/ExplosiveBP.uasset | 4 +-- Content/_Game/Health/HealthBP.uasset | 3 ++ Content/_Game/Maps/DefaultMap.umap | 4 +-- Source/Shooter/BulletHitInterface.h | 2 +- Source/Shooter/Enemy.cpp | 31 ++++++++++--------- Source/Shooter/Enemy.h | 2 +- Source/Shooter/Explosive.cpp | 22 +++++++++++-- Source/Shooter/Explosive.h | 15 ++++++++- Source/Shooter/ShooterCharacter.cpp | 2 +- 71 files changed, 175 insertions(+), 113 deletions(-) create mode 100644 Content/Health/M_Pickup_Health.uasset create mode 100644 Content/Health/SM_Pickup_Health.uasset create mode 100644 Content/_Game/Assets/Sounds/Pickups/HealthPickupCue.uasset create mode 100644 Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Ammo.uasset create mode 100644 Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Health.uasset delete mode 100644 Content/_Game/Enemies/EnemyBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyBeetleMoltenBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyBeetleRedBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyChestPlateBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxBeetleMoltenBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxBeetleRedBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxChestPlateBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxHalloweenBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxQilinBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyGruxWarChiefBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyHalloweenBP.uasset delete mode 100644 Content/_Game/Enemies/EnemyWarChiefBP.uasset delete mode 100644 Content/_Game/Enemies/Grux/Animations/EnemyAttack.uasset delete mode 100644 Content/_Game/Enemies/Grux/Animations/EnemyDeath.uasset delete mode 100644 Content/_Game/Enemies/Grux/Animations/EnemyHit.uasset create mode 100644 Content/_Game/Enemies/Grux/Animations/GruxAttack.uasset create mode 100644 Content/_Game/Enemies/Grux/Animations/GruxDeath.uasset create mode 100644 Content/_Game/Enemies/Grux/Animations/GruxHit.uasset delete mode 100644 Content/_Game/Enemies/GruxAnimBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Death_B.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Death_B_end.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/HS_Idle.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/HitReact_Front.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Jog_Fwd.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/KhaimeraAttack.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/KhaimeraDeath.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/KhaimeraHit.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Khaimera_Idle2Run.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Melee_A.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Melee_A_Fast.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Melee_B.uasset create mode 100644 Content/_Game/Enemies/Khaimera/Animations/Melee_B_Fast.uasset create mode 100644 Content/_Game/Enemies/Khaimera/EnemyKhaimeraBengalBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/EnemyKhaimeraGruxPeltBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/EnemyKhaimeraHalloweenBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/EnemyKhaimeraSnakeKillerBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/EnemyKhaimeraWhiteTigerBP.uasset create mode 100644 Content/_Game/Enemies/Khaimera/KhaimeraAnimBP.uasset delete mode 100644 Content/_Game/Enemies/Khaimera/testmontage.uasset create mode 100644 Content/_Game/Health/HealthBP.uasset diff --git a/Content/Health/M_Pickup_Health.uasset b/Content/Health/M_Pickup_Health.uasset new file mode 100644 index 00000000..3f8be249 --- /dev/null +++ b/Content/Health/M_Pickup_Health.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:495306c27a01aee6c2dc7d01d4d163287fa43d06c9b1beb8a8e72ff5fd8f239c +size 85487 diff --git a/Content/Health/SM_Pickup_Health.uasset b/Content/Health/SM_Pickup_Health.uasset new file mode 100644 index 00000000..229be8c2 --- /dev/null +++ b/Content/Health/SM_Pickup_Health.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a03acf448e64f5dd84852ad1133706d452b8f7d875fc50ea2b2f6215c7249c80 +size 87769 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/AnimBP_Khaimera_Rigging.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/AnimBP_Khaimera_Rigging.uasset index f7734735..831e2000 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/AnimBP_Khaimera_Rigging.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/AnimBP_Khaimera_Rigging.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2f1782211e5cc919daacc45991d54d1c6aed1393d0fe612d16d037ae57742440 -size 460484 +oid sha256:fe50abac5fe8fc08e72fb2f44641922859656c265fd86b995a0186f60d93c5a3 +size 532532 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera.uasset index 4e8ef36d..77660a5f 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fee96f08d9419e949ce157eed99e620651dc86744221618bbad1527036136504 -size 16280165 +oid sha256:521657bdfcc85b898592dde666c967058e8b90b37265bf53f3a62aaff0146224 +size 16280100 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera_Skeleton.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera_Skeleton.uasset index 677e3c08..3b8a0949 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera_Skeleton.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Meshes/Khaimera_Skeleton.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:67d6e142637348cd9a600d1e72f91cf268f5885c926ce3e8a3d0997af368fa7f -size 46513 +oid sha256:f7fd162ba6b42425a30d867c0d8a7777934013e19d80fb7870cf219cd7d7c69b +size 67170 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Halloween/Mesh/Khaimera_Halloween.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Halloween/Mesh/Khaimera_Halloween.uasset index 0e791f6b..f0c4f121 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Halloween/Mesh/Khaimera_Halloween.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Halloween/Mesh/Khaimera_Halloween.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef95bf512adee73ba46999e60a641013a4d00ae0aba760b6874378e384bca013 -size 10379725 +oid sha256:b630806fef532ac830203614e79916fe0230dd0b72386febc9e439069bafff7d +size 16280318 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Snake/Mesh/Khaimera_Snakekiller.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Snake/Mesh/Khaimera_Snakekiller.uasset index 1f05889d..7297c0f5 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Snake/Mesh/Khaimera_Snakekiller.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/CS_Snake/Mesh/Khaimera_Snakekiller.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5880bd3de54701763f71a4ae67d24656e2a4aa51634563ce7eb484e36e35aaa -size 10383233 +oid sha256:07a3ec5d3ec68733049d04560cab0c909e97965ef3ab6bdef46cc7e1ecc55d2a +size 16280751 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/T1_Bengal/Mesh/Khaimera_Bengal.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/T1_Bengal/Mesh/Khaimera_Bengal.uasset index 7f338aff..460e0be2 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/T1_Bengal/Mesh/Khaimera_Bengal.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/T1_Bengal/Mesh/Khaimera_Bengal.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7b7c4f6c120c94b0505dbe204da92b07142a29b6e3f433b90d15d9677a3276f -size 10383298 +oid sha256:0ec93fcbc2d978930be48f8644cadc58afcc71ae9cdcff8b3b3f9111ee4b76b6 +size 16280882 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/WhiteTiger/Mesh/Khaimera_WhiteTiger.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/WhiteTiger/Mesh/Khaimera_WhiteTiger.uasset index 6d938cca..b2750da6 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/WhiteTiger/Mesh/Khaimera_WhiteTiger.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier1/WhiteTiger/Mesh/Khaimera_WhiteTiger.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5fea66ec3bb1d662d8f947da2d648f0cacadba3986f7ce7091cb317bb522348 -size 10381611 +oid sha256:bdfdac3737e4bb0d8dfdb787b584c2804cab653d04e4b877549683c7c2d40480 +size 16280482 diff --git a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier2/GruxPelt/Meshes/Khaimera_GruxPelt.uasset b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier2/GruxPelt/Meshes/Khaimera_GruxPelt.uasset index 70548b62..aad4f249 100644 --- a/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier2/GruxPelt/Meshes/Khaimera_GruxPelt.uasset +++ b/Content/ParagonKhaimera/Characters/Heroes/Khaimera/Skins/Tier2/GruxPelt/Meshes/Khaimera_GruxPelt.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74977610321a93b2be79b753b290a5dfb3d99b668933cb05b5de53339c2f86d0 -size 9891481 +oid sha256:355e2e7fd36af422ec183033d2f517a38174bf7dc041d1b30f62dc6abb8d80b4 +size 15420042 diff --git a/Content/_Game/Assets/Sounds/Pickups/HealthPickupCue.uasset b/Content/_Game/Assets/Sounds/Pickups/HealthPickupCue.uasset new file mode 100644 index 00000000..4ae6fbc6 --- /dev/null +++ b/Content/_Game/Assets/Sounds/Pickups/HealthPickupCue.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c2850e8abb7b46ee8ae5fc63a8ea8ab7bbf123d981ec805c50fd667bc4a84cb +size 4214 diff --git a/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Ammo.uasset b/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Ammo.uasset new file mode 100644 index 00000000..a84540cb --- /dev/null +++ b/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Ammo.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0ef31be9f61ffcc04ffb80557cbc61b015f2a37d5ac7d9ffc01fd56b9b1f5d27 +size 111868 diff --git a/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Health.uasset b/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Health.uasset new file mode 100644 index 00000000..15c2701c --- /dev/null +++ b/Content/_Game/Assets/Sounds/Pickups/sw_Pickup_Health.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c3825f2ad1a3afb39531d7772dedd293ae77a66ef268973f11cfe3bf2ccbdc4e +size 337794 diff --git a/Content/_Game/Enemies/EnemyBP.uasset b/Content/_Game/Enemies/EnemyBP.uasset deleted file mode 100644 index 46afcb6d..00000000 --- a/Content/_Game/Enemies/EnemyBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:12dff75a3ccf921217dec7fcc63197d45bfd24cff1e443f7631a3c22a86aef48 -size 2367 diff --git a/Content/_Game/Enemies/EnemyBeetleMoltenBP.uasset b/Content/_Game/Enemies/EnemyBeetleMoltenBP.uasset deleted file mode 100644 index 85cdb2dc..00000000 --- a/Content/_Game/Enemies/EnemyBeetleMoltenBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44a2fc73375003cbe113b4dfc2c345a45c711ac2def18e391835b656b6f43392 -size 2643 diff --git a/Content/_Game/Enemies/EnemyBeetleRedBP.uasset b/Content/_Game/Enemies/EnemyBeetleRedBP.uasset deleted file mode 100644 index 78f59b7c..00000000 --- a/Content/_Game/Enemies/EnemyBeetleRedBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:690f5b95c5f29789d357aadf96630bd49cd1c258e9332d38406dd2f077341e0a -size 2574 diff --git a/Content/_Game/Enemies/EnemyChestPlateBP.uasset b/Content/_Game/Enemies/EnemyChestPlateBP.uasset deleted file mode 100644 index 936b163c..00000000 --- a/Content/_Game/Enemies/EnemyChestPlateBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ff1c84719e56020d2c04a34fb185c91ab8db14a4a4a4c878d385f2d37eb10bb2 -size 2597 diff --git a/Content/_Game/Enemies/EnemyGruxBP.uasset b/Content/_Game/Enemies/EnemyGruxBP.uasset deleted file mode 100644 index a1c6e17e..00000000 --- a/Content/_Game/Enemies/EnemyGruxBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3a13cba40ec2cadbeadf04fa44b21c6e217a6a14b5fd254fce72485c3b0cf8c -size 2363 diff --git a/Content/_Game/Enemies/EnemyGruxBeetleMoltenBP.uasset b/Content/_Game/Enemies/EnemyGruxBeetleMoltenBP.uasset deleted file mode 100644 index 95dacd09..00000000 --- a/Content/_Game/Enemies/EnemyGruxBeetleMoltenBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5b56257bb024772b6c34cfd425f3755fdfe8fdad19f6e31d65b46b820127c3d -size 2603 diff --git a/Content/_Game/Enemies/EnemyGruxBeetleRedBP.uasset b/Content/_Game/Enemies/EnemyGruxBeetleRedBP.uasset deleted file mode 100644 index e3cb40de..00000000 --- a/Content/_Game/Enemies/EnemyGruxBeetleRedBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:836b274a2fa5026624e75b8d245191b5e62dbcb93938fb905e8990b033a450f3 -size 2543 diff --git a/Content/_Game/Enemies/EnemyGruxChestPlateBP.uasset b/Content/_Game/Enemies/EnemyGruxChestPlateBP.uasset deleted file mode 100644 index b7d7a393..00000000 --- a/Content/_Game/Enemies/EnemyGruxChestPlateBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f31837f1cbf9df627416afc749e3aef98e2bd72ac4cc9014f16e3f813d82114b -size 2563 diff --git a/Content/_Game/Enemies/EnemyGruxHalloweenBP.uasset b/Content/_Game/Enemies/EnemyGruxHalloweenBP.uasset deleted file mode 100644 index 8077af62..00000000 --- a/Content/_Game/Enemies/EnemyGruxHalloweenBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:33cda5ca5b872cf3b11994c9125e12eeed69a3935d559dedf87a2e14239604fb -size 2543 diff --git a/Content/_Game/Enemies/EnemyGruxQilinBP.uasset b/Content/_Game/Enemies/EnemyGruxQilinBP.uasset deleted file mode 100644 index 011b3be7..00000000 --- a/Content/_Game/Enemies/EnemyGruxQilinBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:99c9295b9df43b52596a3482c015fcd0b8ab445df2ae8c2ad32567ea20f4378e -size 2463 diff --git a/Content/_Game/Enemies/EnemyGruxWarChiefBP.uasset b/Content/_Game/Enemies/EnemyGruxWarChiefBP.uasset deleted file mode 100644 index 0a68ff05..00000000 --- a/Content/_Game/Enemies/EnemyGruxWarChiefBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64be23d0082a65a613b02f98806da1cc1462f47438fa0b12379dfe43f3755e54 -size 2523 diff --git a/Content/_Game/Enemies/EnemyHalloweenBP.uasset b/Content/_Game/Enemies/EnemyHalloweenBP.uasset deleted file mode 100644 index ef14c3c5..00000000 --- a/Content/_Game/Enemies/EnemyHalloweenBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:05176b531196551b36c7a760b4e23c2da98d0dc59ba7c6db9de2665977a6f697 -size 2574 diff --git a/Content/_Game/Enemies/EnemyWarChiefBP.uasset b/Content/_Game/Enemies/EnemyWarChiefBP.uasset deleted file mode 100644 index ca958216..00000000 --- a/Content/_Game/Enemies/EnemyWarChiefBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7f5ce125e593be9e87cdb075fbedb6703a8a46982e34b2b381563a1775cf67cc -size 2551 diff --git a/Content/_Game/Enemies/Grux/Animations/EnemyAttack.uasset b/Content/_Game/Enemies/Grux/Animations/EnemyAttack.uasset deleted file mode 100644 index bad6452c..00000000 --- a/Content/_Game/Enemies/Grux/Animations/EnemyAttack.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4dd7dcf5f08f434333f4d348e21b08f3381f220214d5b71e205dff431d36b1c8 -size 36903 diff --git a/Content/_Game/Enemies/Grux/Animations/EnemyDeath.uasset b/Content/_Game/Enemies/Grux/Animations/EnemyDeath.uasset deleted file mode 100644 index 157a171b..00000000 --- a/Content/_Game/Enemies/Grux/Animations/EnemyDeath.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fa18c332ebc30fe2636d00dd0d12ac9e57c2bc567431f986f4b327fbed2eacb -size 11119 diff --git a/Content/_Game/Enemies/Grux/Animations/EnemyHit.uasset b/Content/_Game/Enemies/Grux/Animations/EnemyHit.uasset deleted file mode 100644 index 44e98989..00000000 --- a/Content/_Game/Enemies/Grux/Animations/EnemyHit.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a3bca58621c618fc409a0aba6f1cd695eb43c140f4a1865c0cdb89e686965fca -size 16284 diff --git a/Content/_Game/Enemies/Grux/Animations/GruxAttack.uasset b/Content/_Game/Enemies/Grux/Animations/GruxAttack.uasset new file mode 100644 index 00000000..c8bd2fca --- /dev/null +++ b/Content/_Game/Enemies/Grux/Animations/GruxAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:674d4b17f4db87bdb17923a7ace35e543d18f2bddb5b2e4db526758c37b9d47b +size 36898 diff --git a/Content/_Game/Enemies/Grux/Animations/GruxDeath.uasset b/Content/_Game/Enemies/Grux/Animations/GruxDeath.uasset new file mode 100644 index 00000000..132fa448 --- /dev/null +++ b/Content/_Game/Enemies/Grux/Animations/GruxDeath.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2db50248c587992e218087f913c917d49a194db5e58cf751b8ce35c96a380e79 +size 11114 diff --git a/Content/_Game/Enemies/Grux/Animations/GruxHit.uasset b/Content/_Game/Enemies/Grux/Animations/GruxHit.uasset new file mode 100644 index 00000000..42015822 --- /dev/null +++ b/Content/_Game/Enemies/Grux/Animations/GruxHit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:22a4bf14cf2a258f3e37099dd69c03a545dceaa601260172d9bf71d4b77c4e35 +size 16279 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxBP.uasset index 485f8a83..fcd511ca 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:882a9e2e258debb240cbf35ccc2c606838d1db95fef10296ed30ed74bdbeeedb -size 134422 +oid sha256:37b98694c3b59c25d850e8a288aa2d66ea7c4c19a0afa9dc5de999e374035196 +size 134329 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxBeetleMoltenBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxBeetleMoltenBP.uasset index 5d98b072..ebe52f36 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxBeetleMoltenBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxBeetleMoltenBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:676fe3af672f023830e2b6c8d14bcaa3aa5a80d4270432d9c584ad6489ba90c6 -size 134323 +oid sha256:1c3cf1e51ddaa857605f2430fcf8277159c4b1e4cb1da698799a7d5dbed072e3 +size 134280 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxBeetleRedBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxBeetleRedBP.uasset index 53456ecb..6862b08b 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxBeetleRedBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxBeetleRedBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6558c08014532951e14e2d83e61edcf01583d79ac70ded0934abdbebc188be60 -size 133681 +oid sha256:ca8f0f49bf01f849cf5d468ce4fe64363c7810e813610a919e0d35bbe3dfa5e8 +size 133574 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxChestPlateBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxChestPlateBP.uasset index c236e55b..31fe9993 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxChestPlateBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxChestPlateBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:52a501546270a959136863859a9469679e634bda6f85e894e50449273c407f55 -size 134251 +oid sha256:ed47866824582158868ae5934af846e64da9cd7f05f728674c6a1c6223f148d7 +size 134104 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxHalloweenBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxHalloweenBP.uasset index dd0220c2..0a6231ff 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxHalloweenBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxHalloweenBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7a090a697c929b463507aa88fc56d4f5504f5157e679f45d6268b73c9a0c6f9 -size 134156 +oid sha256:bccd9238f11649fb9d709a6dde18bf94614badfc6cd55088b4c32780b0913d6c +size 134026 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxQilinBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxQilinBP.uasset index 78165fbc..d5ebf4b9 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxQilinBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxQilinBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d841488efbdfc8aa8df784eae13211d181de017082f14bd7e0d0e52b68146ce -size 135046 +oid sha256:5b3553488a5fe14a87c31e629b800be29ba5ffc535e34174b9fc26a3a04368ee +size 134997 diff --git a/Content/_Game/Enemies/Grux/EnemyGruxWarChiefBP.uasset b/Content/_Game/Enemies/Grux/EnemyGruxWarChiefBP.uasset index c3945c03..58d815e0 100644 --- a/Content/_Game/Enemies/Grux/EnemyGruxWarChiefBP.uasset +++ b/Content/_Game/Enemies/Grux/EnemyGruxWarChiefBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73816fe2149f4502f7ec7e000ba217dfd1972fb67765de996ed2f292f2910f18 -size 135223 +oid sha256:75578f4db790f3681010c0a5b46cad5a4c8518e21f37c3a97b0e946d828d8d94 +size 135139 diff --git a/Content/_Game/Enemies/Grux/GruxAnimBP.uasset b/Content/_Game/Enemies/Grux/GruxAnimBP.uasset index a66be05b..080e027a 100644 --- a/Content/_Game/Enemies/Grux/GruxAnimBP.uasset +++ b/Content/_Game/Enemies/Grux/GruxAnimBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41d29024c86d58a2b484ca8df9fc6d0a8d84ef2182fc8c09b4fa64ffc5d3b36e -size 134747 +oid sha256:4d6dc394317d66df1e1ec8108e793105c6ccfd5e28becfb94b63720b1eb58e7c +size 134679 diff --git a/Content/_Game/Enemies/GruxAnimBP.uasset b/Content/_Game/Enemies/GruxAnimBP.uasset deleted file mode 100644 index 6aed193e..00000000 --- a/Content/_Game/Enemies/GruxAnimBP.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c3383e32d4974da639532b351985cb20a9e3cfb9b240dbb2dc2fbe2fee6dd8eb -size 2359 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Death_B.uasset b/Content/_Game/Enemies/Khaimera/Animations/Death_B.uasset new file mode 100644 index 00000000..96ef5258 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Death_B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:50dc103b031bb56424bda49337f111627c995eaac2e0d53e31662fb7795b58c7 +size 698165 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Death_B_end.uasset b/Content/_Game/Enemies/Khaimera/Animations/Death_B_end.uasset new file mode 100644 index 00000000..b16fbc27 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Death_B_end.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b504c78e1cfda492e5ea6cb37ae12af85d7d955ae95c9e5965215681a23f974 +size 256841 diff --git a/Content/_Game/Enemies/Khaimera/Animations/HS_Idle.uasset b/Content/_Game/Enemies/Khaimera/Animations/HS_Idle.uasset new file mode 100644 index 00000000..e684ffcc --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/HS_Idle.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ae8145aa3931a6d07a76e4ac33e03c6473c42adbb95ffdac48a00c2aeb7ae176 +size 1692626 diff --git a/Content/_Game/Enemies/Khaimera/Animations/HitReact_Front.uasset b/Content/_Game/Enemies/Khaimera/Animations/HitReact_Front.uasset new file mode 100644 index 00000000..49c0af34 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/HitReact_Front.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:215ac1c9cbc7b6a36c2fcfa9f271bc0ef697d209fe8dc32f8a4b8a6c2ada66c4 +size 648724 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Jog_Fwd.uasset b/Content/_Game/Enemies/Khaimera/Animations/Jog_Fwd.uasset new file mode 100644 index 00000000..85d7da91 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Jog_Fwd.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecd63bbccf97f40abe8b03ce0f2b98cea15e546e2ee94e00bf560290d8168a28 +size 1147319 diff --git a/Content/_Game/Enemies/Khaimera/Animations/KhaimeraAttack.uasset b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraAttack.uasset new file mode 100644 index 00000000..fb80e014 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraAttack.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d9891c452b70472fc78a138472d670b016450f42a3e64f26c5a58625fadda0a9 +size 36471 diff --git a/Content/_Game/Enemies/Khaimera/Animations/KhaimeraDeath.uasset b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraDeath.uasset new file mode 100644 index 00000000..be859617 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraDeath.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c4f08bee0db7f12d690a5739b1e522fbcaccf2d42bc9862b4f2c5df655e33c7 +size 11051 diff --git a/Content/_Game/Enemies/Khaimera/Animations/KhaimeraHit.uasset b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraHit.uasset new file mode 100644 index 00000000..61855d01 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/KhaimeraHit.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d2af532cbb8468f0636978f396a710d1b5579d97b219a6987c55b3f506937ba3 +size 11899 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Khaimera_Idle2Run.uasset b/Content/_Game/Enemies/Khaimera/Animations/Khaimera_Idle2Run.uasset new file mode 100644 index 00000000..631201c3 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Khaimera_Idle2Run.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:89c36df54b0cfd5b83ce5c24cfbc55558a4f14b59168d53271d88ab0c926a580 +size 7068 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Melee_A.uasset b/Content/_Game/Enemies/Khaimera/Animations/Melee_A.uasset new file mode 100644 index 00000000..db6d1fbd --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Melee_A.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:196aef0327a6107c60b015d0e6705ee11154e145e57e5966baf241849b59f5cb +size 735492 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Melee_A_Fast.uasset b/Content/_Game/Enemies/Khaimera/Animations/Melee_A_Fast.uasset new file mode 100644 index 00000000..66e511e2 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Melee_A_Fast.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff88029bcefec9fc4769f74b328389bbfb75ddeadf027b6fa271c669e1d81b37 +size 496154 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Melee_B.uasset b/Content/_Game/Enemies/Khaimera/Animations/Melee_B.uasset new file mode 100644 index 00000000..63d7019f --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Melee_B.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8e1ca89dde2c577b9a3ab8f421558000d3814ee2c61da323e49c8b1386aff417 +size 766537 diff --git a/Content/_Game/Enemies/Khaimera/Animations/Melee_B_Fast.uasset b/Content/_Game/Enemies/Khaimera/Animations/Melee_B_Fast.uasset new file mode 100644 index 00000000..1a746408 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/Animations/Melee_B_Fast.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c256ad8ca9bfb6ec14f8fdf6bef1153f692c79d653e29e979e183dd81ad6a4c1 +size 503481 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBP.uasset index b56e9ab3..b3cfd990 100644 --- a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBP.uasset +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a664b03cfba479678b54d64d999318f387156614d029fd43dce62b3d910ab5f6 -size 133982 +oid sha256:ed7f2ee5f5325a69d8b494ff889fd5f978469e3f2f7b56040d61cffc35a34a5b +size 133413 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBengalBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBengalBP.uasset new file mode 100644 index 00000000..62f8a2f1 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraBengalBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1de41fa3a6c1d50e2be804d442658ebe870d48779ad3ba44d157eca23d2fa7f6 +size 134195 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraGruxPeltBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraGruxPeltBP.uasset new file mode 100644 index 00000000..52e6cb43 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraGruxPeltBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a64cbf40a55cf8b52bbad259bdad8eb7c9c9ae37c79d155f73e60211b990343 +size 133455 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraHalloweenBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraHalloweenBP.uasset new file mode 100644 index 00000000..b38817ee --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraHalloweenBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:17ecad54228e84558b69c79fba1b19ec12d31fe7a750c0bda9825ab7782befd6 +size 134104 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraSnakeKillerBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraSnakeKillerBP.uasset new file mode 100644 index 00000000..11e9bf0b --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraSnakeKillerBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b4e0003c7a6d9160fae332a3a7c6a6ddf50038f9ae4ea2d097527ffa2ce60f31 +size 134579 diff --git a/Content/_Game/Enemies/Khaimera/EnemyKhaimeraWhiteTigerBP.uasset b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraWhiteTigerBP.uasset new file mode 100644 index 00000000..7e9b8f41 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/EnemyKhaimeraWhiteTigerBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:55dcc29540b1f0d59e870a232c42033516961801e4b4fdf6c6cc9e9815344271 +size 133762 diff --git a/Content/_Game/Enemies/Khaimera/KhaimeraAnimBP.uasset b/Content/_Game/Enemies/Khaimera/KhaimeraAnimBP.uasset new file mode 100644 index 00000000..4881aec8 --- /dev/null +++ b/Content/_Game/Enemies/Khaimera/KhaimeraAnimBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b1a95eb7e92be45714306b9a46d00064037a5c5c2506185171d6a8c1361c7678 +size 135315 diff --git a/Content/_Game/Enemies/Khaimera/testmontage.uasset b/Content/_Game/Enemies/Khaimera/testmontage.uasset deleted file mode 100644 index d988dd18..00000000 --- a/Content/_Game/Enemies/Khaimera/testmontage.uasset +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:731b73e630a84c961a88a213d1123725e6890e66ac1f443e0edd7afe0b640c17 -size 9470 diff --git a/Content/_Game/Explosives/ExplosiveBP.uasset b/Content/_Game/Explosives/ExplosiveBP.uasset index 5d942792..29d983ad 100644 --- a/Content/_Game/Explosives/ExplosiveBP.uasset +++ b/Content/_Game/Explosives/ExplosiveBP.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:01827014006f7491557e32963969cd7e9cffb1b815fee08fccbbe9325e664d60 -size 29076 +oid sha256:91a810ce0d8e9a996c411282637ba14e3a3ec2f0edb54a1d05bd5149333a1060 +size 31761 diff --git a/Content/_Game/Health/HealthBP.uasset b/Content/_Game/Health/HealthBP.uasset new file mode 100644 index 00000000..1f971376 --- /dev/null +++ b/Content/_Game/Health/HealthBP.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5fff3760333d15e6929ee561e6e4b5cf2338d1437ced8648d36dc9d519e188c4 +size 87389 diff --git a/Content/_Game/Maps/DefaultMap.umap b/Content/_Game/Maps/DefaultMap.umap index 0c0e2f6b..bb51fa55 100644 --- a/Content/_Game/Maps/DefaultMap.umap +++ b/Content/_Game/Maps/DefaultMap.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8afc2613fbeb557ac5fe1470622d78e31a4ad2c8967ec0908aeb1c8c83ebbd3e -size 3703608 +oid sha256:e302bb99019db99eb06d9735061265c80f8996fa085573143cb75e688e6052f6 +size 3732949 diff --git a/Source/Shooter/BulletHitInterface.h b/Source/Shooter/BulletHitInterface.h index f7c52503..fef04c20 100644 --- a/Source/Shooter/BulletHitInterface.h +++ b/Source/Shooter/BulletHitInterface.h @@ -24,5 +24,5 @@ class SHOOTER_API IBulletHitInterface public: UFUNCTION(BlueprintNativeEvent, BlueprintCallable) - void BulletHit(FHitResult HitResult); + void BulletHit(FHitResult HitResult, AActor* Shooter, AController* ShooterController); }; diff --git a/Source/Shooter/Enemy.cpp b/Source/Shooter/Enemy.cpp index 07b4d6b0..b474a4c1 100644 --- a/Source/Shooter/Enemy.cpp +++ b/Source/Shooter/Enemy.cpp @@ -209,6 +209,8 @@ void AEnemy::AgroSphereOverlap(UPrimitiveComponent* OverlappedComponent, AActor* if (!Character) return; // Set the value of the Target blackboard key + if (!EnemyController) return; + if (!EnemyController->GetBlackboardComponent()) return; EnemyController->GetBlackboardComponent()->SetValueAsObject(TEXT("Target"), Character); } @@ -385,7 +387,7 @@ void AEnemy::SetupPlayerInputComponent(UInputComponent* PlayerInputComponent) } -void AEnemy::BulletHit_Implementation(FHitResult HitResult) +void AEnemy::BulletHit_Implementation(FHitResult HitResult, AActor* Shooter, AController* ShooterController) { if (ImpactSound) { @@ -396,19 +398,6 @@ void AEnemy::BulletHit_Implementation(FHitResult HitResult) { UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), ImpactParticles, HitResult.Location, FRotator(0.f), true); } - - if (bDying) return; - - ShowHealthBar(); - - // Determine whether bullet hit stuns - const float Stunned = FMath::FRandRange(0.f, 1.f); - if (Stunned <= StunChance) - { - // Stun the Enemy - PlayHitMontage(FName("HitReactFront")); - SetStunned(true); - } } float AEnemy::TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, @@ -431,6 +420,20 @@ float AEnemy::TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AC { Health -= DamageAmount; } + + if (bDying) return DamageInflicted; + + ShowHealthBar(); + + // Determine whether bullet hit stuns + const float Stunned = FMath::FRandRange(0.f, 1.f); + if (Stunned <= StunChance) + { + // Stun the Enemy + PlayHitMontage(FName("HitReactFront")); + SetStunned(true); + } + return DamageInflicted; } diff --git a/Source/Shooter/Enemy.h b/Source/Shooter/Enemy.h index b7eb8b63..11bbadf0 100644 --- a/Source/Shooter/Enemy.h +++ b/Source/Shooter/Enemy.h @@ -249,7 +249,7 @@ public: // Called to bind functionality to input virtual void SetupPlayerInputComponent(class UInputComponent* PlayerInputComponent) override; - virtual void BulletHit_Implementation(FHitResult HitResult) override; + virtual void BulletHit_Implementation(FHitResult HitResult, AActor* Shooter, AController* ShooterController) override; virtual float TakeDamage(float DamageAmount, FDamageEvent const& DamageEvent, AController* EventInstigator, AActor* DamageCauser) override; diff --git a/Source/Shooter/Explosive.cpp b/Source/Shooter/Explosive.cpp index d9c2603e..bb58c6ba 100644 --- a/Source/Shooter/Explosive.cpp +++ b/Source/Shooter/Explosive.cpp @@ -2,16 +2,25 @@ #include "Explosive.h" + +#include "Components/SphereComponent.h" +#include "GameFramework/Character.h" #include "Kismet/GameplayStatics.h" #include "Sound/SoundCue.h" #include "Particles/ParticleSystemComponent.h" // Sets default values -AExplosive::AExplosive() +AExplosive::AExplosive() : + Damage(40.f) { // Set this actor to call Tick() every frame. You can turn this off to improve performance if you don't need it. PrimaryActorTick.bCanEverTick = true; + ExplosiveMesh = CreateDefaultSubobject(TEXT("ExplosiveMesh")); + SetRootComponent(ExplosiveMesh); + + OverlapSphere = CreateDefaultSubobject(TEXT("OverlapSphere")); + OverlapSphere->SetupAttachment(GetRootComponent()); } // Called when the game starts or when spawned @@ -28,7 +37,7 @@ void AExplosive::Tick(float DeltaTime) } -void AExplosive::BulletHit_Implementation(FHitResult HitResult) +void AExplosive::BulletHit_Implementation(FHitResult HitResult, AActor* Shooter, AController* ShooterController) { if (ExplosionSound) { @@ -40,7 +49,14 @@ void AExplosive::BulletHit_Implementation(FHitResult HitResult) UGameplayStatics::SpawnEmitterAtLocation(GetWorld(), ExplosionParticles, HitResult.Location, FRotator(0.f), true); } - // TODO: Apply explosive damage + // Apply explosive damage + TArray OverlappingActors; + GetOverlappingActors(OverlappingActors, ACharacter::StaticClass()); + + for (auto Actor : OverlappingActors) + { + UGameplayStatics::ApplyDamage(Actor, Damage, ShooterController, Shooter, UDamageType::StaticClass()); + } Destroy(); } diff --git a/Source/Shooter/Explosive.h b/Source/Shooter/Explosive.h index b9356fb4..3faf6f93 100644 --- a/Source/Shooter/Explosive.h +++ b/Source/Shooter/Explosive.h @@ -9,6 +9,8 @@ class UParticleSystem; class USoundCue; +class USphereComponent; +class UStaticMeshComponent; UCLASS() class SHOOTER_API AExplosive : public AActor, public IBulletHitInterface @@ -33,9 +35,20 @@ private: UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Combat, meta = (AllowPrivateAccess = true)) USoundCue* ExplosionSound; + /** Mesh for the explosive */ + UPROPERTY(VisibleAnywhere, BlueprintReadOnly, Category = Combat, meta = (AllowPrivateAccess = true)) + UStaticMeshComponent* ExplosiveMesh; + + /** Used to determine what actors overlap during explosion */ + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Combat, meta = (AllowPrivateAccess = true)) + USphereComponent* OverlapSphere; + + /** Damage amount for explosive */ + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = Combat, meta = (AllowPrivateAccess = true)) + float Damage; public: // Called every frame virtual void Tick(float DeltaTime) override; - virtual void BulletHit_Implementation(FHitResult HitResult) override; + virtual void BulletHit_Implementation(FHitResult HitResult, AActor* Shooter, AController* ShooterController) override; }; diff --git a/Source/Shooter/ShooterCharacter.cpp b/Source/Shooter/ShooterCharacter.cpp index a70af3af..2bc7dbb1 100644 --- a/Source/Shooter/ShooterCharacter.cpp +++ b/Source/Shooter/ShooterCharacter.cpp @@ -766,7 +766,7 @@ void AShooterCharacter::SendBullet() { if (IBulletHitInterface* BulletHitInterface = Cast(BeamHitResult.GetActor())) { - BulletHitInterface->BulletHit_Implementation(BeamHitResult); + BulletHitInterface->BulletHit_Implementation(BeamHitResult, this, GetController()); } else {