From 4ab4d829af3d6f44175e637a4d4f6731fe746a90 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 9 Mar 2022 22:55:19 -0500 Subject: [PATCH] Single-weapon avert --- .../sprites/units/weapons/avert-weapon.png | Bin 6929 -> 1067 bytes core/src/mindustry/content/UnitTypes.java | 11 ++++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/core/assets-raw/sprites/units/weapons/avert-weapon.png b/core/assets-raw/sprites/units/weapons/avert-weapon.png index 08083aef14fa64f8276273c6756463cd4a2ada21..75d41b24eecaac6ad03a9398930427eec8ea3319 100644 GIT binary patch delta 693 zcmV;m0!sanHme9BiBL{Q4GJ0x0000DNk~Le0000i0000p2nGNE0PF&Oa}EFi0%1u+K~!jg?U$=hBT*EGf4gSalB^_YLW*g!c0G!Ots$r-HJAp~ zU=X3Mv;b6*8oT3Y@o zpCU=8XBSoeY=1bYtrf}P`0P#K8b^uLatSX|Hh)^vEW8ZaNNtnwGG)Cz)JbnCR1_ru z;N*DB)*Bs+D*)*Ax~h=25Zx;~hh&Ldnq-Nl(&85pS%Rc)IV?H>fMPQNDVm)^XlQ2#Gd=YqL zrGFf$wuBf&I|Wy0bTF^0J`hnXP&=4cRoIU{eSid0CS?0!^IMmb9-~8`lusJvboIm+R;qh z>vM-4)p9zSkta08CSkAa)5|rUUan2CmL4glZSC&lja|KxY<~*3 z5T)s{G5VtVm`|8o+9FF>q%E?5^Jpe%k1SCqZIuNAm!IL_d~SMZvIHl6cCoj-%MX!C zTV;t<+A9k*_=_|goL631Vs)h-k_8$F1GclD!*a=yXe12yrJKkC3lIkE(oJPsT3T9K b{y*>c!c8|p7{?6&0000itsB^VIcw|9P(K_x{(+^_{uD=RW6i&iUNuzOVZnadozp6jKocfk2XY zJ1ckKUln+;B5QzO%}@tf5J;>r#>1QAPKX3ES&SfRC>hL&W|G0=C~6Q06xG+3v6D4c zBWwMwS`5aw9dd9q;P{kO-M(Bwhdp?gJ@qLQ(&ZL`3daNw)!>dTE5~J62cv_4B)V#?#u29xYDy&zj%Kij#axKVoWxZJXDM!|fg_FTb<4H}=WS?(8eM z-E)3hsL{~(H0}8fN>cVY6SRc0Gh6F=7WdSZ4P)h-&*sKXW#%V{=xU8zvXIsq+nYr| zHmOE>q#zz=Ox(=WzmAd5-r#V%tRUW&p#oPejDys(U5YE1^Y zRa@b1X-7_*vC70Xw;{Gl8@~u%Q@h7wA(h*3}TIl9j z|Fj?lXqnG7YE|iLoogNy-Q8Y$k3rQ_I_;l&`G(w{ZGYUHUAs-`qsfq+hO{#I?Ztu< zCe++>C9TMCFLeLd*2=5xM?ATexBA|13-zJCf!2l&gx?sDu88R5**arm-cw8J3l#q> z@?RL8TfCTn?i#Xg(d&xrs_~qoB?qt|iOR`Ms%CzYd@4AVpgW0K1*o?Ys27kwPBrT` z-QC$BBhXN1c}9M)dQsq}OU=!!Z;JG3Ni3y(S-u&2ctUt2wrPBQ7ne8ik>?+OJkiS| zH&0DztdBSzw5NVQr+%;c47=U5#nbl;jamLfV^V?+XRec27un&&v zge~~Ywm%E6FbK;3(mjn>+c)*`^oNb8kCh(_<8@!fsa{j7aMKFv>+%fZdj^sVC;86h zQFO$2UTgE(1br>l<^yvoezCum6w<(NLv0x3DNas|Y$Z3Z@ywNZ$9-O+Q*!zG8%5<9 z?nLadNK%RB`QE1mLp@yCcLnWQ@~-t#V*{Q&`6+Da4uv7T{NpAO`3x(bLL-WpWU_v-5b+6kWDMm>Y*JRv4us)0=sD%s!uyI&3dUW8$RYd2!QVWP zzM63h&w6`|yKY+6)BG%#Wm*0h)*~(3xJy3S>}GSxKGl8&2Wj#5QY~AHy=ub8s;ix6 z)Sz+-j`yq6S(WPXT9q5OH%&*HXm*@0*U+d)X&yR1C28;ZiATK=W1lO2)Y|dHE!PYq zm#6TWi<1gl=pt_G<<4Gn+7Y4tg%)$#{eiji{p$u*{*Qgat8fmX0@vu`2?gSvz0H?5 z*S5S!j4vDVCM4;+`=i*4B53o*r%PApYVf$|-acNo=aL9t8mE-oj~XzQgm6!N!(4bF zFK!~2s147oK25%f3wyingq%Z%eb^O>{Zr8|JD>V}+{#`*>TE>Qjxf4)K1X?Rn&#l` z_EC@bH1yAaX)LxO;F4B+q_@9-h2K^2vM0BT)Kzc3#PT%+AC5TTnzFyahWXm!<^1%P zBPvVn2ZM4XpYO0at}KLYUGF8>@WBGBxtT@iP!GbVab?PQ8M_2~Z<=pymu#;AU%1+z zD0cM;emq|EV7gan!3`m&m%8Yv?AJM(A64(3IX8Zb>ftu_M1%q^(FiFp!Ba5yZZ3AqMc{XFe78Ii%uuQr zUGl7b>}<8yr>}*+Y0$D^z5Tij8&dG6fP(V5sZ^=kUOM`{c;)f_RHSfHmVv2VQ|hsc zu+iHmiq~nfsZsWzCb5aGd)G6xovT_0hwI>{+@=$TPhl=Jgg&Qb{z(w!j}54;`Jl*q z_EyA4KK@O+_8CF$Y?q{x%%Jtt8^)?*e|T;r7b6%NTxv>!YRK%R^{=9;Fy z)j51<#iPirceHBsmM0WNhT+!djd|{pth|K)3+eUz3g;BBAi?BLH<68V;=w%o9IjTf z`MD8iNY^#qKbvdRZ9h9=e=F~FKs*|^4>w^{RvQdr}F;uGN;P@RGYQ1 z&T_I6>4ojg;v37SH7icdxbUW#_m>q|62aa&vMDqX==PVox|QdXpbsl6HTDXs9kq&g zw5`~*?$yi3_q`sxv5^TtoKCgMD*jR{-}W{W{qB&A(1P$DZ4SEc`o4}Mk|Qm_g|hLM z(t;slPU(&27HjEs8t3?J zO$x|0S0$3w-^YF?y0w2ZE1kT1z@;o@aF2s5_fpdIVuqXS6|X<9=r)QZQASB8sEN$G zXKWOQcXtD)H9CeNOo;cV*gd zsbHOxpV8IQl)>|>HoR^g z*te$YdFVQ4Rc=jL;elAyx#vTH8hB-Gl>4=OHpkIXXD2MZ1Pp>?|K>dzPEGdk%{KMju+D48ovM*nfST8U?R zXm&@+#H7?z971O3#K~o)`Q>+0GPh!{fD4y zwY032w5Q|n`PRpUA1+5lPKM1(P4zr-G}!h4VF}+s1)~+{J z2+=3g;nHfmCj*ThE&iEXV9PrvF(uk~#SyJLBso;-MU`NUS2xkxXz=z><4M1> z{;|V;%;!%~8a6ls7gcpdF`DiT#8wrZ=}loCZU!y$6hAKvBh2fO=d(JkI0B}mLYJNW zT1L*hQO-)_l$*6E**m$TEHw~fy%;9_EpJ$frx(i)Ol(dV zHk)d?Zkl+oU9bIO@2B}{8ru25T@?VgP@w`1gtwC;j>w?t5lD01PVn&63I{lLlPRQPec)+gg{_q2q$9DL^M_(jzRncg{QMQ1Uiwt0tJBUQ2`tb zflNkWfQ3Y$4FjS21{fq1i-j9N$#6mt978rlW6*{_LAbD}Kvfb#e~xMeiUdHRNQM|f z5E>1|>IY(=`WTD>6hnj)p@t-)J}Hm{N1;*JRVWe>XTxC82*7euX#@%x#-vkLCsqi@ znY-eRAxJ&=KN8na0w)MCForl%>ETiTOn6XfZTOgFWIt2!=mMxAz{O*KJh#-?z9RYUVr-;D>I)x1E z?;i#Amz?@v7K?-->BHe@I23ER!Y~0F2n{sEBA`S=6v~jKAA}+k$-knr89|�*h=; z0Wt-$0Sag}8}OD@Dz$&rjtnNR@B|0;HXH?o8+gF6I0OQRLIYzQ91el~NEo)VtN+T_ z2=;$CFe;-#rI9s9dfB5;a7XL#J0Q7Gs|BBz=bp595Uor5n zlz&&(Z@T^!1OH0-cXj>0(Ixgz!$YP6x1dO%ok>CRHUX{Bnm`9zE6}%aG(aNC zwA;xBfyCuk9zIZJ);d5a%)vWZ3%?c+k`mV(>|O8$8eTNs%G|^I{&<(M*gZ2Dp_jc) z_XMK&-2@wsS-Dz`g@!h6eLgA@s9Abg@wBsXJk9J>q3jrKJW%~0_;YXeIq$ae%hn4S z12@FMsdhD&XO~ECJ|7v66FWxkDIfLgUZdzlKDtLr0(4i|S>EfCMD0Kz(PR6gw7}xD zJ z4?I1Nj~12cC~gZroZ4X2I;(V4vUQidL}KO?OKPoRn%yS3BaOOh+>MC=RL5_r0IMLp MwX;>FMZlr|0C6%qng9R* diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index dff8f75764..02db950828 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -3158,17 +3158,18 @@ public class UnitTypes{ weapons.add(new Weapon("avert-weapon"){{ reload = 35f; - x = 4f; - y = 6.25f; - shootY = 5.75f; - recoil = 1.5f; + x = 0f; + y = 6.5f; + shootY = 5f; + recoil = 1f; top = false; layerOffset = -0.01f; rotate = false; + mirror = false; shoot = new ShootHelix(); //TODO cooler + balancing - bullet = new BasicBulletType(5f, 15){{ + bullet = new BasicBulletType(5f, 20){{ width = 7f; height = 12f; lifetime = 25f;