From 80c90f98c84aa9c71929aa5272f29515f3f987eb Mon Sep 17 00:00:00 2001
From: Kevin Poretti <kevinporetti@gmail.com>
Date: Thu, 8 Apr 2021 19:20:18 -0500
Subject: [PATCH] Implement hitscan weapon functionality

[git-p4: depot-paths = "//depot/main/": change = 53]
---
 .../States/BP_ProtagGroundedState.uasset      |   4 ++--
 .../States/BP_ProtagReloadState.uasset        |   4 ++--
 .../Private/Characters/SNGCharacterBase.cpp   | Bin 1532 -> 1864 bytes
 .../Private/Characters/SNGProtagonist.cpp     | Bin 12966 -> 14030 bytes
 .../Private/Weapons/SNGHitscanWeapon.cpp      | Bin 618 -> 6764 bytes
 .../Private/Weapons/SNGRangedWeaponBase.cpp   | Bin 1992 -> 3666 bytes
 .../Public/Characters/SNGProtagonist.h        | Bin 6426 -> 6544 bytes
 .../Public/Weapons/SNGHitscanWeapon.h         | Bin 1074 -> 1560 bytes
 .../Public/Weapons/SNGRangedWeaponBase.h      | Bin 3878 -> 4126 bytes
 .../SwordNGun/Public/Weapons/SNGWeaponBase.h  | Bin 2304 -> 2484 bytes
 SwordNGun/Source/SwordNGun/SwordNGun.Build.cs |   2 +-
 SwordNGun/Source/SwordNGun/SwordNGun.h        |   1 +
 12 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagGroundedState.uasset
