From 1beaad73bc1c24c8149c386e4e549492734bdf78 Mon Sep 17 00:00:00 2001 From: Kubson96 <42842162+Kubson96@users.noreply.github.com> Date: Sat, 15 Mar 2025 22:43:58 +0100 Subject: [PATCH] feat: add swapping and drop weapons Added swapping current weapon with weapon from ground. Added dropping weapon. --- .../Player/BP_ExoPlayerCharacter.uasset | Bin 24133 -> 24183 bytes Content/Blueprints/Items/RevolverGun.uasset | Bin 42088 -> 42414 bytes Content/Blueprints/Items/ShotGun.uasset | Bin 41898 -> 42414 bytes .../Player/BP_ExoPlayerController.uasset | Bin 21791 -> 22007 bytes .../Inputs/IMC_ExoMappingContext.uasset | Bin 13145 -> 13801 bytes .../Player/Inputs/Inputs/AI_DropWeapon.uasset | Bin 0 -> 1679 bytes Content/Levels/TestMap.umap | Bin 45726 -> 45726 bytes .../Components/ShootingComponent.cpp | 24 ++++++++++++++++-- .../Private/Player/ExoPlayerController.cpp | 6 +++++ .../Characters/Components/ShootingComponent.h | 4 +++ .../Exo/Public/Player/ExoPlayerController.h | 18 ++++++++----- 11 files changed, 44 insertions(+), 8 deletions(-) create mode 100644 Content/Blueprints/Player/Inputs/Inputs/AI_DropWeapon.uasset diff --git a/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset b/Content/Blueprints/Characters/Player/BP_ExoPlayerCharacter.uasset index aa2df4f2aaad9d533f304e06f1df7bc7d93bc5b0..b9e9b35e0a7f28974c0ee564b594bf3de7fb69c0 100644 GIT binary patch delta 4359 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 diff --git a/Content/Blueprints/Items/RevolverGun.uasset b/Content/Blueprints/Items/RevolverGun.uasset index 0230aa18f34f6cb2b7b5e1d1da5dd20feb17f391..4549f1f861ebc0323bd7ee4540168dc9753a71ac 100644 GIT binary patch delta 10403 zcmcIq30#fY`#s5)=ElX%Y(Z(&6_C^XV65X^-ix%p=A;zV`drJ$tT2x4x zY8aJuFn)eas<9VgOlcCM#kA;u&h34hEH!=p|M{QK+&S-gp6_|K^SsYF=T*zkw9~g} zWs@)(5l%>BbEHoI0G87Lfd2un$wXO>HW7wRnpdO%z%)oInhZdT8UPr4E>j2K9Q?`Z z0Wf&=-OPKpS6Cb^l9bwsbxk5pVM^Eu;u_{UJpi)f3Lt(&8-$Gr2OtU35(>(VX-jFc z6X5f*0N;=h{~(|;t@jlXEjrIo4iQ6xf;bVJ&=42@h_KL*2!CLlSbT2E*EkVCIiS6b zC=_*&kwE;Yh{(`jur@(|0nsH|tMjEK{kv^a6Cskl%*ESgQ%GpIKj6)kC@Q}smL@7C z1{qGi(ILQ3q@#)ml&m$QL&~rfclJilksd*?2oLv-1cw&SY z7EGL$)y0D$1~sAfE&d^q*5STk0pPnKDo7>!-(aND$Y*!5N8Q(O+2h0=hBzEy|4HDH zaSA*-PF&94IH7*w@N-XILXR{429i%-dW>+##)-@Q0tfYfuJ{EMxc3X-*Kx_?#HEae zL;h21j1==n1Ac}(K2BWGKj4J%M~b8V0f^WLS3C~fbBH@MJ{&%nIX>WE);MvIW8kQK zYJ&#)3USc?k=f59CsRftPY!%V;2x4DAp74TZr@jMRBq*wJk+6Lhni5YF#d4xHQ+8G z>{A23hTA<(95r{O!#G78X(8p^NZ{9SRJ6W^D1-k1MGQf*AtZf>3MRn* zCiz?u4Ix@YA7pb!uuI72_!uF3jiRQ4F-bzQWl06PvBPYu5o{`xjN^oCrjn)ts?TU& zMY>Z(hp_dZvXNhi%_SXNj|*o%hO<%CMk*0|3CVuG{S!7N+?*7yw(Ao%C442x_TqiQ zMpPuco)mr}MaW*GqN#v30!sIO((m|#LUt8oqxw&=H<4^9zL3piYAWQ6V0)6nBh!TJ zt&p7$*{C7wL(sMj+no%!uv)}p$UZnk0rO!`y){b&!r3NMH5CYwtpj^q^0{h=oekMV zkVKg#Lz?#6r)(-LugKY*$ArSysA?*p;z-S=bU(@!va29_KRE;G)7R-v~tS83#;y~Lax$=E?h97rFe^8f!4K70nO}uLd9!8)xwF_79w25 zL(_Kst#Nh5Pr_mu;E}HV-c~CJ6W4B%pEHk}H=|?-<+kRR66WK3Tsa;Q*y|GPZ43NY zS;_v+LZVg=3+A$PND|}o?g#cnfj)_2;-FYa2oFS zRbZ-6s?$mOxHY>Aq=mpdGCxyrw#x~^DVDpF~hhgSz++pe}-XT%rt zokVy1{_<|w);jIRLMK{~TIcSUFI|gE>$p??YuXUI`%xwvESVo71!dTKSL<{FC{Jrh zUUi>yb)Rd1KqAz%K@jq?9(q@S*i4BUV;;bLO%^fW{M~K#0twjjRr^)^jZG^+`;MkV zK0O5m0`Ydq1v*QvwmXEL4>ShR8SzE$Wh#w$Ae|SQv9#sAL=7;`#j80@K0W!fst(j~ zmDwh~-Fd#<0x<{vYaf#sgQ^=4k~P3;TG~o)yd)66>+m4pK>()M;l{5mz+($HwZZ5K z`c#}d4KQieHT#zf3-tCk@iB3o*QTEM!7JQzFBss7v%`%u`TbJBYJgLzVflpTIJ;Iv z=Vrs*vRd&w_P~a%AJbESjF}Z*?_A#_uB6)X=PyM_8SL_InZlec$j{|U9x!dUcF}8O zfC^_T7M6Ms&*mLCltr8Jh^x#C*E0;f?|80?&khwm_;Z}Dj^@X2>Npo=3?J8>x|iEz z^ik(=h?(@o0uX+TbD7@mb!5}qoTSZ-%SHNacj=ZVJc$+XnE z;{usEXFk}6_doT%rsy!;<@c`ZW}dC55~cGoJw_bkma}MqGx%Jn(fdG*! zNn4d(V%$AU$&c@ibYd7&`p zn|GH)d732}2Crfqp5U{cEq%~_8Z)t5*{mSkvgYEIgPGOy3(KP>i}j!T$j1)&z5V{$ zir{5#3%>o&722}_hls!2?fssmN-#c)jwWx&_+}38*)m2m^khsfc0Jq?tWE&pe^)OB^Q6qDf#B) zszLA?|K%QcCM-Z8H=PG8+U%g{$~!TgFD~D2>ND${zfSh_=I7Xrogp<3%{n#A)mU-0 zM*>1Bv^_!moSAcg6fAu%3mXlU1Y)R&@!_h~BX`Rwc^vtRW6Dfqal*WG>Xrl0QJ*zM!pu{L!;tVrZ$vekgjtBe6?Lj}JAyzKjR zUXg2uWQG%rzLQv>u6fhap4fAc%7l&$|T7 zWK=F&buXx5jn%oDOeddq$LA3(5^><{(w~gVs_)C?J8L&Z2Vq`zFT53w*RU!p_f1@Z zd(YD7yA!wR0iF|h=bhf(&}|mFr_S*nO1m(Y#5)$Bj`^`mAd%(Qng1j{z&qnvtq6zH zXI(J&a;v!%+(CSu_cJy`<-<)5Zg=E9DHW4S{9gTk@2`R7!96nfxLUc1 zY`6w%9eMq+Y8ij7Zq4>TFCt|WenvgiwO8i9PU2^IOTGzhejFtAebb_WCyQG@*2l^G z?!`VC*yDNoeWRDn1*>P+U2B1Al3P}+c3MH^!^S%v87~Rvja;SQvvB{#z4Za0P}?&Y z?mE~^lvOie32#V7yXr)^df3PfOl;BuPUZB0yXF&Qx84`@>zR1FcsncipT(2I-ykSkCe!Na6w_moX|cKRyPRe` z=5eoxxvJ{SO;?{wX+0BBCv&m1PCnG7yj^3@5-^_ z_KSPp3O01!^iP?PWwXx3KzXAdSL~Z#qt>ibxo%f=la|{l(y_QxG-s@d~I zmFBpxM1bC7||A;O$FFD85SSs%ZKkVSvoS)E{2QPPi>T>0syL4=I; zKAGQmzeV#F@<7M551EnNf#X+{&DyflKE{?z#P_62Uu-psxQ;*2*xgyG-+0c)B^a*l zAF?s;Ernq}`U?|Z*^qT8rLzQ|d*k*GX?h!pH*99Ysjay2yW7W;3-56ay5cu>cwX3g z^5#U7Nar4>IPAfy1P-*DiB1zRLY&7pYP1@k@IWx5efOi}-H*6akLWbiZVBT=r^bOO z!;kF{sr>ZPKmf*f?JsY)PLD6brgTWA=SjM~tgpV@VJ@AU{YnOpTLK?Zp3&SKdy?&) z&0tCW4_s>rZQCeV%A&wb!(P``c+i@GDx51kwEWa}C0`(l>g6u@ve5D!&+8henYO?Z z2uaDk^_-5L;tJsUqVH+af*f^M@>p!$cRaUP{Y@5+tH85m(bkdG92d}|OH1Yz`|V$J zyrH;<4Xn@9upTs}88R@H{yeFBhr+t@;bEIav%l50;_19guQDA{iv^+&;t^;r>l#?j zD8AY1@MI}x?Y8520*NfwrV6iay3LbowfM8-S_pKz9zGdT|+#x!z3eJ3y?$86$sxS~QVITFfYlY>~|aX3rO znjBH8hE4nfer2#EG$IrgD3%aODOgE3L?~(v3r2Umm6TwzHzIG9vxsH|CFR+laVbUU zE5uag(9gK&LosSQA(v$uHZ%ZB$)1`Ehg>ttqR|yV^{U90v6L{0!bqvP<5FZ!TH!%F zk2IQ0g@Cen8S>V>dUm8l7++vr`l7pbuknU+l#yuamQ zjG=;KN2JCo8j$wFZW!ca&x0qJLAr^<~KB$TqAcpA%6HY4Rzk)+nl5#<`)f#iA+7I6%^ zJvnkFf_X}7C`a5#Diw#}v@(a$`DQex05V-kCZ+q+Rcwuug{Jq$nP7{F+TBW$U=ayN zekwthMdEzobi534cB>Dz6+)EhqaiZ4`C#G1kwZq)S5q>`9(|l9ABQ?hY$&!IX`KN+ zpV2l(2!QhK{E+eH2 zV}?_LIGw~IauQiXA*Bxoh&Zz6?`1(KP3488d(;Y#mR+*D7}H0M%|=p)J0ZD4WBMF& zw1DiX5W*dDsLdnncbL#!$WaV&U`K%R*qNrg6NSZOrwO)Jm_}5+L5ao?>xK)ykxaHB z-{q26{~V!z$9I3y4WaM!;iV_SV8H(UNKC#hgD?NqLfL{i?Ock_Wooz+{N1BR#s8D2 zZ2oQ>Q6cp9u&^~S$_yfC4{MCvVf{Pt+cZl2%6R`T@r#cE)tOqZcEvvLYHSPQ-n$bG zdqF`SXAf6wbTAwB zHKg8MVJf-~r{d=_P+`|6iC=69Xmc9-UGz#t?_y}`*Q16Ev>J|@+J2`o-oq5`6ynYP zwb*)Lw7d^28If&I4pEir%>nB#YBuHR=X)TmQkJ8JhfDfQZHr^O*?17SX~CaDV8l3< z-F4JW)(3`k)U_~&+r`*+%;OK)VFHUe+Ciye9zJ4^P2n<#0luE{cGAPI7IS>mq(Y~Z zQKLp3WvHk{kUHeZo~rH!$;{B-)Q!%285~4Q?F2&BFpV=a^uCkj+$wv*u;8A$&__DwHFhg(yQxoU*nP zy%~l=#B4ESxfgLVXSQ-Yd_s-NM=DqRQ0^|HGRkBK^yLLlU%%XxGa551Q`yv=uoKL5 zrR0!EFqM4pAp7CG`xEB5>S#=q&kT|oM_d&cVv6V*qDx5;E(ii7k|4^dPtL@+_au!C zU0V(~9#K=w4Y926UO}Rr$({-Um`)N#T0g4g=q@*^7MO0dIk1^tWKB zQ31Edh?RNjex5^A@OdF(k#wL7fS%Y-w2xu*;5M2$gwg?Q`61l2>FZJ?xAkj z9HE^Qh!Q~^ZiA2rI$9yroQZeam597FCF1a|$#g0%?!@Ul4Gn4(Fa#YIPg%bMNg^iX LqisH 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 diff --git a/Content/Blueprints/Items/ShotGun.uasset b/Content/Blueprints/Items/ShotGun.uasset index a33f65d17c967882da8e9bbb0e936bda07a38f66..7a5fef42f82f142b3ea07cefcb14755c5e7887e3 100644 GIT binary patch delta 10225 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 Mb}+sU#uS?UAFGsg&Hw-a delta 9956 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 diff --git a/Content/Blueprints/Player/BP_ExoPlayerController.uasset b/Content/Blueprints/Player/BP_ExoPlayerController.uasset index b7980c05862b33f017bc280308b9bfbf3751e4c0..291310046d4efa86926b34bba821e5e2db68f497 100644 GIT binary patch delta 4644 zcmcJTYiv|S6vyZGq4w#PwAYJu%zw~y_+-4=Y*Qn5-=`heo2Qnsi? zK!w)B2lWG{#xH6#HdPW65)DQ%8WTtq@eN9~f>t2WCIqZ!?w+~bcdsU$q?tMM|IImb z&dlC>;pNw***B!o3&Gb-jO9apcmf1T36Vz_V;KRA1!6BnL9Ud&b})*u2sDdi#&WSQ zSi+cWL>b3j*l)+b1Ne97gOQ|T*Y;WuC!P3pU)x+ej7o9R5qM2%Nts3Y!&c;-+8j0> zy94J=woV!YQUhg-#LPQ-`!;rU_VxCZZW-wA?P2?yZazL)8k}_#M1|+-=4JMmef+bP zxbvLJ7sA>C^pUu@w7SCy7`oKmF*y@)HqgGE0uNLF6$T%nv6*__dE=hZ$UW_XTe7Y2xh8 zne@@55IOjS7l*wxcYykzk=vnx`w6+7uAC!(cZcT@9B>5{%bh!i+%65=kH|gjm81HL zOnyM{5wD`$y6BkJm0 z*xVclhp;m)Kj69vF4r32L|jS0NI8rfjF2Md==Ty+gna~l1n_p1%js}XPSfvm%&=Rq zpP=!aMV0S%lHa89+ZBpzjZf3_*C_vF;H%g1&kJnrl`b+5$>rK0E;9C_Rgpsz()9f0 zDprs30k)}nMc#(;sAGn455cs0S0m<_4xgg@B*~fBXVG}jrmW6NOw)_nWU?TpBl%Su z=;V0Vlej|9-%29(FC@R?SbY&!^Oup3c>vyCYIP)Lm*-eA3_)rNXL|WsF(CYD%=PCW|s*N?zinXK@!JaN;hSq{1p?cZ3MHxH0;Agl}nVr8iYNe;}wr=nx{)XahzQjLJT#KS|oy2Wa{a!+~ z(AU!6QM3sWO3I@{VpVIVJkjXk?N40Lq#~!wqwTfAqFxO=jVL|g)Zd6IUO|yR19|fZ zauLNOhvq5Hpm^uJn4k<*zhP+B2^HQmCrYhw#%zf((;V*_RsFmrS}rF`{H()OwcU~@ z=ac3AjvTk>{)1=!+~v&zkri2fJU3NjEOXxPa>p_z_E16gI(|=0#bkL@@fsHDb`r&t zMr?suNiai!b!kcpS<9#wSSr~p4aTg+AthwC!tTngaw%D2TdqH!m@1uQhV-gpsRHb^ za){%c@ZX-e>1eo8(*-xGGNet4mO-Al7Kf`kt2fJwk#vn32a`6Hk>&9wIEBI@RHUbd zSHxc9wIad%v}$d8&ctuI*Xh`^WsEYE=tG$yC~w5LtIGz zr~Ym|&++5>V&5l=`q73AsQ^wk48cT0j55lDf#yxpdbqVYQ@R6Yn+xGs)4W~OYyxxR zN2!`gv5=IWLqt_ jlO>Akdd){{x{y^wnBb@_&gGpEPl`tv{*W=lIh*NUuiHfN delta 4429 zcmcJRYgANK6vxj6#zdnaapdAK@)CzZAT!W{9AF;ue#{J+4<3b-7M7aY6Gk(#mj)f{ zQ)SlbgOsgBvsUq?4A-&`JzV;sA|Dm0w9HJi53>3I?S1b)<1o*=T8pz5?0e4txA!@F zpL@@l>mN!72Bg08x^fF+g?x0@eEvm}ehyBJOM@!zo&}U`)w~X#_nY%afJ}E`&=Z7R$W~q^}OK#x( z+9WhwKr4)0aeIw1S+U+VI`a(gm$P@rcvs&t66<+{@NTj{fy;CBY$b~(6!)S=?xpaY zhlzx%SCMu|M&uZj$Y2^07{7Q>dYFyxJ8o4G7+z$}% zdEz|&6F*9WLPRjs0yh!&0@?GxZKh}cc!AtG;I>TV)bN4eZvbwc3M#!oZWOr3HE_QI zw=E<`>4{8!0dRXrP#qN9&%o`_z?}u|iAbC%?->A}j0BQ)8n~x4aHoKKIs&(cG|vS9 zdqaTYdw-QQGLoc294atFr1RV{~kXa2E<{1PAodw)^$aWcQ?t5iNnV~pm5$t)HQfn z`$RxqAQwvIyj5cB99j=bM);BAI#{Z5i{!J6s$J(uEn0X#)Xa^c5CBFW#n_=2=*J>DB)&M}hC zsGc9BW$W>}5HbeGcGRsVWE_n7G>s1#OLRx!mq)&L+;}y;D-VDZ6O)riZc-i5VI}^9 zW>XC;g4#c@U9;)=&Oi~<#ObjGc_zT%8h+d{?=~SR%f!fL9F}bSjWW~P73ho&gNYYs zp)$f)FStO}PpT-Z z@P*->N5opw140N0CrC-dwM_dYSe1yA6llsMpE9xWS=QntQ7}=GLf&LGnMKx!M%;QU zf8UztSxg~mOO&2}2;A5u#MsD+0*B3UiD^p&Uw*U9Ch~Et2r7TlsxG~3#GZ4Rty$zV% zI}Ig~_Z65OjV9@KexR|NpLQOTO8G%ou5=&&#?`~;I@kI7Z#gY|eUsbQKi5>O$AjT! zT7?emwyoPc8HOs*;aTe7^=?P5ST1qC>r?dS(u0kE?l!=EdkX&F%dfkOWaVH4RTOb* gf-TL7HA~4i=);mp@Si+YOhndq#$gIpKGbaa4|pFpA^-pY diff --git a/Content/Blueprints/Player/Inputs/IMC_ExoMappingContext.uasset b/Content/Blueprints/Player/Inputs/IMC_ExoMappingContext.uasset index b6733f857a0f7c9fab56e5485a1330d23edd4080..a0f74ec67c8674264c5522a3914e9e3bf3e87e69 100644 GIT binary patch literal 13801 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 literal 13145 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 JEHq_k{~PcuPC)gIJ3S}4-^F>0000V zv(jgg0T2Z)uo`Shicg^!&Urj|bF-5mfEbeyQZlo>X{8|=z7nAUb91Vcd%*;Q$@bOyqXKg@}|BgMA@LCF!V2Ux55KeHnYA{4-^F-0000Z zv(jgg0T9XW)}4!A?MtF7tNCw!<4uzwfEbeyQZlo>X{8|=z7nAUb8xElS|Gz=N#K6f{x;!wzlmCuAlki#!lVFN5lMqrEv+a#p N0h4u((X(}qDI{y^NKpU) diff --git a/Source/Exo/Private/Characters/Components/ShootingComponent.cpp b/Source/Exo/Private/Characters/Components/ShootingComponent.cpp index 1166109..8b850c3 100644 --- a/Source/Exo/Private/Characters/Components/ShootingComponent.cpp +++ b/Source/Exo/Private/Characters/Components/ShootingComponent.cpp @@ -87,6 +87,8 @@ void UShootingComponent::PickUpGun(AGunBase* gunItem) DropGun(); bIsHoldingGun = true; + + HoldingGunClass = gunItem->GetClass(); MaxRange = gunItem->MaxRange; DamageValue = gunItem->DamageValue; @@ -101,9 +103,27 @@ void UShootingComponent::DropGun() { if (!bIsHoldingGun) return; - // TODO: Spawn gun actor + FVector ForwardVector = PlayerCharacter->GetActorForwardVector(); + FVector PlayerPos = PlayerCharacter->GetActorLocation(); + FVector DroppedGunPos = PlayerPos + (ForwardVector * DropGunRange); + + FTransform DroppedGunTransform = PlayerCharacter->GetActorTransform(); + DroppedGunTransform.SetLocation(DroppedGunPos); - bIsHoldingGun = false; + AGunBase* DroppedGun = GetWorld()->SpawnActor(HoldingGunClass, DroppedGunTransform); + + if (DroppedGun) + { + DroppedGun->MaxRange = MaxRange; + DroppedGun->DamageValue = DamageValue; + DroppedGun->FireRateCooldown = FireRateCooldown; + DroppedGun->RecoilForceMultiplier = RecoilForceMultiplier; + DroppedGun->ReloadTime = ReloadTime; + DroppedGun->CurrentAmmo = CurrentAmmo; + DroppedGun->MaxAmmo = MaxAmmo; + + bIsHoldingGun = false; + } } void UShootingComponent::ResetFireCooldown() diff --git a/Source/Exo/Private/Player/ExoPlayerController.cpp b/Source/Exo/Private/Player/ExoPlayerController.cpp index 3f2c651..1f783ba 100644 --- a/Source/Exo/Private/Player/ExoPlayerController.cpp +++ b/Source/Exo/Private/Player/ExoPlayerController.cpp @@ -59,6 +59,7 @@ void AExoPlayerController::SetupInputComponent() EnhancedInputComponent->BindAction(AimAction, ETriggerEvent::Started, this, &AExoPlayerController::PlayerAim); EnhancedInputComponent->BindAction(MeleAction, ETriggerEvent::Started, this, &AExoPlayerController::PlayerMeleAttack); EnhancedInputComponent->BindAction(ChangeWeaponAction, ETriggerEvent::Started, this, &AExoPlayerController::PlayerChangeWeapon); + EnhancedInputComponent->BindAction(DropWeaponAction, ETriggerEvent::Started, this, &AExoPlayerController::PlayerDropWeapon); EnhancedInputComponent->BindAction(ReloadAction, ETriggerEvent::Started, this, &AExoPlayerController::PlayerReload); } @@ -170,6 +171,11 @@ void AExoPlayerController::PlayerChangeWeapon() } +void AExoPlayerController::PlayerDropWeapon() +{ + ShootingComponent->DropGun(); +} + void AExoPlayerController::PlayerReload() { ShootingComponent->Reload(); diff --git a/Source/Exo/Public/Characters/Components/ShootingComponent.h b/Source/Exo/Public/Characters/Components/ShootingComponent.h index 7239898..2912092 100644 --- a/Source/Exo/Public/Characters/Components/ShootingComponent.h +++ b/Source/Exo/Public/Characters/Components/ShootingComponent.h @@ -45,6 +45,9 @@ public: UFUNCTION(Category = "Shooting") void DropGun(); + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Shooting") + float DropGunRange = 20.0f; + private: void ResetFireCooldown(); @@ -55,6 +58,7 @@ private: FTimerHandle ReloadTimer; bool bIsHoldingGun = false; + TSubclassOf HoldingGunClass; bool bCanShoot = true; bool bIsReloading = false; diff --git a/Source/Exo/Public/Player/ExoPlayerController.h b/Source/Exo/Public/Player/ExoPlayerController.h index 6a7053e..befa154 100644 --- a/Source/Exo/Public/Player/ExoPlayerController.h +++ b/Source/Exo/Public/Player/ExoPlayerController.h @@ -28,9 +28,9 @@ public: protected: virtual void SetupInputComponent() override; - // Moja propozycja sterowania po prawej [Hubert] + // Po prawej przypisane aktualnie klawisze UFUNCTION(BlueprintCallable, Category = "Input") - void Move(const FInputActionValue& InputActionValue); //WSAD + void Move(const FInputActionValue& InputActionValue); // WSAD UFUNCTION(BlueprintCallable, Category = "Input") void Look(const FInputActionValue& InputActionValue); // MouseXY @@ -42,7 +42,7 @@ protected: void PlayerJump(); // Space UFUNCTION(BlueprintCallable, Category = "Input") - void PlayerDodge(); // LShift(Pressed) + void PlayerDodge(); // Left Alt UFUNCTION(BlueprintCallable, Category = "Input") void ResetDodge(); @@ -63,13 +63,16 @@ protected: void PlayerShoot(); // LPM UFUNCTION(BlueprintCallable, Category = "Input") - void PlayerAim(); // PPM + void PlayerAim(); // PPM - nieprzypisane UFUNCTION(BlueprintCallable, Category = "Input") - void PlayerMeleAttack(); // V + void PlayerMeleAttack(); // V - nieprzypisane UFUNCTION(BlueprintCallable, Category = "Input") - void PlayerChangeWeapon(); // 1\2\MouseScroll + void PlayerChangeWeapon(); // 1\2\MouseScroll - nieprzypisane + + UFUNCTION(BlueprintCallable, Category = "Input") + void PlayerDropWeapon(); // F UFUNCTION(BlueprintCallable, Category = "Input") void PlayerReload(); // R @@ -120,6 +123,9 @@ protected: UPROPERTY(EditAnywhere, Category = "Input") TObjectPtr ChangeWeaponAction; + + UPROPERTY(EditAnywhere, Category = "Input") + TObjectPtr DropWeaponAction; UPROPERTY(EditAnywhere, BlueprintReadOnly, Category = "Character") TObjectPtr PlayerCharacter;