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 zcmZ3-vVmoSVf`yl7srr{#<#O<{SG?_xa}|Cv|4q+N;P1kq7zG;8l?^$Ty-pJq8+sf6;7#syy66;^KmKn@E zXI8oIT3&UP4D0v#Qm+~B+4q<=Se{6+x_zN2TvdXHYTrJvX z>Um3c^+V1{3%LDP2(dNWF+BL1nrJ&A*K@_2DE*Be6nsGJ0B^keZIuv~8E(0k8J;`;|8Zp3UQf<9kqsPsg<@RH468T1Vi1kz zvdKv_(AK%Hx@ak~! z`ELfN|4rYns#vA?M0nlX$B< zq-8Vl`Ri*oTI=sHtvt;9w#r{%t-zy8+uR=qaxYA>j=jCDmHo-t345fcY(KnEw&d@B i#wG=hLw29J9j*OcnghSvFfcGMc)I$ztYdacXaWGJ0_ueT delta 520 zcmdnMvW{hfVf_nF7srr{#<#Pq{SG^bxaQwrkqymI+Q=Zr!0MrJL?~m0fVIaaW|vgg zMc&ei6DBc<9blSp=RsFrXiJ-T>&KdVe`KsHmv4G>^2YZY^C~6T1y~#f%BIKVupdp? zrE}VA_xq2DB6sWa)~HvM+ea}yQ#hKkYsuSnUIz1ITGg*8yna~EIl1N4>&sO_-9K}Z zCv9O5J1nf?C_XPhm4~gC;lS(Do4>l4sV*!F2(D;ix~agKb=%DA#^=m4oc?c1a`pAr zueon+y?@)O^Ni69=6kxgd9L6z=)JX!QLp9S!-=K!lZ9?^#a46jAjPjJ=ruuN%4SoF#(LZKC6kz!9@7v~IZ+@m3!y}HPwM{)nsHEV?3>6jKmZZbX2Ts2Hm-YL>k7-xuXGgJ~3C`Z+q~Thz z$dgltapkH5cM4QiY+zZkhN)P{$YYZ{<8+pHv7b!jtZ$oG3RLkn`FflXm1~<-pRWFj zfno2_nq~JF{w|oUvHL%n5=qp!qqhTBmfO)Waye(B{`2A7zh^|C9T zaQRP3y*g{@r(4PstZgo=`_6KbOHnU3TFO6)W9|0KTXUl;9PaU)-0fItEpyxP`hR%^ gjwXdSM*DwW@ppN-#%C1+0|SGntDnm{rv%0(08-KIxBvhE