From 6b5a50555eaa856f1b48f70e7341a1fa1bc4463f Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Feb 2022 16:40:03 -0500 Subject: [PATCH] Tweaks --- .../blocks/turrets/disperse/disperse.png | Bin 2064 -> 4357 bytes core/src/mindustry/content/Blocks.java | 13 ++++++++----- core/src/mindustry/content/Fx.java | 13 +++++++++++++ core/src/mindustry/graphics/FogRenderer.java | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png b/core/assets-raw/sprites/blocks/turrets/disperse/disperse.png index 0ddae61f6a60ab846b026d9e4fed83e9bb4c21fa..39edc8651c7df428547d6765584ebdfdfbb72cfd 100644 GIT binary patch literal 4357 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 delta 2051 zcmZownjkPixt@WsILO_JVcj{ImkbQ-r#xL8Ln`LHookpEV=mB^&MdFQK4I4z-WCSG z%%y^Fq%Gz$tPQd1U81IyDj6Vt*P%^n?P(5!66T$g`6fi~5n&V8Kd&O6ZgE($=x6A* zEmbn-{_D%%pKyouMTym1zvY)-=E!otW!Pb1WhY%@Utd{w>regf)4z&?>hHhVe>WyO zz5HeE+2#G|zE9q%zh$uC=)4~_TPP%-!B;WL!0{^E4B-TuKfyD1yS-Igaf`vw;>h$J z(@bZXG_)kFowdM{*@NrqBFUXbV)KPJeek-#=a)HZnZ;>X83nq=fbQ8G359x|E>Dal= zGHQ7065XfEZp^kq@u2CEj-xG%I;u-V!hYo(Vvx1<5oxm67{sxv)s890Qq7Iw)b6m| z4Mxvi{K)apd>tj@yGn*pr}O;=iC``@HwM3Tdj1a|Jxl!je}4VX($DYpU)P`ayne&l z;>*83hksw+U}brp`+`JhAA{mLJ^$Gmi&dWSILzHTU8L>Sw5jR;4VUo*H2>I{8)e)m z$$UknF7Ng-a!M%EigQU-$R= zzi(Tk7CO%`V7SiY*Qs>&)ss0nO>y;HVoOq5*DcLT5N5j|utZcC8r+SiPENUTD)PlY zdpk)Jp2G|e#1nQ&m^?dgU+4YmeSH1@$G!SnB%VBD={}lNTzmhdLc$FZ+JaU~WNp|5H#vM`(u5F1D z$F?>ItjuQ0|8}2m<@_Ee*AkWoWgAmJ%HA>b>Ssw(W-$A(`gHJ(|9@jYd|%nQb%Trz z&tZYrr>{QMT$QI_Db&%!Ao9^tW2?*=#%=ZIgOnL}Ge(Kc->u87mSD=TttoWzk2|?Z z#RpQ-7(FGNIcDG&K zzW&CtBOg?)pEt|zkU0MJ)1Q`kUxWFkPjX}MabEbhH0sE`Ofk16!x?u1{lzBdGivf) zQ?Ywys_J<%@!ZCujg|~yHE$noSGlpzYu`i{o(o6kAMfJ4!F%DT|M4cy5N^jAEE)3` z9c}0g{mr`|jlt`9wgF?ks++H{$j=2QUVeVl{(b%4_0jk5yY;s-*7$FjTKY><^HKXZ zwIBOlE;$lBw)eJhoBmFjp-ZzEI(w#N<#bKGQk%-{O7-K;wr zG@PgD3$9bizRDu;vG!?d&kw%o(dYhcI>%VVB(0t@%OG2A!Jf~@YZrC&XG%9$sTQ0$ zde*tXFzp;mHG6wxr|;88&l1a~a39@eWqH19<18-)(+lUV^C-Gi*=+jakdLyfmNy%!olsOiIHNrM+%^L~;e?~*E9UV{s|(Xttvh$$ zqNqOU>{`8~#JMb9GZ$?6Aycot^?qZu=A6Hp4YygM9u>zlS0A5z#ExU)aR)u&jPCP= zYp2*{bn+`iu%9q>?E4{f{+#9Yp0BRKH4G1(1g^4NJMw(Tw)OtE9x;pD5Nb1R4E<<% zOXB<4rXLKgX07ku=%ri#`Shpdmx21(F^ zG56mo_I%0aC+pI;Fc$GC6_xb7mbOw|cQCPOj?7FOIXl(m%~M#O&uI9x-BL|M*RJ8i z#{$11A#XvW;}%Q%XRMax*H2~YYe`~xx}$W8k>fhHo0A>7?=clIP5w8l#QVvYslR)V*|9HRnK5gE zl-tZJ5}IlgUhF@iA|R|`COFNvp_lh^`O3Q4zRzS9+I}dWx@V`SOwHH#y3)pOTl*WQ z3FT>u>0D*AYkyze5G?<&X0gNS$yd~@pGwST`2EMu%yIQ2W|KUIhWBa<#PZ|j&7UPE zzu=LjgO(-JHa)uoVm%CeZ%*EvrCuhnZPDbu5aFEeAK)4nRPm-u|K#7ixBuvbhq3z@ Q7#J8lUHx3vIVCg!0Niq|)Bpeg diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 7b324eac49..c6bf597c7b 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -3323,11 +3323,10 @@ public class Blocks{ speed = 8.5f; //width = 11f; //height = 19f; - width = height = 18; + width = height = 16; shrinkY = 0.3f; backSprite = "large-bomb-back"; sprite = "mine-bullet"; - trailColor = Pal.bulletYellowBack; velocityInaccuracy = 0.11f; collidesGround = false; collidesTiles = false; @@ -3335,10 +3334,13 @@ public class Blocks{ smokeEffect = Fx.shootBigSmoke2; frontColor = trailColor = Color.white; backColor = Color.valueOf("869cbe"); - trailInterval = 3; + //trailInterval = 3; + trailChance = 0.44f; lifetime = 34f; rotationOffset = 90f; + trailRotation = true; + trailEffect = Fx.disperseTrail; //spin = 360f; //controversial @@ -3350,9 +3352,10 @@ public class Blocks{ //TODO bullet. //recoilAmount = 1f; - reloadTime = 8f; - shootLength = 14f; + reloadTime = 9f; + shootLength = 15f; rotateSpeed = 5f; + shootCone = 30f; coolantUsage = 30f / 60f; coolantOverride = Liquids.water; diff --git a/core/src/mindustry/content/Fx.java b/core/src/mindustry/content/Fx.java index 058b46659f..96cc76b8df 100644 --- a/core/src/mindustry/content/Fx.java +++ b/core/src/mindustry/content/Fx.java @@ -527,6 +527,19 @@ public class Fx{ Lines.circle(e.x, e.y, 2f + e.finpow() * 7f); }), + disperseTrail = new Effect(13, e -> { + color(Color.white, e.color, e.fin()); + stroke(0.6f + e.fout() * 1.7f); + rand.setSeed(e.id); + + for(int i = 0; i < 2; i++){ + float rot = e.rotation + rand.range(15f) + 180f; + v.trns(rot, rand.random(e.fin() * 27f)); + lineAngle(e.x + v.x, e.y + v.y, rot, e.fout() * rand.random(2f, 7f) + 1.5f); + } + }), + + hitBulletSmall = new Effect(14, e -> { color(Color.white, Pal.lightOrange, e.fin()); diff --git a/core/src/mindustry/graphics/FogRenderer.java b/core/src/mindustry/graphics/FogRenderer.java index 475016e231..1e7d74b5cc 100644 --- a/core/src/mindustry/graphics/FogRenderer.java +++ b/core/src/mindustry/graphics/FogRenderer.java @@ -89,7 +89,7 @@ public class FogRenderer implements CustomChunk{ //TODO slow and terrible Groups.unit.each(u -> { if(u.team == player.team()){ - Fill.circle(u.x, u.y, u.type.lightRadius); + Fill.circle(u.x, u.y, u.type.lightRadius * 1.5f); } });