From 4a5293d9a8f59e2f5a0ac8942c01f71fac3e2103 Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sun, 23 May 2021 14:58:15 -0500 Subject: [PATCH] Add logic to death state so correct anim plays when dying and knocked down and dying in air Add getting up from knockdown state and logic [git-p4: depot-paths = "//depot/main/": change = 73] --- .../Reactions/Getting_Up_Montage.uasset | 3 +++ .../TestEnemy/States/BP_EnemyDead.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyGetUp.uasset | 3 +++ .../TestEnemy/States/BP_EnemyHit.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyKnockdown.uasset | 4 ++-- .../TestEnemy/States/BP_EnemyRootState.uasset | 4 ++-- .../Components/SNGStateMachineComponent.cpp | Bin 9134 -> 9374 bytes .../Components/SNGStateMachineComponent.h | Bin 2686 -> 2880 bytes 8 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up_Montage.uasset create mode 100644 SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up_Montage.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up_Montage.uasset new file mode 100644 index 0000000..97644c5 --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/Animations/Reactions/Getting_Up_Montage.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7146fe72c0b3f92c6d3e9d4c0eb5175ad144e3fc70e4bc71d1764ae5be8b4d62 +size 96205 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset index ed43cf5..2e89c46 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyDead.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d2b4236b87946c3468f9301fe9c2a0345d33fae959b0ee0eb7bc67ccf3faa4a9 -size 54091 +oid sha256:62e251e4c0c84ccb687b760ace9a4ef2af9cce6f77e907533039d07a651de255 +size 85077 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset new file mode 100644 index 0000000..e02d4ab --- /dev/null +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyGetUp.uasset @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1c8ef860969bc05af855268f7119b93c2ea009fb4b02c7a0dbe171b7ccd00820 +size 59419 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset index d3dac3d..b53357e 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyHit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9af7a76681333b2b568abc86214cb4ae77fd93a0e4003454fcde9bfdcb84df42 -size 33494 +oid sha256:885883f4f364d50b13463e172e96ad4bd3818cbcb7dd8c9dfc06ec2bf0ebce56 +size 34434 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset index d0502bb..11643b6 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyKnockdown.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1db8ce792fb15d5c7815cbc72cbbeb28ff386ce23bb6ff82fae704bbafdfe154 -size 51556 +oid sha256:b04527c59ce3913bdde03e42c45f39b3e4d47155ecef750881777d297f9c4023 +size 68274 diff --git a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset index 16a9d36..e4f5f94 100644 --- a/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset +++ b/SwordNGun/Content/Characters/Enemies/TestEnemy/States/BP_EnemyRootState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d88994ce0ee7e53761ef73d0cdbb8820daba708dec29d67b51350fbddb11396f -size 74675 +oid sha256:7fb801251e032d2df0c3c14fd113ce2f279fdcf8d6c85dc80d6e5c000451b2c1 +size 88976 diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp index 1893462b2cb08eea4f475ea602f459d0900cd41a..6078797d2e22c665e57680ee17b6aba1884ca3b5 100644 GIT binary patch delta 58 zcmZ4IKF@Q*D%Qy>SUe{C2}n);Bg8RTfK>&^mSMD?>@6TWNswi70*BD#23D!fb6Dqa OO@1aIwK+q;O&9=0LlU9@ delta 25 hcmbQ|xz2sVD%Q;#*!s98Ul0(R{E1a+bA+IqFaVFF3Euz! diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h index 6887b0bd04f17781773b6b829fdf71a7eda501f8..7a39bf413b2ba92b1ea2a3bb761ca6c598aac87c 100644 GIT binary patch delta 78 zcmew-azJc@9qZ&hEJ6GM3`Gp73}pg_D^Jk9qZ&ntYMS2*o8J{u-#w*095S