From e8253eabd0ddc361b2a295ff7ffc30d339a623a8 Mon Sep 17 00:00:00 2001 From: Slotterleet <62336673+Slotterleet@users.noreply.github.com> Date: Wed, 24 Apr 2024 15:13:13 +0300 Subject: [PATCH] Fixed weapon module outlines --- .../statuses/modular/legion-fabricator.png | Bin 908 -> 1259 bytes src/fos/content/FOSUnitTypes.java | 13 +++++++++++++ 2 files changed, 13 insertions(+) diff --git a/res/sprites/statuses/modular/legion-fabricator.png b/res/sprites/statuses/modular/legion-fabricator.png index fd117c0e8f8682d6dbf62165417ed1e299f57b58..34abf2f7cab0aa070bf1940c6a7a1df0b13bb7d3 100644 GIT binary patch delta 1240 zcmV;}1Sk892kQxtBYyw^b5ch_0Itp)=>Px(rAb6VRCt{2TfI&jK@gtMM1ho+eQpw^ z4MHRZL840&nPO004aZ@-^hos#i*cB2Fyw2(Jj;cMBZ6t* zA&-!fj*`#umn(vL6Vx_4+zL%1Dy`=Bt0ma4_!Oi%T#RnNFRnzb8>6U>cc;fKOr$wK zwWY+j$G5ZJDS2ycK!u9#7()*yt@VD2i*d~^cqXHf*y`KkTejtg2Zt{5h=>S{Omg=4 zk>Mbb*MF`>$OFi^a@<@CA<=I(!x6P&ik^Q$O!p`wE3{I9! zAA^%+*g3wwSJ#Rm!IQfxfHvl(T^ToZAt3-zMM$rubu`~rK9&gKy@0kg#XEMI=%<_K z4Ii8cTv=KdebP-++pV%HfEJ9Fal5&*({tFJ41ZbQDPgHs>`sPoc6u)ECOr>JtY;8r z4?qXQgF~?kazSo>{+j*PM9|1{zOQy*o&XECDEK{9hxF&YdUe^burO-yS&j;JO~ z>Wjvr4G|T=Edb}ZQ}r6HF}=DBbzLtuwl>*V+|(QqA-oqrL>C>o$KxKf5y8D1v;t~C zLiBIcMnkR$ssP;6)wV6K5sTPz;BvFxN;7*vdH^}kZePkrnxk}hn!d#CET$O8lqM(BBRqRpgwc*;xO0m z1*D;XKvG`26s3A+@t37jXgwjl=25kq2Oi{;8QQ`UDX-n5{A31UiD0#;W%sB*nnL7G zpBDa!&*l)NMVJS9fH?{P;QtWvZ+tMhzyb>Z0Kjjt$uw;o1L;!$0000?a;JCroL#kGBhk|vYSU%tNJ^M5V2`rLnawajLStuV6H z7th>(cWKrT!MhJ1{|h5gV_$2o`|mCdO9V>{UBf5#i~H}c45?AW_m1HE(X2xrpl94r z^}Qc!>qfKOe^+Tbjr+_%Evz5S(#KuYGuOhfJ?!fdwfecKR!kdm3;U(k>gy)b@W`}v zvp8ooPk*l}zkj^8O!sP^e|~$x=fTP^L;BI@tH_@(%>;&T)n@qC5o*tD_?sNTWvyWK z2-an-;p-8s4`#zB`rbt@5zX}s8d|JhnO)KURdRR_O={GzJyvFpFvmr5=oXqy!+$>g zc)_reb)#7;m}f~2OGai||6eoI))B08&ggrk=O-}Nw0|5_m$jC*zOfC}JA&^$!ptv= zey%>i*0Q>^8cg22egA@?Jc7@Y?00VZ(nsqEQERSg)n)l_mj#-u;kS;^!+z&)d8wYw zH7ysm7W*#H{OS?xn>~W>5_3(n{DYj!=7+REM}E2;=sI zG|*!80D*f#(W@_yV9&I2fWtHV$^i^HI)HyC?g?eT{^}9znN~DAw1%HOfI$u4d*>YY zglfG$^9c4V$$^@-KGX|;2`dK(^lSY^>V*%i4eb>^Svf$kYxtB)66-=?c62n2`n*-M za&LgZx?ME8#E+qUHP}jxds6oKepk&b(YOJ9H(TSLsu^E5lg4X6pUJ4kJ%^RX_rg7g zmgcX;`41sO$ZFj~$}qi9zVFpNq-I0S);*+VL(SHmI(6#QsZ-bMFRT)WwfNRzxc~qF M07*qoM6N<$g1t1$jQ{`u diff --git a/src/fos/content/FOSUnitTypes.java b/src/fos/content/FOSUnitTypes.java index d2e52d60..721efc59 100644 --- a/src/fos/content/FOSUnitTypes.java +++ b/src/fos/content/FOSUnitTypes.java @@ -9,6 +9,7 @@ import fos.graphics.*; import fos.type.abilities.*; import fos.type.bullets.*; +import fos.type.content.WeaponSet; import fos.type.units.types.*; import fos.type.units.weapons.InjectorWeapon; import mindustry.ai.UnitCommand; @@ -83,6 +84,10 @@ public class FOSUnitTypes { // MINER UNITS draug; + public static @Annotations.EntityDef({Unitc.class}) UnitType + // INTERNAL, USED FOR INITIALIZING WEAPON SETS + weaponSetInit; + public static void load(){ //DestroyersUnits.load(); @@ -1188,6 +1193,14 @@ public static void load(){ ); }}; + weaponSetInit = new UnitType("weapon-set-init"){{ + hidden = true; + internal = true; + for (var s : WeaponSet.sets) { + weapons.add(s.weapons); + } + }}; + //TODO subSmall = new SubmarineUnitType("sub-small"){{ health = 250;