From a5be9b9956581576937bb10937865aac2a61c468 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 6 Apr 2025 11:06:37 -0400 Subject: [PATCH] Ammo colors for remaining turrets / Stone + basalt vents --- .../blocks/environment/basalt-vent1.png | Bin 0 -> 1618 bytes .../blocks/environment/basalt-vent2.png | Bin 0 -> 1545 bytes .../blocks/environment/stone-vent1.png | Bin 0 -> 1486 bytes .../blocks/environment/stone-vent2.png | Bin 0 -> 1516 bytes core/assets/bundles/bundle.properties | 2 + core/assets/icons/icons.properties | 2 + core/src/mindustry/content/Blocks.java | 126 +++++++++++++----- core/src/mindustry/content/Fx.java | 2 +- core/src/mindustry/graphics/Pal.java | 27 +++- core/src/mindustry/type/UnitType.java | 2 +- 10 files changed, 128 insertions(+), 33 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/environment/basalt-vent1.png create mode 100644 core/assets-raw/sprites/blocks/environment/basalt-vent2.png create mode 100644 core/assets-raw/sprites/blocks/environment/stone-vent1.png create mode 100644 core/assets-raw/sprites/blocks/environment/stone-vent2.png diff --git a/core/assets-raw/sprites/blocks/environment/basalt-vent1.png b/core/assets-raw/sprites/blocks/environment/basalt-vent1.png new file mode 100644 index 0000000000000000000000000000000000000000..52619379c9b72c4274105964c757669ff28c1983 GIT binary patch literal 1618 zcmV-Y2CeytP)Px*3`s;mRCt{2T|J8%F%Z=q>8^0K77Vv&SglEzpxyxTwHxA zf{ZMWq#5arG;8~TA@S|5rS~+W8GWsDHw?wy$RGdt`1rxS_GPylT2?I#sg#8H5GfJ3 z&$B3E*8B2%;uHso=ed_n=%6MHr&r z;s`NBfKlXo^z08xBB%&pnS2i`BESW(>UucP6eT4>R{<=OUqVituwJ?AC=sA}fJVaA zng^gTZ8m3RN#z}qGFJ(po!Qp9g8e+Ji@?2(TL+Ne^7W6akj{qI>Rzh}KULk|MwQHyFOJqEJ`ZadU>FAufojM6P8~BGeL20r@O#WCf^= z{ipR*G}n+M4Z>P2sTZ0ppeBiW{q^cxK$12_iNI;VO#(<=j|<4R1Zg8G^#hXdwOW9d zmTwWr;SdS30@NPt^2wtJm_(1t1yV!JvGuo-Peq$a0jfjOg}RwogqV1(zyz{EBMwEmtv>F+ zEQPC_A(>JK%;5ksDPMzB;YZ~Snz4TlD%(^Muw)GsP_uxrIpHM_VN2yn5g$!(L~L0%|xR1?_xj*bAL~#UQW8;;dpbNWSawN^=*H99IfuDd^*LdW{5_7;Zqi ztK6&>7d?kzObFnFA|TyY>e;Px)!%0LzRCt{2UAu1EFcf8qZXGfShPDhrh7Lu?7$}f$FAyLZiw^w-Bk=`A{D|FU2)U909<@~eEbXj{`~qn)jds9Sd91_vj{PKA#21h z>w59s@o)gIHKHiP6(|LV{0K~h6uBT2msyKAqyP{R5cv@t5j3z6;n??`yMkvuA2oCUYk<<-M1h9w{D)|vL0l(_AAsi{M%Z z^dvu?uf2vvIUsy=yRrhFH#{2L93YMU_e6g1a)5+<3Gr!e_7-kgSC{^UsQ|5r4~2@+ zs={pzbt|Yvs*y$>XUM{$k0EJ>svO`=zSi=;e*C=r@7)6aS8E4}958a!hY-T??Fg5n zBEs1*f&oAGj+mxh-zw@c@=xVKM8L|Mms2_vL2ib650V`Z2X)j_$qx*nYOqRGBmpeQ zuaVoD`25`JZ_08}fmXsP`FVkJ8<%bre@nW(m*%@uC=cR2<)qB-hmbBc6+$^ZWOo;`g_=pUCBEg|0JV+$g5x`x^P! zZ&-amfy4#Xrc-_~E6Y=(m*NyXF5UiheI$xE^r%+n~nS& zQW3Zg8E%ElNZ`5wBERMWeI-2EqkyAQzZuQ~r5UIT*HW@uyNS>`GL5&6VTsm-sRkg?i`V*j+axXhH` zicoa`Wt6kkrWhl_s*ZF^L0fVGcix!e0&qg6*8{6tM_Li99N;lNJ{oG#uU+C4feuAz zT(G4yl)^GIsOx|&ci6zEs9UZP!vLkBt+~LuUIfR2tT3YprRb03Tkg0;asa0KmeWv# z2l>IWAAtSoOfIOld>rx{ab_)@L(#EaCC<#y_KL`aVWfwHvScwoOa6~EsM1C;b+?$l|Ya&o8 zUMn|nMab(G%K7&Xcc*)@ihit4RqYwa+Ec;65fl=!O1*ZC`-eMH*{I}G8#C+{kF^MA zzbluxN?TNvt?ntrH`~76Q-srT%wEz-aMzt3Prnmi(-NRLsi07z?|U`?KxUJn(6)mhZcl* zwpx{y9OXwKl*49=@6;ueQJBc<}dT4YVpw0!ye=Z&-V$>(lUzJoB$EC2(eiKA}}E$0TRJ-^0?RNMSf^000$6(9I~iF vTm>i~Cr?Te)p@-ztN@lMiO`$)D+a+oW@&(*jDwsJ00000NkvXXu0mjf+bGe1 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/environment/stone-vent1.png b/core/assets-raw/sprites/blocks/environment/stone-vent1.png new file mode 100644 index 0000000000000000000000000000000000000000..89bf1a4af45634313aa4754aff31d33aa046eae9 GIT binary patch literal 1486 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 S=`V}`0000 { color(e.color); Fill.circle(e.x, e.y, e.rotation * e.fout()); - }), + }).layer(Layer.bullet - 0.01f), incendTrail = new Effect(50, e -> { color(Pal.lightOrange); diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 97a219ae87..911aa19b34 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -138,5 +138,30 @@ public class Pal{ techBlue = Color.valueOf("8ca9e8"), vent = Color.valueOf("6b4e4e"), - vent2 = Color.valueOf("3b2a2a"); + vent2 = Color.valueOf("3b2a2a"), + + copperAmmoFront = Color.valueOf("eac1a8"), + copperAmmoBack = Color.valueOf("d39169"), + + graphiteAmmoBack = Color.valueOf("7d89d8"), + graphiteAmmoFront = Color.valueOf("dae1ee"), + + siliconAmmoBack = Color.valueOf("707594"), + siliconAmmoFront = Color.valueOf("999ba0"), + + glassAmmoBack = Color.valueOf("b9c9df"), + glassAmmoFront = Color.valueOf("ffffff"), + + scrapAmmoFront = Color.valueOf("f5e0cc"), + scrapAmmoBack = Color.valueOf("d8887e"), + + surgeAmmoFront = Color.white.cpy(), + surgeAmmoBack = surge.cpy(), + + blastAmmoBack = Color.valueOf("e9665b"), + blastAmmoFront = Color.valueOf("eeab89"), + + thoriumAmmoBack = Color.valueOf("f595be"), + thoriumAmmoFront = Color.white.cpy() + ; } diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 5425212ea4..260a0f3656 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -699,7 +699,7 @@ public class UnitType extends UnlockableContent implements Senseable{ stats.add(Stat.speed, speed * 60f / tilesize, StatUnit.tilesSecond); stats.add(Stat.size, StatValues.squared(hitSize / tilesize, StatUnit.blocks)); stats.add(Stat.itemCapacity, itemCapacity); - stats.add(Stat.range, (int)(maxRange / tilesize), StatUnit.blocks); + stats.add(Stat.range, Strings.autoFixed(maxRange / tilesize, 1), StatUnit.blocks); stats.add(Stat.targetsAir, targetAir); stats.add(Stat.targetsGround, targetGround);