From 026f5d7a9ef66fd1414e3273e9cf36a9d0c02360 Mon Sep 17 00:00:00 2001 From: Atsuihsio <842960157@qq.com> Date: Sat, 24 Aug 2024 21:11:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=8D=E4=BD=8E=E6=95=B4=E4=BD=93=E5=BC=B9?= =?UTF-8?q?=E9=80=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/model/item/Ntw20Model.java | 2 +- .../entity/ProjectileEntity.java | 2 +- .../superbwarfare/item/gun/Ntw20.java | 5 ----- .../geo/projectile_entity.geo.json | 18 +++++++++--------- .../geo/projectile_entity2.geo.json | 16 ++++++++-------- .../textures/entity/projectile_entity.png | Bin 4164 -> 3624 bytes .../entity/projectile_entity_inside.png | Bin 1384 -> 1656 bytes .../data/superbwarfare/guns/aa_12.json | 2 +- .../data/superbwarfare/guns/ak_47.json | 2 +- .../data/superbwarfare/guns/devotion.json | 2 +- .../data/superbwarfare/guns/hk_416.json | 2 +- .../data/superbwarfare/guns/m_4.json | 2 +- .../data/superbwarfare/guns/m_60.json | 2 +- .../data/superbwarfare/guns/m_870.json | 2 +- .../data/superbwarfare/guns/marlin.json | 2 +- .../data/superbwarfare/guns/minigun.json | 2 +- .../data/superbwarfare/guns/mk_14.json | 2 +- .../data/superbwarfare/guns/qbz_95.json | 2 +- .../data/superbwarfare/guns/rpk.json | 2 +- .../data/superbwarfare/guns/sks.json | 2 +- .../data/superbwarfare/guns/svd.json | 2 +- 21 files changed, 33 insertions(+), 38 deletions(-) diff --git a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java index 0617c6393..2a3fd5e02 100644 --- a/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java +++ b/src/main/java/net/mcreator/superbwarfare/client/model/item/Ntw20Model.java @@ -129,7 +129,7 @@ public class Ntw20Model extends GeoModel { float numR = (float) (1 - 0.92 * data.getDouble("zoom_time")); float numP = (float) (1 - 0.88 * data.getDouble("zoom_time")); - if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0) { + if (stack.getOrCreateTag().getInt("gun_reloading_time") > 0 || stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { main.setRotX(numR * main.getRotX()); main.setRotY(numR * main.getRotY()); main.setRotZ(numR * main.getRotZ()); diff --git a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java index efbb90035..07313e190 100644 --- a/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java +++ b/src/main/java/net/mcreator/superbwarfare/entity/ProjectileEntity.java @@ -279,7 +279,7 @@ public class ProjectileEntity extends Entity implements IEntityAdditionalSpawnDa this.setPosRaw(this.getX() + vec.x, this.getY() + vec.y, this.getZ() + vec.z); } - this.setDeltaMovement(vec.x, vec.y - 0.05000000074505806, vec.z); + this.setDeltaMovement(vec.x, vec.y - 0.02, vec.z); this.tickCount++; if (this.tickCount > 40) { diff --git a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java index 54dc5d201..c4144954c 100644 --- a/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java +++ b/src/main/java/net/mcreator/superbwarfare/item/gun/Ntw20.java @@ -8,7 +8,6 @@ import net.mcreator.superbwarfare.init.ModItems; import net.mcreator.superbwarfare.init.ModSounds; import net.mcreator.superbwarfare.init.ModTags; import net.mcreator.superbwarfare.item.AnimatedItem; -import net.mcreator.superbwarfare.network.ModVariables; import net.mcreator.superbwarfare.tools.GunsTool; import net.mcreator.superbwarfare.tools.RarityTool; import net.mcreator.superbwarfare.tools.TooltipTool; @@ -94,10 +93,6 @@ public class Ntw20 extends GunItem implements GeoItem, AnimatedItem { if (this.animationProcedure.equals("empty")) { - if ((player.getCapability(ModVariables.PLAYER_VARIABLES_CAPABILITY, null).orElse(new ModVariables.PlayerVariables())).zooming && stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { - return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift2")); - } - if (stack.getOrCreateTag().getInt("bolt_action_anim") > 0) { return event.setAndContinue(RawAnimation.begin().thenPlay("animation.ntw_20.shift")); } diff --git a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json index ac4e4df10..98ec7da86 100644 --- a/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/projectile_entity.geo.json @@ -6,7 +6,7 @@ "identifier": "geometry.unknown", "texture_width": 32, "texture_height": 32, - "visible_bounds_width": 4, + "visible_bounds_width": 6, "visible_bounds_height": 6, "visible_bounds_offset": [0, -1, 0] }, @@ -22,16 +22,16 @@ "rotation": [-90, 0, -3.75], "cubes": [ { - "origin": [-1.34303, -32.03027, 10.5525], - "size": [2.352, 2.352, 0], + "origin": [-2.34303, -33.03027, 10.5525], + "size": [4.352, 4.352, 0], "uv": { "north": {"uv": [8, 0], "uv_size": [24, 24]}, "south": {"uv": [8, 0], "uv_size": [24, 24]} } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, 30], "uv": { @@ -40,8 +40,8 @@ } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, -30], "uv": { @@ -50,8 +50,8 @@ } }, { - "origin": [-0.16703, -62.33427, -4.3575], - "size": [0, 49.96, 1.68], + "origin": [-0.16703, -62.33427, -5.3575], + "size": [0, 49.96, 3.68], "pivot": [-0.16703, -30.85427, -3.5175], "rotation": [-90, 0, -90], "uv": { diff --git a/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json b/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json index edd3094e1..b0cb2ef23 100644 --- a/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json +++ b/src/main/resources/assets/superbwarfare/geo/projectile_entity2.geo.json @@ -22,16 +22,16 @@ "rotation": [-90, 0, 0], "cubes": [ { - "origin": [-3.34303, -32.03027, 8.1525], - "size": [2.352, 2.352, 0], + "origin": [-4.34303, -33.03027, 8.1525], + "size": [4.352, 4.352, 0], "uv": { "north": {"uv": [8, 0], "uv_size": [24, 24]}, "south": {"uv": [8, 0], "uv_size": [24, 24]} } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, 30], "uv": { @@ -40,8 +40,8 @@ } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, -30], "uv": { @@ -50,8 +50,8 @@ } }, { - "origin": [-2.16703, -62.33427, -6.7575], - "size": [0, 49.96, 1.68], + "origin": [-2.16703, -62.33427, -7.7575], + "size": [0, 49.96, 3.68], "pivot": [-2.16703, -30.85427, -5.9175], "rotation": [-90, 0, -90], "uv": { diff --git a/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png b/src/main/resources/assets/superbwarfare/textures/entity/projectile_entity.png index 4e65dffc6e28475b3c1357bda1fe51ef9135275b..1c904ba40cfd1dfbe621c237abda53cc8437bafa 100644 GIT binary patch delta 3603 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 R2ZR7<5l`7$)SUE7{T~c9!W;kq delta 4147 zcmV-35X|qW9K;}yIDZfJNklVt(lYOt>s20(@{x1o+^X2=Ku% z5#WO(Zu*D$d~UPZ%x1IM(ebypH+y?~vpml`E8K+hqc#DeD1Wl~d~Wmk+@dJ5D2fUa zyuH2I;c&3S;b3{57oQV`k6HwPz!!^!EtgAME|<1gEG&v5Gc!9J4wj~=?RGoc?RJ)? zX+eky!$u_m(CSyKm0e$7+wJYG-Q3*R_4Tza77H^oOViX|US90^`PrVHp6uo2#WtJG zWD-VzS_D`u7Jqhib!ET)`m6o++i!M%e{Y{Zf40?XWoBmE?baS2AMM|N|Ft-d3zM+h z?Ir>Y9F+u^&1RM)iGBL?$-aE~Vt@Schdn$z*xlWot=DTa`=0>czJ0URYGrwz+ithB z?RINvnx6duCY**+0?cN!LIYf1Ul$tS;o-r4`Q?`*6MwK?uPx7WdwF@W$Hzx|etx#i zW@EG2%--In?uMbFmI;XC*w*W{-QM2X-QAtt-QC&E&5b2VVrFLh{oc&XUSD7B^XJdD zUau{V<05372ryh!Y5>*(tJTWZ>$R;`D_blU_UE5}S`Jvya^qC6nc2g`gZ=*d@5T3j0<;#~M3uyL#rttp$ey{=uRPaiGx`e>B6m%rYT&oqsrL zln5%*07FQ1hQc`&z6zSR#bRM`92cKBPfZ5y$IowOM>Zd=9s*C()b{(mMNwo~mc1it zmSyjri5niCsmuCp6b00E0xzZhJ;AHmXQ89-fXQMduxkM<4t=4A#;B{9vIRHG9AN{k~T-5X$3wjvq7tguGg<-VJ8KaV0>g z^?D&7)ISqIZNJ$MM>3R1;!o8ANG6?vS_EJ=L#-+BJ3L*aJo|u#QC{o!gbzVqU0oGK zz@{321z3jw>;P)ZSJkiTUVk%*N`#Q+XoFfNfNfe80r2~!2%t`&+J7d&dc7`MKJP05 z)CW-Y&BEjOpZ^zfAT__DY2!GKi`LJrzBdA(U>wd=X@D%tdP@v>i4-sHhcG-1z$O6u zN&wCXRz(3!0L1;?Fgb4V+E>8B*C}^Of>Rn=?M$FLHwq4W;4Ac@0e?cRpL_LK_+A9S zs{iWh>c|OX2QH+-wVoh6G>VYNuO@@@2kb{6Wvm@hy%2y4%7s;M!TZbwc&$IA0h9=y z7T{x=2;z{E%>b)^7NT|{0qoVQu+?vfxVLd zx_PN$XbBwCRt@q)_}lH)w%cv3Y#~~Gnx<~f0p-{3V}Aa&=&Umcr06pp>98l zh!)@*KsbDVt{aUQ$_Sw0^(8h zS@@wc>gK8bQ;5)N24|=O zGOt>l$y3W1YRM{muce3ftLmXHIyC`9LYX$Gd%WxNgzi!I_&LzZ1gNlCD_klPQ0TBU zFF93pyzBDRxkum8RP880!9$oa0tn~!CHy)S82auFVhs(-IJJ!0M-sY^M@a8`oqDK? z+8RJ_!hc=D*dKDMhlcWoTPZ1cP(~NvL{Nx)N;v&~u7=gv1Yq+Bz~}UZDz&a%**NA6 zz~J-Ht9Q!CCXflae!Yio-oV8p~HF zEzBlnyWQGmvndF`)5W+Om^al3-g9(m23qw7nuRq$-;Q9J7w@$$9dX0Lz~~!I%-|VU ztAADP$)OPbX0s_wiQZ3-Y5CMdgr4;jG+rXc(*T+V?o$JBnY3-Z?xX2=7l|e}eCicPsFwga~Pbs?e}5T1^f$^VNP=g=zwi1RBbDqi>V|+*7A2 z9>l_^9bOF;eet*t4~^%!fjI67orSMH0Do`isOQEefa6p^$<~ zol!S@eY89XQ|AZjIZ8PE4;sPSJS~9#YJ||c3E;}$N(Z_wRMRqfCLrWtqa{|&)aC0z zqkt&9vWJ#K?+rn+un`%snP3u>`2iOrfT|qM16;BnAmjkD8Gs;kj9|#_t1$Qb{eO|# z=Q#md4mLYFJ=_yMK0R}w>c1>y+!kli0DSJbp@PT62~48k1({$9cDvoX0T+5bZplfK z6jQyt`F;4Gmv>O755h-;phWN@0*wT^jJjGy0cOJq15qZA1hB~vzD^oJe9wXm) z-5vo{>#zpkmJi`G2|^m6tpDOvbbp=+yaWkCjv$1D2^D3dY&;)=lSE1Y%?yUjj%ona z0@&vWp)3^ax}ICD6pD({hsSw+1FatAf^gIfKnr*Tz;(RbL1=-8x*7ng9fD@H&-*NV zlmpjfa(Xgoi`HSFrwuNt1t541%glbP9^$RZ$7S}S2Tl*``T%7F;P8|40DtW5v)X6j zbHXT;2}D`DK3iSomP7w0p@MAJ1ND%rD1P1|Ns#e5Gu2()T-@^qii<#iT9 zPGA>k>;y8?fpf&CZJ@T11%Cuh;GL^kJk1_rHn66PnwDJM8 z5T1v639uFj5ka*XS1uM~fa4cR7ndc1s(;tArg3G&`>X=_Rl4JvlbeF*$H@Q%1ffkPO9KJfx{g>UgAd`K$si8 zF0QAEAti(gzG^#1y|&T-aF~ElPt_&ik$}sFEFQ{@^f9-5olsgfQPWG5F&S9cdQ9t< z8`C+3Z`M!)gw&Deuzw5zN&+wWgA5{a2HcsXf-lP=@^x7gs6a!x{iERC_Vs# z)iH$4LT4htf#iM!9T6OwyBErpgaoR`L&P~ZT5ABE7{ctv`9lIKmW9vzAb}>4LYrAR z0jf4Nm*))i%FvhqY`cIV+5R#>8*mDjg<2(evu@uVY-Se|Jb%#ol`-lAcn>#Js1HzA z=ygcIb)}zW+Tc=XH6#oz2~Yxz3F;(<2*5(GLjdfT5nu>t)fZq^J~wbE57!i)U_$CY z6b0!1kc91_lkVU#Yk(^JjL*bqH9g$S*8qC%gyEyr+&~b)TNmJGZ!td`TKfPXz$Ex_ zqxGd}zH;B)5FsZ%Bgkya{1KEu0(%4sAZbgl1^HTz@=Tz4`$-Z^Agxc)55@1y2s( zxY0=zFolBSMXT4xs|lEdKVGyl0jvQ$Eihp`ILQgrC}6_)(CVE*+~P4Va54kqM5EWn zsj7zw;NK^V3n!TXEORoYg2#)KoxmvvFmALm0iF-Q38D$(!O2m;&pa>iBcSoiqqX%< z1Q<6On|}b#{qs6^lL;6nTA2V|CrB4Go-i&n9u>^%-C@z=DI+*uG+rc%Uxc*XZjV;I zp2ETLq47$gc=gFLPo_aZcq*!~LJ@fclATFK z4HD+>z5N7p^8R*hCbk)S+EaM0k7Ha#A+6GT5FaYY5*KG12hA#^AmbN>3EG@oW zf+L$Tzi9J@HhU1|YP(+v7I>#bNPue3eQyF_VZO@{qMj>7RIv$}HfY9&6X1DW96h~q zh4)fqI2=uz;&_6APvT7KT3({PCuZis3)uXrGIMG&!D4bu@OagHO~Wc2Z0MeZGtqJI zH>AieQ>Hx5M&`P~cSCPfkG|wdI|?7)Dit$S>D*!NkB%~4U^t%RaL%k0!`sEv>05VV zK${=y+dqCptLn+?&uyf)w7i$)j&{6teQ4?=*yi(Fq#vA#Lt2OkK0EtaUA^dQcDQIy7w|> zT*&ON%d877MqfvSH%mxyIQX{I;*?Qx3&q|*-_8hSAPR_;)ZL#xxBi@jAr5~%_oz0w zfh^jRI;B?Yi#HvxL^r4{6d_@eJZ zKLqj-VM#4<;=@wCuD-YRCA4e=0f7LS&fm# zFke1u@_mpI!84=PW3=mLl}%*%Tvr5i=P-TX(@5`(9l~EqMbeeXqJ<_#D>6J7JoCGw ziW(F4syfemLP5cAkp3!k5s6%Vgud7y7(boHH(q}kyKd1}6&OmQ7;<|fozZvk*W#LX zI+PWwDk~HT32^b4s@*R`F*n5q$7@aujA&C$#e;z-HZN$IayN}m7j{hchEU>YYTZ~T z?~=TxY~PpEsEn=fzTA#6D?tFleS%VU&>gsb&HV7tNW7ndPRJq%c2wOp4A||>$EM{D zM^%|HQO!qhBt%5>S5e|{l_v4D=;-J`<9ITy+JtK9Yw&R|b*$W+lMhk;;GiO$&^u#k zYWr=0DJqqUETUjGz@=|}27NV#^7zWz(RG$#HtxtO(*sUe1I_YRqW#9wuAAF-UAXcL z5DtYf-OOE2AM^B_VYRo)(T>84*)lj`ag@4((DqhT=>`w2Px_``5}MxT?dY~JF?{QT%{!8) z-!g%1MNM>z?LkY%{e6 zkjM!yO4aesA^*a} pn!0djXDxDCFhgcq{}*}RfYpnI=kc#@?p}H&V7n{RrNSxT!aujC@~8j+ literal 1384 zcmaJ>eNYl+9DWf)m%yl*BAM9ilALqUs0hSxsL7_3niU#|UtOAdl4dI6P*bmr?5NCB z4{cqs<|Mj4W(mfD9Zf3SC_kdaj|_t}(_^#@9j1)B575g@)#Sip=#M>tn_|Q$P&-8M2~zxb`$NhD;2uK6Vk0@>)w!Xy(<)_21hd z$&-tAMpFy1AvDnOTZNjg2WR}RKCGt#atO@d7m7Lwao2*Q=|D{YqiA71oJRT!d~lWO z(5;?l&)9p?&j)Ns#On3>Ojg5$!=aqr{FXFLFM;h1IoJ4LKLA?Zt}S%x%y_m;ChHB= z>%NwlCkn~b(g$TYYWc!=PPJRB;s_P4%&Q>?Hb+!Wis7{*wc!Rj|w(aRC< zkB*ZX^=4aON_DO=pY1*OyW*!KI|xEpO)59kFMV_K)TXI#qYT8so1&qdnm5I84W8_m z#fP_5WHmX(IFHD!EXa7sS8BUi4uu}zvUUqRP0QE=sVuKxoh5_MP6G&H?EDP%jwn0% zhc2ATgSTRxOCGcyB5Op6z+x8=cBUBYdKSizseVzGSw z2J|FO80Po1FjL71&=>UZPT-DPR)t^6>ZV*hZ7vb0_DqFwIGj=?+I5L28JYZb|F!Uj zOm~f(V1#RU%T_!IP(y9ge;rr^^%!Y|S_AV2tzvj?eFKAx#+77Y|UO zeexR%UMjXq&hz%)*AB|Z0~24$lk`BkFo&1QYy<#BZO%4m x=8n7D9|Z}KTH1EC?caCH|4RJFCi(|^8Y{@24P@sAlsi`^U_>$_WM6SB{{T*uX=wle diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json index 5b91adcb2..96adf22b5 100644 --- a/src/main/resources/data/superbwarfare/guns/aa_12.json +++ b/src/main/resources/data/superbwarfare/guns/aa_12.json @@ -7,7 +7,7 @@ "recoil_y": 0.018, "damage": 2.5, "headshot": 1.5, - "velocity": 16, + "velocity": 13, "mag": 25, "projectile_amount": 12, "fire_interval": 4, diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json index d2c6b2f57..0c6c3bfc1 100644 --- a/src/main/resources/data/superbwarfare/guns/ak_47.json +++ b/src/main/resources/data/superbwarfare/guns/ak_47.json @@ -7,7 +7,7 @@ "recoil_y": 0.012, "damage": 8.5, "headshot": 2, - "velocity": 35, + "velocity": 22, "mag": 30, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json index 482add644..0fec6e3ee 100644 --- a/src/main/resources/data/superbwarfare/guns/devotion.json +++ b/src/main/resources/data/superbwarfare/guns/devotion.json @@ -8,7 +8,7 @@ "recoil_y": 0.01, "damage": 7, "headshot": 2, - "velocity": 42.4, + "velocity": 25, "mag": 55, "projectile_amount": 1, "fire_interval": 5, diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json index 35df04ed9..386a3a828 100644 --- a/src/main/resources/data/superbwarfare/guns/hk_416.json +++ b/src/main/resources/data/superbwarfare/guns/hk_416.json @@ -7,7 +7,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 44, + "velocity": 24, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json index 3a7642aa8..d6b8f71c8 100644 --- a/src/main/resources/data/superbwarfare/guns/m_4.json +++ b/src/main/resources/data/superbwarfare/guns/m_4.json @@ -7,7 +7,7 @@ "recoil_y": 0.011, "damage": 7, "headshot": 2, - "velocity": 44, + "velocity": 24, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json index 4d921c958..62b2ba34f 100644 --- a/src/main/resources/data/superbwarfare/guns/m_60.json +++ b/src/main/resources/data/superbwarfare/guns/m_60.json @@ -8,7 +8,7 @@ "recoil_y": 0.014, "damage": 9, "headshot": 2, - "velocity": 42.5, + "velocity": 22, "mag": 100, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json index 46959ebd0..ff566645a 100644 --- a/src/main/resources/data/superbwarfare/guns/m_870.json +++ b/src/main/resources/data/superbwarfare/guns/m_870.json @@ -7,7 +7,7 @@ "recoil_y": 0.04, "damage": 3, "headshot": 1.5, - "velocity": 16, + "velocity": 13, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 12, diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json index 20fff0ade..b0d586b37 100644 --- a/src/main/resources/data/superbwarfare/guns/marlin.json +++ b/src/main/resources/data/superbwarfare/guns/marlin.json @@ -7,7 +7,7 @@ "recoil_y": 0.031, "damage": 16, "headshot": 2.5, - "velocity": 38, + "velocity": 23, "mag": 8, "force_stop_reloading": 1, "projectile_amount": 1, diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json index ad5c932a5..2c39fca4c 100644 --- a/src/main/resources/data/superbwarfare/guns/minigun.json +++ b/src/main/resources/data/superbwarfare/guns/minigun.json @@ -6,7 +6,7 @@ "recoil_y": 0.011, "damage": 8, "headshot": 2, - "velocity": 48, + "velocity": 24, "fire_interval": 1, "weight": 2, "fire_mode": 2, diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json index f21f4fb9b..841183850 100644 --- a/src/main/resources/data/superbwarfare/guns/mk_14.json +++ b/src/main/resources/data/superbwarfare/guns/mk_14.json @@ -10,7 +10,7 @@ "recoil_y": 0.014, "damage": 12, "headshot": 2.5, - "velocity": 42.5, + "velocity": 25, "mag": 20, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json index 362272b23..d3599bfe9 100644 --- a/src/main/resources/data/superbwarfare/guns/qbz_95.json +++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json @@ -7,7 +7,7 @@ "recoil_y": 0.009, "damage": 7.5, "headshot": 2, - "velocity": 48, + "velocity": 27, "mag": 30, "projectile_amount": 1, "fire_interval": 1, diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json index 1b397edd4..8d0613142 100644 --- a/src/main/resources/data/superbwarfare/guns/rpk.json +++ b/src/main/resources/data/superbwarfare/guns/rpk.json @@ -8,7 +8,7 @@ "recoil_y": 0.012, "damage": 8.75, "headshot": 2, - "velocity": 37, + "velocity": 24, "mag": 75, "projectile_amount": 1, "fire_interval": 2, diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json index d195e4408..11bfe72ce 100644 --- a/src/main/resources/data/superbwarfare/guns/sks.json +++ b/src/main/resources/data/superbwarfare/guns/sks.json @@ -7,7 +7,7 @@ "recoil_y": 0.015, "damage": 9.5, "headshot": 2, - "velocity": 36.5, + "velocity": 23, "mag": 20, "projectile_amount": 1, "fire_interval": 3, diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json index 42917423f..f222e7558 100644 --- a/src/main/resources/data/superbwarfare/guns/svd.json +++ b/src/main/resources/data/superbwarfare/guns/svd.json @@ -7,7 +7,7 @@ "recoil_y": 0.015, "damage": 18, "headshot": 2, - "velocity": 41.5, + "velocity": 25, "mag": 10, "projectile_amount": 1, "fire_interval": 5,