From fd8021bcbc3ff29a63584408a1d5784f0f0b58ea Mon Sep 17 00:00:00 2001 From: Kevin Poretti Date: Sat, 10 Apr 2021 18:35:49 -0500 Subject: [PATCH] Health component [git-p4: depot-paths = "//depot/main/": change = 57] --- .../Protagonist/States/BP_ProtagHit.uasset | 4 ++-- .../States/BP_ProtagHitStun.uasset | 4 ++-- .../States/BP_ProtagRootState.uasset | 4 ++-- SwordNGun/Content/Maps/Test.umap | 4 ++-- SwordNGun/Content/Maps/Test_BuiltData.uasset | 2 +- .../Private/Characters/SNGCharacterBase.cpp | Bin 1864 -> 3276 bytes .../Private/Characters/SNGProtagonist.cpp | Bin 14712 -> 14932 bytes .../Private/Components/SNGHealthComponent.cpp | Bin 0 -> 2404 bytes .../Public/Characters/SNGCharacterBase.h | Bin 1272 -> 2368 bytes .../Public/Characters/SNGProtagonist.h | Bin 6742 -> 6800 bytes .../Public/Components/SNGHealthComponent.h | Bin 0 -> 2190 bytes .../Components/SNGStateMachineComponent.h | Bin 2644 -> 2650 bytes .../Components/SNGWeaponInventoryComponent.h | Bin 3100 -> 3106 bytes .../Interfaces/SNGEventProcessorInterface.h | Bin 1268 -> 1268 bytes SwordNGun/Source/SwordNGun/SNGTypes.h | Bin 2572 -> 2808 bytes 15 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 SwordNGun/Source/SwordNGun/Private/Components/SNGHealthComponent.cpp create mode 100644 SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHit.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHit.uasset index f32bc86..2881eb1 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHit.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHit.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8e3e9abe94b31ed7b2672b6dfafaf6ad370b095c25972a78169a305a0f7d4d74 -size 5445 +oid sha256:56ef1181e85e76b93a39bc0629305334b39fbf41d7910dba9aa839b0176264e3 +size 5836 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset index 17328f8..c39dc29 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagHitStun.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1ab71d8d3b8e19940fd610b1ce954d59f5c08ef1bc186d4b2c71ae3ab42bb3a0 -size 5494 +oid sha256:d46bdd074ee87c786f1dee75060511647af71c4ccbc05d01e774ad3852a3e98c +size 52537 diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagRootState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagRootState.uasset index 82e59cb..209da8d 100644 --- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagRootState.uasset +++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagRootState.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fa5e3e1e9eb5793ce0977fcc71ac49050da746922c1ff96f01ea5c61da9694c -size 15722 +oid sha256:90bb85eb721d5aed6195fda41d3bab692366054f38dd00deaece337e8425e1b9 +size 31195 diff --git a/SwordNGun/Content/Maps/Test.umap b/SwordNGun/Content/Maps/Test.umap index 8f101e6..b58d4ce 100644 --- a/SwordNGun/Content/Maps/Test.umap +++ b/SwordNGun/Content/Maps/Test.umap @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:29ea516ad4c2a25615067a744718bce9cf2fc6a55da7397ca06b166d617f4cf5 -size 631613 +oid sha256:a0ae31e2980abe3ca6fd7376199c61291b2d0df60cf13587c62fe73d78892f02 +size 638815 diff --git a/SwordNGun/Content/Maps/Test_BuiltData.uasset b/SwordNGun/Content/Maps/Test_BuiltData.uasset index 01f171d..e06f8ed 100644 --- a/SwordNGun/Content/Maps/Test_BuiltData.uasset +++ b/SwordNGun/Content/Maps/Test_BuiltData.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ed93eb057f79771a397f9597e2f608f52a8fa81998f14209b99833f9903cfdd +oid sha256:ab864adbcc532b2fdfefa054105ff115aea6133ffb85aaae3f4ec36b2d40d357 size 2330061 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp index debd3a8b9c6c6527389a6e3b8117317d77bf0f43..b191e605f1f1513647a2dc62a32b7b540e8d46ac 100644 GIT binary patch literal 3276 zcmds(T~8B16o$|3n)n|!n3!U)eq5rG@NJ_Yp*4DEptOJ#O6Yq~hN6w;eBXAGck=q>DN45v@p5ri} zH-TH%wmH4Nwu0S+oo#l_-Ge)}Q&^ATG@um@ca{C;^e*8raDG*7B5o7csE^o58!-)< zg}I0!-@VdZP7{ON`8|Y%7)bLg`qE>-s_d8V^?lJ6XRvD7yurLEnYc1>52Wl9bnsH{K4My*8!zNf7`y;C%7*Y5senmb{(r-<~!VBMOlj7W*nm9W7K!( zO_2#6E`uqKiks)H+<3xiTg1O<&7%cn>U*VzkA8;#Lwvgn$>(=wKEpFIWjboqI8|T^ z-pc3>UYwIF1t%(dMrfYu^TWl||0*x9*mvwI;6WZbVXHgqhcEw<-Ap@MibcS+b7)@t%Pv*jf-}= z%RXydrA$v!%%rrcXsS_$nwO}p`Mdp2k;F6|M{Zh)qh_Yny;W8| zm;Br8EA;f2(fg6s>FM^qPV3c{g5k?B-P5Xg7T*h>Nm;4$^b8EuBr4HPRO#`0Np1gH zt=DontSc64#B+jd4g}lI;PDT%(GYkBdY}1 diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp index f3043df996e13afe3d2378f82e03fe5fe0e69933..aae39f97f96f5d13fb737d2f0fbf3681aecaa28b 100644 GIT binary patch delta 98 zcmexSbfsj&1og=dYC4?G43!MY3^@#`lYeu`vhp%;F;q{!&u%{1fQyCIogtN>WU`@} nHIgbuUU5zh22BQtN}$~2J?aZ47qDxAbWEP1p||;&#v}m%T|gTU delta 48 zcmV-00MGx_bog?xkSCK|B`lN1D4>%zG!Bz+2P%`0DKe9^E)WZ50AT=Z0CNCk06Vk2 GDVGr8R}oGC diff --git a/SwordNGun/Source/SwordNGun/Private/Components/SNGHealthComponent.cpp b/SwordNGun/Source/SwordNGun/Private/Components/SNGHealthComponent.cpp new file mode 100644 index 0000000000000000000000000000000000000000..a362b8eb66f281beb891aaad7a6251036296a913 GIT binary patch literal 2404 zcmeH}*>2NN5QgU#B;LUaf~G8K%4HB2G<19*Zqn7h1I#Xd3p=R1-sHda*Q5YDUt_ve|bH0jo60ZcCm=8;@Bh5$Jq9`QkxQ6 z%Rb=!07(b!6rYNrtXD%?Sz?EbT384na{NBlGq;b3PDnHMwcGa?BS%hL5?{gJaQV5{ z=p4HV+KJmMr{lF^Y*=GW&8lsBF5mrrj~b{$A)mj;sogQUC&U(cg%gid`6l)asrq?I zwN&4LCCvd98M)0A{f_51wP);f(34FOSGmXbb%CaCt0Hr>`m6z|##>~ch-StbJC0Ch zXyl%!?z7Lmv)EHlRMRZ$F_?W2g8#((E~d(71Xtuaba3Q8VwWdwGhcY`vYy!n7!hla zU&u&R7+G!MPZJ<~Wk0`$W9>!OHLBZmU%QLUvz^FZ;XzCrl10y6I&#S74evPzi);>7 z+ssd$Sn6m6yQ~5=q#?#1OT0cF#`sZ2>$7j47}C-tiD~MN>Z8sp){J!%*UtJ?j5x%X zM{|LF;x%1Ame=TaS7Iqovj+vb{vC5-xf<#YkG(U2$ax#^pj+sBr)c`v&@e#GJ zkf*Gk*dCLfIv1s(oLa6OCRsDQx9om7$4xLY?gZ8y;-%=jS@K-79sGz#U7t`fpvrYh zH^cN7ZL=z6U0G#;Jl=%~EzX1!XP?dveSL~vtIR{r^}K)O6S8P=J61fW<~gcz{LhMi z$%^pp(s?=Lcf0S;T^Y55p8*^`1#h5dmu z(ObyZCEgqO>-o8I8S}Q;SIcopZ-kvPkz?E^mjQREP>`mc*Row6N4fqL?!df^uukNZ zNIO(T@r0)5=!XUL^4f*pE31*ij#ce}XJ5IIeM+r5_STN=#G0PtF5hQpx2=UtR?7VE z<43lK-Zho)<8w?lWL4IGRMKi?zW*#^V)V&5RKT?lx_z+M?3CXo$m?)v+Pfc2rC&t1 zm)V9X>X0{eSmb@HYA(FLBC4oPTOgNoeAruu|gs1z8N zqx_qisQb&6JA$!#L>nWYf`BT*LZ7^fZR(TKb-8Ah{s{A#pG5`v&l%E|S642)V>bIf zqw?CX>Znzh1hm@Be;av(-qabk$+hH9`%0Sfs?HbZ#2zBa^)w-ht6Nlg&|MpBYmP(zWl@ZxZc@!cuj$@Y zr4v4y%Q&0$(7$1Cs4v4EG-R)?wm_Q=cg#lCraSfB_683rPnh@`*p}R97w$cFT;*;% zLE0nkG1?RKgj}%W*xWrE>b2&VIiGsZ)j# delta 26 icmX>g^n-K4iODLA36noCp4h}(#WeX6yWHdp90dTKqBBD!Lo!1SLn=cMLn1>SLpqR^!VnH5 z6B!B^@)`0b*K+upDlkA`8Bin>D6hbP(B}(O3(}v8tcyW|L36U8nBrtTVUfx2c=$Ho q;xc2JtR^Wid5t93M$q(wUsg?G2}30G9&|eo>0xM3}ry&c?=~C0SrYzgOh>0Vj#>1@;t%f zsX$g5(Aeb7jI5ljo0+(am?ocKGn?!rA|~nw6fXgq2r>h1(qu*nVZi{PZN)%GAVl}_ LDsTS8JC6qdX9z9O diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGHealthComponent.h new file mode 100644 index 0000000000000000000000000000000000000000..b1016bc1de1281c0fca109fdeca8e42c679f486b GIT binary patch literal 2190 zcmb`IU2hUm5QgU#6aT{o69v;)^|Fl@l+tR{mhchd6=6S>FBQ_RDb-U>{B5oy|JhdnOJi|h4A^Kzf1MW=l8WrTyzOWHK` zcE2&}&u)3>nj?Ef1m(=;cAYW4WIy6bY(}m%&rrE3mv#AWdu=-dhxgbDi7mnRHVXsy z6?ujU>wY0hA#iLB^ga;vaL-d&^}-_@u?$L};aYv8@cURoWz3y%nl zL-#c%yNaFIIhn4-Mt1e2Jzcs~UBfLJ$Cdg13nR#QSfpuUedRTQNM@=THEwU^e3V_WyGI49$6 zRjhlos!dwMv|2?bYKn;mMK;P;n#qJHlmF;<0R}@b4X90@-@4bl0|KhGjq@e&Us-57 zKNO$lrY7`btflo%tD=b{ea(V{H6E<+lO&)UuDGKau6k<*5Adu$3LGcR9L>|TuA2AS z&%Fj>&MNXFGzLf~bcJfObY5!aFObCigi*ACdlN>VqakK@oXfYnwuM%RuIAkcyW8qr zMClOzrAVx}c-u<@dqeW5VRM;bu$qzgN1(|j6ou}93}b8r%p85cijkDJ#wr%%-B-My z_riJ~-<`+pSZma3Ms5Q#TXo2;cpF}y^qZN-`}nU*;PokHQ-@Fa_bAQnXIB5eie_a$ literal 0 HcmV?d00001 diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGStateMachineComponent.h index a5bfb5b94169b23193c314d34644228678ed9d63..1accf441ca7d38626ff63c666c49b9418a7cac39 100644 GIT binary patch delta 30 lcmca2a!X``ACq7(Lpeh}LlHv?gCB!CLn%Yv=18XB>;Q^r_ diff --git a/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h b/SwordNGun/Source/SwordNGun/Public/Components/SNGWeaponInventoryComponent.h index 65ae95c2f45bb6a008a642b2b00162e15d117061..18cd85e324108437f2cdd713ac719cc53ae24172 100644 GIT binary patch delta 30 lcmbOuu}ES=6q8^uLpeh}LlHv?gCB!CLn%Yv=2WKboB(~z2kig= delta 24 fcmZ1^F-KxU6ce{ILn%WsLkUAZL+<8mrtO>nS4{@t diff --git a/SwordNGun/Source/SwordNGun/Public/Interfaces/SNGEventProcessorInterface.h b/SwordNGun/Source/SwordNGun/Public/Interfaces/SNGEventProcessorInterface.h index 517af96d6d81d063ab42f5cd298b53c1ab8b66ac..83a990f13214bbfe39a4757996faa59fdfa10cf0 100644 GIT binary patch delta 19 acmeyu`Gs@C5*GF{hJ1!hhLp*xSv&zr&jyzO delta 19 Zcmeyu`Gs@C5*GF(hI}B*nY^0C697p?29W>& diff --git a/SwordNGun/Source/SwordNGun/SNGTypes.h b/SwordNGun/Source/SwordNGun/SNGTypes.h index a8a366b1a2438f20914f3ff842f13cd922a35bbb..ccbe2603564ef1cc266855f8b53fca3895c1e27c 100644 GIT binary patch delta 142 zcmeAX`60TYg>7;VThnA44m(Rn24{wRhCGH6h9V%H1B9tSmKK8ogDXQBkPVXY1d_!- zI+G!tArVOD165d0Hso;ER{*L5K}R4=hRT5Sx&YPX0&zOf1ZN;!3e*oYck)9P@yQyT PB9pb)Wj6b