From 1b8da1ff55b446610fd43975abe3df9b61c36673 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 10 Feb 2022 16:40:39 -0500 Subject: [PATCH] Unit production tweaks --- .../blocks/turrets/afflict/afflict.png | Bin 2164 -> 5165 bytes .../blocks/turrets/disperse/disperse.png | Bin 0 -> 934 bytes core/src/mindustry/content/Blocks.java | 13 ++++++------- core/src/mindustry/content/UnitTypes.java | 7 ++++--- 4 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/turrets/disperse/disperse.png diff --git a/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png b/core/assets-raw/sprites/blocks/turrets/afflict/afflict.png index d075c56d0b67a4f2c1917c2fc88077a973d46a6d..85d22846956b9555488ac6605ec069e4a8b7862c 100644 GIT binary patch literal 5165 zcmW+)dpy(s_kYhew-GaDB= zfY~);Gai9hrk*`)UnqF)|sHs(kK5Z z@F%8b$c*BQ?neEef0T?rUiet`l9ttdBhxk!--G=%F$YJi|ML3~a(Tr!zHzhR=jZKd zD=*804?nxdTPrpjwi7>m-$}%Hn-K|-L~6o|B+!UWo7$s`|BCS4+6AGImOfN&QzX{?umz9Ct9>5sKlbi zrl3;iIz=E!3oNsS+X|m{dp6c|1Yn<@kKIrG^`zY6R-xZz0Ini^XP`J3C<*HjkFq z=&(`y{ZLvRQf{F>!cc8txWx0edM0@3xbA#6HViTL95_Qs5@J!`)wRfhm(?7WO%+PQ zv7Sv0MHfnH#V%Z=8euHsw@QwN`P3%xwr}};-q+<%Me56FDb`O!7*?AZPf+4=wOx!o z*Wa&qHuvy`AIJQDdgVjVa^IK)m1kaX3-m~x+)(}1RG}ce^cddKQC90{is&^z^`D-e z*uI7nSOnOct7>GeiF40X6ss0ssxABvQ`hAgWCp+&~wI$-` z^V0wuJkVkv6MvROGVt-m%5d^9WtdvuczW1=1)#0 z+N}jSO|}`D&}6Yw*5oImaZW*$z+}Gw>H}V5O_6^)zRDH0AB^DGOB{W%wN84j<$4)D zHjxRc5Q|9z>9Ex)cSWrkhB^^ls5#T-%7Oj0_nCC5M!9FD#4nO=ay>9vof;23$Dh2| zm52;0zb9iy4?9$Gm~m=9T@BZUyi{eC;~(47oOWb#|L4tC@*?&0^`I_|%vv}?w-J>1 zIQ;U^dI&yxc^b=RnryB(bHZHw;jlt$_Z6s8eBcapaG?^F3NE0o1y0;O_u)1sL~pe@WMRC`s-ly&E;< z`|LRZbA0Ib1+y%$%AQib6l}#=Kz5ckX=*D_)ysR&J*2KS&xRko=BLAk$=)Q(EguT6 zyp)`{&l2o2yMcT{&tkdsD z^X%>FES~M*yc>zg4tujlO#`}< zE@~u%1e`$o1RvH&*?Fl}Z8oLf2#pMs4i=q(l<+Dh9F71j^Q4o-^Go+7pGaz!+M)Aw z&eG#B_Nz)=kVUgw)m|YV&wpM9{|X%6uHXrZ2auJE9PBorv0;U=crv5ZdOV3Iq)9)? zLpEA$DB00IWiZoA6oBfqhnB}XV9XKH^CX@!e@E0(B-wXr($MCRl%*q~Iutd`mNKL! zLgyKMH6zn6c2%X-)id)rN?+i95&_bv7)YA2)Q$i;^K zqml01?Cx4Y^1``t>HmuPAi?;s6j%co{L_TdC(-MeRS2^YEL&sFmMJ1$^sr04pSr)u$EVtT+?z66{cg6~zpm?R zu7Ab@0<8F(_twmzk1fKNSfjN)&X?zItX}hL-3b?Zm-9!QUuh%fo!nYMQyUYPFg%atMGno8|Vxh9End8ft>H@4Om#ZpL740 zT5*kdxv!;r=rmAL(Mjos$5+Ke7&FRtn#r9P)B?PSivcVEOw9d^ptg4{Wx z@|IEUjo6aBdpW@cW)HCPk>a9bXW`#!@`5f17pL>2XYTSHoAmrSgosK2Q}U z30zZ&H>GIMRY448F~5SocBWOt(C8hvyxF$Ho0-;#k7|+L)ke=@Ub{va_7f_nqh>Sd* z9|K~%{SSTpm2eC6Q{7LOZ9Q6^*ds6Ju{UoZ+3*K!usla;%y|1{_$WXd2W&D4pn_#7 zS^9BJT)1VD=$X1EZv;AbNjqY7B9CWB{=MvhNNOh`x1tR|J5^b{$<#^6Y2o?0V4>%S zj+`}z&)4_NsEiSX6q7ybXqewSLp|^OHyK7C2Of94eYH>AZlLG)jjRK&@kIEGlmrh% z*Vgox)s%(-N7q?XA0w_FU$^Bl5WfL-tfbb-A%FzmHl~Q#@ibMo_&QKT#oBrKQv2Uk+AZ!>@quZepswqs$z@T*-gCP7scjntquQp7QWI>E}F|sbY zn>7Sf@a8j!s#g4D zo)V=_lusC1dr%meL{$P`w1h`r2^)%&E=$A)QIB&iLD53WGZ3Yd@WNk~hKNAN9+n|s z=BT->(@nSM5Um8^^1aS1mnex&d;t6+`12Qod8;rpNxJaxQjNeXYG1ErYn-@%F67duzNfA|1XQmK%p z*N?qd;{GYXHkJl@A>5g@;d;XcDLaiOQ6@HC+$0NKpL3Ly%vQwXSdKpW-DxnoTe<|T z^XS0X!?N!JXgukU_t$?g<%hF=r?P+&9udkCBXy-tJ7f)#y1ayA)@ZJ{#6K2D?VPY4 ze8PxUvMJ?msY8Qqu64n|j=NXe$6tlGmub7cw<`5TWB9=z)&8pLFudY?WqhAxn85~5RQ&S5|E_CM6^g!gM{Cn|x^|0J zPYVy@kixE_WmIX6hK#{c6JXt^KPa#-MEay+z@0BR1vxMvXxlcvDWV^wXg;X@>(F}8 zh9ThZZTQ(iEcDWk(wnu1H~M8P(o`?pk95`PDQZI>_snb9XKP%s8e_43{t1l*bg3`j zhFWkLF1j3jVj9V!r3E+ka<55!v>6yJy^I(jR%#eBe*LV77jY|&69+=6$9`8iT9Gqg z6aI&YLNngM;MC@dE%iNh7T#cLZGdxvo|kw`lI8gO>x9&~mqJ;Jqu#{44 zH{5L&`xLQZSHDj=JLBt~9{EdXXQ2cZCg45QZ#ziO6C0FK5pT(TyW714+KP;78Ua6Yft{e@6~$`0#{WBookTETOpQjlq( z+wk#IddJMweccGvwxT86?U#FEkGa_GO}8@A`vnCmOt`r~f-#5%rHvrRcMTR^b$eP& zT6Bm#iVl41?Kj_h$7+V0lb~D$I)fcSX%?r0q$?=Cp)y#|WnJ|^;o(VwJ@dO=7#Ohs z>tb>P;Ip6;B{!EWMzYJvZ&dfao~Fv~M}vFa5P{HP@gf6vGE9@cX=2-vdud1SMy6DX zBw%+UUk-h!d}ylA7Yk~vhYNUD#!+?@)BwPG3-JLx>I=D`*9Aqe9ykn77BpJ<>vGQ< zgRNBri1R^`2GOl=m1yI$S-nOec8lMUvQ|ys9ue--)dYn%0M&asS@yNvka%?wrJXqj@$hEh tm{mU4;v!ZatklvacyMDh=obG0?3y07@mil33Z4OhzwKS{O}513{|D!CTyp>b delta 2152 zcmV-u2$%P*DD)7JBYyw^b5ch_0Itp)=>Px-E=fc|RCt{2UAu7{IS>U^XD|R741jB~ zHiWb2-I+>&=2@%_Kn4v3z)}R406j?_Er!54YZ-tH1#lkEIZ)sbpZ+%ngJb9$3Dr86dY>)x!$bL>?5rNIQaJp)(uw0ZyZ2jeh~GvVqhn7*dX9T@v7OP|N_S z1Ete8(Ey7~AW2N=RF6a*mXE(J^5ZF{o5Q~7GbjVZf~bb{h8#(2o40_H-vYP`xY+Hh zg|1lyBaz?YX$kZgz(WMJE{KDh!|jU}`C2x&$j5>-2plOBtO?TOhfojzq*Y82*n&%b ziBr~NAb(YL6g(fFSZNhwE5|Rcomg-=SlwEHWpJ_R*|rkg&jv;XV}h4{)-ns_KqcMV z?ugZ8fC*W!GJsUdySoY@T%@9gsQ_26B(U5}fUQsBJ0(DT@yZ0|0`N|GJ;Nh5rUJk? z=#>&Rfbqpz1ZHCZ3i;QM$Li<4UiLAY*0S?rw-1L0cnmDZ1ST0^t1W+t9y5Wu04Diw z(SMr=R0S}}&!Z<1s0aW%H@zkDBd|Vetsc5h1#gl3h#q`*-49R;z}-~{KhJmS_0+xt zO}~HtUbpk?vTOsU9u2r4j9zb*_un;Uq&}m(t&SlD!TK%K! z5Eh*Xf>iFU_+Am?(h|bOZZCQQ3DpJED)u73wHB`ljk+N*s>K>B4v{f{2l>~JM}JrH zHSOSv0E6x}gg~$ixW}Q)Wt|=(kN{f%EhS1i(o3r^LE64n>?E=PN&w3Wt;w&!G7Gfo z@)QA96zJ>SFn8*31rVRJTLDd%V?Y0pJ5P|qr}JOW{!qKPXB;q(h^6b`NN@hL&lSeD(|2M}$yoTtEY1b--v=32z$e#L3wW^L%_llb?br1WqQoemt_ClBAb{m$pP~X<$ut}Dy|5i zdj+^FZ&(pVE$rGMjy;QH|hvhn%&#G1&V*ocjZO=U&x!L;yT7M34r#&sZ1MTHq zZSqs7?+8i(5dlXCkr<6#L$OQ_`4Ims$q&JBQ)mRFU*m}2^N&+Nw& z5E21U#sMj$=L@KpI%q?~E{*5=8d9#`kS?+GYwb)6+yQ8B_DR^23PAOEI0S2a&yEy& zXe?da61GJV^gwR(#Xwdz9kZd+;_OMr9C3+kkuJL?u{c$KnW^k1gKCb@qdx_m4aM+++QB;0ZK*~ z6+?9a7MaWPgtP^+0$6ijr%BM7$uDs_WET*Lk`nToiEm-3E?@$Wq5#(14Ma$^+!0!T zjmvH`z(})&J^RwF0HnZa!6UT(7KRr<2s9$MKz;}f0gNyXh`S;mtK; ei#|_ui2nd`Px&U`a$lRCt{2-BFI)FbqXer_dOr?^z)N`fW5`vWe-8>!HpJwmpKG~qBj7s2taWJ zpg00h904fqCwc>}Il|s;s`)-1fVzqP#mX$$#5EoCT3p- zAztX0L0Hr9{Q%G~^?raIA0pLNJ%r zqvz-V3$q9Ti@@So1THRg5lHbhjD&zIfl2g+fHgpId>fcZPZ!{ZkYrjzz-{3PwS?gE z3n~6uu7=>!izxn@u7u$03n>2DzJ=i9e^UG$K81km0L7gqgS|hOvo1gfD2@OWM*xcB z8GnVmTL%nv0Odc4TE%D$x&uJ*b&S;FXXX!spS>=vhwr8iz~f-`yw)_)D^FU~A zSL$>28g2?rfL{(pHv&)`w}mIsdl+aw4OI1R0<1#n`PtEy?*Lbl-@C1zpKWc)4$yn? z;`rWZ7GsDEQAhwrir4er=i`2Bo#fV^vuY5g{$|kV1trV9e)I}j%V(dlzQEQq2G(^b07*qo IM6N<$g8t~DX8-^I literal 0 HcmV?d00001 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a4bb6fd822..f7ba80ae5e 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1691,7 +1691,7 @@ public class Blocks{ }}; regenProjector = new RegenProjector("regen-projector"){{ - requirements(Category.effect, with(Items.silicon, 60, Items.tungsten, 60, Items.oxide, 30, Items.beryllium, 80)); + requirements(Category.effect, with(Items.silicon, 80, Items.tungsten, 60, Items.oxide, 40, Items.beryllium, 80)); size = 3; consumes.power(1f); range = 28; @@ -2572,7 +2572,7 @@ public class Blocks{ thrusterLength = 34/4f; armor = 5f; - unitCapModifier = 4; + unitCapModifier = 2; researchCostMultiplier = 0.07f; }}; @@ -2587,7 +2587,7 @@ public class Blocks{ thrusterLength = 40/4f; armor = 10f; - unitCapModifier = 8; + unitCapModifier = 4; researchCostMultiplier = 0.11f; }}; @@ -2602,7 +2602,7 @@ public class Blocks{ thrusterLength = 48/4f; armor = 15f; - unitCapModifier = 12; + unitCapModifier = 6; researchCostMultiplier = 0.11f; }}; @@ -3509,12 +3509,11 @@ public class Blocks{ shipAssembler = new UnitAssembler("ship-assembler"){{ requirements(Category.units, with(Items.beryllium, 700, Items.oxide, 150, Items.tungsten, 500, Items.silicon, 800)); size = 5; - plans.add(new AssemblerUnitPlan(UnitTypes.quell, 60f * 40f, BlockStack.list(Blocks.berylliumWallLarge, 4, Blocks.duct, 10, Blocks.plasmaBore, 4))); + plans.add(new AssemblerUnitPlan(UnitTypes.quell, 60f * 60f, BlockStack.list(Blocks.berylliumWallLarge, 4, Blocks.duct, 15, Blocks.plasmaBore, 4))); consumes.power(3f); areaSize = 13; - //consumes.liquid(Liquids.gallium, 2f / 60f); - + consumes.liquid(Liquids.gallium, 2f / 60f); }}; //TODO requirements diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index b2e69cc0c9..a72a9158c8 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2456,7 +2456,7 @@ public class UnitTypes{ heatColor = Color.valueOf("f9350f"); cooldownTime = 80f; - bullet = new BasicBulletType(8f, 110){{ + bullet = new BasicBulletType(8f, 140){{ sprite = "missile-large"; width = 9.5f; height = 15f; @@ -2487,7 +2487,7 @@ public class UnitTypes{ rotate = true; rotateSpeed = 2f; - bullet = new BasicBulletType(4.5f, 20){{ + bullet = new BasicBulletType(4.5f, 25){{ width = 6.5f; height = 11f; shootEffect = Fx.sparkShoot; @@ -2746,7 +2746,7 @@ public class UnitTypes{ //TODO better shootEffect = Fx.shootBig2; smokeEffect = Fx.shootSmokeTitan; - splashDamage = 50f; + splashDamage = 60f; splashDamageRadius = 30f; frontColor = Color.white; hitSound = Sounds.none; @@ -2935,6 +2935,7 @@ public class UnitTypes{ unitSpawned = new MissileUnitType("quell-missile"){{ speed = 3.8f; maxRange = 80f; + lifetime = 60f * 1.4f; outlineColor = Pal.darkOutline; health = 45;