From feb1135bccee4cfb97d04660f7e83007014e7f7c Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 9 Jan 2022 19:08:35 -0500 Subject: [PATCH] Some visual tweaks --- .../sprites/blocks/drills/cliff-crusher.png | Bin 1234 -> 1742 bytes .../blocks/drills/large-plasma-bore.png | Bin 1507 -> 3257 bytes .../blocks/drills/plasma-bore-glow.png | Bin 2306 -> 2237 bytes .../sprites/blocks/drills/plasma-bore-top.png | Bin 450 -> 455 bytes .../sprites/blocks/drills/plasma-bore.png | Bin 1086 -> 1534 bytes core/src/mindustry/content/Blocks.java | 1 + core/src/mindustry/content/Planets.java | 2 ++ .../abilities/SuppressionFieldAbility.java | 13 +++++++++---- .../mindustry/entities/comp/BuildingComp.java | 9 +++++++++ .../world/blocks/defense/MendProjector.java | 1 + .../world/blocks/defense/RegenProjector.java | 1 + 11 files changed, 23 insertions(+), 4 deletions(-) diff --git a/core/assets-raw/sprites/blocks/drills/cliff-crusher.png b/core/assets-raw/sprites/blocks/drills/cliff-crusher.png index ba6e5f2a2e348067210c34bcb4b7d036dd2d37e5..384a6b7e92a5333c3e6997273b63758354a3d2e1 100644 GIT binary patch delta 1727 zcmV;w20;1J3C<0WBYy^!Nkl0{XCbt=l$v8|*bkrmhlYu1YjJOgM zR7TK^f&|2cq8mZ+4+!m#(S;jv@*ygS#nM9rgZ~JxisZ(EF zdKh6IDEfBl)Onw-I(4c}_sEAIb?&|W&bysgUVY8Ae0=EH&VPHaFSwTZg|}RFmTh~O z+Z>sgnCL9s9nB^uw`LwL-X6;yT6fb^G?b%!6P_Gfbg%xyjY)S|F*37fw$tri%2uL; zVTXqxfF~2l=kt*{R3c@}TIU;Z-M ztIvBFTlxe*nSTVrTh81V&vuSqw{H#b&F|X=-YcU{y@;(UVL$*BNyvv6sm9g`FY44= zRYFt%l0FVSK^k5s?MtD)DUfS$A9FhWH>%B zMwU@Wg6a(d*nlK>I=#nlp32s(xt5J@evnm@H0=+N=)o(2PFdlhCjgLed31uOg%BS8 zynL%vLVumBvpfiFQvzoZOP>IkfB1Gd@5WGgk&^JqXWwNfPyXD>a`^c9?798Z+H8{4 zp76rd#euzcK)}{5>%-Wd!G|RuUc@APdh|*-lo&|00sRuEJi>XP9OW&9hx}n16#!h| zNJ3F~VI>e=(4RDwKzKnY!g-(^kto)2EJyqMLWl^~MP{JkTaOax1|K zpnSL(vY{kE;lT<3%Ci6hfDslOTn-c-*gk_LmON^Yl^_9xhai9_1Y-9_fDI3M0Tvn{ zmP3LK4|e-`Bmg7<0SXU20f2v!?A4}Y%!7^Z}Lc<>4UBrHAf2v2+T2>_1IJXHk1 zFeJpnLlpr)+bly70Bp$af=wt24=Yvxv?ZYG9w=hl=ZmonZ4ZE01M09UpnIv%+v*{( zcVD5L*dDlg2;_bTvDydl0|~niwJ{D5v0bnZ|I0q0Y%;Y9d?`f|R%9R0W_VE~p?_5Y zFYee7y(?T~AMy%rofnIS5dAKmb??c>$E?(wVDAHDEcy3oC)`Gt*;33GD$24+sF250j(3AtV4K z!3rR}K*H$unM&bjXLpCe2rwPKBffO3<;e&-e1H}lX-MiJh!m;pzd4sY!MNfF)kzjw6kw+3*yDL1m@oIh> z1EeHW2`^F-QsD&>_zfX@u*Dt%kURu*Z;)^vD3{+8>Vy|D2~5*@r{K@x%hg$G7`ZAq~8)&+rO z5CT5UV1Y8cvG9U+$0Sr1093}peF8>dp5@rt3t=7B^DJAI?z-yb!b^3R!FKZ!Y6*a{F}kJB zsnMSD%3!2Oc@KFBwKxO}JG>wi;XF`|@*b>&$^w=vydV_eJW!7E9=hF2+0xz7>|YkW V>BJdjnf(9&002ovPDHLkV1kd;9jgEU delta 1215 zcmV;w1VH=F4blmaBYyw^b5ch_0Itp)=>Px(j7da6RCt`-o6TxdK@`VNL-C`ngf{X5~y9A^J0+N(aYZnq+)MD+fF2V_uxo2k1 znK}28=D!LzcjnIjm-##=cjoQ84;R&H88~V+_gMFtsy8;pWq*o%W~tY0L#NYIuNW0$ zAf>FdjU@npNrX^TZ!6)4NrF)1P@8%2^7VyzpIvp|Av2VG22+7@d$6et001`x>Y5e=t==SsKmq{BLhx0b3PF1)Ng!nA09)ls zja^xckr;7-bART9+0@3Mwi}B8jc4%f@3K~vq}JyL006MlJPF?0>GXmSoI?PB|Lboz z7Du14fqBTR+kB=^q2W;a^ZO_HMT~h=9uTNHQz5jPd&3@JLr5`?(uClvD;5H7wnjq$ zA!wLKX+YrAA%$S>G{@!u*Kn}4cGiVoKfbf>ElOMn_J1}zGYN*4vbD1=0012HPlFIN zRs=~MAqbSWnT@AU#`XcrckTiJz1E_6QxDf}!0r2wGS@$T`s#13Q19Ptupsfv3BF$K-3MSnmwA*4!EC4o1hbA92%#bE z1;D8Qb$`%5B^#ImfhsG3z-fCB006-5@p(ANcImRTQsFg;#^omb|yT|9SwQ_Cr`Bi;*?Bt%owN{5-w+#S8 z!?;_F*>}t?EUmJ4fGDabNFbyN&7)#BT=mB0aDNCaEUl)u3gUv2QrYHXg;C_u9B>&R zXqyMHCc#ODkcW8yVikx9a8lBQpkvdcKp<0N zv41M!IIIo9nH=?LYvtM~D1s^~766cius%PCO2f69d-8~oX&gUG%ya*M6;ioUgI>2i zW_*2qAP$a*c7pb=4gm14^_g9sb3&AyBB^YVv?s6uQ07sg#0h}R80TKC)I1A-&pgTp zAtpB9E2Ej34+4;!2q_3Dff1^#BsI@zJAdmq%t?HpOb8lLA+ruiY913O(Z^xCpcH~; zNUT~dXL^?pf}J(;K_LGh;48qH@KBtbB1gVC$o_wVFJ*RgxF7z1K&Z<|dID$iOs&I} znx_;DigLr^5(q`em71sI42z?AZU~wKL1PG{rshrIyp&0d*uT661g-HOs!M7fHGfKt zxw?G{1Woh4I%CbFM#)i^Vj$#Uo~k?5JSun^>~-6$GkAZl0!N4YaPe??px>NAql;^j;LVO?FQZ1IXKaN|_i4A^=61 dPbn*f@E?&Hfzao^(h2|o002ovPDHLkV1oFoJca-O diff --git a/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png b/core/assets-raw/sprites/blocks/drills/large-plasma-bore.png index 4d85f466950e894c316735f8e501129a583d8c96..7fb0859b715539e52c9947f75beeb5f85fc62cd2 100644 GIT binary patch literal 3257 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 KMNUMnLSTYOq^>Cd delta 411 zcmV;M0c8Hi1HuE4F@JnXL_t(|ob8%B4#F@Dh67^YD4c?mFfdgd33X!NBs~R3VS_1B zWhJT8)Q>v;MuaN+ubtSgLvS3&aU3&zr{P!g{{xjF63m@HUq_U0W&}vRd5j1q1Sp05 zk_gA`&Ecgs=OMcnphVXx(DfmRb>1AU=YeCLRD_tm1?J?^qkjtlN@s(40hSI%(*j^_ z1=9jx=w5&m<-?!jo24*$47b&lA6W!&Io}G209u_-^$44%0M_~YWkNsm^|`LLCz5NB z*bYJHaE((nVx=f`hb#g_2P8xgABjQ3IYq$C1xN+R87!F&5H*F6ln81BkV1_B+}C1+ zRDhhJ@OLTaLw{h10BA6$^J?1RXt>0iS2GZi4EvG@Bp(pCo1t7g3>{AuMkEo?(w|ep zIu_R|0)%uTvNjAih9hoi%UROm3`Qk}@Gc*K2Yu zYqB92zXsJzgeYmf<9D9|k*?R}Bfc&hyxMad$8l=-0~C+ru?}a@nLz*m002ovPDHLk FV1h1`u)+WU diff --git a/core/assets-raw/sprites/blocks/drills/plasma-bore.png b/core/assets-raw/sprites/blocks/drills/plasma-bore.png index fc0202ed77c8bea57d09258199f79960b3c5799d..f9d5379973606acca45766826d63a50ca0f4bd97 100644 GIT binary patch delta 1517 zcmVuI@BYy?ONklzK_k{+9!;$kOGA=2PmPGHBGrl@ zE>xsT7g9yqofLPXU>0uN6kQ1}O2M@v1wjNi6%hm}XlNQ5C+JCuH+qDbh6Cb~MHn<&q zv0VLi)~&ofjYeZ)eWTYLK0IJjxo~tQ>MhS6YMI|w((13XZkwKw(dI;}wO~>u#5Pc* zNT{=JmrMXJrbtL_poo!BXWc$F1wgEX;bz?EQ!7qJpj!i!i5c6gB@Ay)uM0u|;_B%w@rQ6#|^UeM;4 zQ+rSV3^b1L5CjQ#A3v3KLUcs-cJkC%SDRgzz5n%{<$qwCAVxw^!0^aZ)Kkc3FPW%Q zTvc$Yd}YX(@9z}XSR^4=KuUNKbDr-O!iy>-cm$-#v5j^k{ZW z7s1ayk2)my!i!i57klQ+nW5#j>yk|Ygoh)KHnKs^^_7D>_44|kzneq7{pNwe{4!Na z2!$6#5`R8=7NWB8gg9gWtCqdx>0YII!ujh-W z$FhqdApzh@Pr^}zJP-EQ>ugo}Z4loxh*kN`kJ&s)uW0U!x(c;S;k_^Kfk z;bNd1<=yaL3xGlaaOK97Io->iA6r5l;RT@x7k|TS->?~5UFaxUN&rLBU)By3O89)K zc+}V}F%rJ~YdHIuN(Dej!nMc7DY7MmBq%&oE&zNIwlci%NwC91Eds!nupQxrEx`>B zwFv+uu*F<0)(M>*=W`#G2>52;$!z{EkL?x^y5?v8(VbrFI1Ai8(VVbParQun@W3Qy z9)CMo0PW@sW=pUIaM)x+VSdVzAOQ*wRFua~7XY>d2_QUV0@#rR1lZwWw+jGCK!C!- zrT{>~#xpOl+s0lH07zIl_8hyLvlCYZv*x^9}011V&!bo5YoySfd2YfKN-qCDZ02B%U zp8yUUE}^F%s(&Up#E0Xp?3>gvZNr!6Qi%YXbluu-78<`0Ce|VPV%L zxf9f_X!Q1ki-B^KuM&k9AqiTb<^Bd&LWh9Rw79|xLJ=+o%6&J#klky@{f6Ca=U3;w zAL)~z@WPc~3t)0I8wxWS$~hf06n}QZixdgeTLo&H4_ks8Uf2>OfbftBV28%?K?ukT zFJdHIUOk}VU8A<;frO%^c}YNk!o#Kj;DZ?T#SCvl5~>U@Xd7RUkJtrT?q+odOKk!K z$7@*$b%Yl_39;du&HrzjaPbO&G7{hc;S;kctN{E5~2kFmFesd8(ySHhz&1n33hlvyYnO@2>>d) z{6s&y$;3!V4KI*z<;Ikrc4k1keG-xdz|i7SHu_=&mbzV?%>U0Ilds*>&DkM@PeLgH zd{Ew~EJVyWq0YL&l~76mq&74ryr{EouqBih0I>~C2`}ob+Zbb7tp&5b(QEz#3i%@3 T-=CT<00000NkvXXu0mjfrzXG> delta 1066 zcmV+_1l9Zg3%&@DBYyw^b5ch_0Itp)=>Px&_(?=TRCt{2o3T$DF%-tXoEXT8IwVrZ z(4nPFU76Tgi6QMDz?880jg@$&z)_jch%#@8Y9c+Q-926?g2Q(FfYa8a?mIP zfGQATnb*Xu10gd%_&|tlUK6`2gf;t@d_DyLNNd8+9}8#O#pTyZiD)(4*>pE<_{YnN ze~@OvY?kBbe%;xA#wA!&T{@RVE-*P1j)RSF9Z?*P=-JSjs-z$-pB_+ z=lzF|ORmFU^M9=vSQSSnzyBSz6kN|=OqB>&7bVne<1PE zsGs9xSJzhp@-l$0kRP4GCRsf8r2K_DyyO)Lq5?a7Xp0juVze}AyGcRK+9Os;N32(jgYKzT6` zI^RAGSKM#Ed$rQhzSkP_#r`kel<&s}-{pjTq@Cu)v5V%5xw5xGI{;-Kpl3p8^S&_+ zEa_4P6aawdw?vn02u+wb@`gR0f zjDs-h=kC&&WZuYCFo_{;X`X^$`jf>`t$Cvq5PVDXHiS}f)M(sYdYddLCFp-YY0e_Ck+0)xT zAAdjv@G&P9RJGzRzvB4>s$^!D$?d*Rg%K)I7rm6FFiM)zJmtkyl*rr&9pO6t&r^R&1|)WA)dcg3z_9uQ88Yh)+Tqw}lqOd<&bEukdfyR}G+=8X)5Ur{g^pEGU>rvLx|07*qoM6N<$f{jT9IRF3v diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index d9cfd2bb5c..130e1a6cba 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1644,6 +1644,7 @@ public class Blocks{ arrowTimeScl = 2.75f; hasPower = true; pulse = true; + envEnabled |= Env.space; consumes.power(0.30f); }}; diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 8ddcb84f63..355e962995 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -104,6 +104,8 @@ public class Planets{ //define launch candidates after all planets initialize serpulo.launchCandidates.add(gier); + + //TODO WHAT IF THERE'S NO TRANSITION?? gier.launchCandidates.add(erekir); } diff --git a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java index c97de62c22..01b13d62f6 100644 --- a/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java +++ b/core/src/mindustry/entities/abilities/SuppressionFieldAbility.java @@ -9,6 +9,8 @@ import mindustry.*; import mindustry.content.*; import mindustry.gen.*; import mindustry.graphics.*; +import mindustry.world.blocks.defense.MendProjector.*; +import mindustry.world.blocks.defense.RegenProjector.*; import static mindustry.Vars.*; @@ -48,11 +50,14 @@ public class SuppressionFieldAbility extends Ability{ float prev = build.healSuppressionTime; build.applyHealSuppression(reload + 1f); - any = true; + //TODO maybe should be block field instead of instanceof check + if(build.wasRecentlyHealed(60f * 12f) || (build instanceof MendBuild || build instanceof RegenProjectorBuild)){ + any = true; - //add prev check so ability spam doesn't lead to particle spam (essentially, recently suppressed blocks don't get new particles) - if(!headless && prev - Time.time <= reload/2f){ - builds.add(build); + //add prev check so ability spam doesn't lead to particle spam (essentially, recently suppressed blocks don't get new particles) + if(!headless && prev - Time.time <= reload/2f){ + builds.add(build); + } } } }); diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index b55656f55c..c31e160f3f 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -77,6 +77,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, ConsumeModule cons; public transient float healSuppressionTime = -1f; + public transient float lastHealTime = -120f * 10f; private transient float timeScale = 1f, timeScaleDuration; private transient float dumpAccum; @@ -339,6 +340,14 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, return Time.time <= healSuppressionTime; } + public void recentlyHealed(){ + lastHealTime = Time.time; + } + + public boolean wasRecentlyHealed(float duration){ + return lastHealTime + duration >= Time.time; + } + public Building nearby(int dx, int dy){ return world.build(tile.x + dx, tile.y + dy); } diff --git a/core/src/mindustry/world/blocks/defense/MendProjector.java b/core/src/mindustry/world/blocks/defense/MendProjector.java index 5767939183..4a59734b38 100644 --- a/core/src/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/mindustry/world/blocks/defense/MendProjector.java @@ -106,6 +106,7 @@ public class MendProjector extends Block{ indexer.eachBlock(this, realRange, b -> b.damaged() && !b.isHealSuppressed(), other -> { other.heal(other.maxHealth() * (healPercent + phaseHeat * phaseBoost) / 100f * efficiency()); + other.recentlyHealed(); Fx.healBlockFull.at(other.x, other.y, other.block.size, baseColor); }); } diff --git a/core/src/mindustry/world/blocks/defense/RegenProjector.java b/core/src/mindustry/world/blocks/defense/RegenProjector.java index 95c3df59ac..46559c8cc3 100644 --- a/core/src/mindustry/world/blocks/defense/RegenProjector.java +++ b/core/src/mindustry/world/blocks/defense/RegenProjector.java @@ -134,6 +134,7 @@ public class RegenProjector extends Block{ var build = world.build(entry.key); if(build != null){ build.heal(entry.value); + build.recentlyHealed(); } } mendMap.clear();