Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Balancing / Renamed palettes file

Browse Source
This commit is contained in:
Anuken
2019-02-07 15:33:56 -05:00
parent 7b90044544
commit 7e35de3c33
55 changed files with 272 additions and 271 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
core/assets-raw/sprites_replacement/blocks/turrets/duo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

10
core/src/io/anuke/mindustry/content/Blocks.java
View File

@@ -300,7 +300,7 @@ public class Blocks implements ContentList{
//region crafting //region crafting
graphitePress = new GenericCrafter("graphite-press"){{ graphitePress = new GenericCrafter("graphite-press"){{
requirements(Category.crafting, ItemStack.with(Items.copper, 200, Items.lead, 60)); requirements(Category.crafting, ItemStack.with(Items.copper, 150, Items.lead, 60));
craftEffect = Fx.pulverizeMedium; craftEffect = Fx.pulverizeMedium;
output = Items.graphite; output = Items.graphite;
@@ -897,7 +897,7 @@ public class Blocks implements ContentList{
//region production //region production
mechanicalDrill = new Drill("mechanical-drill"){{ mechanicalDrill = new Drill("mechanical-drill"){{
requirements(Category.production, ItemStack.with(Items.copper, 20), true); requirements(Category.production, ItemStack.with(Items.copper, 25), true);
tier = 2; tier = 2;
drillTime = 600; drillTime = 600;
size = 2; size = 2;
@@ -991,7 +991,7 @@ public class Blocks implements ContentList{
alwaysUnlocked = true; alwaysUnlocked = true;
health = 1100; health = 1100;
itemCapacity = 2000; itemCapacity = 4000;
size = 3; size = 3;
}}; }};
@@ -999,7 +999,7 @@ public class Blocks implements ContentList{
requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000)); requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 4000, Items.silicon, 2000));
health = 2000; health = 2000;
itemCapacity = 4000; itemCapacity = 7000;
size = 4; 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)); requirements(Category.effect, () -> false, ItemStack.with(Items.titanium, 8000, Items.silicon, 4000, Items.surgealloy, 2000));
health = 3000; health = 3000;
itemCapacity = 6000; itemCapacity = 10000;
size = 5; size = 5;
}}; }};

