From 32a178d3d805325dcd75aff6a922881b156ccafe Mon Sep 17 00:00:00 2001
From: Kevin Poretti <kevinporetti@gmail.com>
Date: Sat, 20 Mar 2021 22:51:59 -0500
Subject: [PATCH] Implement CanCancel flag and disallow state transitioning to
 itself

[git-p4: depot-paths = "//depot/main/": change = 31]
---
 .../Locomotion/Roll_RootMotion_Montage.uasset |   4 ++--
 .../States/BP_ProtagAirAttack1.uasset         |   4 ++--
 .../States/BP_ProtagAirborneState.uasset      |   4 ++--
 .../States/BP_ProtagDashState.uasset          |   4 ++--
 .../States/BP_ProtagGroundAttack1.uasset      |   4 ++--
 .../States/BP_ProtagGroundedState.uasset      |   4 ++--
 .../Core/AnimNotifies/AN_CanCancel.uasset     |   3 +++
 .../Private/Characters/SNGCharacterBase.cpp   | Bin 1176 -> 1532 bytes
 .../SwordNGun/Private/Components/SNGState.cpp | Bin 6234 -> 6550 bytes
 .../Components/SNGStateMachineComponent.cpp   | Bin 8184 -> 8524 bytes
 .../Public/Characters/SNGCharacterBase.h      | Bin 894 -> 1272 bytes
 .../SwordNGun/Public/Components/SNGState.h    | Bin 5386 -> 5472 bytes
 12 files changed, 15 insertions(+), 12 deletions(-)
 create mode 100644 SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset

diff --git a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset
index b0c1798..9b81ebd 100644
--- a/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/Animations/Locomotion/Roll_RootMotion_Montage.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5e3926efa6bca6e4f169ea07342e4a7ffe1a313565054cff83c18cc9f9a7d4bd
-size 99658
+oid sha256:0fbb53df9d81429d498e9c02be65c33bcc21030c06e32d20807e4958db6f6f87
+size 98026
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
index 45dfd01..3ade6d3 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirAttack1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8acce1d740f45b828d23ecde03cf087979c75e96bd56dda0eb76279fd0f08bd2
-size 79978
+oid sha256:4f8e1a15cb2f4cf70a6465cbaf50f453135181e2b49748f61c42645439fd02d4
+size 103492
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset
index 7e8fec2..fc8a66f 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagAirborneState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0a980235347259d1ef4cc80617588a7eca41fbc25c870e08db5298a35f79ff8e
-size 83068
+oid sha256:e00f3c2b3710c3883d3ea7c9825977b8ceb8ae7edb726f9edbaa1ae4baec5f32
+size 89856
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset
index 3fcf279..a85ad60 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagDashState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:39470a4079d79dcc09e4b4e5d6cbe647f002c5dbddff8cc06627494722cf1ed4
-size 65180
+oid sha256:7f43af6ab695acb4e8bd987675f006af87596c5d67a4ffab5cb3de10f50b2f44
+size 93850
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset
index a385b3e..d6eeccb 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundAttack1.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:3f1e1763fb6384f23c1b99ea9e4ffcd26715e0c2d9624863a42bf4ed2b2e3264
-size 73182
+oid sha256:7f04da310c025be9b91479f975036f39a7ad7921be091f6ea500c0695acf1255
+size 98583
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset
index da72050..d471825 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2118e71303e6417bcf359ba346eef27db3389e933234b166c023840a2d49ca5c
-size 120901
+oid sha256:ead6ad6de46bedcc71317d276a58a27374747e8584654f96bc7fc9f136276fec
+size 138884
diff --git a/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset b/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset
new file mode 100644
index 0000000..866a5a5
--- /dev/null
+++ b/SwordNGun/Content/Core/AnimNotifies/AN_CanCancel.uasset
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:5a88e9fe63e260cdbf54bdbfa3dab7bd6717b7a4dc0bcd28dd3ce287e503aff9
+size 23342
diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp
index cbe8f227d89abcbe6d1ac638f1f380d5d13553a1..bc09a3a2a46ec3c2ff85e35fdfb66e933535914c 100644
GIT binary patch
delta 257
zcmbQi`G<Rh2$OIUgEK=SLmre&W=Lho+5DYxA=6|&X0v(>DFzLOB!+w-%wbT#)X1R8
zzy*ZWV3HH45>vkdgDqB_)?hugU=m~o*cKL$H531<hhUncfo4|`(BUNvr3^(tuP9)(
H8Qlf|RCOzT

delta 16
YcmeyvJ%e+D2-D<a%-1$cF|T6;05~fKAOHXW

diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGState.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGState.cpp
index 98cc902ab559931bd2acabe327034625b144774e..c515b14afcbe082a4e9e1ab12d3bfe1c2bbe5fac 100644
GIT binary patch
delta 153
zcmca*FwJ<v4{kq(M21|3R0ahG+sWD7(vz<U=x}l}Br!Mx#q%aBGKngNFyu3MGL$eB
z16AcPq=8fdaT-uQ2P|g2@#9HR_9URHe1@FKjI5HZaJ~F!dM7iA$pcm5l;6BkY$GE8
D$%rD?

delta 16
YcmbPce9K_MkIfSp4~cI6Ccc0X07mc!*Z=?k

diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGStateMachineComponent.cpp
index a271b01cc29ee9df752ca3846a3f3a30a7782a99..fb20b57bef8f30293874676e8b023c4ab4ed7542 100644
GIT binary patch
delta 185
zcmexif5vIUGRetK5>A`>q%;^O*GWoDJ|-<PnMXuo^8{%tCRPOoH3qfG4`pR1E6B-A
z-XO~{nMGD*@;gp0piB)z&16Pdc~)nJM25V{@_eGAAq@Epo(v@n#SEzoISgqG8Vs5Y
Wnv?zIyC-iD<d_^I_k~L4tporm2`-KR

delta 106
zcmX@(^uvC`GD%f8hG2#gh9ZVchCGIJ1_g!?AS;(4mBACp2gxJ?aq4783Fpl(BsCaC
hu}W{|m#$}G)SR5iFS<ELu7DB3oSY+9GFeYi4gjV)8ixP?

diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGCharacterBase.h
index 52521d5ac16b064cfba290cf2fca747e87eccc2b..62d9b4a248708cbb6e054bd9fc5d240ad4c1228c 100644
GIT binary patch
delta 275
zcmeyz_Jean8S~_8Od*!e42cYR3=lGzA(bJAL4zTQAs+~H7!;u5$g-LY)(l)g$T|5c
zlWx5`P)7+6rZN;UXhOvC>ec|Ng6apWE&%Gw2kTD;lPL^VU~#Yw4517G3_%S3K++XR
vhcH9}-R1;zS1Hgwkj_j`pwml$QmH^sqyQD>0VON3I3x*+M<C9qg*pcSYHBVn

delta 16
Wcmeyt`HyWw88b&MgEa#e5CQ-(hXexv

diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGState.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGState.h
index 85e5365e4266559e24f4b90e9ddc80872acae90d..33854f3ab2d64e7bd7d79fc221298e10615a2980 100644
GIT binary patch
delta 130
zcmeCudZ4v{bMgW<4*n#Dd?3tWP+)LoNMy*HypUN`Fa#*#$xy;j%#aF{Nn_BMe2`Ok
z@&X~X%?6w+SSJ7Dy(X>6zy*YyK!`9P31I|3nh}#H^0`m`$9E5iwKnSr++zU%M}r~j

delta 68
zcmaE$)upw7bMh-5p2>aeHk<o6C$KQ<Fepsk$SOR!j8AN`3f~1JzQE)%{zsEHu?hj@
MKy1CuO#=5=01U?#XaE2J