index 8954a0e..7ac1612 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:2779af18fafadee39d4bd4a5fcf068122dd3340f1d8955a758ef2eb8ae4320cc
-size 174254
+oid sha256:7aaed864a84944c4540e30db7e7bedcdec0377c4bc1f40aa7270d19198656d61
+size 186477
diff --git a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset
index 95e9518..16679af 100644
--- a/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset
+++ b/SwordNGun/Content/Characters/Protagonist/States/BP_ProtagReloadState.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4b60a8b533e4f866fbda11a3ef736c33e2bceb2b2970c6b7a3657bb66e6658df
-size 139209
+oid sha256:0bcf6fc62840c0eab05dd9e39d0e60b672d26d1f9c56793e51d635f798fefafd
+size 122050
diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGCharacterBase.cpp
index 92ce9b37730ac0a56f99825023a0773eb744a059..debd3a8b9c6c6527389a6e3b8117317d77bf0f43 100644
GIT binary patch
delta 317
zcmaiv%?d$L6oo%zfEXH!i7P*EpmdXN384%nZm7$ZL(IGak0LL@%-fh4ST`mz(CO4U
z-(Gv|y`G6{>Uclx(+8ggD}0u?x*H4?Y(`>+EuN^Y>bIuMj4Vmw<d~~#EZvrgv>EXp
zJ9Vt}Z_yB6%JG+dJkB>ebO@Yc(z=@eZ+0Gw5>+|A)xKtX+QR4tDZ1k3lgQ}Z7qzwT
uNVOoNM_&InO&v!r4();#9WtO!jgCq!iV9MftSjy?Rbvpy#kxepkH`z+{yfnD

delta 16
YcmX@X_lJAJh0QsPHjJAim_INB06wq=oB#j-

diff --git a/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp b/SwordNGun/Source/SwordNGun/Private/Characters/SNGProtagonist.cpp
index 596fc3f2ed4272cb8c39657ca43b95431a2ce78b..b1940ea51f0c249b0b8af4abcccc61df6fc322ea 100644
GIT binary patch
delta 813
zcmbVKO)ErU7(FvmMn1|%Q);*&?qp`nj7UUH^C6OCrb$XdGlP6yR~C}|0SnL0La~sg
zvb7mYN%;eQfUGQRIq#jBnk$>p+xy)2<2lbc_dM@S=4I>d$<ehB6U&_IScS&8&Gi7n
zT*r{X3J#EySBHBs27`HrRz{AuW1K;Zq8_zKAi_KoJBV^_W1n%8=rj=q5zDNj_H&$B
z;-b8XaA#xi+ZlAE5XU^Dj!q;og9!xeh-fFg@L38pR;^^%m{07?K2}nHRY^USTducM
zvCKtgOwyYyy)m#wPn74%Ev=?_s41h9g`fJLgt%pG0!#d^(QHNH#pr$B@!facJsg?k
z$ssAzq|R_PO#!QAQgmi(JSjBMv}`!CqKk+ubh)bPkcBQyuB+NzevGpz8JKeFY_7Iy
z$zHQtZrkeQU2pIv`6zaIZ(xMO%EX@vh-#IKmLd7@o2|<FBAdP4o|38Rk>;qhkXh6x
z`G7~>`kUk-SSy!-9(fGhiV-@Kul{i3uU5)nxL2lvF>$)H@)=AxT=E_ANGhZe@hn5(
MjRqHvt@?%d1M$q0cmMzZ

delta 99
zcmX??yDW9XDaOf4ib|V}SgvSKzM!Zxd68ksWHmjB$rp^cChs#AnA~GzG+9Pd0LY&<
zxyQ6;@)u(xW=;mq$+jlRlYi(5OpcNanapPDHhGhY%;YRn1)!Q!ljF>i*lHPg8Mqh#
Dg-j!x

diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGHitscanWeapon.cpp
index 6c77e9253c48d69e5c269396b0dcb557ac3d0cfd..9985f646cb6cae641aac57d81fa7660f5c55f76b 100644
GIT binary patch
literal 6764
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

delta 51
zcmaE3@``1`smVbsVUsVgoC9Jjb~lDhh9ZX4$=BJ`MKl;R8LSz28Mwf>7EA&F(gzI$

diff --git a/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp b/SwordNGun/Source/SwordNGun/Private/Weapons/SNGRangedWeaponBase.cpp
index 8599efdfbe0e6064ac24328dbc8d602f32580ecd..076963c94c693021e8825e25a55422042a46c17e 100644
GIT binary patch
literal 3666
zcmchZYflqF6o${&n)n|!m=K79h>0KY7DZ6wHI~RnLvK<ol<cko8h?;~QhnYto!xe2
zZ41OS+nt>`b1v_B=gj&2>!#hb#NJwJL;GZ1Yg^8D(~kL0t;2Yc=c#?ML*ARr9@!}?
zefwzpF8h=Dbz9@P#pne(zOpLmx2~g$RL;y*yHY&YT%v6Q^mf>h*n;iy-b4G4y%}CL
z?KO7aF?WcqE^^}%kD1SyUB!!qLhqv)cWu~)%__TO%dY>s|2OOvK7Zpkz<LvJ+xD4J
zj<<Vuz$mf%9?!Vkg54eM-T}Kk_H=pgFiJhPzjv2%Tg2ZX#-KqcHXM~49dE2>+hCa%
zcJGjhRi0j9@fB81i1vWr&@-r9D$DZo&V=6g#5Q16-tAe-V|>EsfJZq{Oass65%0ds
z1wHE%R(}*3`HIcH^JrGQm769ugiT&VSIt7;tr#H0`^1~T*^)t;%b3gD+X3EcMyzb(
z(U9*B|HnSl!j?3N?P6cTs%C_dm>aS>sr}d`66^-_JEQ#e*gIrRdqZZV=Ly=S^ORYk
zz73L+*(cTwAD`F~zn8AHjC!ZAew|(M>oMALkG6}qO|%U8&fsZcD?CqqeV5tP;}mu)
z_Mq6`WL+qTSDD>lN94?M!J4X$XghUp5AjocNbz}@%u8cl=+|s1{|s4K(s}t%%-6*r
zZ-k4or}5&<=Tu0>vv6aSjmC`jQh42UduQb=qH-CmR{e}#RyjQ%=9`YFPDzRN`EkFj
z7~g?oH~}5!hU!(UoSUGW@)K+G+KN<HuR{GRbI^jpI>*Ue4B2!x{>w}Gm%FFo#+&Bz
zJv{gyKG(5kUVk6p@7m~`muRXs=60J~d_Ft_XQySh%Jlhsu4evxcZw>`N9xKUeMzXr
zRj-<4{RpYltMb|M<F{};cXhQa-mq(6sxC{tO!d|d`WoEJ(|D$PV^*G>521+5b8fsN
zd{r;F#SPa36OA)Y^cLvtbB|>p*+ynS?U(00m)Bi9`MrazFjXzzw)Z1Vx|tFix1(M$
zaB#BQn#{>89@g8hvsdP{JP#K`FrL+M^p^gLzuM!CM}ARHq6bxut5aHnZMu`kWrFQS
zQL7s;R-DbqZi}~ib@fE*snijv|Lb~Zq`Dzq_r0S?IAcRrB)897Cw<j_Ei|bsQnzx<
zTm4t)+4L`eLcgWiuonA(hebEpp!bblhisnhg`$opt5Ng<_1%@uR`vFkj{2^t)IROx
zuArrq4ycAMbF!oCfuPWeon*{FkW~+^{yp@sv4dB=>Nxu4zQCNz;?Fdc%lkc8`~y8$
BQ0xEz

delta 100
zcmca4bAo>Z7t`bjri96}xE&_vvC4tzAT}u=%{94z-DdI+HZ9IHhD3%OhGK@)$?@#P
s2;SzO?5>QHU3e8H_p#|smSHoS9Kg*nc?XxwW+SeBjBK?GybN3n03)#+s{jB1

diff --git a/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h b/SwordNGun/Source/SwordNGun/Public/Characters/SNGProtagonist.h
index 5eb757adfebd60be127bb4bbb231be9ce39976d0..cd4eec9e387d3879461686dc289073a2b4bcbbc4 100644
GIT binary patch
delta 85
zcmbPbG{Ja7frP6YLl{FULo!1NLq0<hg93v)kXOPGz>vsL&X5O`%LMYv8GL}U$w09Z
cAU_`{uEC%QRGSQD7c-Ph?w7EhTqUsp05$s)LI3~&

delta 11
ScmbPWJj-Z9fyCrz5~~0l^92I{

diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGHitscanWeapon.h
index fd04f79f43648cb7240e0849703ec82aa065664e..096242963b67628767bc3e4be158c2fe186ba7ed 100644
GIT binary patch
delta 398
zcma)2y$XU*7(HY|MNW+oG#b5u(UK*(Bv>tNmKsKXs0j@bG`G3*7|{dtBE3w<n?ckP
zm+QUv`_9jIycI6xYak`}+@j)Pi4AN-sKes9#yojQ&Ezbdss>irvhVVA*@*<sCw`sC
z`PxxN2}O*da}S_l1Op~-3OZ!%$k`%*FPMXj8?)L&`c3s3cxlAc^x<#@ll4CD5kkzw
zJUU+i@e0u`fzN!8e;I2OS#sH!iYUL9U7DxS_rfrwwL)c!)mPvR?duqdFfMTphxEAg
akW;1qt<C*SP@!VNejvm@rQRtHS(+#C7)Qqd

delta 23
fcmbQivx#Fv5%VOLIg@v=$Z*s$STpc4a4`S?Tww+H

diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGRangedWeaponBase.h
index df35f57f1b4cd2c55be64248aa11e1448d4fa9aa..7a8f28f80e94e78f1ff9d6cbc974f341e94989fe 100644
GIT binary patch
delta 158
zcmZ1`H&0>1H7-WZ%~!eV87Hsfw3r;jtz{j?P|A?QkjIe9P{fePkOX9>GPnR)xj>u_
zWcz~UOBga43V?E%V0G3EybN3noRjBsOHU496WW}{)5kQKg<op&0#>%kHM~-jdH6Z>
gJb^}lw4?&*RG<YVKm$R><OA6n44MoOLu#Qk01|Q{IRF3v

delta 38
ucmbQIuuN{lHLlG!xat@u2e1ikR^aVpntXv@Ve&qHE{<9TYX)8hE(QP*ISXX~

diff --git a/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h b/SwordNGun/Source/SwordNGun/Public/Weapons/SNGWeaponBase.h
index a2708e8dc7d2610d615cb2ba0c36b6d695e961d8..2331e88f95b3748e0b0d08e72a601cddbc23a385 100644
GIT binary patch
delta 118
zcmZn=+9JGR4*TR6Y(a@G42cZ6K%CBy%Amxc$-v9N#lXoB!Vt_*%8<m6%#Z_=D+WS;
mhBO8nhEN7%^&t$E3<W@ab_@zw#jQc6O^)Y~-MoX{gAoAAa2Kfn

delta 12
TcmdlY+#s}J4*TW+jub`!9(@EI

diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs
index 9456a44..1632fc9 100644
--- a/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs
+++ b/SwordNGun/Source/SwordNGun/SwordNGun.Build.cs
@@ -8,7 +8,7 @@ public class SwordNGun : ModuleRules
 	{
 		PCHUsage = PCHUsageMode.UseExplicitOrSharedPCHs;
 	
-		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore" });
+		PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "InputCore", "PhysicsCore" });
 
 		PrivateDependencyModuleNames.AddRange(new string[] {  });
 
diff --git a/SwordNGun/Source/SwordNGun/SwordNGun.h b/SwordNGun/Source/SwordNGun/SwordNGun.h
index c4e9827..b3d87cb 100644
--- a/SwordNGun/Source/SwordNGun/SwordNGun.h
+++ b/SwordNGun/Source/SwordNGun/SwordNGun.h
@@ -4,3 +4,4 @@
 
 #include "CoreMinimal.h"
 
+#define COLLISION_WEAPON	ECC_GameTraceChannel1
\ No newline at end of file