70
core/src/io/anuke/mindustry/content/Bullets.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.effect.Fire;
import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.entities.effect.Puddle; import io.anuke.mindustry.entities.effect.Puddle;
import io.anuke.mindustry.game.ContentList; 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.graphics.Shapes;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.blocks.BuildBlock; import io.anuke.mindustry.world.blocks.BuildBlock;
@@ -69,8 +69,8 @@ public class Bullets implements ContentList{
bulletHeight = 12f; bulletHeight = 12f;
bulletShrink = 1f; bulletShrink = 1f;
lifetime = 15f; lifetime = 15f;
backColor = Palette.plastaniumBack; backColor = Pal.plastaniumBack;
frontColor = Palette.plastaniumFront; frontColor = Pal.plastaniumFront;
despawnEffect = Fx.none; despawnEffect = Fx.none;
}}; }};
@@ -84,8 +84,8 @@ public class Bullets implements ContentList{
splashDamage = 35f; splashDamage = 35f;
fragBullet = artilleryPlasticFrag; fragBullet = artilleryPlasticFrag;
fragBullets = 9; fragBullets = 9;
backColor = Palette.plastaniumBack; backColor = Pal.plastaniumBack;
frontColor = Palette.plastaniumFront; frontColor = Pal.plastaniumFront;
}}; }};
artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{ artilleryHoming = new ArtilleryBulletType(3f, 0, "shell"){{
@@ -110,8 +110,8 @@ public class Bullets implements ContentList{
splashDamage = 30f; splashDamage = 30f;
incendAmount = 4; incendAmount = 4;
incendSpread = 11f; incendSpread = 11f;
frontColor = Palette.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Palette.lightOrange; backColor = Pal.lightOrange;
trailEffect = Fx.incendTrail; trailEffect = Fx.incendTrail;
}}; }};
@@ -123,8 +123,8 @@ public class Bullets implements ContentList{
collidesTiles = false; collidesTiles = false;
splashDamageRadius = 45f; splashDamageRadius = 45f;
splashDamage = 50f; splashDamage = 50f;
backColor = Palette.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Palette.missileYellow; frontColor = Pal.missileYellow;
}}; }};
artilleryUnit = new ArtilleryBulletType(2f, 0, "shell"){{ artilleryUnit = new ArtilleryBulletType(2f, 0, "shell"){{
@@ -136,8 +136,8 @@ public class Bullets implements ContentList{
collidesTiles = true; collidesTiles = true;
splashDamageRadius = 45f; splashDamageRadius = 45f;
splashDamage = 50f; splashDamage = 50f;
backColor = Palette.bulletYellowBack; backColor = Pal.bulletYellowBack;
frontColor = Palette.bulletYellow; frontColor = Pal.bulletYellow;
}}; }};
flakPlastic = new FlakBulletType(4f, 5){{ flakPlastic = new FlakBulletType(4f, 5){{
@@ -145,8 +145,8 @@ public class Bullets implements ContentList{
fragBullet = artilleryPlasticFrag; fragBullet = artilleryPlasticFrag;
fragBullets = 4; fragBullets = 4;
hitEffect = Fx.plasticExplosion; hitEffect = Fx.plasticExplosion;
frontColor = Palette.plastaniumFront; frontColor = Pal.plastaniumFront;
backColor = Palette.plastaniumBack; backColor = Pal.plastaniumBack;
shootEffect = Fx.shootBig; shootEffect = Fx.shootBig;
}}; }};
@@ -175,8 +175,8 @@ public class Bullets implements ContentList{
}}; }};
missileIncendiary = new MissileBulletType(2f, 12, "missile"){{ missileIncendiary = new MissileBulletType(2f, 12, "missile"){{
frontColor = Palette.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Palette.lightOrange; backColor = Pal.lightOrange;
bulletWidth = 7f; bulletWidth = 7f;
bulletHeight = 8f; bulletHeight = 8f;
bulletShrink = 0f; bulletShrink = 0f;
@@ -216,8 +216,8 @@ public class Bullets implements ContentList{
trailColor = Color.valueOf("b6c6fd"); trailColor = Color.valueOf("b6c6fd");
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
backColor = Palette.bulletYellowBack; backColor = Pal.bulletYellowBack;
frontColor = Palette.bulletYellow; frontColor = Pal.bulletYellow;
weaveScale = 8f; weaveScale = 8f;
weaveMag = 2f; weaveMag = 2f;
}}; }};
@@ -233,8 +233,8 @@ public class Bullets implements ContentList{
splashDamage = 10f; splashDamage = 10f;
lifetime = 120f; lifetime = 120f;
trailColor = Color.GRAY; trailColor = Color.GRAY;
backColor = Palette.bulletYellowBack; backColor = Pal.bulletYellowBack;
frontColor = Palette.bulletYellow; frontColor = Pal.bulletYellow;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
weaveScale = 8f; weaveScale = 8f;
@@ -251,9 +251,9 @@ public class Bullets implements ContentList{
splashDamageRadius = 25f; splashDamageRadius = 25f;
splashDamage = 10f; splashDamage = 10f;
lifetime = 80f; lifetime = 80f;
trailColor = Palette.unitBack; trailColor = Pal.unitBack;
backColor = Palette.unitBack; backColor = Pal.unitBack;
frontColor = Palette.unitFront; frontColor = Pal.unitFront;
hitEffect = Fx.blastExplosion; hitEffect = Fx.blastExplosion;
despawnEffect = Fx.blastExplosion; despawnEffect = Fx.blastExplosion;
weaveScale = 6f; weaveScale = 6f;
@@ -296,8 +296,8 @@ public class Bullets implements ContentList{
standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{ standardIncendiary = new BasicBulletType(3.2f, 11, "bullet"){{
bulletWidth = 10f; bulletWidth = 10f;
bulletHeight = 12f; bulletHeight = 12f;
frontColor = Palette.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Palette.lightOrange; backColor = Pal.lightOrange;
incendSpread = 3f; incendSpread = 3f;
incendAmount = 1; incendAmount = 1;
incendChance = 0.3f; incendChance = 0.3f;
@@ -339,8 +339,8 @@ public class Bullets implements ContentList{
standardIncendiaryBig = new BasicBulletType(7f, 38, "bullet"){{ standardIncendiaryBig = new BasicBulletType(7f, 38, "bullet"){{
bulletWidth = 16f; bulletWidth = 16f;
bulletHeight = 21f; bulletHeight = 21f;
frontColor = Palette.lightishOrange; frontColor = Pal.lightishOrange;
backColor = Palette.lightOrange; backColor = Pal.lightOrange;
incendSpread = 3f; incendSpread = 3f;
incendAmount = 2; incendAmount = 2;
incendChance = 0.3f; incendChance = 0.3f;
@@ -371,7 +371,7 @@ public class Bullets implements ContentList{
@Override @Override
public void draw(Bullet b){ public void draw(Bullet b){
Draw.color(Palette.heal); Draw.color(Pal.heal);
Lines.stroke(2f); Lines.stroke(2f);
Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f); Lines.lineAngleCenter(b.x, b.y, b.rot(), 7f);
Draw.color(Color.WHITE); Draw.color(Color.WHITE);
@@ -385,7 +385,7 @@ public class Bullets implements ContentList{
tile = tile.target(); tile = tile.target();
if(tile != null && tile.getTeam() == b.getTeam() && !(tile.block() instanceof BuildBlock)){ 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()); tile.entity.healBy(healPercent / 100f * tile.entity.maxHealth());
} }
} }
@@ -409,7 +409,7 @@ public class Bullets implements ContentList{
@Override @Override
public void draw(Bullet b){ public void draw(Bullet b){
//TODO add color to the bullet depending on the color of the flame it came from //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()); Fill.circle(b.x, b.y, 3f * b.fout());
Draw.reset(); Draw.reset();
} }
@@ -452,7 +452,7 @@ public class Bullets implements ContentList{
}; };
lancerLaser = new BulletType(0.001f, 140){ 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[] tscales = {1f, 0.7f, 0.5f, 0.2f};
float[] lenscales = {1f, 1.1f, 1.13f, 1.14f}; float[] lenscales = {1f, 1.1f, 1.13f, 1.14f};
float length = 100f; float length = 100f;
@@ -562,7 +562,7 @@ public class Bullets implements ContentList{
@Override @Override
public void draw(Bullet b) { public void draw(Bullet b) {
super.draw(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++){ for(int i = 0; i < 7; i++){
Tmp.v1.trns(b.rot(), i * 8f); Tmp.v1.trns(b.rot(), i * 8f);
float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10); float sl = Mathf.clamp(b.fout()-0.5f) * (80f - i *10);
@@ -614,7 +614,7 @@ public class Bullets implements ContentList{
@Override @Override
public void init(Bullet b){ 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 @Override
public void init(Bullet b){ 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; bulletWidth = 8f;
bulletHeight = 12f; bulletHeight = 12f;
hitEffect = Fx.flakExplosion; hitEffect = Fx.flakExplosion;
backColor = Palette.lightOrange; backColor = Pal.lightOrange;
frontColor = Palette.lightishOrange; frontColor = Pal.lightishOrange;
incendChance = 1f; incendChance = 1f;
incendAmount = 3; incendAmount = 3;
incendSpread = 10f; incendSpread = 10f;

136
core/src/io/anuke/mindustry/content/Fx.java
View File

@@ -12,7 +12,7 @@ import io.anuke.arc.util.Tmp;
import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect; import io.anuke.mindustry.entities.effect.GroundEffectEntity.GroundEffect;
import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.game.ContentList; 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.graphics.Shapes;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -55,21 +55,21 @@ public class Fx implements ContentList{
}); });
placeBlock = new Effect(16, e -> { placeBlock = new Effect(16, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(3f - e.fin() * 2f); Lines.stroke(3f - e.fin() * 2f);
Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f);
Draw.reset(); Draw.reset();
}); });
tapBlock = new Effect(12, e -> { tapBlock = new Effect(12, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(3f - e.fin() * 2f); Lines.stroke(3f - e.fin() * 2f);
Lines.circle(e.x, e.y, 4f + (tilesize / 1.5f * e.rotation) * e.fin()); Lines.circle(e.x, e.y, 4f + (tilesize / 1.5f * e.rotation) * e.fin());
Draw.reset(); Draw.reset();
}); });
breakBlock = new Effect(12, e -> { breakBlock = new Effect(12, e -> {
Draw.color(Palette.remove); Draw.color(Pal.remove);
Lines.stroke(3f - e.fin() * 2f); Lines.stroke(3f - e.fin() * 2f);
Lines.square(e.x, e.y, tilesize / 2f * e.rotation + e.fin() * 3f); 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 -> { select = new Effect(23, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(e.fout() * 3f); Lines.stroke(e.fout() * 3f);
Lines.circle(e.x, e.y, 3f + e.fin() * 14f); Lines.circle(e.x, e.y, 3f + e.fin() * 14f);
Draw.reset(); Draw.reset();
}); });
smoke = new Effect(100, e -> { 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; float size = 7f - e.fin() * 7f;
Draw.rect("circle", e.x, e.y, size, size); Draw.rect("circle", e.x, e.y, size, size);
Draw.reset(); Draw.reset();
@@ -101,7 +101,7 @@ public class Fx implements ContentList{
spawn = new Effect(30, e -> { spawn = new Effect(30, e -> {
Lines.stroke(2f * e.fout()); Lines.stroke(2f * e.fout());
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.poly(e.x, e.y, 4, 5f + e.fin() * 12f); Lines.poly(e.x, e.y, 4, 5f + e.fin() * 12f);
Draw.reset(); Draw.reset();
}); });
@@ -109,13 +109,13 @@ public class Fx implements ContentList{
vtolHover = new Effect(40f, e -> { vtolHover = new Effect(40f, e -> {
float len = e.finpow() * 10f; float len = e.finpow() * 10f;
float ang = e.rotation + Mathf.randomSeedRange(e.id, 30f); 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()); Fill.circle(e.x + Angles.trnsx(ang, len), e.y + Angles.trnsy(ang, len), 2f * e.fout());
Draw.reset(); Draw.reset();
}); });
unitDrop = new GroundEffect(30, e -> { unitDrop = new GroundEffect(30, e -> {
Draw.color(Palette.lightishGray); Draw.color(Pal.lightishGray);
Angles.randLenVectors(e.id, 9, 3 + 20f * e.finpow(), (x, y) -> { Angles.randLenVectors(e.id, 9, 3 + 20f * e.finpow(), (x, y) -> {
Fill.circle(e.x + x, e.y + y, e.fout() * 4f + 0.4f); 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 -> { unitPickup = new GroundEffect(18, e -> {
Draw.color(Palette.lightishGray); Draw.color(Pal.lightishGray);
Lines.stroke(e.fin() * 2f); Lines.stroke(e.fin() * 2f);
Lines.poly(e.x, e.y, 4, 13f * e.fout()); Lines.poly(e.x, e.y, 4, 13f * e.fout());
Draw.reset(); Draw.reset();
}); });
landShock = new GroundEffect(12, e -> { landShock = new GroundEffect(12, e -> {
Draw.color(Palette.lancerLaser); Draw.color(Pal.lancerLaser);
Lines.stroke(e.fout() * 3f); Lines.stroke(e.fout() * 3f);
Lines.poly(e.x, e.y, 12, 20f * e.fout()); Lines.poly(e.x, e.y, 12, 20f * e.fout());
Draw.reset(); Draw.reset();
}); });
pickup = new Effect(18, e -> { pickup = new Effect(18, e -> {
Draw.color(Palette.lightishGray); Draw.color(Pal.lightishGray);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6); Lines.spikes(e.x, e.y, 1f + e.fin() * 6f, e.fout() * 4f, 6);
Draw.reset(); Draw.reset();
}); });
healWave = new Effect(22, e -> { healWave = new Effect(22, e -> {
Draw.color(Palette.heal); Draw.color(Pal.heal);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Lines.poly(e.x, e.y, 30, 4f + e.finpow() * 60f); Lines.poly(e.x, e.y, 30, 4f + e.finpow() * 60f);
Draw.color(); Draw.color();
}); });
heal = new Effect(11, e -> { heal = new Effect(11, e -> {
Draw.color(Palette.heal); Draw.color(Pal.heal);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Lines.poly(e.x, e.y, 10, 2f + e.finpow() * 7f); Lines.poly(e.x, e.y, 10, 2f + e.finpow() * 7f);
Draw.color(); Draw.color();
@@ -167,7 +167,7 @@ public class Fx implements ContentList{
hitBulletSmall = new Effect(14, e -> { 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 -> { e.scaled(7f, s -> {
Lines.stroke(0.5f + s.fout()); Lines.stroke(0.5f + s.fout());
@@ -186,7 +186,7 @@ public class Fx implements ContentList{
}); });
hitFuse = new Effect(14, e -> { 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 -> { e.scaled(7f, s -> {
Lines.stroke(0.5f + s.fout()); Lines.stroke(0.5f + s.fout());
@@ -205,7 +205,7 @@ public class Fx implements ContentList{
}); });
hitBulletBig = new Effect(13, e -> { 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); Lines.stroke(0.5f + e.fout() * 1.5f);
Angles.randLenVectors(e.id, 8, e.finpow() * 30f, e.rotation, 50f, (x, y) -> { 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 -> { 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()); Lines.stroke(0.5f + e.fout());
Angles.randLenVectors(e.id, 5, e.fin() * 15f, e.rotation, 50f, (x, y) -> { 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 -> { hitMeltdown = new Effect(12, e -> {
Draw.color(Palette.meltdownHit); Draw.color(Pal.meltdownHit);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Angles.randLenVectors(e.id, 6, e.finpow() * 18f, e.rotation, 360f, (x, y) -> { 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 -> { 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.stroke(0.5f + e.fout());
Lines.circle(e.x, e.y, e.fin()*5f); Lines.circle(e.x, e.y, e.fin()*5f);
Draw.reset(); Draw.reset();
}); });
despawn = new Effect(12, e -> { 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()); Lines.stroke(e.fout());
Angles.randLenVectors(e.id, 7, e.fin() * 7f, e.rotation, 40f, (x, y) -> { 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 -> { flakExplosion = new Effect(20, e -> {
Draw.color(Palette.bulletYellow); Draw.color(Pal.bulletYellow);
e.scaled(6, i -> { e.scaled(6, i -> {
Lines.stroke(3f * i.fout()); Lines.stroke(3f * i.fout());
Lines.circle(e.x, e.y, 3f + i.fin() * 10f); 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); 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()); Lines.stroke(1f * e.fout());
Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { 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 -> { plasticExplosion = new Effect(24, e -> {
Draw.color(Palette.plastaniumFront); Draw.color(Pal.plastaniumFront);
e.scaled(7, i -> { e.scaled(7, i -> {
Lines.stroke(3f * i.fout()); Lines.stroke(3f * i.fout());
Lines.circle(e.x, e.y, 3f + i.fin() * 24f); 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); 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()); Lines.stroke(1f * e.fout());
Angles.randLenVectors(e.id + 1, 4, 1f + 25f * e.finpow(), (x, y) -> { 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 -> { plasticExplosionFlak = new Effect(28, e -> {
Draw.color(Palette.plastaniumFront); Draw.color(Pal.plastaniumFront);
e.scaled(7, i -> { e.scaled(7, i -> {
Lines.stroke(3f * i.fout()); Lines.stroke(3f * i.fout());
Lines.circle(e.x, e.y, 3f + i.fin() * 34f); 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); 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()); Lines.stroke(1f * e.fout());
Angles.randLenVectors(e.id + 1, 4, 1f + 30f * e.finpow(), (x, y) -> { 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 -> { blastExplosion = new Effect(22, e -> {
Draw.color(Palette.missileYellow); Draw.color(Pal.missileYellow);
e.scaled(6, i -> { e.scaled(6, i -> {
Lines.stroke(3f * i.fout()); Lines.stroke(3f * i.fout());
Lines.circle(e.x, e.y, 3f + i.fin() * 15f); 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); 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()); Lines.stroke(1f * e.fout());
Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { 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 -> { incendTrail = new Effect(50, e -> {
Draw.color(Palette.lightOrange); Draw.color(Pal.lightOrange);
Fill.circle(e.x, e.y, e.rotation * e.fout()); Fill.circle(e.x, e.y, e.rotation * e.fout());
Draw.reset(); Draw.reset();
}); });
@@ -396,7 +396,7 @@ public class Fx implements ContentList{
}); });
absorb = new Effect(12, e -> { absorb = new Effect(12, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(2f * e.fout()); Lines.stroke(2f * e.fout());
Lines.circle(e.x, e.y, 5f * e.fout()); Lines.circle(e.x, e.y, 5f * e.fout());
Draw.reset(); Draw.reset();
@@ -404,7 +404,7 @@ public class Fx implements ContentList{
flakExplosionBig = new Effect(30, e -> { flakExplosionBig = new Effect(30, e -> {
Draw.color(Palette.bulletYellowBack); Draw.color(Pal.bulletYellowBack);
e.scaled(6, i -> { e.scaled(6, i -> {
Lines.stroke(3f * i.fout()); Lines.stroke(3f * i.fout());
Lines.circle(e.x, e.y, 3f + i.fin() * 25f); 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); 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()); Lines.stroke(1f * e.fout());
Angles.randLenVectors(e.id + 1, 4, 1f + 23f * e.finpow(), (x, y) -> { 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 -> { 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) -> { 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); 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 -> { 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) -> { 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); 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 -> { 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) -> { 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); 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 -> { overdriven = new Effect(20f, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Angles.randLenVectors(e.id, 2, 1f + e.fin() * 2f, (x, y) -> { 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); 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); 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()); Lines.stroke(1.5f * e.fout());
Angles.randLenVectors(e.id + 1, 8, 1f + 23f * e.finpow(), (x, y) -> { 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); 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()); Lines.stroke(1.7f * e.fout());
Angles.randLenVectors(e.id + 1, 9, 1f + 23f * e.finpow(), (x, y) -> { 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 -> { 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(); 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, 15f * e.fout(), e.rotation);
Shapes.tri(e.x, e.y, w, 3f * e.fout(), e.rotation + 180f); 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 -> { shootHeal = new Effect(8, e -> {
Draw.color(Palette.heal); Draw.color(Pal.heal);
float w = 1f + 5 * e.fout(); 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, 17f * e.fout(), e.rotation);
Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); 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 -> { 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) -> { 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); 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 -> { 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(); 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, 25f * e.fout(), e.rotation);
Shapes.tri(e.x, e.y, w, 4f * e.fout(), e.rotation + 180f); 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 -> { 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(); 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, 29f * e.fout(), e.rotation);
Shapes.tri(e.x, e.y, w, 5f * e.fout(), e.rotation + 180f); 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 -> { 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) -> { 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); 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 -> { 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) -> { 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); 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 -> { 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) -> { 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); 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 -> { 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; float rot = Math.abs(e.rotation) + 90f;
int i = Mathf.sign(e.rotation); int i = Mathf.sign(e.rotation);
@@ -729,7 +729,7 @@ public class Fx implements ContentList{
}); });
shellEjectMedium = new GroundEffect(34f, 400f, e -> { 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; float rot = e.rotation + 90f;
for(int i : Mathf.signs){ for(int i : Mathf.signs){
float len = (2f + e.finpow() * 10f) * i; float len = (2f + e.finpow() * 10f) * i;
@@ -752,7 +752,7 @@ public class Fx implements ContentList{
}); });
shellEjectBig = new GroundEffect(22f, 400f, e -> { 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; float rot = e.rotation + 90f;
for(int i : Mathf.signs){ for(int i : Mathf.signs){
float len = (4f + e.finpow() * 8f) * i; float len = (4f + e.finpow() * 8f) * i;
@@ -776,7 +776,7 @@ public class Fx implements ContentList{
}); });
lancerLaserShoot = new Effect(21f, e -> { lancerLaserShoot = new Effect(21f, e -> {
Draw.color(Palette.lancerLaser); Draw.color(Pal.lancerLaser);
for(int i : Mathf.signs){ for(int i : Mathf.signs){
Shapes.tri(e.x, e.y, 4f * e.fout(), 29f, e.rotation + 90f * i); 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 -> { lancerLaserShootSmoke = new Effect(26f, e -> {
Draw.color(Palette.lancerLaser); Draw.color(Pal.lancerLaser);
Angles.randLenVectors(e.id, 7, 80f, e.rotation, 0f, (x, y) -> { 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); 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 -> { 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) -> { 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); 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 -> { lancerLaserChargeBegin = new Effect(71f, e -> {
Draw.color(Palette.lancerLaser); Draw.color(Pal.lancerLaser);
Fill.circle(e.x, e.y, e.fin() * 3f); Fill.circle(e.x, e.y, e.fin() * 3f);
Draw.color(); Draw.color();
@@ -814,7 +814,7 @@ public class Fx implements ContentList{
}); });
lightningCharge = new Effect(38f, e -> { 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) -> { 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)); 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 -> { 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); Lines.stroke(e.fout() * 1.2f + 0.5f);
Angles.randLenVectors(e.id, 7, 25f * e.finpow(), e.rotation, 50f, (x, y) -> { 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 -> { redgeneratespark = new Effect(18, e -> {
Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
float len = e.fout() * 4f; 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.rect("circle", e.x + x, e.y + y, len, len);
Draw.reset(); Draw.reset();
}); });
@@ -870,7 +870,7 @@ public class Fx implements ContentList{
generatespark = new Effect(18, e -> { generatespark = new Effect(18, e -> {
Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> { Angles.randLenVectors(e.id, 5, e.fin() * 8f, (x, y) -> {
float len = e.fout() * 4f; 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.rect("circle", e.x + x, e.y + y, len, len);
Draw.reset(); Draw.reset();
}); });
@@ -892,42 +892,42 @@ public class Fx implements ContentList{
}); });
pulverize = new Effect(40, e -> { pulverize = new Effect(40, e -> {
Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
Draw.reset(); Draw.reset();
}); });
}); });
pulverizeRed = new Effect(40, e -> { pulverizeRed = new Effect(40, e -> {
Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, e.fout() * 2f + 0.5f, 45);
Draw.reset(); Draw.reset();
}); });
}); });
pulverizeRedder = new Effect(40, e -> { pulverizeRedder = new Effect(40, e -> {
Angles.randLenVectors(e.id, 5, 3f + e.fin() * 9f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, e.fout() * 2.5f + 0.5f, 45);
Draw.reset(); Draw.reset();
}); });
}); });
pulverizeSmall = new Effect(30, e -> { pulverizeSmall = new Effect(30, e -> {
Angles.randLenVectors(e.id, 3, e.fin() * 5f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45);
Draw.reset(); Draw.reset();
}); });
}); });
pulverizeMedium = new Effect(30, e -> { pulverizeMedium = new Effect(30, e -> {
Angles.randLenVectors(e.id, 5, 3f + e.fin() * 8f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, e.fout() * 1f + 0.5f, 45);
Draw.reset(); Draw.reset();
}); });
}); });
producesmoke = new Effect(12, e -> { producesmoke = new Effect(12, e -> {
Angles.randLenVectors(e.id, 8, 4f + e.fin() * 18f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, 1f + e.fout() * 3f, 45);
Draw.reset(); Draw.reset();
}); });
@@ -941,7 +941,7 @@ public class Fx implements ContentList{
}); });
formsmoke = new Effect(40, e -> { formsmoke = new Effect(40, e -> {
Angles.randLenVectors(e.id, 6, 5f + e.fin() * 8f, (x, y) -> { 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); Fill.square(e.x + x, e.y + y, 0.2f + e.fout() * 2f, 45);
Draw.reset(); Draw.reset();
}); });
@@ -1089,7 +1089,7 @@ public class Fx implements ContentList{
}); });
launch = new Effect(28, e -> { launch = new Effect(28, e -> {
Draw.color(Palette.command); Draw.color(Pal.command);
Lines.stroke(e.fout() * 2f); Lines.stroke(e.fout() * 2f);
Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f); Lines.poly(e.x, e.y, 40, 4f + e.finpow() * 120f);
Draw.color(); Draw.color();
@@ -1110,7 +1110,7 @@ public class Fx implements ContentList{
}); });
healBlock = new Effect(20, e -> { healBlock = new Effect(20, e -> {
Draw.color(Palette.heal); Draw.color(Pal.heal);
Lines.stroke(2f * e.fout() + 0.5f); Lines.stroke(2f * e.fout() + 0.5f);
Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f)); Lines.square(e.x, e.y, 1f + (e.fin() * e.rotation * tilesize/2f-1f));
Draw.color(); Draw.color();
@@ -1131,7 +1131,7 @@ public class Fx implements ContentList{
}); });
shieldBreak = new Effect(40, e -> { shieldBreak = new Effect(40, e -> {
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(3f * e.fout()); Lines.stroke(3f * e.fout());
Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90); Lines.poly(e.x, e.y, 6, e.rotation + e.fin(), 90);
Draw.reset(); Draw.reset();

16
core/src/io/anuke/mindustry/content/Mechs.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.game.ContentList; 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.graphics.Shaders;
import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.type.Weapon; import io.anuke.mindustry.type.Weapon;
@@ -85,7 +85,7 @@ public class Mechs implements ContentList{
Effects.shake(1f, 1f, player); Effects.shake(1f, 1f, player);
Effects.effect(Fx.landShock, player); Effects.effect(Fx.landShock, player);
for(int i = 0; i < 8; i++){ 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; boostSpeed = 0.8f;
canHeal = true; canHeal = true;
health = 200f; health = 200f;
engineColor = Palette.heal; engineColor = Pal.heal;
weapon = new Weapon("heal-blaster"){{ weapon = new Weapon("heal-blaster"){{
length = 1.5f; length = 1.5f;
@@ -210,7 +210,7 @@ public class Mechs implements ContentList{
Shaders.build.progress = player.shootHeat; Shaders.build.progress = player.shootHeat;
Shaders.build.region = armorRegion; Shaders.build.region = armorRegion;
Shaders.build.time = Time.time() / 10f; 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.shader(Shaders.build);
Draw.alpha(1f); Draw.alpha(1f);
Draw.rect(armorRegion, player.x, player.y, player.rotation); Draw.rect(armorRegion, player.x, player.y, player.rotation);
@@ -228,7 +228,7 @@ public class Mechs implements ContentList{
health = 180f; health = 180f;
weaponOffsetX = -1; weaponOffsetX = -1;
weaponOffsetY = -1; weaponOffsetY = -1;
engineColor = Palette.lightTrail; engineColor = Pal.lightTrail;
cellTrnsY = 1f; cellTrnsY = 1f;
weapon = new Weapon("blaster"){{ weapon = new Weapon("blaster"){{
length = 1.5f; length = 1.5f;
@@ -285,8 +285,8 @@ public class Mechs implements ContentList{
public void updateAlt(Player player){ public void updateAlt(Player player){
float scl = scld(player); float scl = scld(player);
if(Mathf.chance(Time.delta() * (0.15*scl))){ if(Mathf.chance(Time.delta() * (0.15*scl))){
Effects.effect(Fx.hitLancer, Palette.lancerLaser, player.x, player.y); Effects.effect(Fx.hitLancer, Pal.lancerLaser, player.x, player.y);
Lightning.create(player.getTeam(), Palette.lancerLaser, 10f, Lightning.create(player.getTeam(), Pal.lancerLaser, 10f,
player.x + player.velocity().x, player.y + player.velocity().y, player.rotation, 14); 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; if(scl < 0.01f) return;
float alpha = Draw.getColor().a; float alpha = Draw.getColor().a;
Draw.shader(); Draw.shader();
Draw.color(Palette.lancerLaser); Draw.color(Pal.lancerLaser);
Draw.alpha(scl/2f); Draw.alpha(scl/2f);
Draw.blend(Blending.additive); Draw.blend(Blending.additive);
Draw.rect(shield, player.x + Mathf.range(scl/2f), player.y + Mathf.range(scl/2f), player.rotation - 90); Draw.rect(shield, player.x + Mathf.range(scl/2f), player.y + Mathf.range(scl/2f), player.rotation - 90);

2
core/src/io/anuke/mindustry/core/Renderer.java
View File

@@ -215,7 +215,7 @@ public class Renderer implements ApplicationListener{
Draw.flush(); Draw.flush();
shieldBuffer.end(); shieldBuffer.end();
Draw.shader(Shaders.shield); 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.rect(Draw.wrap(shieldBuffer.getTexture()), camera.position.x, camera.position.y, camera.width, -camera.height);
Draw.color(); Draw.color();
Draw.shader(); Draw.shader();

4
core/src/io/anuke/mindustry/core/UI.java
View File

@@ -28,7 +28,7 @@ import io.anuke.arc.util.Strings;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.mindustry.editor.MapEditorDialog; import io.anuke.mindustry.editor.MapEditorDialog;
import io.anuke.mindustry.game.EventType.ResizeEvent; 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.dialogs.*;
import io.anuke.mindustry.ui.fragments.*; 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.")); 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(); loadCursors();
} }

8
core/src/io/anuke/mindustry/editor/MapView.java
View File

@@ -19,7 +19,7 @@ import io.anuke.arc.scene.ui.TextField;
import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.util.Tmp; import io.anuke.arc.util.Tmp;
import io.anuke.mindustry.editor.DrawOperation.TileOperation; 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.input.Binding;
import io.anuke.mindustry.ui.GridImage; import io.anuke.mindustry.ui.GridImage;
@@ -299,7 +299,7 @@ public class MapView extends Element implements GestureListener{
return; return;
} }
Draw.color(Palette.remove); Draw.color(Pal.remove);
Lines.stroke(2f); Lines.stroke(2f);
Lines.rect(centerx - sclwidth / 2 - 1, centery - sclheight / 2 - 1, sclwidth + 2, sclheight + 2); 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); 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(); float scaling = zoom * Math.min(width, height) / editor.getMap().width();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(Unit.dp.scl(2f)); Lines.stroke(Unit.dp.scl(2f));
if((!editor.getDrawBlock().isMultiblock() || tool == EditorTool.eraser) && tool != EditorTool.fill){ 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.stroke(Unit.dp.scl(3f));
Lines.rect(x, y, width, height); Lines.rect(x, y, width, height);
Draw.reset(); Draw.reset();

4
core/src/io/anuke/mindustry/entities/Damage.java
View File

@@ -17,7 +17,7 @@ import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call; 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 io.anuke.mindustry.world.Tile;
import static io.anuke.mindustry.Vars.*; 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){ 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++){ for(int i = 0; i < Mathf.clamp(power / 20, 0, 6); i++){
int branches = 5 + Mathf.clamp((int) (power / 30), 1, 20); 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))); x, y, Mathf.random(360f), branches + Mathf.range(2)));
} }

6
core/src/io/anuke/mindustry/entities/bullet/BasicBulletType.java
View File

@@ -11,11 +11,11 @@ import io.anuke.mindustry.entities.Effects;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.entities.traits.TargetTrait; 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.*/ /**An extended BulletType for most ammo-based bullets shot from turrets and units.*/
public class BasicBulletType extends BulletType{ 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 bulletWidth = 5f, bulletHeight = 7f;
public float bulletShrink = 0.5f; public float bulletShrink = 0.5f;
public String bulletSprite; public String bulletSprite;
@@ -107,7 +107,7 @@ public class BasicBulletType extends BulletType{
} }
for (int i = 0; i < lightining; i++) { 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);
} }
} }
} }

6
core/src/io/anuke/mindustry/entities/bullet/MassDriverBolt.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Draw;
import io.anuke.arc.math.Angles; import io.anuke.arc.math.Angles;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.content.Fx; 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 io.anuke.mindustry.world.blocks.distribution.MassDriver.DriverBulletData;
import static io.anuke.mindustry.Vars.content; import static io.anuke.mindustry.Vars.content;
@@ -26,10 +26,10 @@ public class MassDriverBolt extends BulletType{
public void draw(Bullet b){ public void draw(Bullet b){
float w = 11f, h = 13f; 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.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.rect("shell", b.x, b.y, w, h, b.rot() + 90);
Draw.reset(); Draw.reset();

8
core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
View File

@@ -2,21 +2,21 @@ package io.anuke.mindustry.entities.bullet;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.content.Fx; 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.mindustry.entities.Effects;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
public class MissileBulletType extends BasicBulletType{ public class MissileBulletType extends BasicBulletType{
protected Color trailColor = Palette.missileYellowBack; protected Color trailColor = Pal.missileYellowBack;
protected float weaveScale = 0f; protected float weaveScale = 0f;
protected float weaveMag = -1f; protected float weaveMag = -1f;
public MissileBulletType(float speed, float damage, String bulletSprite){ public MissileBulletType(float speed, float damage, String bulletSprite){
super(speed, damage, bulletSprite); super(speed, damage, bulletSprite);
backColor = Palette.missileYellowBack; backColor = Pal.missileYellowBack;
frontColor = Palette.missileYellow; frontColor = Pal.missileYellow;
homingPower = 7f; homingPower = 7f;
} }

4
core/src/io/anuke/mindustry/entities/effect/ItemTransfer.java
View File

@@ -15,7 +15,7 @@ import io.anuke.arc.math.geom.Vector2;
import io.anuke.arc.util.Time; import io.anuke.arc.util.Time;
import io.anuke.arc.util.pooling.Pools; import io.anuke.arc.util.pooling.Pools;
import io.anuke.mindustry.entities.type.Unit; 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.type.Item;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -105,7 +105,7 @@ public class ItemTransfer extends TimedEntity implements DrawTrait{
@Override @Override
public void draw(){ public void draw(){
Lines.stroke(fslope() * 2f, Palette.accent); Lines.stroke(fslope() * 2f, Pal.accent);
Lines.circle(x, y, fslope() * 2f); Lines.circle(x, y, fslope() * 2f);

6
core/src/io/anuke/mindustry/entities/effect/Lightning.java
View File

@@ -27,7 +27,7 @@ import io.anuke.mindustry.entities.bullet.Bullet;
import io.anuke.mindustry.entities.traits.SyncTrait; import io.anuke.mindustry.entities.traits.SyncTrait;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call; 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.DataInput;
import java.io.DataOutput; import java.io.DataOutput;
@@ -46,7 +46,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
private static int lastSeed = 0; private static int lastSeed = 0;
private Array<Position> lines = new Array<>(); private Array<Position> lines = new Array<>();
private Color color = Palette.lancerLaser; private Color color = Pal.lancerLaser;
/**For pooling use only. Do not call directly!*/ /**For pooling use only. Do not call directly!*/
public Lightning(){ public Lightning(){
@@ -119,7 +119,7 @@ public class Lightning extends TimedEntity implements DrawTrait, SyncTrait, Time
@Override @Override
public void reset(){ public void reset(){
super.reset(); super.reset();
color = Palette.lancerLaser; color = Pal.lancerLaser;
lines.clear(); lines.clear();
} }

6
core/src/io/anuke/mindustry/entities/traits/BuilderTrait.java
View File

@@ -21,7 +21,7 @@ import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.game.EventType.BuildSelectEvent; import io.anuke.mindustry.game.EventType.BuildSelectEvent;
import io.anuke.mindustry.gen.Call; 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.graphics.Shapes;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -315,7 +315,7 @@ public interface BuilderTrait extends Entity, TeamTrait{
return; return;
} }
Lines.stroke(1f, Palette.accent); Lines.stroke(1f, Pal.accent);
float focusLen = 3.8f + Mathf.absin(Time.time(), 1.1f, 0.6f); float focusLen = 3.8f + Mathf.absin(Time.time(), 1.1f, 0.6f);
float px = unit.x + Angles.trnsx(unit.rotation, focusLen); float px = unit.x + Angles.trnsx(unit.rotation, focusLen);
float py = unit.y + Angles.trnsy(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); Shapes.laser("minelaser", "minelaser-end", px, py, ex, ey);
if(unit instanceof Player && ((Player) unit).isLocal){ 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()); Lines.poly(tile.worldx(), tile.worldy(), 4, tilesize / 2f * Mathf.sqrt2, Time.time());
} }

4
core/src/io/anuke/mindustry/entities/type/FlyingUnit.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.Predict;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.entities.units.UnitState; 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.graphics.Shaders;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -171,7 +171,7 @@ public abstract class FlyingUnit extends BaseUnit{
} }
public void drawEngine(){ 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), 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)); type.engineSize + Mathf.absin(Time.time(), 2f, type.engineSize/4f));

10
core/src/io/anuke/mindustry/entities/type/Player.java
View File

@@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.traits.SpawnerTrait;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call; 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.graphics.Shaders;
import io.anuke.mindustry.input.Binding; import io.anuke.mindustry.input.Binding;
import io.anuke.mindustry.io.TypeIO; 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(); Block block = world.tile(request.x, request.y).target().block();
//draw removal request //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; float rad = Mathf.absin(Time.time(), 7f, 1f) + block.size * tilesize / 2f - 1;
Lines.square( Lines.square(
@@ -428,7 +428,7 @@ public class Player extends Unit implements BuilderTrait, ShooterTrait{
request.y * tilesize + block.offset() - 1, request.y * tilesize + block.offset() - 1,
rad); rad);
Draw.color(Palette.remove); Draw.color(Pal.remove);
Lines.square( Lines.square(
request.x * tilesize + block.offset(), 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; float rad = Mathf.absin(Time.time(), 7f, 1f) - 1.5f + request.block.size * tilesize / 2f;
//draw place request //draw place request
Lines.stroke(1f, Palette.accentBack); Lines.stroke(1f, Pal.accentBack);
Lines.square( Lines.square(
request.x * tilesize + request.block.offset(), 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); request.y * tilesize + request.block.offset(), rad*2, rad*2, request.rotation * 90);
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.square( Lines.square(
request.x * tilesize + request.block.offset(), request.x * tilesize + request.block.offset(),

4
core/src/io/anuke/mindustry/entities/type/Unit.java
View File

@@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.units.Statuses;
import io.anuke.mindustry.game.EventType.UnitDestroyEvent; import io.anuke.mindustry.game.EventType.UnitDestroyEvent;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.Teams.TeamData; 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.Interpolator;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -113,7 +113,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ
public void onDeath(){ public void onDeath(){
float explosiveness = 2f + item.item.explosiveness * item.amount; float explosiveness = 2f + item.item.explosiveness * item.amount;
float flammability = item.item.flammability * 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); ScorchDecal.create(x, y);
Effects.effect(Fx.explosion, this); Effects.effect(Fx.explosion, this);

8
core/src/io/anuke/mindustry/graphics/OverlayRenderer.java
View File

@@ -28,7 +28,7 @@ public class OverlayRenderer{
if(!input.isDrawing() || player.isDead()) continue; if(!input.isDrawing() || player.isDead()) continue;
Shaders.outline.color.set(Palette.accent); Shaders.outline.color.set(Pal.accent);
//TODO draw outlined version //TODO draw outlined version
//Graphics.beginShaders(Shaders.outline); //Graphics.beginShaders(Shaders.outline);
@@ -79,7 +79,7 @@ public class OverlayRenderer{
if(dst < state.rules.enemyCoreBuildRadius * 1.5f){ if(dst < state.rules.enemyCoreBuildRadius * 1.5f){
Draw.color(Color.DARK_GRAY); Draw.color(Color.DARK_GRAY);
Lines.poly(core.drawx(), core.drawy() - 2, 200, state.rules.enemyCoreBuildRadius); 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); 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()); Vector2 v = Core.input.mouseWorld(input.getMouseX(), input.getMouseY());
float size = 8; float size = 8;
Draw.rect(player.item().item.region, v.x, v.y, size, size); 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)); Lines.circle(v.x, v.y, 6 + Mathf.absin(Time.time(), 5f, 1f));
Draw.reset(); Draw.reset();
Tile tile = world.tileWorld(v.x, v.y); Tile tile = world.tileWorld(v.x, v.y);
if(tile != null) tile = tile.target(); 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){ 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)); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1 + Mathf.absin(Time.time(), 5f, 1f));
Draw.color(); Draw.color();
} }

2
core/src/io/anuke/mindustry/graphics/Palette.java → core/src/io/anuke/mindustry/graphics/Pal.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.graphics;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
public class Palette{ public class Pal{
public static final Color public static final Color
command = Color.valueOf("eab678"), command = Color.valueOf("eab678"),

22
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -10,7 +10,7 @@ import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.content.Blocks; import io.anuke.mindustry.content.Blocks;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.type.Player; 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.NormalizeDrawResult;
import io.anuke.mindustry.input.PlaceUtils.NormalizeResult; import io.anuke.mindustry.input.PlaceUtils.NormalizeResult;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
@@ -51,9 +51,9 @@ public class DesktopInput extends InputHandler{
region.getWidth() * selectScale * Draw.scl, region.getWidth() * selectScale * Draw.scl,
region.getHeight() * selectScale * Draw.scl, block.rotate ? rotation * 90 : 0); region.getHeight() * selectScale * Draw.scl, block.rotate ? rotation * 90 : 0);
}else{ }else{
Draw.color(Palette.removeBack); Draw.color(Pal.removeBack);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f); 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); 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()); int y = selectY + i * Mathf.sign(cursorY - selectY) * Mathf.num(!result.isX());
if(i + block.size > result.getLength() && block.rotate){ 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"), Draw.rect(Core.atlas.find("place-arrow"),
x * tilesize + block.offset(), x * tilesize + block.offset(),
y * tilesize + block.offset() - 1, y * tilesize + block.offset() - 1,
Core.atlas.find("place-arrow").getWidth() * Draw.scl, Core.atlas.find("place-arrow").getWidth() * Draw.scl,
Core.atlas.find("place-arrow").getHeight() * Draw.scl, result.rotation * 90 - 90); 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"), Draw.rect(Core.atlas.find("place-arrow"),
x * tilesize + block.offset(), x * tilesize + block.offset(),
y * 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; if(tile == null || !validBreak(tile.x, tile.y)) continue;
tile = tile.target(); tile = tile.target();
Draw.color(Palette.removeBack); Draw.color(Pal.removeBack);
Lines.square(tile.drawx(), tile.drawy()-1, tile.block().size * tilesize / 2f - 1); 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); 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); 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); Lines.rect(result.x, result.y, result.x2 - result.x, result.y2 - result.y);
}else if(isPlacing()){ }else if(isPlacing()){
if(block.rotate){ 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"), Draw.rect(Core.atlas.find("place-arrow"),
cursorX * tilesize + block.offset(), cursorX * tilesize + block.offset(),
cursorY * tilesize + block.offset() - 1, cursorY * tilesize + block.offset() - 1,
Core.atlas.find("place-arrow").getWidth() * Draw.scl, Core.atlas.find("place-arrow").getWidth() * Draw.scl,
Core.atlas.find("place-arrow").getHeight() * Draw.scl, rotation * 90 - 90); 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"), Draw.rect(Core.atlas.find("place-arrow"),
cursorX * tilesize + block.offset(), cursorX * tilesize + block.offset(),
cursorY * tilesize + block.offset(), cursorY * tilesize + block.offset(),

28
core/src/io/anuke/mindustry/input/MobileInput.java
View File

@@ -26,7 +26,7 @@ import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit; 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.graphics.Shaders;
import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult; import io.anuke.mindustry.input.PlaceUtils.NormalizeDrawResult;
import io.anuke.mindustry.input.PlaceUtils.NormalizeResult; 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); TextureRegion region = request.block.icon(Icon.full);
Draw.alpha(Mathf.clamp((1f - request.scale) / 0.5f)); 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, Draw.rect(region, tile.worldx() + offset, tile.worldy() + offset,
region.getWidth() * request.scale * Draw.scl, 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; float rad = (tile.block().size * tilesize / 2f - 1) * request.scale;
Draw.alpha(0f); Draw.alpha(0f);
//draw removing request //draw removing request
Draw.tint(Palette.removeBack); Draw.tint(Pal.removeBack);
Lines.square(tile.drawx(), tile.drawy()-1, rad); Lines.square(tile.drawx(), tile.drawy()-1, rad);
Draw.tint(Palette.remove); Draw.tint(Pal.remove);
Lines.square(tile.drawx(), tile.drawy(), rad); Lines.square(tile.drawx(), tile.drawy(), rad);
} }
} }
@@ -213,7 +213,7 @@ public class MobileInput extends InputHandler implements GestureListener{
@Override @Override
public void buildUI(Table table){ 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.row();
table.left().margin(0f).defaults().size(48f); table.left().margin(0f).defaults().size(48f);
@@ -277,7 +277,7 @@ public class MobileInput extends InputHandler implements GestureListener{
public void drawOutlined(){ public void drawOutlined(){
Lines.stroke(1f); Lines.stroke(1f);
Shaders.mix.color.set(Palette.accent); Shaders.mix.color.set(Pal.accent);
Draw.shader(Shaders.mix); Draw.shader(Shaders.mix);
//draw removals //draw removals
@@ -318,7 +318,7 @@ public class MobileInput extends InputHandler implements GestureListener{
Draw.shader(); Draw.shader();
Draw.color(Palette.accent); Draw.color(Pal.accent);
//Draw lines //Draw lines
if(lineMode){ if(lineMode){
@@ -348,9 +348,9 @@ public class MobileInput extends InputHandler implements GestureListener{
region.getHeight() * lineScale * Draw.scl, region.getHeight() * lineScale * Draw.scl,
block.rotate ? result.rotation * 90 : 0); block.rotate ? result.rotation * 90 : 0);
}else{ }else{
Draw.color(Palette.removeBack); Draw.color(Pal.removeBack);
Lines.square(x * tilesize + block.offset(), y * tilesize + block.offset() - 1, block.size * tilesize / 2f); 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); 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; if(other == null || !validBreak(other.x, other.y)) continue;
other = other.target(); other = other.target();
Draw.color(Palette.removeBack); Draw.color(Pal.removeBack);
Lines.square(other.drawx(), other.drawy()-1, other.block().size * tilesize / 2f - 1); 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); 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); 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); 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); crosshairScale = Mathf.lerpDelta(crosshairScale, 1f, 0.2f);
Draw.color(Palette.remove); Draw.color(Pal.remove);
Lines.stroke(1f); Lines.stroke(1f);
float radius = Interpolation.swingIn.apply(crosshairScale); float radius = Interpolation.swingIn.apply(crosshairScale);

4
core/src/io/anuke/mindustry/type/Item.java
View File

@@ -9,7 +9,7 @@ import io.anuke.arc.util.Log;
import io.anuke.arc.util.Strings; import io.anuke.arc.util.Strings;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.ui.ContentDisplay; import io.anuke.mindustry.ui.ContentDisplay;
public class Item extends UnlockableContent implements Comparable<Item>{ public class Item extends UnlockableContent implements Comparable<Item>{
@@ -29,7 +29,7 @@ public class Item extends UnlockableContent implements Comparable<Item>{
/**drill hardness of the item*/ /**drill hardness of the item*/
public int hardness = 0; public int hardness = 0;
/**the burning color of this item. TODO unused; implement*/ /**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 * base material cost of this item, used for calculating place times
* 1 cost = 1 tick added to build time * 1 cost = 1 tick added to build time

4
core/src/io/anuke/mindustry/type/Mech.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Pal;
import io.anuke.mindustry.ui.ContentDisplay; import io.anuke.mindustry.ui.ContentDisplay;
public class Mech extends UnlockableContent{ public class Mech extends UnlockableContent{
@@ -27,7 +27,7 @@ public class Mech extends UnlockableContent{
public float mineSpeed = 1f; public float mineSpeed = 1f;
public int drillPower = -1; public int drillPower = -1;
public float buildPower = 1f; public float buildPower = 1f;
public Color engineColor = Palette.boostTo; public Color engineColor = Pal.boostTo;
public int itemCapacity = 30; public int itemCapacity = 30;
public boolean turnCursor = true; public boolean turnCursor = true;
public boolean canHeal = false; public boolean canHeal = false;

4
core/src/io/anuke/mindustry/ui/BorderImage.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.ui;
import io.anuke.arc.graphics.Texture; import io.anuke.arc.graphics.Texture;
import io.anuke.arc.graphics.g2d.TextureRegion; 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.Draw;
import io.anuke.arc.graphics.g2d.Lines; import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.Image;
@@ -36,7 +36,7 @@ public class BorderImage extends Image{
float scaleX = getScaleX(); float scaleX = getScaleX();
float scaleY = getScaleY(); float scaleY = getScaleY();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(Unit.dp.scl(thickness)); Lines.stroke(Unit.dp.scl(thickness));
Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY); Lines.rect(x + imageX, y + imageY, imageWidth * scaleX, imageHeight * scaleY);
Draw.reset(); Draw.reset();

4
core/src/io/anuke/mindustry/ui/ContentDisplay.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Strings; import io.anuke.arc.util.Strings;
import io.anuke.mindustry.type.UnitType; 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.Item;
import io.anuke.mindustry.type.Liquid; import io.anuke.mindustry.type.Liquid;
import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Mech;
@@ -49,7 +49,7 @@ public class ContentDisplay{
if(map.size == 0) continue; 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(); table.row();
for(BlockStat stat : map.keys()){ for(BlockStat stat : map.keys()){

3
core/src/io/anuke/mindustry/ui/ItemsDisplay.java
View File

@@ -1,6 +1,7 @@
package io.anuke.mindustry.ui; package io.anuke.mindustry.ui;
import io.anuke.arc.collection.ObjectIntMap; import io.anuke.arc.collection.ObjectIntMap;
import io.anuke.arc.graphics.Color;
import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
import io.anuke.mindustry.type.ItemType; import io.anuke.mindustry.type.ItemType;
@@ -29,7 +30,7 @@ public class ItemsDisplay extends Table{
if(item.type == ItemType.material && data.isUnlocked(item)){ if(item.type == ItemType.material && data.isUnlocked(item)){
t.label(() -> format.format(items.get(item, 0))).left(); t.label(() -> format.format(items.get(item, 0))).left();
t.addImage(item.region).size(8*3).padLeft(4).padRight(4); 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(); t.row();
} }
} }

4
core/src/io/anuke/mindustry/ui/dialogs/AboutDialog.java
View File

@@ -4,7 +4,7 @@ import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.arc.collection.Array; import io.anuke.arc.collection.Array;
import io.anuke.arc.collection.ObjectSet; 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;
import io.anuke.mindustry.io.Contributors.Contributor; import io.anuke.mindustry.io.Contributors.Contributor;
import io.anuke.mindustry.ui.Links; import io.anuke.mindustry.ui.Links;
@@ -103,7 +103,7 @@ public class AboutDialog extends FloatingDialog{
dialog.cont.add("$credits.text"); dialog.cont.add("$credits.text");
dialog.cont.row(); dialog.cont.row();
if(!contributors.isEmpty()){ 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.row();
dialog.cont.add("$contributors"); dialog.cont.add("$contributors");
dialog.cont.row(); dialog.cont.row();

4
core/src/io/anuke/mindustry/ui/dialogs/ControlsDialog.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.input.KeyCode;
import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.Image;
import io.anuke.arc.scene.ui.KeybindDialog; import io.anuke.arc.scene.ui.KeybindDialog;
import io.anuke.arc.util.Align; import io.anuke.arc.util.Align;
import io.anuke.mindustry.graphics.Palette; import io.anuke.mindustry.graphics.Pal;
public class ControlsDialog extends KeybindDialog{ public class ControlsDialog extends KeybindDialog{
@@ -16,7 +16,7 @@ public class ControlsDialog extends KeybindDialog{
title.setAlignment(Align.center); title.setAlignment(Align.center);
titleTable.row(); titleTable.row();
titleTable.add(new Image("white")) titleTable.add(new Image("white"))
.growX().height(3f).pad(4f).get().setColor(Palette.accent); .growX().height(3f).pad(4f).get().setColor(Pal.accent);
} }
@Override @Override

6
core/src/io/anuke/mindustry/ui/dialogs/DatabaseDialog.java
View File

@@ -4,7 +4,7 @@ import io.anuke.arc.collection.Array;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.game.Content; import io.anuke.mindustry.game.Content;
import io.anuke.mindustry.game.UnlockableContent; 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.mindustry.type.ContentType;
import io.anuke.arc.scene.event.HandCursorListener; import io.anuke.arc.scene.event.HandCursorListener;
import io.anuke.arc.scene.ui.Image; import io.anuke.arc.scene.ui.Image;
@@ -41,9 +41,9 @@ public class DatabaseDialog extends FloatingDialog{
Array<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden()); Array<Content> array = allContent[j].select(c -> c instanceof UnlockableContent && !((UnlockableContent)c).isHidden());
if(array.size == 0) continue; 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.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.row();
table.table(list -> { table.table(list -> {
list.left(); list.left();

4
core/src/io/anuke/mindustry/ui/dialogs/DeployDialog.java
View File

@@ -13,7 +13,7 @@ import io.anuke.arc.util.Structs;
import io.anuke.mindustry.content.Zones; import io.anuke.mindustry.content.Zones;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.Saves.SaveSlot; 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.io.SaveIO.SaveException;
import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.type.Zone; import io.anuke.mindustry.type.Zone;
@@ -251,7 +251,7 @@ public class DeployDialog extends FloatingDialog{
for(ZoneNode node : nodes){ for(ZoneNode node : nodes){
for(ZoneNode child : node.children){ 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); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY);
} }
} }

4
core/src/io/anuke/mindustry/ui/dialogs/DiscordDialog.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.ui.dialogs;
import io.anuke.arc.Core; import io.anuke.arc.Core;
import io.anuke.arc.graphics.Color; 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 io.anuke.arc.scene.ui.Dialog;
import static io.anuke.mindustry.Vars.discordURL; import static io.anuke.mindustry.Vars.discordURL;
@@ -33,7 +33,7 @@ public class DiscordDialog extends Dialog{
i.addImage("icon-discord").size(14 * 3); i.addImage("icon-discord").size(14 * 3);
}).size(h).left(); }).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); }).size(470f, h).pad(10f);
buttons.defaults().size(170f, 50); buttons.defaults().size(170f, 50);

4
core/src/io/anuke/mindustry/ui/dialogs/FloatingDialog.java
View File

@@ -5,7 +5,7 @@ import io.anuke.arc.input.KeyCode;
import io.anuke.arc.util.Align; import io.anuke.arc.util.Align;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.game.EventType.ResizeEvent; 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.mindustry.net.Net;
import io.anuke.arc.Events; import io.anuke.arc.Events;
import io.anuke.arc.scene.ui.Dialog; import io.anuke.arc.scene.ui.Dialog;
@@ -22,7 +22,7 @@ public class FloatingDialog extends Dialog{
setFillParent(true); setFillParent(true);
this.title.setAlignment(Align.center); this.title.setAlignment(Align.center);
titleTable.row(); titleTable.row();
titleTable.addImage("white", Palette.accent) titleTable.addImage("white", Pal.accent)
.growX().height(3f).pad(4f); .growX().height(3f).pad(4f);
hidden(() -> { hidden(() -> {

4
core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
View File

@@ -14,7 +14,7 @@ import io.anuke.arc.scene.ui.layout.Table;
import io.anuke.arc.util.Align; import io.anuke.arc.util.Align;
import io.anuke.mindustry.Vars; import io.anuke.mindustry.Vars;
import io.anuke.mindustry.core.GameState.State; 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 io.anuke.mindustry.net.Net;
import static io.anuke.mindustry.Vars.*; import static io.anuke.mindustry.Vars.*;
@@ -49,7 +49,7 @@ public class SettingsMenuDialog extends SettingsDialog{
title.setAlignment(Align.center); title.setAlignment(Align.center);
titleTable.row(); titleTable.row();
titleTable.add(new Image("white")) 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.clearChildren();
cont.remove(); cont.remove();

4
core/src/io/anuke/mindustry/ui/dialogs/TechTreeDialog.java
View File

@@ -18,7 +18,7 @@ import io.anuke.arc.util.Log;
import io.anuke.arc.util.Structs; import io.anuke.arc.util.Structs;
import io.anuke.mindustry.content.TechTree; import io.anuke.mindustry.content.TechTree;
import io.anuke.mindustry.content.TechTree.TechNode; 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.type.ItemStack;
import io.anuke.mindustry.ui.ItemsDisplay; import io.anuke.mindustry.ui.ItemsDisplay;
import io.anuke.mindustry.ui.TreeLayout; import io.anuke.mindustry.ui.TreeLayout;
@@ -254,7 +254,7 @@ public class TechTreeDialog extends FloatingDialog{
for(TechTreeNode node : nodes){ for(TechTreeNode node : nodes){
for(TechTreeNode child : node.children){ 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); Lines.line(node.x + offsetX, node.y + offsetY, child.x + offsetX, child.y + offsetY);
} }

8
core/src/io/anuke/mindustry/ui/fragments/HudFragment.java
View File

@@ -23,7 +23,7 @@ import io.anuke.mindustry.game.EventType.StateChangeEvent;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.gen.Call; 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.input.Binding;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.net.Packets.AdminAction; import io.anuke.mindustry.net.Packets.AdminAction;
@@ -97,11 +97,11 @@ public class HudFragment extends Fragment{
} }
}).get(); }).get();
select.addImage("blank").color(Palette.accent).width(6f).fillY(); select.addImage("blank").color(Pal.accent).width(6f).fillY();
}); });
cont.row(); cont.row();
cont.addImage("blank").height(6f).color(Palette.accent).fillX(); cont.addImage("blank").height(6f).color(Pal.accent).fillX();
cont.row(); cont.row();
} }
@@ -237,7 +237,7 @@ public class HudFragment extends Fragment{
button.setText(Core.bundle.get(state.enemies() > 0 ? "launch.unable" : "launch") + "\n" + button.setText(Core.bundle.get(state.enemies() > 0 ? "launch.unable" : "launch") + "\n" +
Core.bundle.format("launch.next", state.wave + world.getZone().launchPeriod)); 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))); Mathf.absin(Time.time(), 7f, 1f)));
}); });

6
core/src/io/anuke/mindustry/ui/fragments/LoadingFragment.java
View File

@@ -1,6 +1,6 @@
package io.anuke.mindustry.ui.fragments; 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.Group;
import io.anuke.arc.scene.event.Touchable; import io.anuke.arc.scene.event.Touchable;
import io.anuke.arc.scene.ui.Label; import io.anuke.arc.scene.ui.Label;
@@ -18,11 +18,11 @@ public class LoadingFragment extends Fragment{
t.touchable(Touchable.enabled); t.touchable(Touchable.enabled);
t.add().height(70f).row(); 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.row();
t.add("$loading").name("namelabel").pad(10f); t.add("$loading").name("namelabel").pad(10f);
t.row(); 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(); t.row();
button = t.addButton("$cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get(); button = t.addButton("$cancel", () -> {}).pad(20).size(250f, 70f).visible(false).get();

4
core/src/io/anuke/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -18,7 +18,7 @@ import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.game.EventType.UnlockEvent; import io.anuke.mindustry.game.EventType.UnlockEvent;
import io.anuke.mindustry.game.EventType.WorldLoadEvent; 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.Binding;
import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.InputHandler;
import io.anuke.mindustry.type.Category; 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); }).colspan(3).fillX().visible(() -> getSelected() != null || tileDisplayBlock() != null).touchable(Touchable.enabled);
frame.row(); 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.row();
frame.table("pane-2", blocksSelect -> { frame.table("pane-2", blocksSelect -> {
blocksSelect.margin(4).marginTop(0); blocksSelect.margin(4).marginTop(0);

6
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -11,7 +11,7 @@ import io.anuke.arc.scene.ui.layout.Unit;
import io.anuke.arc.util.Interval; import io.anuke.arc.util.Interval;
import io.anuke.mindustry.core.GameState.State; import io.anuke.mindustry.core.GameState.State;
import io.anuke.mindustry.gen.Call; 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.Net;
import io.anuke.mindustry.net.NetConnection; import io.anuke.mindustry.net.NetConnection;
import io.anuke.mindustry.net.Packets.AdminAction; import io.anuke.mindustry.net.Packets.AdminAction;
@@ -82,7 +82,7 @@ public class PlayerListFragment extends Fragment{
@Override @Override
public void draw(){ public void draw(){
super.draw(); super.draw();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Draw.alpha(parentAlpha); Draw.alpha(parentAlpha);
Lines.stroke(Unit.dp.scl(3f)); Lines.stroke(Unit.dp.scl(3f));
Lines.rect(x, y, width, height); 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.add(button).padBottom(-6).width(350f).maxHeight(h + 14);
content.row(); 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(); content.row();
}); });

10
core/src/io/anuke/mindustry/world/Block.java
View File

@@ -25,7 +25,7 @@ import io.anuke.mindustry.entities.effect.RubbleDecal;
import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.game.UnlockableContent;
import io.anuke.mindustry.graphics.CacheLayer; import io.anuke.mindustry.graphics.CacheLayer;
import io.anuke.mindustry.graphics.Layer; 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.Category;
import io.anuke.mindustry.type.ContentType; import io.anuke.mindustry.type.ContentType;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -344,7 +344,7 @@ public class Block extends BlockStorage{
} }
public void drawConfigure(Tile tile){ public void drawConfigure(Tile tile){
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(1f); Lines.stroke(1f);
Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1f); Lines.square(tile.drawx(), tile.drawy(), tile.block().size * tilesize / 2f + 1f);
Draw.reset(); 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){ if(!tile.floor().solid && !tile.floor().isLiquid){
RubbleDecal.create(tile.drawx(), tile.drawy(), size); RubbleDecal.create(tile.drawx(), tile.drawy(), size);
} }
@@ -492,7 +492,7 @@ public class Block extends BlockStorage{
public void displayBars(Tile tile, Table bars){ public void displayBars(Tile tile, Table bars){
TileEntity entity = tile.entity; 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(); bars.row();
if(entity.liquids != null){ if(entity.liquids != null){
@@ -501,7 +501,7 @@ public class Block extends BlockStorage{
} }
if(entity.power != null && consumes.has(ConsumePower.class)){ 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(); bars.row();
} }
} }

4
core/src/io/anuke/mindustry/world/blocks/BuildBlock.java
View File

@@ -20,7 +20,7 @@ import io.anuke.mindustry.game.EventType.BlockBuildEndEvent;
import io.anuke.mindustry.game.Team; import io.anuke.mindustry.game.Team;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Layer; 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.graphics.Shaders;
import io.anuke.mindustry.type.ItemStack; import io.anuke.mindustry.type.ItemStack;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
@@ -134,7 +134,7 @@ public class BuildBlock extends Block{
BuildEntity entity = tile.entity(); BuildEntity entity = tile.entity();
Shaders.blockbuild.color = Palette.accent; Shaders.blockbuild.color = Pal.accent;
Block target = entity.block == null ? entity.previous : entity.block; Block target = entity.block == null ? entity.previous : entity.block;

4
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@@ -16,7 +16,7 @@ import io.anuke.arc.util.Time;
import io.anuke.mindustry.content.Fx; import io.anuke.mindustry.content.Fx;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.traits.AbsorbTrait; 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.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter;
@@ -243,7 +243,7 @@ public class ForceProjector extends Block {
@Override @Override
public void draw(){ public void draw(){
Draw.color(Palette.accent); Draw.color(Pal.accent);
Fill.poly(x, y, 6, realRadius(entity)); Fill.poly(x, y, 6, realRadius(entity));
Draw.color(); Draw.color();
} }

4
core/src/io/anuke/mindustry/world/blocks/defense/ShockMine.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.entities.effect.Lightning; import io.anuke.mindustry.entities.effect.Lightning;
import io.anuke.mindustry.graphics.Layer; 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.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -51,7 +51,7 @@ public class ShockMine extends Block{
public void unitOn(Tile tile, Unit unit){ public void unitOn(Tile tile, Unit unit){
if(unit.getTeam() != tile.getTeam() && tile.entity.timer.get(timerDamage, cooldown)){ if(unit.getTeam() != tile.getTeam() && tile.entity.timer.get(timerDamage, cooldown)){
for(int i = 0; i < tendrils; i++){ 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); tile.entity.damage(tileDamage);
} }

4
core/src/io/anuke/mindustry/world/blocks/defense/SurgeWall.java
View File

@@ -3,7 +3,7 @@ package io.anuke.mindustry.world.blocks.defense;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.Bullet;
import io.anuke.mindustry.entities.effect.Lightning; 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; import io.anuke.arc.math.Mathf;
public class SurgeWall extends Wall{ public class SurgeWall extends Wall{
@@ -19,7 +19,7 @@ public class SurgeWall extends Wall{
public void handleBulletHit(TileEntity entity, Bullet bullet){ public void handleBulletHit(TileEntity entity, Bullet bullet){
super.handleBulletHit(entity, bullet); super.handleBulletHit(entity, bullet);
if(Mathf.chance(lightningChance)){ 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);
} }
} }
} }

4
core/src/io/anuke/mindustry/world/blocks/defense/turrets/ItemTurret.java
View File

@@ -6,7 +6,7 @@ import io.anuke.mindustry.Vars;
import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit; 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.type.Item;
import io.anuke.mindustry.ui.Bar; import io.anuke.mindustry.ui.Bar;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -46,7 +46,7 @@ public class ItemTurret extends CooledTurret{
TurretEntity entity = tile.entity(); 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(); bars.row();
} }

6
core/src/io/anuke/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -23,7 +23,7 @@ import io.anuke.mindustry.entities.bullet.Bullet;
import io.anuke.mindustry.entities.bullet.BulletType; import io.anuke.mindustry.entities.bullet.BulletType;
import io.anuke.mindustry.entities.traits.TargetTrait; import io.anuke.mindustry.entities.traits.TargetTrait;
import io.anuke.mindustry.graphics.Layer; 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.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
import io.anuke.mindustry.world.meta.BlockFlag; import io.anuke.mindustry.world.meta.BlockFlag;
@@ -38,7 +38,7 @@ public abstract class Turret extends Block{
protected final int timerTarget = timers++; protected final int timerTarget = timers++;
protected Color heatColor = Palette.turretHeat; protected Color heatColor = Pal.turretHeat;
protected Effect shootEffect = Fx.none; protected Effect shootEffect = Fx.none;
protected Effect smokeEffect = Fx.none; protected Effect smokeEffect = Fx.none;
protected Effect ammoUseEffect = Fx.none; protected Effect ammoUseEffect = Fx.none;
@@ -142,7 +142,7 @@ public abstract class Turret extends Block{
@Override @Override
public void drawPlace(int x, int y, int rotation, boolean valid){ 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); Lines.dashCircle(x * tilesize + offset(), y * tilesize + offset(), range);
Draw.color(); Draw.color();
} }

8
core/src/io/anuke/mindustry/world/blocks/distribution/ItemBridge.java
View File

@@ -18,7 +18,7 @@ import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Layer; 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.type.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Edges; import io.anuke.mindustry.world.Edges;
@@ -98,7 +98,7 @@ public class ItemBridge extends Block{
@Override @Override
public void drawPlace(int x, int y, int rotation, boolean valid){ public void drawPlace(int x, int y, int rotation, boolean valid){
Lines.stroke(2f); Lines.stroke(2f);
Draw.color(Palette.placing); Draw.color(Pal.placing);
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
Lines.dashLine( Lines.dashLine(
x * tilesize + Geometry.d4[i].x * (tilesize / 2f + 2), x * tilesize + Geometry.d4[i].x * (tilesize / 2f + 2),
@@ -115,7 +115,7 @@ public class ItemBridge extends Block{
public void drawConfigure(Tile tile){ public void drawConfigure(Tile tile){
ItemBridgeEntity entity = tile.entity(); ItemBridgeEntity entity = tile.entity();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(1f); Lines.stroke(1f);
Lines.square(tile.drawx(), tile.drawy(), Lines.square(tile.drawx(), tile.drawy(),
tile.block().size * tilesize / 2f + 1f); 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); Tile other = tile.getNearby(Geometry.d4[j].x * i, Geometry.d4[j].y * i);
if(linkValid(tile, other)){ if(linkValid(tile, other)){
boolean linked = other.pos() == entity.link; 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(), Lines.square(other.drawx(), other.drawy(),
other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); other.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f)));

8
core/src/io/anuke/mindustry/world/blocks/distribution/MassDriver.java
View File

@@ -22,7 +22,7 @@ import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.bullet.Bullet; import io.anuke.mindustry.entities.bullet.Bullet;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Layer; 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.type.Item;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -190,7 +190,7 @@ public class MassDriver extends Block{
public void drawConfigure(Tile tile){ public void drawConfigure(Tile tile){
float sin = Mathf.absin(Time.time(), 6f, 1f); float sin = Mathf.absin(Time.time(), 6f, 1f);
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(1f); Lines.stroke(1f);
Lines.poly(tile.drawx(), tile.drawy(), 20, (tile.block().size/2f+1) * tilesize + sin); 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)){ if(linkValid(tile)){
Tile target = world.tile(entity.link); 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); Lines.poly(target.drawx(), target.drawy(), 20, (target.block().size/2f+1) * tilesize + sin);
Draw.reset(); Draw.reset();
} }
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.dashCircle(tile.drawx(), tile.drawy(), range); Lines.dashCircle(tile.drawx(), tile.drawy(), range);
Draw.color(); Draw.color();
} }

14
core/src/io/anuke/mindustry/world/blocks/power/PowerNode.java
View File

@@ -13,7 +13,7 @@ import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.gen.Call; import io.anuke.mindustry.gen.Call;
import io.anuke.mindustry.graphics.Layer; 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.Tile;
import io.anuke.mindustry.world.blocks.PowerBlock; import io.anuke.mindustry.world.blocks.PowerBlock;
import io.anuke.mindustry.world.meta.BlockStat; import io.anuke.mindustry.world.meta.BlockStat;
@@ -141,7 +141,7 @@ public class PowerNode extends PowerBlock{
Lines.stroke(1f); Lines.stroke(1f);
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.poly(tile.drawx(), tile.drawy(), 50, laserRange*tilesize); Lines.poly(tile.drawx(), tile.drawy(), 50, laserRange*tilesize);
Draw.reset(); Draw.reset();
} }
@@ -150,7 +150,7 @@ public class PowerNode extends PowerBlock{
public void drawConfigure(Tile tile){ public void drawConfigure(Tile tile){
TileEntity entity = tile.entity(); TileEntity entity = tile.entity();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.stroke(1.5f); Lines.stroke(1.5f);
Lines.circle(tile.drawx(), tile.drawy(), Lines.circle(tile.drawx(), tile.drawy(),
@@ -165,13 +165,13 @@ public class PowerNode extends PowerBlock{
if(link != tile && linkValid(tile, link, false)){ if(link != tile && linkValid(tile, link, false)){
boolean linked = linked(tile, link); 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(), Lines.circle(link.drawx(), link.drawy(),
link.block().size * tilesize / 2f + 1f + (linked ? 0f : Mathf.absin(Time.time(), 4f, 1f))); 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){ 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); Lines.lineAngleCenter(link.drawx(), link.drawy(), 45, link.block().size * Mathf.sqrt2 * tilesize * 0.9f);
Draw.color(); Draw.color();
} }
@@ -185,7 +185,7 @@ public class PowerNode extends PowerBlock{
@Override @Override
public void drawPlace(int x, int y, int rotation, boolean valid){ public void drawPlace(int x, int y, int rotation, boolean valid){
Lines.stroke(1f); Lines.stroke(1f);
Draw.color(Palette.placing); Draw.color(Pal.placing);
Lines.poly(x * tilesize + offset(), y * tilesize + offset(), 50, laserRange*tilesize); Lines.poly(x * tilesize + offset(), y * tilesize + offset(), 50, laserRange*tilesize);
Draw.reset(); Draw.reset();
} }
@@ -245,7 +245,7 @@ public class PowerNode extends PowerBlock{
x2 += t2.x; x2 += t2.x;
y2 += t2.y; 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.stroke(2f);
Lines.line(x1, y1, x2, y2); Lines.line(x1, y1, x2, y2);
} }

6
core/src/io/anuke/mindustry/world/blocks/production/PhaseWeaver.java
View File

@@ -6,7 +6,7 @@ import io.anuke.arc.graphics.g2d.Lines;
import io.anuke.arc.graphics.g2d.TextureRegion; import io.anuke.arc.graphics.g2d.TextureRegion;
import io.anuke.arc.math.Mathf; import io.anuke.arc.math.Mathf;
import io.anuke.mindustry.Vars; 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.graphics.Shaders;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -41,7 +41,7 @@ public class PhaseWeaver extends PowerSmelter{
Shaders.build.region = weaveRegion; Shaders.build.region = weaveRegion;
Shaders.build.progress = progress; Shaders.build.progress = progress;
Shaders.build.color.set(Palette.accent); Shaders.build.color.set(Pal.accent);
Shaders.build.color.a = entity.heat; Shaders.build.color.a = entity.heat;
Shaders.build.time = -entity.time / 10f; 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.rect(weaveRegion, tile.drawx(), tile.drawy(), entity.time);
Draw.shader(); Draw.shader();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Draw.alpha(entity.heat); Draw.alpha(entity.heat);
Lines.lineAngleCenter( Lines.lineAngleCenter(

6
core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.entities.traits.SpawnerTrait; import io.anuke.mindustry.entities.traits.SpawnerTrait;
import io.anuke.mindustry.gen.Call; 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.graphics.Shaders;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -116,14 +116,14 @@ public class CoreBlock extends StorageBlock{
Shaders.build.region = region; Shaders.build.region = region;
Shaders.build.progress = entity.progress; Shaders.build.progress = entity.progress;
Shaders.build.color.set(Palette.accent); Shaders.build.color.set(Pal.accent);
Shaders.build.time = -entity.time / 10f; Shaders.build.time = -entity.time / 10f;
Draw.shader(Shaders.build, true); Draw.shader(Shaders.build, true);
Draw.rect(region, tile.drawx(), tile.drawy()); Draw.rect(region, tile.drawx(), tile.drawy());
Draw.shader(); Draw.shader();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.lineAngleCenter( Lines.lineAngleCenter(
tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size),

8
core/src/io/anuke/mindustry/world/blocks/units/MechPad.java
View File

@@ -18,7 +18,7 @@ import io.anuke.mindustry.entities.traits.SpawnerTrait;
import io.anuke.mindustry.entities.type.Player; import io.anuke.mindustry.entities.type.Player;
import io.anuke.mindustry.entities.type.TileEntity; import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.gen.Call; 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.graphics.Shaders;
import io.anuke.mindustry.type.Mech; import io.anuke.mindustry.type.Mech;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
@@ -108,7 +108,7 @@ public class MechPad extends Block{
@Override @Override
public void drawSelect(Tile tile){ public void drawSelect(Tile tile){
Draw.color(Palette.accent); Draw.color(Pal.accent);
for(int i = 0; i < 4; i ++){ for(int i = 0; i < 4; i ++){
float length = tilesize * size/2f + 3 + Mathf.absin(Time.time(), 5f, 2f); 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); 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.region = region;
Shaders.build.progress = entity.progress; Shaders.build.progress = entity.progress;
Shaders.build.time = -entity.time / 4f; Shaders.build.time = -entity.time / 4f;
Shaders.build.color.set(Palette.accent); Shaders.build.color.set(Pal.accent);
Draw.shader(Shaders.build, false); Draw.shader(Shaders.build, false);
Shaders.build.apply(); Shaders.build.apply();
Draw.rect(region, tile.drawx(), tile.drawy()); Draw.rect(region, tile.drawx(), tile.drawy());
Draw.shader(); Draw.shader();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.lineAngleCenter( Lines.lineAngleCenter(
tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size), tile.drawx() + Mathf.sin(entity.time, 6f, Vars.tilesize / 3f * size),

4
core/src/io/anuke/mindustry/world/blocks/units/RepairPoint.java
View File

@@ -14,7 +14,7 @@ import io.anuke.mindustry.entities.type.TileEntity;
import io.anuke.mindustry.entities.type.Unit; import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.entities.Units; import io.anuke.mindustry.entities.Units;
import io.anuke.mindustry.graphics.Layer; 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.graphics.Shapes;
import io.anuke.mindustry.world.Block; import io.anuke.mindustry.world.Block;
import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.Tile;
@@ -61,7 +61,7 @@ public class RepairPoint extends Block{
@Override @Override
public void drawSelect(Tile tile){ public void drawSelect(Tile tile){
Draw.color(Palette.accent); Draw.color(Pal.accent);
Lines.dashCircle(tile.drawx(), tile.drawy(), repairRadius); Lines.dashCircle(tile.drawx(), tile.drawy(), repairRadius);
Draw.color(); Draw.color();
} }

6
core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
View File

@@ -16,7 +16,7 @@ import io.anuke.mindustry.entities.type.Unit;
import io.anuke.mindustry.entities.type.BaseUnit; import io.anuke.mindustry.entities.type.BaseUnit;
import io.anuke.mindustry.type.UnitType; import io.anuke.mindustry.type.UnitType;
import io.anuke.mindustry.gen.Call; 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.graphics.Shaders;
import io.anuke.mindustry.net.Net; import io.anuke.mindustry.net.Net;
import io.anuke.mindustry.type.Item; import io.anuke.mindustry.type.Item;
@@ -116,7 +116,7 @@ public class UnitFactory extends Block{
Shaders.build.region = region; Shaders.build.region = region;
Shaders.build.progress = entity.buildTime / produceTime; 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.color.a = entity.speedScl;
Shaders.build.time = -entity.time / 10f; Shaders.build.time = -entity.time / 10f;
@@ -125,7 +125,7 @@ public class UnitFactory extends Block{
Draw.rect(region, tile.drawx(), tile.drawy()); Draw.rect(region, tile.drawx(), tile.drawy());
Draw.shader(); Draw.shader();
Draw.color(Palette.accent); Draw.color(Pal.accent);
Draw.alpha(entity.speedScl); Draw.alpha(entity.speedScl);
Lines.lineAngleCenter( Lines.lineAngleCenter(

6
core/src/io/anuke/mindustry/world/consumers/Consume.java
View File

@@ -2,7 +2,7 @@ package io.anuke.mindustry.world.consumers;
import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.Color;
import io.anuke.mindustry.entities.type.TileEntity; 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.Block;
import io.anuke.mindustry.world.meta.BlockStats; import io.anuke.mindustry.world.meta.BlockStats;
import io.anuke.arc.scene.ui.Tooltip; import io.anuke.arc.scene.ui.Tooltip;
@@ -47,8 +47,8 @@ public abstract class Consume{
table.table(out -> { 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(Color.DARK_GRAY).padRight(-10 * scale).padBottom(-scale * 2);
out.addImage(getIcon()).size(10 * scale).color(Palette.accent); out.addImage(getIcon()).size(10 * scale).color(Pal.accent);
out.addImage("icon-missing").size(10 * scale).color(Palette.remove).padLeft(-10 * scale); out.addImage("icon-missing").size(10 * scale).color(Pal.remove).padLeft(-10 * scale);
}).size(10 * scale).get().addListener(new Tooltip<>(t)); }).size(10 * scale).get().addListener(new Tooltip<>(t));
} }