From 7e35de3c334fe39b7caa6bae85b5214d1f885c94 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 7 Feb 2019 15:33:56 -0500 Subject: [PATCH] Balancing / Renamed palettes file --- .../blocks/turrets/duo.png | Bin 2266 -> 2314 bytes .../io/anuke/mindustry/content/Blocks.java | 10 +- .../io/anuke/mindustry/content/Bullets.java | 70 ++++----- core/src/io/anuke/mindustry/content/Fx.java | 136 +++++++++--------- .../src/io/anuke/mindustry/content/Mechs.java | 16 +-- .../src/io/anuke/mindustry/core/Renderer.java | 2 +- core/src/io/anuke/mindustry/core/UI.java | 4 +- .../io/anuke/mindustry/editor/MapView.java | 8 +- .../io/anuke/mindustry/entities/Damage.java | 4 +- .../entities/bullet/BasicBulletType.java | 6 +- .../entities/bullet/MassDriverBolt.java | 6 +- .../entities/bullet/MissileBulletType.java | 8 +- .../entities/effect/ItemTransfer.java | 4 +- .../mindustry/entities/effect/Lightning.java | 6 +- .../entities/traits/BuilderTrait.java | 6 +- .../mindustry/entities/type/FlyingUnit.java | 4 +- .../anuke/mindustry/entities/type/Player.java | 10 +- .../anuke/mindustry/entities/type/Unit.java | 4 +- .../mindustry/graphics/OverlayRenderer.java | 8 +- .../graphics/{Palette.java => Pal.java} | 2 +- .../anuke/mindustry/input/DesktopInput.java | 22 +-- .../io/anuke/mindustry/input/MobileInput.java | 28 ++-- core/src/io/anuke/mindustry/type/Item.java | 4 +- core/src/io/anuke/mindustry/type/Mech.java | 4 +- .../io/anuke/mindustry/ui/BorderImage.java | 4 +- .../io/anuke/mindustry/ui/ContentDisplay.java | 4 +- .../io/anuke/mindustry/ui/ItemsDisplay.java | 3 +- .../mindustry/ui/dialogs/AboutDialog.java | 4 +- .../mindustry/ui/dialogs/ControlsDialog.java | 4 +- .../mindustry/ui/dialogs/DatabaseDialog.java | 6 +- .../mindustry/ui/dialogs/DeployDialog.java | 4 +- .../mindustry/ui/dialogs/DiscordDialog.java | 4 +- .../mindustry/ui/dialogs/FloatingDialog.java | 4 +- .../ui/dialogs/SettingsMenuDialog.java | 4 +- .../mindustry/ui/dialogs/TechTreeDialog.java | 4 +- .../mindustry/ui/fragments/HudFragment.java | 8 +- .../ui/fragments/LoadingFragment.java | 6 +- .../ui/fragments/PlacementFragment.java | 4 +- .../ui/fragments/PlayerListFragment.java | 6 +- core/src/io/anuke/mindustry/world/Block.java | 10 +- .../mindustry/world/blocks/BuildBlock.java | 4 +- .../world/blocks/defense/ForceProjector.java | 4 +- .../world/blocks/defense/ShockMine.java | 4 +- .../world/blocks/defense/SurgeWall.java | 4 +- .../blocks/defense/turrets/ItemTurret.java | 4 +- .../world/blocks/defense/turrets/Turret.java | 6 +- .../world/blocks/distribution/ItemBridge.java | 8 +- .../world/blocks/distribution/MassDriver.java | 8 +- .../world/blocks/power/PowerNode.java | 14 +- .../world/blocks/production/PhaseWeaver.java | 6 +- .../world/blocks/storage/CoreBlock.java | 6 +- .../mindustry/world/blocks/units/MechPad.java | 8 +- .../world/blocks/units/RepairPoint.java | 4 +- .../world/blocks/units/UnitFactory.java | 6 +- .../mindustry/world/consumers/Consume.java | 6 +- 55 files changed, 272 insertions(+), 271 deletions(-) rename core/src/io/anuke/mindustry/graphics/{Palette.java => Pal.java} (98%) diff --git a/core/assets-raw/sprites_replacement/blocks/turrets/duo.png b/core/assets-raw/sprites_replacement/blocks/turrets/duo.png index e21eec98f162475ad842b2cf7d0a10157ab2b32c..4af6e56d86210456de053f2ad9fe4270a18da00e 100644 GIT binary patch delta 2247 zcmV;&2sroJ5sDI!BLW91ktHC1vg9ZX{O1&N1cX?`aabef26OyLVeDF5^`^UH%I_JB z0WB$|uo?gSJ8IHzNBYnpLv)_dMAfu{*|TKbySQ75`+;{&#JEZ+n{c_Usd! z(F68lXWU?7i@T^4h6bFuu=e$yoQ^R1jsb^Pe>b?2SmOaj|t}r(43GvNG zdz`}CIA3Dii$?U2{PJRsD+q4Bo3qQDSHgclKdmd{ z5}4S4SO=OFS2L8!!P}F6JasBGX{@$UgNoh_2X{N?n&UMlaDR4ff#UU|=@Q`S23R<5 zK#ei%E?sEJ%}ZV*f#gn@=?I$U#r!xCpWXlpzKJHWCMl zWRr7=2!0gcQ=qwH?<9}qvu z3u34Q4&H!o0_GG&B+{>VWP#S)O z5l0#_@+cFrHhKCPW}Iot%(GmmZB$=Tqc`M!MvXRVikM&X(gQUNr*v*XN+&@v17gk- z5KoE#0@^8NR>*s&$SGzvJ0wMLK#hWe(@7Bnf_{(-lP>Ik9?1QOn+g86aC6^~GYZ}R zft*q3Hgb2|KA_giswlhw(kxV;TAm;_Oc+v}6s<}3wssrAie-&`XeUFWC$lz&b8KUdXWtT+rU6tonm)^FnRc~&_I(#yI_Apz6d!&r!s?1WP)hulQ)ZuF^6h`V{ z2(LCqgx2|gfEIBW$On@u;0EhXM_5==o2mOrtj?(r-ax(+@pQ;rFVu0xj`(8lFPiq% zg)l<*&BFvYBG;0;nlTEL#2-8&A<+!|Xewrvgp$I=hLmSW#dd8qWbJw~=djk)(Q`ok zS#3l36zVML+#MN=m`;+rx`RUT4nY~gk9ndT)qqfcJ>qCo7ICKm+Wr(j+dpcm_Kn(K z*YHT$1FZog{LBv9s2-^OajT?Cx70xe+QjbRkyb^9z!>ucEQZ?+SvBJ{CviveB=Ex} zMX0+a#wE$@_x$0r!Qm(T>{x6<2EyYXPh0&fns|z$-j70JMoEbWmFZ6(18I zHp^3UhG_Dd$2_Sg>R6kG!pyhaN&UKK^GZ+AxlR{`Bc+%b`8HpU%vQw)umk(67Qxuk-Vju<3mv$Zlb*L$1(rs9$tM-7XA zD8?*V43fT%HhQ6vj(LvLR|B^GVNB$Q%>nPZl?XyG$fZ7a_(3WE%{axG7St~mT?Uzl zMGJJDi*B~hITvc_QE4E71|lPqCk_QsXnPCBh(Sg-FXGs z!aER=t4WyaM_d_Y9%YIfp+8eC6W=_4O1$_};zho}pY}$)m$?A|8v0=GPv)*HK|!V= zdz%7*4srCliI!*OZA|ju<~CyWWw~Ss_;;*>3o5YZY(bx@Y+uS64MfWCd`7@_1)Zi< zqLP5^rYt=b@KwKB+l*j7pE-EdeOSOaIjh5pKXeX)gGMJX<2YK(h7)BP(8Jz;sJG#7 zbOghWh-81KtfA31SCh>v&uyC1FY_}ZixLniy(nmigC6v%J3 zZF0re#0QLS?5enxQbP;^=~4#!sv z3{-Yk2l5ToraV6$d4Lo-&cblOG2me-a!i0CXC90004VNklC4`uZqrqXuTp&y4Qz0M#PC7+gf{K3{LLe{&YgR)uf@Aemd7Fab#7^Y!MN6N_a#WN(Ea z@9vEtlCWh%lP3QDbno8zZ_ke^1bH&|L=J+|`dum}JubxTdBkFt_X?r|xvF%K zbulS~#f3C`E}nKuqo?3EoY49M(t0@#fw;i4PsOD^u`b;kY7Hu6u@^+^jQ>R(6#-a6 Vr1AiB%Ip9D002ovPDHLkV1fbOGQ9u* delta 2222 zcmV;f2vPTn650`vBLW8UktHC1mc*b9{O1%o0s@5KIIQpG204C87`xru%w%cL7>os4 zswA)(|N7@N|G>|2iYBn6m}9i~g&eXg=p=jmj+Sg#_w{r86`r5Q&Go`z$fNbgV;oz) zV4NQlB<%6}JZ_}zb<$pl?2~G*nzg^>(q72BW1RN0$$MT2H+S~GYkS#$)2)~1AP7ch ztmmC^!;`nTC)MI%fzQ5p?dx42WY>t_Bm6mb=IXu#@9Mq8&XzsypF?46+ye0>Mthw2 zW!ztC+>=H0(ERiQ{cP{QTkPiSY0hzYS3*RjqS;QJuB;veD^~JrTEr#zXY^%V8CQaf z4TyE1S#dQ(nH-`$DNv_>LX*a78#S01+;9lDbFMkR#uCDxU0a|8y=XcC7~S{;G#XIz z7uGUb~)uV%uwX?4k-XabH|id zeAi`eysA@|(aQ2X68;m_tgQV{T5F+S*W*9>r2-rxTDUucE zga~m=z^A}+=Yy+2fS6q;Gl7lw5#S`Jx-my+$vSq&FiH!6U?05z8l(%r3W32N2?-o3 z>^T@_jx3xwbBR8N$T3EVTBC}13BnRZBuSQ%d z9%X`S)6Xz@#wjz+Jj;dJM)esrdO_}I)M%roh=nC557aO$axOtyPFOJmVlEI67exSs zc8Zxz6oOOa6f>J0l7byjBUW%aDPlk{401f_!tR0GkGL6s4*wBu?i+GOq5FRzXB4`P z+&gX`Q0rywD1HH?S*S6!exk5JV5H(w(LL$Ct=&dc#j?gew9`XlAhSA{qVl!P^7A|o ziKO$+X_rRx-IRN)Q{R@ZRc~&_I)a!mJI~e-o>WG2HO*2|t2wm+P)De-5D)1*l3#6% zpw{_-7CdBs3T&hTZdBdr2osC6DLqW`8k`E{4aIkYPlvwsLIYRqh)@3h(Y3E3gcG`M z9){hBzLwn8jZt7E{t%JGLX-Q^R7e%Umg0+L$&;nnuB}qmt|xO2>z+D#X6!$!ZJWnQa7MSn~YO`?IEA9mGv;XQ-DqmQ6ER#b4us>SYq`+ ziU-1w!*N-g&`b)O^a%$NIhY}N#Eis!#SUfbRFzapl{MFUn<1G)Ww3X|IgZLj!pviq zoKP3)XrmVzvSa1t3YJC_JySiM9K+c{*)owsHZuf#D-j$64f_noOc)g&h5QH`?7)_P z-2#&K@F>!69)XgFD7yKV&djfgWpWRf52ud|)aZ8~0X=Snubh#|C}%W5 z2uT12q`g*glHYPy_iiofkO?rSjaWl}DHDgNk#J%I%av@{pM%d9m4kf-)<-P4P<|A< z(;l0{!6Vq?5qIEi`XVUo!O`hrWc-bhmUq$8W<|_AhfE`;wx2#QCTi>j5S`U+;8XC` z#$L?Ms$5=QTHZKn^Vz^-%D(^gcW6!@}vY=CRRv4)MBD{{jxF8$S4d@WlnA zDYgM>h-P>y(>mIRSlIo4;0`; zS&u?pWl?v;J9o`N-Vf~ikRLmLL?<<$&b8*5sQ9LGX?iMM8IkeDJOz1Io6~xYkCuin znA?!gNe4<9*p4R5*RLEsVUP0>+X?oreHw0q?7)}Rmo!vnSz}L<{p{DT{+heP;eU8A zPfvfgOeQ|KviUc=iup!5GXlo|000SaNLh0L04^f{04^f|c%?sf0001!ZwCo~4j=_o zV^wkh00DbRL_t(o!_8MKZo@zjU5|W)kTA;%D@hd;Rf>$lj7-hqJM;uqX>q$KhCyaQ zR!C58P(@|UF%o2Vz1`3A+AH~?SUZ||^JaH46EF*sB+;JLbq(9-K(4`2*nE)B;E1mf zb&@XT_vUx?{Trxk-gjwh^ZHeP1&Cil7>mJCh-6GEP@l|)l7I+|S$o7c`N|$ufrezy zIcJ>nK`M~X>=6~hA+;~d()lhl9g=)!Z&QI>f~#zhC#SN3I^lY=VvI3%K3)EiXwF15 zcB->p&v3n2b(|m$MUv;!rSt9734J3pNj?@#C80jSZ?mN}SpN0_m8VyK32w7x8$8Mi ztzEp$TM{NBlez%b~r5a-E_~U-u|0Sp571^^m`5sxm7ek6S;7 zPiJ|r$9?BpHKtAH4v6#n7%G^u7h_H96^x| false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000)); health = 2000; - itemCapacity = 4000; + itemCapacity = 7000; size = 4; }}; @@ -1007,7 +1007,7 @@ public class Blocks implements ContentList{ requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 8000, Items.silicon, 4000, Items.surgealloy, 2000)); health = 3000; - itemCapacity = 6000; + itemCapacity = 10000; size = 5; }}; diff --git a/core/src/io/anuke/mindustry/content/Bullets.java b/core/src/io/anuke/mindustry/content/Bullets.java index e73ad80aa1..d38e98cbaf 100644 --- a/core/src/io/anuke/mindustry/content/Bullets.java +++ b/core/src/io/anuke/mindustry/content/Bullets.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.effect.Fire; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.BuildBlock; @@ -69,8 +69,8 @@ public class Bullets implements ContentList{ bulletHeight = 12f; bulletShrink = 1f; lifetime = 15f; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; + backColor = Pal.plastaniumBack; + frontColor = Pal.plastaniumFront; despawnEffect = Fx.none; }}; @@ -84,8 +84,8 @@ public class Bullets implements ContentList{ splashDamage = 35f; fragBullet = artilleryPlasticFrag; fragBullets = 9; - backColor = Palette.plastaniumBack; - frontColor = Palette.plastaniumFront; + backColor = Pal.plastaniumBack; + frontColor = Pal.plastaniumFront; }}; artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{ @@ -110,8 +110,8 @@ public class Bullets implements ContentList{ splashDamage = 30f; incendAmount = 4; incendSpread = 11f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; + frontColor = Pal.lightishOrange; + backColor = Pal.lightOrange; trailEffect = Fx.incendTrail; }}; @@ -123,8 +123,8 @@ public class Bullets implements ContentList{ collidesTiles = false; splashDamageRadius = 45f; splashDamage = 50f; - backColor = Palette.missileYellowBack; - frontColor = Palette.missileYellow; + backColor = Pal.missileYellowBack; + frontColor = Pal.missileYellow; }}; artilleryUnit = new ArtilleryBulletType(2f, 0, "shell"){{ @@ -136,8 +136,8 @@ public class Bullets implements ContentList{ collidesTiles = true; splashDamageRadius = 45f; splashDamage = 50f; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; + backColor = Pal.bulletYellowBack; + frontColor = Pal.bulletYellow; }}; flakPlastic = new FlakBulletType(4f, 5){{ @@ -145,8 +145,8 @@ public class Bullets implements ContentList{ fragBullet = artilleryPlasticFrag; fragBullets = 4; hitEffect = Fx.plasticExplosion; - frontColor = Palette.plastaniumFront; - backColor = Palette.plastaniumBack; + frontColor = Pal.plastaniumFront; + backColor = Pal.plastaniumBack; shootEffect = Fx.shootBig; }}; @@ -175,8 +175,8 @@ public class Bullets implements ContentList{ }}; missileIncendiary = new MissileBulletType(2f, 12, "missile"){{ - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; + frontColor = Pal.lightishOrange; + backColor = Pal.lightOrange; bulletWidth = 7f; bulletHeight = 8f; bulletShrink = 0f; @@ -216,8 +216,8 @@ public class Bullets implements ContentList{ trailColor = Color.valueOf("b6c6fd"); hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; + backColor = Pal.bulletYellowBack; + frontColor = Pal.bulletYellow; weaveScale = 8f; weaveMag = 2f; }}; @@ -233,8 +233,8 @@ public class Bullets implements ContentList{ splashDamage = 10f; lifetime = 120f; trailColor = Color.GRAY; - backColor = Palette.bulletYellowBack; - frontColor = Palette.bulletYellow; + backColor = Pal.bulletYellowBack; + frontColor = Pal.bulletYellow; hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; weaveScale = 8f; @@ -251,9 +251,9 @@ public class Bullets implements ContentList{ splashDamageRadius = 25f; splashDamage = 10f; lifetime = 80f; - trailColor = Palette.unitBack; - backColor = Palette.unitBack; - frontColor = Palette.unitFront; + trailColor = Pal.unitBack; + backColor = Pal.unitBack; + frontColor = Pal.unitFront; hitEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion; weaveScale = 6f; @@ -296,8 +296,8 @@ public class Bullets implements ContentList{ standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{ bulletWidth = 10f; bulletHeight = 12f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; + frontColor = Pal.lightishOrange; + backColor = Pal.lightOrange; incendSpread = 3f; incendAmount = 1; incendChance = 0.3f; @@ -339,8 +339,8 @@ public class Bullets implements ContentList{ standardIncendiaryBig = new BasicBulletType(7f, 38, "bullet"){{ bulletWidth = 16f; bulletHeight = 21f; - frontColor = Palette.lightishOrange; - backColor = Palette.lightOrange; + frontColor = Pal.lightishOrange; + backColor = Pal.lightOrange; incendSpread = 3f; incendAmount = 2; incendChance = 0.3f; @@ -371,7 +371,7 @@ public class Bullets implements ContentList{ @Override public void draw(Bullet b){ - Draw.color(Palette.heal); + Draw.color(Pal.heal); Lines.stroke(2f); Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f); Draw.color(Color.WHITE); @@ -385,7 +385,7 @@ public class Bullets implements ContentList{ tile = tile.target(); if(tile != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){ - Effects.effect(Fx.healBlockFull, Palette.heal, tile.drawx(), tile.drawy(), tile.block().size); + Effects.effect(Fx.healBlockFull, Pal.heal, tile.drawx(), tile.drawy(), tile.block().size); tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth()); } } @@ -409,7 +409,7 @@ public class Bullets implements ContentList{ @Override public void draw(Bullet b){ //TODO add color to the bullet depending on the color of the flame it came from - Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, b.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, b.fin()); Fill.circle(b.x, b.y, 3f * b.fout()); Draw.reset(); } @@ -452,7 +452,7 @@ public class Bullets implements ContentList{ }; lancerLaser = new BulletType(0.001f, 140){ - Color[] colors = {Palette.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Palette.lancerLaser, Color.WHITE}; + Color[] colors = {Pal.lancerLaser.cpy().mul(1f, 1f, 1f, 0.4f), Pal.lancerLaser, Color.WHITE}; float[] tscales = {1f, 0.7f, 0.5f, 0.2f}; float[] lenscales = {1f, 1.1f, 1.13f, 1.14f}; float length = 100f; @@ -562,7 +562,7 @@ public class Bullets implements ContentList{ @Override public void draw(Bullet b) { super.draw(b); - Draw.color(Color.WHITE, Palette.surge, b.fin()); + Draw.color(Color.WHITE, Pal.surge, b.fin()); for(int i = 0; i < 7; i++){ Tmp.v1.trns(b.rot(), i * 8f); float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10); @@ -614,7 +614,7 @@ public class Bullets implements ContentList{ @Override public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 30); + Lightning.create(b.getTeam(), Pal.lancerLaser, damage, b.x, b.y, b.rot(), 30); } }; @@ -629,7 +629,7 @@ public class Bullets implements ContentList{ @Override public void init(Bullet b){ - Lightning.create(b.getTeam(), Palette.lancerLaser, damage, b.x, b.y, b.rot(), 14); + Lightning.create(b.getTeam(), Pal.lancerLaser, damage, b.x, b.y, b.rot(), 14); } }; @@ -653,8 +653,8 @@ public class Bullets implements ContentList{ bulletWidth = 8f; bulletHeight = 12f; hitEffect = Fx.flakExplosion; - backColor = Palette.lightOrange; - frontColor = Palette.lightishOrange; + backColor = Pal.lightOrange; + frontColor = Pal.lightishOrange; incendChance = 1f; incendAmount = 3; incendSpread = 10f; diff --git a/core/src/io/anuke/mindustry/content/Fx.java b/core/src/io/anuke/mindustry/content/Fx.java index ba7145c80e..0b7c5221e5 100644 --- a/core/src/io/anuke/mindustry/content/Fx.java +++ b/core/src/io/anuke/mindustry/content/Fx.java @@ -12,7 +12,7 @@ import io.anuke.arc.util.Tmp; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.type.Item; @@ -55,21 +55,21 @@ public class Fx implements ContentList{ }); placeBlock = new Effect(16, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(3f - e.fin() * 2f); Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); Draw.reset(); }); tapBlock = new Effect(12, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(3f - e.fin() * 2f); Lines.circle(e.x, e.y, 4f + (tilesize / 1.5f * e.rotation) * e.fin()); Draw.reset(); }); breakBlock = new Effect(12, e -> { - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.stroke(3f - e.fin() * 2f); Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); @@ -80,14 +80,14 @@ public class Fx implements ContentList{ }); select = new Effect(23, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(e.fout() * 3f); Lines.circle(e.x, e.y, 3f + e.fin() * 14f); Draw.reset(); }); smoke = new Effect(100, e -> { - Draw.color(Color.GRAY, Palette.darkishGray, e.fin()); + Draw.color(Color.GRAY, Pal.darkishGray, e.fin()); float size = 7f - e.fin() * 7f; Draw.rect("circle", e.x, e.y, size, size); Draw.reset(); @@ -101,7 +101,7 @@ public class Fx implements ContentList{ spawn = new Effect(30, e -> { Lines.stroke(2f * e.fout()); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.poly(e.x, e.y, 4, 5f + e.fin() * 12f); Draw.reset(); }); @@ -109,13 +109,13 @@ public class Fx implements ContentList{ vtolHover = new Effect(40f, e -> { float len = e.finpow() * 10f; float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f); - Draw.color(Palette.lightFlame, Palette.lightOrange, e.fin()); + Draw.color(Pal.lightFlame, Pal.lightOrange, e.fin()); Fill.circle(e.x + Angles.trnsx(ang, len), e.y + Angles.trnsy(ang, len), 2f * e.fout()); Draw.reset(); }); unitDrop = new GroundEffect(30, e -> { - Draw.color(Palette.lightishGray); + Draw.color(Pal.lightishGray); Angles.randLenVectors(e.id, 9, 3 + 20f * e.finpow(), (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.4f); }); @@ -131,35 +131,35 @@ public class Fx implements ContentList{ }); unitPickup = new GroundEffect(18, e -> { - Draw.color(Palette.lightishGray); + Draw.color(Pal.lightishGray); Lines.stroke(e.fin() * 2f); Lines.poly(e.x, e.y, 4, 13f * e.fout()); Draw.reset(); }); landShock = new GroundEffect(12, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Lines.stroke(e.fout() * 3f); Lines.poly(e.x, e.y, 12, 20f * e.fout()); Draw.reset(); }); pickup = new Effect(18, e -> { - Draw.color(Palette.lightishGray); + Draw.color(Pal.lightishGray); Lines.stroke(e.fout() * 2f); Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6); Draw.reset(); }); healWave = new Effect(22, e -> { - Draw.color(Palette.heal); + Draw.color(Pal.heal); Lines.stroke(e.fout() * 2f); Lines.poly(e.x, e.y, 30, 4f + e.finpow() * 60f); Draw.color(); }); heal = new Effect(11, e -> { - Draw.color(Palette.heal); + Draw.color(Pal.heal); Lines.stroke(e.fout() * 2f); Lines.poly(e.x, e.y, 10, 2f + e.finpow() * 7f); Draw.color(); @@ -167,7 +167,7 @@ public class Fx implements ContentList{ hitBulletSmall = new Effect(14, e -> { - Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); + Draw.color(Color.WHITE, Pal.lightOrange, e.fin()); e.scaled(7f, s -> { Lines.stroke(0.5f + s.fout()); @@ -186,7 +186,7 @@ public class Fx implements ContentList{ }); hitFuse = new Effect(14, e -> { - Draw.color(Color.WHITE, Palette.surge, e.fin()); + Draw.color(Color.WHITE, Pal.surge, e.fin()); e.scaled(7f, s -> { Lines.stroke(0.5f + s.fout()); @@ -205,7 +205,7 @@ public class Fx implements ContentList{ }); hitBulletBig = new Effect(13, e -> { - Draw.color(Color.WHITE, Palette.lightOrange, e.fin()); + Draw.color(Color.WHITE, Pal.lightOrange, e.fin()); Lines.stroke(0.5f + e.fout() * 1.5f); Angles.randLenVectors(e.id, 8, e.finpow() * 30f, e.rotation, 50f, (x, y) -> { @@ -217,7 +217,7 @@ public class Fx implements ContentList{ }); hitFlameSmall = new Effect(14, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, e.fin()); Lines.stroke(0.5f + e.fout()); Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 50f, (x, y) -> { @@ -251,7 +251,7 @@ public class Fx implements ContentList{ }); hitMeltdown = new Effect(12, e -> { - Draw.color(Palette.meltdownHit); + Draw.color(Pal.meltdownHit); Lines.stroke(e.fout() * 2f); Angles.randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> { @@ -263,14 +263,14 @@ public class Fx implements ContentList{ }); hitLaser = new Effect(8, e -> { - Draw.color(Color.WHITE, Palette.heal, e.fin()); + Draw.color(Color.WHITE, Pal.heal, e.fin()); Lines.stroke(0.5f + e.fout()); Lines.circle(e.x, e.y, e.fin()*5f); Draw.reset(); }); despawn = new Effect(12, e -> { - Draw.color(Palette.lighterOrange, Color.GRAY, e.fin()); + Draw.color(Pal.lighterOrange, Color.GRAY, e.fin()); Lines.stroke(e.fout()); Angles.randLenVectors(e.id, 7, e.fin() * 7f, e.rotation, 40f, (x, y) -> { @@ -283,7 +283,7 @@ public class Fx implements ContentList{ flakExplosion = new Effect(20, e -> { - Draw.color(Palette.bulletYellow); + Draw.color(Pal.bulletYellow); e.scaled(6, i -> { Lines.stroke(3f * i.fout()); Lines.circle(e.x, e.y, 3f + i.fin() * 10f); @@ -295,7 +295,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x, e.y + y, e.fout() * 3f + 0.5f); }); - Draw.color(Palette.lighterOrange); + Draw.color(Pal.lighterOrange); Lines.stroke(1f * e.fout()); Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { @@ -307,7 +307,7 @@ public class Fx implements ContentList{ plasticExplosion = new Effect(24, e -> { - Draw.color(Palette.plastaniumFront); + Draw.color(Pal.plastaniumFront); e.scaled(7, i -> { Lines.stroke(3f * i.fout()); Lines.circle(e.x, e.y, 3f + i.fin() * 24f); @@ -319,7 +319,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); }); - Draw.color(Palette.plastaniumBack); + Draw.color(Pal.plastaniumBack); Lines.stroke(1f * e.fout()); Angles.randLenVectors(e.id + 1, 4, 1f + 25f * e.finpow(), (x, y) -> { @@ -331,7 +331,7 @@ public class Fx implements ContentList{ plasticExplosionFlak = new Effect(28, e -> { - Draw.color(Palette.plastaniumFront); + Draw.color(Pal.plastaniumFront); e.scaled(7, i -> { Lines.stroke(3f * i.fout()); Lines.circle(e.x, e.y, 3f + i.fin() * 34f); @@ -343,7 +343,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); }); - Draw.color(Palette.plastaniumBack); + Draw.color(Pal.plastaniumBack); Lines.stroke(1f * e.fout()); Angles.randLenVectors(e.id + 1, 4, 1f + 30f * e.finpow(), (x, y) -> { @@ -355,7 +355,7 @@ public class Fx implements ContentList{ blastExplosion = new Effect(22, e -> { - Draw.color(Palette.missileYellow); + Draw.color(Pal.missileYellow); e.scaled(6, i -> { Lines.stroke(3f * i.fout()); Lines.circle(e.x, e.y, 3f + i.fin() * 15f); @@ -367,7 +367,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); }); - Draw.color(Palette.missileYellowBack); + Draw.color(Pal.missileYellowBack); Lines.stroke(1f * e.fout()); Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { @@ -384,7 +384,7 @@ public class Fx implements ContentList{ }); incendTrail = new Effect(50, e -> { - Draw.color(Palette.lightOrange); + Draw.color(Pal.lightOrange); Fill.circle(e.x, e.y, e.rotation * e.fout()); Draw.reset(); }); @@ -396,7 +396,7 @@ public class Fx implements ContentList{ }); absorb = new Effect(12, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(2f * e.fout()); Lines.circle(e.x, e.y, 5f * e.fout()); Draw.reset(); @@ -404,7 +404,7 @@ public class Fx implements ContentList{ flakExplosionBig = new Effect(30, e -> { - Draw.color(Palette.bulletYellowBack); + Draw.color(Pal.bulletYellowBack); e.scaled(6, i -> { Lines.stroke(3f * i.fout()); Lines.circle(e.x, e.y, 3f + i.fin() * 25f); @@ -416,7 +416,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.5f); }); - Draw.color(Palette.bulletYellow); + Draw.color(Pal.bulletYellow); Lines.stroke(1f * e.fout()); Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { @@ -428,7 +428,7 @@ public class Fx implements ContentList{ burning = new Effect(35f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, e.fin()); Angles.randLenVectors(e.id, 3, 2f + e.fin() * 7f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.1f + e.fout() * 1.4f); @@ -438,7 +438,7 @@ public class Fx implements ContentList{ }); fire = new Effect(35f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, e.fin()); Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.2f + e.fslope() * 1.5f); @@ -478,7 +478,7 @@ public class Fx implements ContentList{ }); ballfire = new Effect(25f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, e.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, e.fin()); Angles.randLenVectors(e.id, 2, 2f + e.fin() * 7f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.2f + e.fout() * 1.5f); @@ -528,7 +528,7 @@ public class Fx implements ContentList{ }); overdriven = new Effect(20f, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { Fill.square(e.x + x, e.y + y, e.fout() * 2.3f+0.5f); @@ -586,7 +586,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); }); - Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); + Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin()); Lines.stroke(1.5f * e.fout()); Angles.randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) -> { @@ -609,7 +609,7 @@ public class Fx implements ContentList{ Fill.circle(e.x + x / 2f, e.y + y / 2f, e.fout() * 1f); }); - Draw.color(Palette.lighterOrange, Palette.lightOrange, Color.GRAY, e.fin()); + Draw.color(Pal.lighterOrange, Pal.lightOrange, Color.GRAY, e.fin()); Lines.stroke(1.7f * e.fout()); Angles.randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> { @@ -632,7 +632,7 @@ public class Fx implements ContentList{ shootSmall = new Effect(8, e -> { - Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); + Draw.color(Pal.lighterOrange, Pal.lightOrange, e.fin()); float w = 1f + 5 * e.fout(); Shapes.tri(e.x, e.y, w, 15f * e.fout(), e.rotation); Shapes.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); @@ -640,7 +640,7 @@ public class Fx implements ContentList{ }); shootHeal = new Effect(8, e -> { - Draw.color(Palette.heal); + Draw.color(Pal.heal); float w = 1f + 5 * e.fout(); Shapes.tri(e.x, e.y, w, 17f * e.fout(), e.rotation); Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); @@ -648,7 +648,7 @@ public class Fx implements ContentList{ }); shootSmallSmoke = new Effect(20f, e -> { - Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); Angles.randLenVectors(e.id, 5, e.finpow() * 6f, e.rotation, 20f, (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 1.5f); @@ -658,7 +658,7 @@ public class Fx implements ContentList{ }); shootBig = new Effect(9, e -> { - Draw.color(Palette.lighterOrange, Palette.lightOrange, e.fin()); + Draw.color(Pal.lighterOrange, Pal.lightOrange, e.fin()); float w = 1.2f + 7 * e.fout(); Shapes.tri(e.x, e.y, w, 25f * e.fout(), e.rotation); Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); @@ -666,7 +666,7 @@ public class Fx implements ContentList{ }); shootBig2 = new Effect(10, e -> { - Draw.color(Palette.lightOrange, Color.GRAY, e.fin()); + Draw.color(Pal.lightOrange, Color.GRAY, e.fin()); float w = 1.2f + 8 * e.fout(); Shapes.tri(e.x, e.y, w, 29f * e.fout(), e.rotation); Shapes.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); @@ -674,7 +674,7 @@ public class Fx implements ContentList{ }); shootBigSmoke = new Effect(17f, e -> { - Draw.color(Palette.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.color(Pal.lighterOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); Angles.randLenVectors(e.id, 8, e.finpow() * 19f, e.rotation, 10f, (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 2f + 0.2f); @@ -684,7 +684,7 @@ public class Fx implements ContentList{ }); shootBigSmoke2 = new Effect(18f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); + Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Color.GRAY, e.fin()); Angles.randLenVectors(e.id, 9, e.finpow() * 23f, e.rotation, 20f, (x, y) -> { Fill.circle(e.x + x, e.y + y, e.fout() * 2.4f + 0.2f); @@ -694,7 +694,7 @@ public class Fx implements ContentList{ }); shootSmallFlame = new Effect(32f, e -> { - Draw.color(Palette.lightFlame, Palette.darkFlame, Color.GRAY, e.fin()); + Draw.color(Pal.lightFlame, Pal.darkFlame, Color.GRAY, e.fin()); Angles.randLenVectors(e.id, 8, e.finpow() * 44f, e.rotation, 10f, (x, y) -> { Fill.circle(e.x + x, e.y + y, 0.65f + e.fout() * 1.5f); @@ -714,7 +714,7 @@ public class Fx implements ContentList{ }); shellEjectSmall = new GroundEffect(30f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin()); float rot = Math.abs(e.rotation) + 90f; int i = Mathf.sign(e.rotation); @@ -729,7 +729,7 @@ public class Fx implements ContentList{ }); shellEjectMedium = new GroundEffect(34f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin()); float rot = e.rotation + 90f; for(int i : Mathf.signs){ float len = (2f + e.finpow() * 10f) * i; @@ -752,7 +752,7 @@ public class Fx implements ContentList{ }); shellEjectBig = new GroundEffect(22f, 400f, e -> { - Draw.color(Palette.lightOrange, Color.LIGHT_GRAY, Palette.lightishGray, e.fin()); + Draw.color(Pal.lightOrange, Color.LIGHT_GRAY, Pal.lightishGray, e.fin()); float rot = e.rotation + 90f; for(int i : Mathf.signs){ float len = (4f + e.finpow() * 8f) * i; @@ -776,7 +776,7 @@ public class Fx implements ContentList{ }); lancerLaserShoot = new Effect(21f, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); for(int i : Mathf.signs){ Shapes.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); @@ -786,7 +786,7 @@ public class Fx implements ContentList{ }); lancerLaserShootSmoke = new Effect(26f, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Angles.randLenVectors(e.id, 7, 80f, e.rotation, 0f, (x, y) -> { Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fout() * 9f); @@ -796,7 +796,7 @@ public class Fx implements ContentList{ }); lancerLaserCharge = new Effect(38f, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { Lines.lineAngle(e.x + x, e.y + y, Mathf.angle(x, y), e.fslope() * 3f + 1f); @@ -806,7 +806,7 @@ public class Fx implements ContentList{ }); lancerLaserChargeBegin = new Effect(71f, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Fill.circle(e.x, e.y, e.fin() * 3f); Draw.color(); @@ -814,7 +814,7 @@ public class Fx implements ContentList{ }); lightningCharge = new Effect(38f, e -> { - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Angles.randLenVectors(e.id, 2, 1f + 20f * e.fout(), e.rotation, 120f, (x, y) -> { Shapes.tri(e.x + x, e.y + y, e.fslope() * 3f + 1, e.fslope() * 3f + 1, Mathf.angle(x, y)); @@ -824,7 +824,7 @@ public class Fx implements ContentList{ }); lightningShoot = new Effect(12f, e -> { - Draw.color(Color.WHITE, Palette.lancerLaser, e.fin()); + Draw.color(Color.WHITE, Pal.lancerLaser, e.fin()); Lines.stroke(e.fout() * 1.2f + 0.5f); Angles.randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { @@ -862,7 +862,7 @@ public class Fx implements ContentList{ redgeneratespark = new Effect(18, e -> { Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { float len = e.fout() * 4f; - Draw.color(Palette.redSpark, Color.GRAY, e.fin()); + Draw.color(Pal.redSpark, Color.GRAY, e.fin()); Draw.rect("circle", e.x + x, e.y + y, len, len); Draw.reset(); }); @@ -870,7 +870,7 @@ public class Fx implements ContentList{ generatespark = new Effect(18, e -> { Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { float len = e.fout() * 4f; - Draw.color(Palette.orangeSpark, Color.GRAY, e.fin()); + Draw.color(Pal.orangeSpark, Color.GRAY, e.fin()); Draw.rect("circle", e.x + x, e.y + y, len, len); Draw.reset(); }); @@ -892,42 +892,42 @@ public class Fx implements ContentList{ }); pulverize = new Effect(40, e -> { Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.stoneGray); + Draw.color(Pal.stoneGray); Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); Draw.reset(); }); }); pulverizeRed = new Effect(40, e -> { Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.redDust, Palette.stoneGray, e.fin()); + Draw.color(Pal.redDust, Pal.stoneGray, e.fin()); Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45); Draw.reset(); }); }); pulverizeRedder = new Effect(40, e -> { Angles.randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> { - Draw.color(Palette.redderDust, Palette.stoneGray, e.fin()); + Draw.color(Pal.redderDust, Pal.stoneGray, e.fin()); Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45); Draw.reset(); }); }); pulverizeSmall = new Effect(30, e -> { Angles.randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> { - Draw.color(Palette.stoneGray); + Draw.color(Pal.stoneGray); Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); Draw.reset(); }); }); pulverizeMedium = new Effect(30, e -> { Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.stoneGray); + Draw.color(Pal.stoneGray); Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45); Draw.reset(); }); }); producesmoke = new Effect(12, e -> { Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> { - Draw.color(Color.WHITE, Palette.accent, e.fin()); + Draw.color(Color.WHITE, Pal.accent, e.fin()); Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45); Draw.reset(); }); @@ -941,7 +941,7 @@ public class Fx implements ContentList{ }); formsmoke = new Effect(40, e -> { Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> { - Draw.color(Palette.plasticSmoke, Color.LIGHT_GRAY, e.fin()); + Draw.color(Pal.plasticSmoke, Color.LIGHT_GRAY, e.fin()); Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45); Draw.reset(); }); @@ -1089,7 +1089,7 @@ public class Fx implements ContentList{ }); launch = new Effect(28, e -> { - Draw.color(Palette.command); + Draw.color(Pal.command); Lines.stroke(e.fout() * 2f); Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f); Draw.color(); @@ -1110,7 +1110,7 @@ public class Fx implements ContentList{ }); healBlock = new Effect(20, e -> { - Draw.color(Palette.heal); + Draw.color(Pal.heal); Lines.stroke(2f * e.fout() + 0.5f); Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f)); Draw.color(); @@ -1131,7 +1131,7 @@ public class Fx implements ContentList{ }); shieldBreak = new Effect(40, e -> { - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(3f * e.fout()); Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index dd2a7fc643..5695a681bd 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.game.ContentList; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Weapon; @@ -85,7 +85,7 @@ public class Mechs implements ContentList{ Effects.shake(1f, 1f, player); Effects.effect(Fx.landShock, player); for(int i = 0; i < 8; i++){ - Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Palette.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14)); + Time.run(Mathf.random(8f), () -> Lightning.create(player.getTeam(), Pal.lancerLaser, 17f, player.x, player.y, Mathf.random(360f), 14)); } } } @@ -110,7 +110,7 @@ public class Mechs implements ContentList{ boostSpeed = 0.8f; canHeal = true; health = 200f; - engineColor = Palette.heal; + engineColor = Pal.heal; weapon = new Weapon("heal-blaster"){{ length = 1.5f; @@ -210,7 +210,7 @@ public class Mechs implements ContentList{ Shaders.build.progress = player.shootHeat; Shaders.build.region = armorRegion; Shaders.build.time = Time.time() / 10f; - Shaders.build.color.set(Palette.accent).a = player.shootHeat; + Shaders.build.color.set(Pal.accent).a = player.shootHeat; Draw.shader(Shaders.build); Draw.alpha(1f); Draw.rect(armorRegion, player.x, player.y, player.rotation); @@ -228,7 +228,7 @@ public class Mechs implements ContentList{ health = 180f; weaponOffsetX = -1; weaponOffsetY = -1; - engineColor = Palette.lightTrail; + engineColor = Pal.lightTrail; cellTrnsY = 1f; weapon = new Weapon("blaster"){{ length = 1.5f; @@ -285,8 +285,8 @@ public class Mechs implements ContentList{ public void updateAlt(Player player){ float scl = scld(player); if(Mathf.chance(Time.delta() * (0.15*scl))){ - Effects.effect(Fx.hitLancer, Palette.lancerLaser, player.x, player.y); - Lightning.create(player.getTeam(), Palette.lancerLaser, 10f, + Effects.effect(Fx.hitLancer, Pal.lancerLaser, player.x, player.y); + Lightning.create(player.getTeam(), Pal.lancerLaser, 10f, player.x + player.velocity().x, player.y + player.velocity().y, player.rotation, 14); } } @@ -297,7 +297,7 @@ public class Mechs implements ContentList{ if(scl < 0.01f) return; float alpha = Draw.getColor().a; Draw.shader(); - Draw.color(Palette.lancerLaser); + Draw.color(Pal.lancerLaser); Draw.alpha(scl/2f); Draw.blend(Blending.additive); Draw.rect(shield, player.x + Mathf.range(scl/2f), player.y + Mathf.range(scl/2f), player.rotation - 90); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index cf077199bf..e0bf8704a1 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -215,7 +215,7 @@ public class Renderer implements ApplicationListener{ Draw.flush(); shieldBuffer.end(); Draw.shader(Shaders.shield); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Draw.rect(Draw.wrap(shieldBuffer.getTexture()), camera.position.x, camera.position.y, camera.width, -camera.height); Draw.color(); Draw.shader(); diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java index 9f4bb58306..85cf266f77 100644 --- a/core/src/io/anuke/mindustry/core/UI.java +++ b/core/src/io/anuke/mindustry/core/UI.java @@ -28,7 +28,7 @@ import io.anuke.arc.util.Strings; import io.anuke.arc.util.Time; import io.anuke.mindustry.editor.MapEditorDialog; import io.anuke.mindustry.game.EventType.ResizeEvent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.ui.dialogs.*; import io.anuke.mindustry.ui.fragments.*; @@ -108,7 +108,7 @@ public class UI implements ApplicationListener{ Core.app.post(() -> showError("Failed to access local storage.\nSettings will not be saved.")); }); - Colors.put("accent", Palette.accent); + Colors.put("accent", Pal.accent); loadCursors(); } diff --git a/core/src/io/anuke/mindustry/editor/MapView.java b/core/src/io/anuke/mindustry/editor/MapView.java index 8c90eb35c3..d382439978 100644 --- a/core/src/io/anuke/mindustry/editor/MapView.java +++ b/core/src/io/anuke/mindustry/editor/MapView.java @@ -19,7 +19,7 @@ import io.anuke.arc.scene.ui.TextField; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Tmp; import io.anuke.mindustry.editor.DrawOperation.TileOperation; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.ui.GridImage; @@ -299,7 +299,7 @@ public class MapView extends Element implements GestureListener{ return; } - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.stroke(2f); Lines.rect(centerx - sclwidth / 2 - 1, centery - sclheight / 2 - 1, sclwidth + 2, sclheight + 2); editor.renderer().draw(centerx - sclwidth / 2, centery - sclheight / 2, sclwidth, sclheight); @@ -326,7 +326,7 @@ public class MapView extends Element implements GestureListener{ float scaling = zoom * Math.min(width, height) / editor.getMap().width(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(Unit.dp.scl(2f)); if((!editor.getDrawBlock().isMultiblock() || tool == EditorTool.eraser) && tool != EditorTool.fill){ @@ -356,7 +356,7 @@ public class MapView extends Element implements GestureListener{ } } - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(Unit.dp.scl(3f)); Lines.rect(x, y, width, height); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/entities/Damage.java b/core/src/io/anuke/mindustry/entities/Damage.java index c9ec98e1cc..79194260c7 100644 --- a/core/src/io/anuke/mindustry/entities/Damage.java +++ b/core/src/io/anuke/mindustry/entities/Damage.java @@ -17,7 +17,7 @@ import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.*; @@ -32,7 +32,7 @@ public class Damage{ public static void dynamicExplosion(float x, float y, float flammability, float explosiveness, float power, float radius, Color color){ for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){ int branches = 5 + Mathf.clamp((int) (power / 30), 1, 20); - Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.none, Palette.power, 3, + Time.run(i * 2f + Mathf.random(4f), () -> Lightning.create(Team.none, Pal.power, 3, x, y, Mathf.random(360f), branches + Mathf.range(2))); } diff --git a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java index bdcb0b39db..b1127b6581 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java @@ -11,11 +11,11 @@ import io.anuke.mindustry.entities.Effects; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.traits.TargetTrait; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; /**An extended BulletType for most ammo-based bullets shot from turrets and units.*/ public class BasicBulletType extends BulletType{ - public Color backColor = Palette.bulletYellowBack, frontColor = Palette.bulletYellow; + public Color backColor = Pal.bulletYellowBack, frontColor = Pal.bulletYellow; public float bulletWidth = 5f, bulletHeight = 7f; public float bulletShrink = 0.5f; public String bulletSprite; @@ -107,7 +107,7 @@ public class BasicBulletType extends BulletType{ } for (int i = 0; i < lightining; i++) { - Lightning.create(b.getTeam(), Palette.surge, damage, b.x, b.y, Mathf.random(360f), lightningLength); + Lightning.create(b.getTeam(), Pal.surge, damage, b.x, b.y, Mathf.random(360f), lightningLength); } } } diff --git a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java index 578f20708b..237aa09a15 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java @@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Angles; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData; import static io.anuke.mindustry.Vars.content; @@ -26,10 +26,10 @@ public class MassDriverBolt extends BulletType{ public void draw(Bullet b){ float w = 11f, h = 13f; - Draw.color(Palette.bulletYellowBack); + Draw.color(Pal.bulletYellowBack); Draw.rect("shell-back", b.x, b.y, w, h, b.rot() + 90); - Draw.color(Palette.bulletYellow); + Draw.color(Pal.bulletYellow); Draw.rect("shell", b.x, b.y, w, h, b.rot() + 90); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java index 033be6e4e1..351078866d 100644 --- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java +++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java @@ -2,21 +2,21 @@ package io.anuke.mindustry.entities.bullet; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.content.Fx; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.entities.Effects; import io.anuke.arc.util.Time; import io.anuke.arc.math.Mathf; public class MissileBulletType extends BasicBulletType{ - protected Color trailColor = Palette.missileYellowBack; + protected Color trailColor = Pal.missileYellowBack; protected float weaveScale = 0f; protected float weaveMag = -1f; public MissileBulletType(float speed, float damage, String bulletSprite){ super(speed, damage, bulletSprite); - backColor = Palette.missileYellowBack; - frontColor = Palette.missileYellow; + backColor = Pal.missileYellowBack; + frontColor = Pal.missileYellow; homingPower = 7f; } diff --git a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java index 77ebb457e6..5083897a33 100644 --- a/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java +++ b/core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java @@ -15,7 +15,7 @@ import io.anuke.arc.math.geom.Vector2; import io.anuke.arc.util.Time; import io.anuke.arc.util.pooling.Pools; import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Tile; @@ -105,7 +105,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{ @Override public void draw(){ - Lines.stroke(fslope() * 2f, Palette.accent); + Lines.stroke(fslope() * 2f, Pal.accent); Lines.circle(x, y, fslope() * 2f); diff --git a/core/src/io/anuke/mindustry/entities/effect/Lightning.java b/core/src/io/anuke/mindustry/entities/effect/Lightning.java index 1ce05328f8..7a89b29f9d 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Lightning.java +++ b/core/src/io/anuke/mindustry/entities/effect/Lightning.java @@ -27,7 +27,7 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import java.io.DataInput; import java.io.DataOutput; @@ -46,7 +46,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time private static int lastSeed = 0; private Array lines = new Array<>(); - private Color color = Palette.lancerLaser; + private Color color = Pal.lancerLaser; /**For pooling use only. Do not call directly!*/ public Lightning(){ @@ -119,7 +119,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time @Override public void reset(){ super.reset(); - color = Palette.lancerLaser; + color = Pal.lancerLaser; lines.clear(); } diff --git a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java index 8ed8291e4e..4ca7b6a41c 100644 --- a/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java +++ b/core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java @@ -21,7 +21,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.game.EventType.BuildSelectEvent; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; @@ -315,7 +315,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ return; } - Lines.stroke(1f, Palette.accent); + Lines.stroke(1f, Pal.accent); float focusLen = 3.8f + Mathf.absin(Time.time(), 1.1f, 0.6f); float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float py = unit.y + Angles.trnsy(unit.rotation, focusLen); @@ -366,7 +366,7 @@ public interface BuilderTrait extends Entity, TeamTrait{ Shapes.laser("minelaser", "minelaser-end", px, py, ex, ey); if(unit instanceof Player && ((Player) unit).isLocal){ - Lines.stroke(1f, Palette.accent); + Lines.stroke(1f, Pal.accent); Lines.poly(tile.worldx(), tile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time()); } diff --git a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java index b6195e953c..a545da4608 100644 --- a/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java +++ b/core/src/io/anuke/mindustry/entities/type/FlyingUnit.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.Predict; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.units.UnitState; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.world.Tile; @@ -171,7 +171,7 @@ public abstract class FlyingUnit extends BaseUnit{ } public void drawEngine(){ - Draw.color(Palette.engine); + Draw.color(Pal.engine); Fill.circle(x + Angles.trnsx(rotation + 180, type.engineOffset), y + Angles.trnsy(rotation + 180, type.engineOffset), type.engineSize + Mathf.absin(Time.time(), 2f, type.engineSize/4f)); diff --git a/core/src/io/anuke/mindustry/entities/type/Player.java b/core/src/io/anuke/mindustry/entities/type/Player.java index 34efced6e6..7dbe978342 100644 --- a/core/src/io/anuke/mindustry/entities/type/Player.java +++ b/core/src/io/anuke/mindustry/entities/type/Player.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.traits.SpawnerTrait; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.io.TypeIO; @@ -420,7 +420,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ Block block = world.tile(request.x, request.y).target().block(); //draw removal request - Lines.stroke(2f, Palette.removeBack); + Lines.stroke(2f, Pal.removeBack); float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1; Lines.square( @@ -428,7 +428,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ request.y * tilesize + block.offset() - 1, rad); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.square( request.x * tilesize + block.offset(), @@ -438,7 +438,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ float rad = Mathf.absin(Time.time(), 7f, 1f) - 1.5f + request.block.size * tilesize / 2f; //draw place request - Lines.stroke(1f, Palette.accentBack); + Lines.stroke(1f, Pal.accentBack); Lines.square( request.x * tilesize + request.block.offset(), @@ -452,7 +452,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{ request.y * tilesize + request.block.offset(), rad*2, rad*2, request.rotation * 90); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.square( request.x * tilesize + request.block.offset(), diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 34acf67e52..2b7c5c956b 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.units.Statuses; import io.anuke.mindustry.game.EventType.UnitDestroyEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Teams.TeamData; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.net.Interpolator; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; @@ -113,7 +113,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ public void onDeath(){ float explosiveness = 2f + item.item.explosiveness * item.amount; float flammability = item.item.flammability * item.amount; - Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, getSize() / 2f, Palette.darkFlame); + Damage.dynamicExplosion(x, y, flammability, explosiveness, 0f, getSize() / 2f, Pal.darkFlame); ScorchDecal.create(x, y); Effects.effect(Fx.explosion, this); diff --git a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java index b646229875..6906357e1b 100644 --- a/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java +++ b/core/src/io/anuke/mindustry/graphics/OverlayRenderer.java @@ -28,7 +28,7 @@ public class OverlayRenderer{ if(!input.isDrawing() || player.isDead()) continue; - Shaders.outline.color.set(Palette.accent); + Shaders.outline.color.set(Pal.accent); //TODO draw outlined version //Graphics.beginShaders(Shaders.outline); @@ -79,7 +79,7 @@ public class OverlayRenderer{ if(dst < state.rules.enemyCoreBuildRadius * 1.5f){ Draw.color(Color.DARK_GRAY); Lines.poly(core.drawx(), core.drawy() - 2, 200, state.rules.enemyCoreBuildRadius); - Draw.color(Palette.accent, enemy.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); + Draw.color(Pal.accent, enemy.color, 0.5f + Mathf.absin(Time.time(), 10f, 0.5f)); Lines.poly(core.drawx(), core.drawy(), 200, state.rules.enemyCoreBuildRadius); } } @@ -103,14 +103,14 @@ public class OverlayRenderer{ Vector2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY()); float size = 8; Draw.rect(player.item().item.region, v.x, v.y, size, size); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f)); Draw.reset(); Tile tile = world.tileWorld(v.x, v.y); if(tile != null) tile = tile.target(); if(tile != null && tile.getTeam() == player.getTeam() && tile.block().acceptStack(player.item().item, player.item().amount, tile, player) > 0){ - Draw.color(Palette.place); + Draw.color(Pal.place); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Time.time(), 5f, 1f)); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/graphics/Palette.java b/core/src/io/anuke/mindustry/graphics/Pal.java similarity index 98% rename from core/src/io/anuke/mindustry/graphics/Palette.java rename to core/src/io/anuke/mindustry/graphics/Pal.java index 39f1ff1585..cad77809cb 100644 --- a/core/src/io/anuke/mindustry/graphics/Palette.java +++ b/core/src/io/anuke/mindustry/graphics/Pal.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.graphics; import io.anuke.arc.graphics.Color; -public class Palette{ +public class Pal{ public static final Color command = Color.valueOf("eab678"), diff --git a/core/src/io/anuke/mindustry/input/DesktopInput.java b/core/src/io/anuke/mindustry/input/DesktopInput.java index 18c11c62aa..c0e0d3b1eb 100644 --- a/core/src/io/anuke/mindustry/input/DesktopInput.java +++ b/core/src/io/anuke/mindustry/input/DesktopInput.java @@ -10,7 +10,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.type.Player; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult; import io.anuke.mindustry.input.PlaceUtils.NormalizeResult; import io.anuke.mindustry.net.Net; @@ -51,9 +51,9 @@ public class DesktopInput extends InputHandler{ region.getWidth() * selectScale * Draw.scl, region.getHeight() * selectScale * Draw.scl, block.rotate ? rotation * 90 : 0); }else{ - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize / 2f); } } @@ -78,14 +78,14 @@ public class DesktopInput extends InputHandler{ int y = selectY + i * Mathf.sign(cursorY - selectY) * Mathf.num(!result.isX()); if(i + block.size > result.getLength() && block.rotate){ - Draw.color(!validPlace(x, y, block, result.rotation) ? Palette.removeBack : Palette.accentBack); + Draw.color(!validPlace(x, y, block, result.rotation) ? Pal.removeBack : Pal.accentBack); Draw.rect(Core.atlas.find("place-arrow"), x * tilesize + block.offset(), y * tilesize + block.offset() - 1, Core.atlas.find("place-arrow").getWidth() * Draw.scl, Core.atlas.find("place-arrow").getHeight() * Draw.scl, result.rotation * 90 - 90); - Draw.color(!validPlace(x, y, block, result.rotation) ? Palette.remove : Palette.accent); + Draw.color(!validPlace(x, y, block, result.rotation) ? Pal.remove : Pal.accent); Draw.rect(Core.atlas.find("place-arrow"), x * tilesize + block.offset(), y * tilesize + block.offset(), @@ -107,27 +107,27 @@ public class DesktopInput extends InputHandler{ if(tile == null || !validBreak(tile.x, tile.y)) continue; tile = tile.target(); - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.square(tile.drawx(), tile.drawy()-1, tile.block().size * tilesize / 2f - 1); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f - 1); } } - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); }else if(isPlacing()){ if(block.rotate){ - Draw.color(!validPlace(cursorX, cursorY, block, rotation) ? Palette.removeBack : Palette.accentBack); + Draw.color(!validPlace(cursorX, cursorY, block, rotation) ? Pal.removeBack : Pal.accentBack); Draw.rect(Core.atlas.find("place-arrow"), cursorX * tilesize + block.offset(), cursorY * tilesize + block.offset() - 1, Core.atlas.find("place-arrow").getWidth() * Draw.scl, Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90); - Draw.color(!validPlace(cursorX, cursorY, block, rotation) ? Palette.remove : Palette.accent); + Draw.color(!validPlace(cursorX, cursorY, block, rotation) ? Pal.remove : Pal.accent); Draw.rect(Core.atlas.find("place-arrow"), cursorX * tilesize + block.offset(), cursorY * tilesize + block.offset(), diff --git a/core/src/io/anuke/mindustry/input/MobileInput.java b/core/src/io/anuke/mindustry/input/MobileInput.java index 462831470a..24d3435cd9 100644 --- a/core/src/io/anuke/mindustry/input/MobileInput.java +++ b/core/src/io/anuke/mindustry/input/MobileInput.java @@ -26,7 +26,7 @@ import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult; import io.anuke.mindustry.input.PlaceUtils.NormalizeResult; @@ -174,7 +174,7 @@ public class MobileInput extends InputHandler implements GestureListener{ TextureRegion region = request.block.icon(Icon.full); Draw.alpha(Mathf.clamp((1f - request.scale) / 0.5f)); - Draw.tint(Color.WHITE, Palette.breakInvalid, request.redness); + Draw.tint(Color.WHITE, Pal.breakInvalid, request.redness); Draw.rect(region, tile.worldx() + offset, tile.worldy() + offset, region.getWidth() * request.scale * Draw.scl, @@ -184,9 +184,9 @@ public class MobileInput extends InputHandler implements GestureListener{ float rad = (tile.block().size * tilesize / 2f - 1) * request.scale; Draw.alpha(0f); //draw removing request - Draw.tint(Palette.removeBack); + Draw.tint(Pal.removeBack); Lines.square(tile.drawx(), tile.drawy()-1, rad); - Draw.tint(Palette.remove); + Draw.tint(Pal.remove); Lines.square(tile.drawx(), tile.drawy(), rad); } } @@ -213,7 +213,7 @@ public class MobileInput extends InputHandler implements GestureListener{ @Override public void buildUI(Table table){ - table.addImage("blank").color(Palette.accent).height(3f).colspan(4).growX(); + table.addImage("blank").color(Pal.accent).height(3f).colspan(4).growX(); table.row(); table.left().margin(0f).defaults().size(48f); @@ -277,7 +277,7 @@ public class MobileInput extends InputHandler implements GestureListener{ public void drawOutlined(){ Lines.stroke(1f); - Shaders.mix.color.set(Palette.accent); + Shaders.mix.color.set(Pal.accent); Draw.shader(Shaders.mix); //draw removals @@ -318,7 +318,7 @@ public class MobileInput extends InputHandler implements GestureListener{ Draw.shader(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); //Draw lines if(lineMode){ @@ -348,9 +348,9 @@ public class MobileInput extends InputHandler implements GestureListener{ region.getHeight() * lineScale * Draw.scl, block.rotate ? result.rotation * 90 : 0); }else{ - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset(), block.size * tilesize / 2f); } } @@ -366,16 +366,16 @@ public class MobileInput extends InputHandler implements GestureListener{ if(other == null || !validBreak(other.x, other.y)) continue; other = other.target(); - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.square(other.drawx(), other.drawy()-1, other.block().size * tilesize / 2f - 1); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f - 1); } } - Draw.color(Palette.removeBack); + Draw.color(Pal.removeBack); Lines.rect(result.x, result.y - 1, result.x2 - result.x, result.y2 - result.y); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y); } @@ -393,7 +393,7 @@ public class MobileInput extends InputHandler implements GestureListener{ crosshairScale = Mathf.lerpDelta(crosshairScale, 1f, 0.2f); - Draw.color(Palette.remove); + Draw.color(Pal.remove); Lines.stroke(1f); float radius = Interpolation.swingIn.apply(crosshairScale); diff --git a/core/src/io/anuke/mindustry/type/Item.java b/core/src/io/anuke/mindustry/type/Item.java index c055fd35cd..b75ba11c21 100644 --- a/core/src/io/anuke/mindustry/type/Item.java +++ b/core/src/io/anuke/mindustry/type/Item.java @@ -9,7 +9,7 @@ import io.anuke.arc.util.Log; import io.anuke.arc.util.Strings; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.UnlockableContent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.ui.ContentDisplay; public class Item extends UnlockableContent implements Comparable{ @@ -29,7 +29,7 @@ public class Item extends UnlockableContent implements Comparable{ /**drill hardness of the item*/ public int hardness = 0; /**the burning color of this item. TODO unused; implement*/ - public Color flameColor = Palette.darkFlame.cpy(); + public Color flameColor = Pal.darkFlame.cpy(); /** * base material cost of this item, used for calculating place times * 1 cost = 1 tick added to build time diff --git a/core/src/io/anuke/mindustry/type/Mech.java b/core/src/io/anuke/mindustry/type/Mech.java index bdd94a2288..bfe9842a62 100644 --- a/core/src/io/anuke/mindustry/type/Mech.java +++ b/core/src/io/anuke/mindustry/type/Mech.java @@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.game.UnlockableContent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.ui.ContentDisplay; public class Mech extends UnlockableContent{ @@ -27,7 +27,7 @@ public class Mech extends UnlockableContent{ public float mineSpeed = 1f; public int drillPower = -1; public float buildPower = 1f; - public Color engineColor = Palette.boostTo; + public Color engineColor = Pal.boostTo; public int itemCapacity = 30; public boolean turnCursor = true; public boolean canHeal = false; diff --git a/core/src/io/anuke/mindustry/ui/BorderImage.java b/core/src/io/anuke/mindustry/ui/BorderImage.java index 2b479a1980..0db23da2ba 100644 --- a/core/src/io/anuke/mindustry/ui/BorderImage.java +++ b/core/src/io/anuke/mindustry/ui/BorderImage.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.ui; import io.anuke.arc.graphics.Texture; import io.anuke.arc.graphics.g2d.TextureRegion; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.scene.ui.Image; @@ -36,7 +36,7 @@ public class BorderImage extends Image{ float scaleX = getScaleX(); float scaleY = getScaleY(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(Unit.dp.scl(thickness)); Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); Draw.reset(); diff --git a/core/src/io/anuke/mindustry/ui/ContentDisplay.java b/core/src/io/anuke/mindustry/ui/ContentDisplay.java index 4dce150c26..7f9e969938 100644 --- a/core/src/io/anuke/mindustry/ui/ContentDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ContentDisplay.java @@ -6,7 +6,7 @@ import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Strings; import io.anuke.mindustry.type.UnitType; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.Mech; @@ -49,7 +49,7 @@ public class ContentDisplay{ if(map.size == 0) continue; - table.add("$category." + cat.name()).color(Palette.accent).fillX(); + table.add("$category." + cat.name()).color(Pal.accent).fillX(); table.row(); for(BlockStat stat : map.keys()){ diff --git a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java index 2a91be51c8..98e34facf8 100644 --- a/core/src/io/anuke/mindustry/ui/ItemsDisplay.java +++ b/core/src/io/anuke/mindustry/ui/ItemsDisplay.java @@ -1,6 +1,7 @@ package io.anuke.mindustry.ui; import io.anuke.arc.collection.ObjectIntMap; +import io.anuke.arc.graphics.Color; import io.anuke.arc.scene.ui.layout.Table; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.ItemType; @@ -29,7 +30,7 @@ public class ItemsDisplay extends Table{ if(item.type == ItemType.material && data.isUnlocked(item)){ t.label(() -> format.format(items.get(item, 0))).left(); t.addImage(item.region).size(8*3).padLeft(4).padRight(4); - t.add("[LIGHT_GRAY]" + item.localizedName()).left(); + t.add(item.localizedName()).color(Color.LIGHT_GRAY).left(); t.row(); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java index a10edecfa0..af6ddffe1b 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java @@ -4,7 +4,7 @@ import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; import io.anuke.arc.collection.Array; import io.anuke.arc.collection.ObjectSet; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.io.Contributors; import io.anuke.mindustry.io.Contributors.Contributor; import io.anuke.mindustry.ui.Links; @@ -103,7 +103,7 @@ public class AboutDialog extends FloatingDialog{ dialog.cont.add("$credits.text"); dialog.cont.row(); if(!contributors.isEmpty()){ - dialog.cont.addImage("blank").color(Palette.accent).fillX().height(3f).pad(3f); + dialog.cont.addImage("blank").color(Pal.accent).fillX().height(3f).pad(3f); dialog.cont.row(); dialog.cont.add("$contributors"); dialog.cont.row(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java index 48fb57029b..2a6db67316 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java @@ -5,7 +5,7 @@ import io.anuke.arc.input.KeyCode; import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.KeybindDialog; import io.anuke.arc.util.Align; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; public class ControlsDialog extends KeybindDialog{ @@ -16,7 +16,7 @@ public class ControlsDialog extends KeybindDialog{ title.setAlignment(Align.center); titleTable.row(); titleTable.add(new Image("white")) - .growX().height(3f).pad(4f).get().setColor(Palette.accent); + .growX().height(3f).pad(4f).get().setColor(Pal.accent); } @Override diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java index aac01a18a2..879a9340e1 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java @@ -4,7 +4,7 @@ import io.anuke.arc.collection.Array; import io.anuke.mindustry.Vars; import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.UnlockableContent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.ContentType; import io.anuke.arc.scene.event.HandCursorListener; import io.anuke.arc.scene.ui.Image; @@ -41,9 +41,9 @@ public class DatabaseDialog extends FloatingDialog{ Array array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden()); if(array.size == 0) continue; - table.add("$content." + type.name() + ".name").growX().left().color(Palette.accent); + table.add("$content." + type.name() + ".name").growX().left().color(Pal.accent); table.row(); - table.addImage("white").growX().pad(5).padLeft(0).padRight(0).height(3).color(Palette.accent); + table.addImage("white").growX().pad(5).padLeft(0).padRight(0).height(3).color(Pal.accent); table.row(); table.table(list -> { list.left(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java index 22da104913..fc20402fea 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java @@ -13,7 +13,7 @@ import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.Zones; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.Saves.SaveSlot; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.io.SaveIO.SaveException; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.Zone; @@ -251,7 +251,7 @@ public class DeployDialog extends FloatingDialog{ for(ZoneNode node : nodes){ for(ZoneNode child : node.children){ - Lines.stroke(3f, node.zone.locked() || child.zone.locked() ? Palette.locked : Palette.accent); + Lines.stroke(3f, node.zone.locked() || child.zone.locked() ? Pal.locked : Pal.accent); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } } diff --git a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java index c064f59729..b21e875749 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs; import io.anuke.arc.Core; import io.anuke.arc.graphics.Color; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.arc.scene.ui.Dialog; import static io.anuke.mindustry.Vars.discordURL; @@ -33,7 +33,7 @@ public class DiscordDialog extends Dialog{ i.addImage("icon-discord").size(14 * 3); }).size(h).left(); - t.add("$discord").color(Palette.accent).growX().padLeft(10f); + t.add("$discord").color(Pal.accent).growX().padLeft(10f); }).size(470f, h).pad(10f); buttons.defaults().size(170f, 50); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java index 616780ef95..4ad7908bec 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java @@ -5,7 +5,7 @@ import io.anuke.arc.input.KeyCode; import io.anuke.arc.util.Align; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.game.EventType.ResizeEvent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.net.Net; import io.anuke.arc.Events; import io.anuke.arc.scene.ui.Dialog; @@ -22,7 +22,7 @@ public class FloatingDialog extends Dialog{ setFillParent(true); this.title.setAlignment(Align.center); titleTable.row(); - titleTable.addImage("white", Palette.accent) + titleTable.addImage("white", Pal.accent) .growX().height(3f).pad(4f); hidden(() -> { diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index c54b1c8b3f..810bdd2e20 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -14,7 +14,7 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.util.Align; import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.net.Net; import static io.anuke.mindustry.Vars.*; @@ -49,7 +49,7 @@ public class SettingsMenuDialog extends SettingsDialog{ title.setAlignment(Align.center); titleTable.row(); titleTable.add(new Image("white")) - .growX().height(3f).pad(4f).get().setColor(Palette.accent); + .growX().height(3f).pad(4f).get().setColor(Pal.accent); cont.clearChildren(); cont.remove(); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java index 34136eb722..871611778c 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java @@ -18,7 +18,7 @@ import io.anuke.arc.util.Log; import io.anuke.arc.util.Structs; import io.anuke.mindustry.content.TechTree; import io.anuke.mindustry.content.TechTree.TechNode; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.ui.ItemsDisplay; import io.anuke.mindustry.ui.TreeLayout; @@ -254,7 +254,7 @@ public class TechTreeDialog extends FloatingDialog{ for(TechTreeNode node : nodes){ for(TechTreeNode child : node.children){ - Lines.stroke(3f, locked(node.node) || locked(child.node) ? Palette.locked : Palette.accent); + Lines.stroke(3f, locked(node.node) || locked(child.node) ? Pal.locked : Pal.accent); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY); } diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index ff449fb759..3691589184 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -23,7 +23,7 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Packets.AdminAction; @@ -97,11 +97,11 @@ public class HudFragment extends Fragment{ } }).get(); - select.addImage("blank").color(Palette.accent).width(6f).fillY(); + select.addImage("blank").color(Pal.accent).width(6f).fillY(); }); cont.row(); - cont.addImage("blank").height(6f).color(Palette.accent).fillX(); + cont.addImage("blank").height(6f).color(Pal.accent).fillX(); cont.row(); } @@ -237,7 +237,7 @@ public class HudFragment extends Fragment{ button.setText(Core.bundle.get(state.enemies() > 0 ? "launch.unable" : "launch") + "\n" + Core.bundle.format("launch.next", state.wave + world.getZone().launchPeriod)); - button.getLabel().setColor(Tmp.c1.set(Color.WHITE).lerp(state.enemies() > 0 ? Color.WHITE : Palette.accent, + button.getLabel().setColor(Tmp.c1.set(Color.WHITE).lerp(state.enemies() > 0 ? Color.WHITE : Pal.accent, Mathf.absin(Time.time(), 7f, 1f))); }); diff --git a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java index 031077b367..2b178a2125 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java @@ -1,6 +1,6 @@ package io.anuke.mindustry.ui.fragments; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.arc.scene.Group; import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.ui.Label; @@ -18,11 +18,11 @@ public class LoadingFragment extends Fragment{ t.touchable(Touchable.enabled); t.add().height(70f).row(); - t.addImage("white").growX().height(3f).pad(4f).growX().get().setColor(Palette.accent); + t.addImage("white").growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); t.row(); t.add("$loading").name("namelabel").pad(10f); t.row(); - t.addImage("white").growX().height(3f).pad(4f).growX().get().setColor(Palette.accent); + t.addImage("white").growX().height(3f).pad(4f).growX().get().setColor(Pal.accent); t.row(); button = t.addButton("$cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get(); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java index 19128bac74..53d45737b4 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.game.EventType.UnlockEvent; import io.anuke.mindustry.game.EventType.WorldLoadEvent; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.type.Category; @@ -243,7 +243,7 @@ public class PlacementFragment extends Fragment{ }); }).colspan(3).fillX().visible(() -> getSelected() != null || tileDisplayBlock() != null).touchable(Touchable.enabled); frame.row(); - frame.addImage("blank").color(Palette.accent).colspan(3).height(3).growX(); + frame.addImage("blank").color(Pal.accent).colspan(3).height(3).growX(); frame.row(); frame.table("pane-2", blocksSelect -> { blocksSelect.margin(4).marginTop(0); diff --git a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java index bea91a8001..dbad24b6a6 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java @@ -11,7 +11,7 @@ import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.Interval; import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.NetConnection; import io.anuke.mindustry.net.Packets.AdminAction; @@ -82,7 +82,7 @@ public class PlayerListFragment extends Fragment{ @Override public void draw(){ super.draw(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Draw.alpha(parentAlpha); Lines.stroke(Unit.dp.scl(3f)); Lines.rect(x, y, width, height); @@ -136,7 +136,7 @@ public class PlayerListFragment extends Fragment{ content.add(button).padBottom(-6).width(350f).maxHeight(h + 14); content.row(); - content.addImage("blank").height(3f).color(state.rules.pvp ? player.getTeam().color : Palette.accent).growX(); + content.addImage("blank").height(3f).color(state.rules.pvp ? player.getTeam().color : Pal.accent).growX(); content.row(); }); diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index adef75d8d0..7606689732 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -25,7 +25,7 @@ import io.anuke.mindustry.entities.effect.RubbleDecal; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.graphics.CacheLayer; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Category; import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.Item; @@ -344,7 +344,7 @@ public class Block extends BlockStorage{ } public void drawConfigure(Tile tile){ - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(1f); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1f); Draw.reset(); @@ -435,7 +435,7 @@ public class Block extends BlockStorage{ }); } - Damage.dynamicExplosion(x, y, flammability, explosiveness, power, tilesize * size / 2f, Palette.darkFlame); + Damage.dynamicExplosion(x, y, flammability, explosiveness, power, tilesize * size / 2f, Pal.darkFlame); if(!tile.floor().solid && !tile.floor().isLiquid){ RubbleDecal.create(tile.drawx(), tile.drawy(), size); } @@ -492,7 +492,7 @@ public class Block extends BlockStorage{ public void displayBars(Tile tile, Table bars){ TileEntity entity = tile.entity; - bars.add(new Bar("blocks.health", Palette.health, entity::healthf).blink(Color.WHITE)); + bars.add(new Bar("blocks.health", Pal.health, entity::healthf).blink(Color.WHITE)); bars.row(); if(entity.liquids != null){ @@ -501,7 +501,7 @@ public class Block extends BlockStorage{ } if(entity.power != null && consumes.has(ConsumePower.class)){ - bars.add(new Bar(consumes.get(ConsumePower.class).isBuffered ? "blocks.power" : "blocks.power.satisfaction", Palette.power, () -> entity.power.satisfaction)).growX(); + bars.add(new Bar(consumes.get(ConsumePower.class).isBuffered ? "blocks.power" : "blocks.power.satisfaction", Pal.power, () -> entity.power.satisfaction)).growX(); bars.row(); } } diff --git a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java index ba8d3c188b..3296b08f4e 100644 --- a/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/BuildBlock.java @@ -20,7 +20,7 @@ import io.anuke.mindustry.game.EventType.BlockBuildEndEvent; import io.anuke.mindustry.game.Team; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.world.Block; @@ -134,7 +134,7 @@ public class BuildBlock extends Block{ BuildEntity entity = tile.entity(); - Shaders.blockbuild.color = Palette.accent; + Shaders.blockbuild.color = Pal.accent; Block target = entity.block == null ? entity.previous : entity.block; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index d8cced4f79..55ecd34d38 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -16,7 +16,7 @@ import io.anuke.arc.util.Time; import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.traits.AbsorbTrait; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; @@ -243,7 +243,7 @@ public class ForceProjector extends Block { @Override public void draw(){ - Draw.color(Palette.accent); + Draw.color(Pal.accent); Fill.poly(x, y, 6, realRadius(entity)); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java index ae637a578a..94e8a0590c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java @@ -6,7 +6,7 @@ import io.anuke.arc.math.Mathf; import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -51,7 +51,7 @@ public class ShockMine extends Block{ public void unitOn(Tile tile, Unit unit){ if(unit.getTeam() != tile.getTeam() && tile.entity.timer.get(timerDamage, cooldown)){ for(int i = 0; i < tendrils; i++){ - Lightning.create(tile.getTeam(), Palette.lancerLaser, damage, tile.drawx(), tile.drawy(), Mathf.random(360f), length); + Lightning.create(tile.getTeam(), Pal.lancerLaser, damage, tile.drawx(), tile.drawy(), Mathf.random(360f), length); } tile.entity.damage(tileDamage); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java index adf8ddbaf1..e9a26e505a 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java @@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.defense; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.effect.Lightning; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.arc.math.Mathf; public class SurgeWall extends Wall{ @@ -19,7 +19,7 @@ public class SurgeWall extends Wall{ public void handleBulletHit(TileEntity entity, Bullet bullet){ super.handleBulletHit(entity, bullet); if(Mathf.chance(lightningChance)){ - Lightning.create(entity.getTeam(), Palette.surge, lightningDamage, bullet.x, bullet.y, bullet.rot() + 180f, lightningLength); + Lightning.create(entity.getTeam(), Pal.surge, lightningDamage, bullet.x, bullet.y, bullet.rot() + 180f, lightningLength); } } } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java index 2f7168b434..616ffb0d53 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -6,7 +6,7 @@ import io.anuke.mindustry.Vars; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.Unit; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.world.Tile; @@ -46,7 +46,7 @@ public class ItemTurret extends CooledTurret{ TurretEntity entity = tile.entity(); - bars.add(new Bar("blocks.ammo", Palette.ammo, () -> (float)entity.totalAmmo / maxAmmo)).growX(); + bars.add(new Bar("blocks.ammo", Pal.ammo, () -> (float)entity.totalAmmo / maxAmmo)).growX(); bars.row(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java index 13f2a4da5a..b4cc5f0c49 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java @@ -23,7 +23,7 @@ import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.meta.BlockFlag; @@ -38,7 +38,7 @@ public abstract class Turret extends Block{ protected final int timerTarget = timers++; - protected Color heatColor = Palette.turretHeat; + protected Color heatColor = Pal.turretHeat; protected Effect shootEffect = Fx.none; protected Effect smokeEffect = Fx.none; protected Effect ammoUseEffect = Fx.none; @@ -142,7 +142,7 @@ public abstract class Turret extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ - Lines.stroke(1f, Palette.placing); + Lines.stroke(1f, Pal.placing); Lines.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java index 4f5b117365..395251ecdf 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Edges; @@ -98,7 +98,7 @@ public class ItemBridge extends Block{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ Lines.stroke(2f); - Draw.color(Palette.placing); + Draw.color(Pal.placing); for(int i = 0; i < 4; i++){ Lines.dashLine( x * tilesize + Geometry.d4[i].x * (tilesize / 2f + 2), @@ -115,7 +115,7 @@ public class ItemBridge extends Block{ public void drawConfigure(Tile tile){ ItemBridgeEntity entity = tile.entity(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(1f); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1f); @@ -125,7 +125,7 @@ public class ItemBridge extends Block{ Tile other = tile.getNearby(Geometry.d4[j].x * i, Geometry.d4[j].y * i); if(linkValid(tile, other)){ boolean linked = other.pos() == entity.link; - Draw.color(linked ? Palette.place : Palette.breakInvalid); + Draw.color(linked ? Pal.place : Pal.breakInvalid); Lines.square(other.drawx(), other.drawy(), other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); diff --git a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java index 3597372ea4..2d092a0180 100644 --- a/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java +++ b/core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java @@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.type.Item; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -190,7 +190,7 @@ public class MassDriver extends Block{ public void drawConfigure(Tile tile){ float sin = Mathf.absin(Time.time(), 6f, 1f); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(1f); Lines.poly(tile.drawx(), tile.drawy(), 20, (tile.block().size/2f+1) * tilesize + sin); @@ -199,12 +199,12 @@ public class MassDriver extends Block{ if(linkValid(tile)){ Tile target = world.tile(entity.link); - Draw.color(Palette.place); + Draw.color(Pal.place); Lines.poly(target.drawx(), target.drawy(), 20, (target.block().size/2f+1) * tilesize + sin); Draw.reset(); } - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.dashCircle(tile.drawx(), tile.drawy(), range); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java index 7522c53e4a..3f7969efd8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java @@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.meta.BlockStat; @@ -141,7 +141,7 @@ public class PowerNode extends PowerBlock{ Lines.stroke(1f); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.poly(tile.drawx(), tile.drawy(), 50, laserRange*tilesize); Draw.reset(); } @@ -150,7 +150,7 @@ public class PowerNode extends PowerBlock{ public void drawConfigure(Tile tile){ TileEntity entity = tile.entity(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.stroke(1.5f); Lines.circle(tile.drawx(), tile.drawy(), @@ -165,13 +165,13 @@ public class PowerNode extends PowerBlock{ if(link != tile && linkValid(tile, link, false)){ boolean linked = linked(tile, link); - Draw.color(linked ? Palette.place : Palette.breakInvalid); + Draw.color(linked ? Pal.place : Pal.breakInvalid); Lines.circle(link.drawx(), link.drawy(), link.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); if((entity.power.links.size >= maxNodes || (link.block() instanceof PowerNode && link.entity.power.links.size >= ((PowerNode) link.block()).maxNodes)) && !linked){ - Draw.color(Palette.breakInvalid); + Draw.color(Pal.breakInvalid); Lines.lineAngleCenter(link.drawx(), link.drawy(), 45, link.block().size * Mathf.sqrt2 * tilesize * 0.9f); Draw.color(); } @@ -185,7 +185,7 @@ public class PowerNode extends PowerBlock{ @Override public void drawPlace(int x, int y, int rotation, boolean valid){ Lines.stroke(1f); - Draw.color(Palette.placing); + Draw.color(Pal.placing); Lines.poly(x * tilesize + offset(), y * tilesize + offset(), 50, laserRange*tilesize); Draw.reset(); } @@ -245,7 +245,7 @@ public class PowerNode extends PowerBlock{ x2 += t2.x; y2 += t2.y; - Draw.color(Palette.powerLight, Palette.power, Mathf.absin(Time.time(), 8f, 1f)); + Draw.color(Pal.powerLight, Pal.power, Mathf.absin(Time.time(), 8f, 1f)); Lines.stroke(2f); Lines.line(x1, y1, x2, y2); } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java index 2881afc5a6..ae7b2e3530 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java @@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.Vars; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.world.Tile; @@ -41,7 +41,7 @@ public class PhaseWeaver extends PowerSmelter{ Shaders.build.region = weaveRegion; Shaders.build.progress = progress; - Shaders.build.color.set(Palette.accent); + Shaders.build.color.set(Pal.accent); Shaders.build.color.a = entity.heat; Shaders.build.time = -entity.time / 10f; @@ -50,7 +50,7 @@ public class PhaseWeaver extends PowerSmelter{ Draw.rect(weaveRegion, tile.drawx(), tile.drawy(), entity.time); Draw.shader(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Draw.alpha(entity.heat); Lines.lineAngleCenter( diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 6a68f73bab..3a4d106d24 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.traits.SpawnerTrait; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; @@ -116,14 +116,14 @@ public class CoreBlock extends StorageBlock{ Shaders.build.region = region; Shaders.build.progress = entity.progress; - Shaders.build.color.set(Palette.accent); + Shaders.build.color.set(Pal.accent); Shaders.build.time = -entity.time / 10f; Draw.shader(Shaders.build, true); Draw.rect(region, tile.drawx(), tile.drawy()); Draw.shader(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.lineAngleCenter( tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), diff --git a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java index 85ae8cb0d2..e0b959e1ff 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/MechPad.java @@ -18,7 +18,7 @@ import io.anuke.mindustry.entities.traits.SpawnerTrait; import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.world.Block; @@ -108,7 +108,7 @@ public class MechPad extends Block{ @Override public void drawSelect(Tile tile){ - Draw.color(Palette.accent); + Draw.color(Pal.accent); for(int i = 0; i < 4; i ++){ float length = tilesize * size/2f + 3 + Mathf.absin(Time.time(), 5f, 2f); Draw.rect("transfer-arrow", tile.drawx() + Geometry.d4[i].x * length, tile.drawy() + Geometry.d4[i].y * length, (i+2) * 90); @@ -154,14 +154,14 @@ public class MechPad extends Block{ Shaders.build.region = region; Shaders.build.progress = entity.progress; Shaders.build.time = -entity.time / 4f; - Shaders.build.color.set(Palette.accent); + Shaders.build.color.set(Pal.accent); Draw.shader(Shaders.build, false); Shaders.build.apply(); Draw.rect(region, tile.drawx(), tile.drawy()); Draw.shader(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.lineAngleCenter( tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), diff --git a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java index 2c361cfa1b..157c7899e4 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java @@ -14,7 +14,7 @@ import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.graphics.Layer; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shapes; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Tile; @@ -61,7 +61,7 @@ public class RepairPoint extends Block{ @Override public void drawSelect(Tile tile){ - Draw.color(Palette.accent); + Draw.color(Pal.accent); Lines.dashCircle(tile.drawx(), tile.drawy(), repairRadius); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index 7731aaafe1..1ca8f6c301 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.type.UnitType; import io.anuke.mindustry.gen.Call; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.graphics.Shaders; import io.anuke.mindustry.net.Net; import io.anuke.mindustry.type.Item; @@ -116,7 +116,7 @@ public class UnitFactory extends Block{ Shaders.build.region = region; Shaders.build.progress = entity.buildTime / produceTime; - Shaders.build.color.set(Palette.accent); + Shaders.build.color.set(Pal.accent); Shaders.build.color.a = entity.speedScl; Shaders.build.time = -entity.time / 10f; @@ -125,7 +125,7 @@ public class UnitFactory extends Block{ Draw.rect(region, tile.drawx(), tile.drawy()); Draw.shader(); - Draw.color(Palette.accent); + Draw.color(Pal.accent); Draw.alpha(entity.speedScl); Lines.lineAngleCenter( diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index 4edb63e360..e52901f7c8 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -2,7 +2,7 @@ package io.anuke.mindustry.world.consumers; import io.anuke.arc.graphics.Color; import io.anuke.mindustry.entities.type.TileEntity; -import io.anuke.mindustry.graphics.Palette; +import io.anuke.mindustry.graphics.Pal; import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.arc.scene.ui.Tooltip; @@ -47,8 +47,8 @@ public abstract class Consume{ table.table(out -> { out.addImage(getIcon()).size(10 * scale).color(Color.DARK_GRAY).padRight(-10 * scale).padBottom(-scale * 2); - out.addImage(getIcon()).size(10 * scale).color(Palette.accent); - out.addImage("icon-missing").size(10 * scale).color(Palette.remove).padLeft(-10 * scale); + out.addImage(getIcon()).size(10 * scale).color(Pal.accent); + out.addImage("icon-missing").size(10 * scale).color(Pal.remove).padLeft(-10 * scale); }).size(10 * scale).get().addListener(new Tooltip<>(t)); }