From fcb4c232e8e71cab8e4d8bf88c95d527cfd408e2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Feb 2022 07:55:57 -0500 Subject: [PATCH] WIP --- .../blocks/turrets/disperse/disperse.png | Bin 934 -> 2024 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 4074 -> 4084 bytes core/src/mindustry/content/Blocks.java | 38 ++++++++++++------ 4 files changed, 26 insertions(+), 13 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index ad400ba0f05cb80e9865c2be0f03d303b9f46448..bf7bbc092ccdeabd745b310f7abc3a9c9ac50c75 100644 GIT binary patch delta 1998 zcmV;<2Qm1j2j~xwFnK~5b<5Qd8=hwuSlXKsKjIZKlba&F-4kc?R- z8_XswUx>sm+yILWco`&%8{i!rAh(z-qDJHA?w+o$s;;Vj{YjQA;7wQ6|G%E;p6(fd z!C){L3cIrA4bVdTrDJ+GfolWAkPyGcv9;*V00SJu02|IQ zz=rdqb^zS0kK3u|?bJL#FPJdE`jvD{w9-i&E6gX80_$e7Fqx!&3h+LRqF^C+RRdTk zfHvASP%}V_#D68Hf;rJNf%+*xiWXDBJz&lNR=>4YiLE8lC zJwPoM#1B}C1xphHq=rPbSS&bqOx!g~AwCtHOMj$h3OLLGSY(=}X+9T_qI635&Hmd- z`nd?AJpi|hEsG!Ej#0WN5bFW3fuFBVVE^Y|lD{u4tcBab(=<)FT+UY~sCfg)o;~vreD1a^n1Iy)*cmL3;&Zo&tpWEeA)5gI=l%w>nwRsUw1o-K2Jj$$U@lyV__4pOS<3Cn z1Y-9BIK`*1y|arFKX7|aKss`{PzT~mBO`v7~3*sLgpQ7XF%>*h2(02WL z4A$alN!2o=+=Ro6m#@D2+5Pp!;+T4ANm$94y!6|dDmL}=b8^elZf~v@kMZ>Q5P!Yu z|M%;c*ll^Z|4f%@>^Jvb4l$2wL6QePXQ$jdJ-S=H(YR;fU>Pz z>>7YueC;h%7%;JN_XJo(3?TK*_h5pW7&T46Zh%;zdk2T`;^nL7f2o8^ZrWHjK}l?> z9M4xL-_$5}0VrVt@nK*rk<=qx0Dt_NfFeFXye2Jfs)-sPmq1S@kPts0Z32=3o*o~P z$(ID)g9#+X52R|DtA8mhJ-~Vp7}w?sP%``>u0Y?1T+yX}YK&UNezO2^(l)&Z%SudD16V!b3=Q-7gk7*l2lVM;fXMdM>$(gt% z6YL!vk_ubO+2!40FPDn-==hWrqnlx1ZJ@au9RTUV&IOS)!Ti`M6D%2ZDaRCUCV~Rk zfJ+OrUSRAzLoFra^wL$tSQEIL3J#P8jx9(iw1w5jAqMOc^3t3o#RnifA||W}Sh^^= zzrOfJsM;=YPVRxw8tfe$W`Ex*nj%(<`Fe^H@waz&;r)l*#kZEGAa4yTaehdIOMI(v z#1?8)Dt76+fW5HB5S}-b#GRX9AR1sk4h%ST6#lOwd|< zj?YT1ci`Ty$UX|-Hi4G-9LL~Z@g%WXRb&{*Wdd#SIgVA5gO>OJf`9V>R1;9dml!)! zj+x6vQ+xp7iJ)2&SQDS)*s+|n#Rq7xBn)c;tKxICG0)9{_yCRG9J;-;yO{9P;{)nR z9xcR1wf*jO(Px)-Km}Soout{`K+c4yTeGl~9E-B6B$KWsl zrA8+A2ChR%u%^Hi6MwXRiFIr70fhGkazZI=jgS=MwBG8iwl}bq2{;Oh5tQT9(aHo= z4agUPoF>?cP`gGjMv1UB;^)=?#&SY8kbtB1>JN!pBA29v2RT}M8#os81^}>Y0`KAj zI57Z#JrndGK7bFX96*8K7m-+9t3fK37|8J%GpLIe+n*KkF%g5*YT)n3ha{ zjfL_SQ0~0huK{WTtSyKI6V%2~le0v=A{T*}K&kJ<)ieRMZA|V`d8&VdxG3GJv~;0Z z`gsez4+pM>fjPWhglW@FBJ0Fn0$DmtjP(LiuW#3;%cKHx6JX~E<|gP>e1Ogk0Pw#F zYA1-E9v`|EA4j00Yk(9K0ecr8U;}!90CwkWPZxSQHX_MDsR=ek{J~%_7z_r3!C){L g3U4?*g|jTV2G zIRt;AHvq8+Kyd`1I08@{0VwV#dIPRHuIQhS`)&Vs^a}mB9e=Oe7`Ii|$#3M9Q@OLr z_C5_9*)|oj9l)x1(NsFs8Ob$3mf|0&j!7~Am}lxC;B_xhZHu!-&dan8@U8`_w#AvE z=VeL&D0I77bLM&opzvd6oI$vC0E%zNb1q#1K=JK)%_*mW#Swtw2taWJpg00h904ef z02CJWy02tdSYT44omAw>Yt zPc{IV))C5MkqtnrnJqa>``@-i0YD!DP+Y12%xKM-+W)pC3jo>?fa1~xz_UeXYyaCO z9Dq!dtvnWq04Pt87nLzf1i+fd?Awn%GgW0VR2=Ig#w<=gXX)RMlsZ}Z%H*HPD--WB(C0|4y^nf7bJFz6c})emv&3`Ite0wY9DTI1MbWDJ|^%YiQ{Lbb#UrKyd`1 zI08@{r+ z7vP4FWLiVOZQ%*Egy8ZEDgIinhTzhRDE^wRgn!`c3n>2DzJ=i9e^UG$K81km0L7gq zgS|hOvo1gfD2@OWM*xcB8GnVmTL%nv0Odc4TE%D$x&uJ*b&S;FXXX!spS>=vhwr8i zz~f-`yw)_)D^FU~ASL$>28g2?rfL{(pHv&)`w}mIsdl+aw4OI1R0<1#n`PtEy z?|cAPlHa?no}X=P$qvwa@#6U2Xcl9L3{gk`MvB+--sj_fYn|lQpR;NZrv7Ho=mjOq zy?*oxTFYmjvA)38GX~cVU^S^8?cVbcGP+04yyWh(2<(|$&plFs#rUk}8~^|S0001m Z{0D*os|E;OtR(;d002ovPDHLkV1nVmo>>3@ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 288ebd3764..c67e06c80b 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -533,3 +533,4 @@ 63170=world-processor|block-world-processor-ui 63169=reinforced-payload-conveyor|block-reinforced-payload-conveyor-ui 63168=reinforced-payload-router|block-reinforced-payload-router-ui +63167=disperse|block-disperse-ui diff --git a/core/assets/logicids.dat b/core/assets/logicids.dat index 6ba4b4cfc5be36c08a6ceed8805a2cca28525444..0ab389a106f9115501ca6bb1b046c1af9e7d6f9a 100644 GIT binary patch delta 26 hcmaDQ|3#jO;r2!*MP5#hl+5CS)S}|l%}Tr{m;ijn2=@R0 delta 16 Xcmew&|4N>T;nqebMc&Q2yvLaUHG~C_ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f7ba80ae5e..3b862cacb1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -127,7 +127,7 @@ public class Blocks{ duo, scatter, scorch, hail, arc, wave, lancer, swarmer, salvo, fuse, ripple, cyclone, foreshadow, spectre, meltdown, segment, parallax, tsunami, //turrets - erekir - breach, sublimate, titan, afflict, + breach, sublimate, titan, disperse, afflict, //units commandCenter, @@ -3315,33 +3315,45 @@ public class Blocks{ size = 4; }}; - /* - afflict = new ContinuousTurret("afflict"){{ + disperse = new ItemTurret("disperse"){{ requirements(Category.turret, with(Items.carbide, 250, Items.surgeAlloy, 160, Items.silicon, 300, Items.beryllium, 400)); + ammo(Items.graphite, new BasicBulletType(){{ + damage = 40; + speed = 7f; + width = 9f; + height = 15f; + trailColor = Pal.bulletYellowBack; + }}); + //TODO bullet. - shootShake = 4f; - recoilAmount = 1f; - reloadTime = 60f * 3f; - shootLength = 7f; - rotateSpeed = 2.5f; + //recoilAmount = 1f; + reloadTime = 5f; + shootLength = 15f; + rotateSpeed = 5f; coolantUsage = 30f / 60f; coolantOverride = Liquids.water; - draw = new DrawTurret("reinforced-"); + draw = new DrawTurret("reinforced-"){{ - restitution = 0.02f; + }}; + + shots = 4; + alternate = true; + spread = 4.6f; + + restitution = 0.1f; shootWarmupSpeed = 0.08f; outlineColor = Pal.darkOutline; acceptCoolant = false; - scaledHealth = 300; - range = 390f; + scaledHealth = 340; + range = 250f; size = 4; - }};*/ + }}; //endregion //region units