From 41865631edb66ac85854f0f3bdb70448db92ac37 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 18 Apr 2022 22:07:18 -0400 Subject: [PATCH 1/2] Polish --- core/src/mindustry/content/UnitTypes.java | 17 +++++++++-------- .../mindustry/entities/effect/WrapEffect.java | 9 +++++---- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index cca7c8f777..f1d320e3b8 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2929,8 +2929,9 @@ public class UnitTypes{ drag = 0.1f; hitSize = 21f; rotateSpeed = 3f; - health = 1100; - armor = 5f; + health = 2600; + armor = 7f; + fogRadius = 40f; legCount = 6; legLength = 18f; @@ -2980,8 +2981,8 @@ public class UnitTypes{ minWarmup = 0.9f; shootStatus = StatusEffects.slow; shootStatusDuration = reload + 1f; - - rotateSpeed = 5f; + rotationLimit = 70f; + rotateSpeed = 2f; inaccuracy = 20f; rotate = true; @@ -3038,9 +3039,9 @@ public class UnitTypes{ engineLayer = Layer.effect; speed = 3.7f; maxRange = 6f; - lifetime = 60f * 1.63f; + lifetime = 60f * 1.7f; outlineColor = Pal.darkOutline; - health = 40; + health = 45; lowAltitude = true; parts.add(new FlarePart(){{ @@ -3058,8 +3059,8 @@ public class UnitTypes{ mirror = false; reload = 1f; shootOnDeath = true; - bullet = new ExplosionBulletType(100f, 22f){{ - shootEffect = new MultiEffect(Fx.massiveExplosion, new WaveEffect(){{ + bullet = new ExplosionBulletType(120f, 25f){{ + shootEffect = new MultiEffect(Fx.massiveExplosion, new WrapEffect(Fx.dynamicSpikes, Pal.techBlue, 24f), new WaveEffect(){{ colorFrom = colorTo = Pal.techBlue; sizeTo = 40f; lifetime = 12f; diff --git a/core/src/mindustry/entities/effect/WrapEffect.java b/core/src/mindustry/entities/effect/WrapEffect.java index d5484b1b96..ece9bfb88d 100644 --- a/core/src/mindustry/entities/effect/WrapEffect.java +++ b/core/src/mindustry/entities/effect/WrapEffect.java @@ -32,9 +32,10 @@ public class WrapEffect extends Effect{ @Override public void render(EffectContainer e){ - e.color = color; - if(!Float.isNaN(rotation)) e.rotation = rotation; - effect.render(e); - clip = Math.max(clip, effect.clip); + } + + @Override + public void create(float x, float y, float rotation, Color color, Object data){ + effect.create(x, y, this.rotation, this.color, data); } } From 0915598d647cc359e8c0efcaf71a569e33d7acbe Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 18 Apr 2022 22:14:33 -0400 Subject: [PATCH 2/2] sfgdhjk --- .../sprites/units/anthicus-leg-base.png | Bin 558 -> 560 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/core/assets-raw/sprites/units/anthicus-leg-base.png b/core/assets-raw/sprites/units/anthicus-leg-base.png index 3eb8a24de5a106c23c8a42c437865d971bfb6a92..0b92243f3082cd49beac6f0947c74609631c4bfc 100644 GIT binary patch delta 522 zcmV+l0`>i_1h52+t6}XB^VEm!V_wcVt;tTBw_vaX+4P5a=tZ5 z+8wLm36h`-PpA?GgFXP@^<`l_kZnn*?9>#Vpg=ZAg4(u?5)ND%bHY!Q@|F$4PQswBvb^LMs3po=R^Pa#Jasn3G7*b2)zcex-_Atx-m$xM$ zdLiT!p5RE(!4YGU5Va5r2@e2g=ZB@wN2hnJ{_3Vxz&y1^D}+MB6HQBC35Zn%riLRy zg(V{RZ92U8)3O z2@mYZZvp(}umv??90P1mbA6^o->H-v-j_~44?w_~FLj`jDm;()FfuiOHu!vpPl zPY|sT;?lN9<53HtVmn>iwuJ}e&5*nsl()m79d!Nw0fHb1!anm0K|4=GgHiW900000 MNkvXXt^-0~f~W%Og#Z8m delta 520 zcmV+j0{8u}1g->-F@NYuL_t(&f$f?*PQySHMQ_*y9aU%|u>ckT1xO&o5@@IpJ4mtv zL}f*yOB*4Ok^&aM0+8I`ijGx;h8KnLeBS&VJ9($F;>pEIY-5tN z2Uf!qBtaLRP$dioeE`7g%d_=FHYK5UP*Zq<0@)x5YTGtS*z;-32~X{GZ7(jbtlv93 zzqZQH0b2k!yo2x+!DO+ z0K!*7%p;Ujf`3;Xu#S%aTlkyd5CHK0_Otrz`=h9}b4f7alH*+m0PgVIt4-mFO-M*y z2!)0xToQC}#F!)`Erepj1Hj4Y{%ZT+_?Fe5Ygz@&Q){w9C`EXpNeL_gsj9%-a3rX( z1f;A2a}qL0vL6AL1nyn(G#)$KG&vA@4T4Qb$Q2%jntx{}>Hq+}#eAmUq5E)~DnVGn z16%T20Dn1bK}{IP0NZMA$g~(bm2$&}(&_a8L|plQ9jN3APn2cVnx*pEBak~h(609c z$qFGZZCe^oS_rMT)3t3|ctG9^$-6;$I~?0V*Z&_N2!bH&GQauMPekdgOsW6?002ov KPDHLkU;%