diff --git a/core/assets/maps/labyrinth.msav b/core/assets/maps/labyrinth.msav index 525ecf7b1c..ab7bf64c9d 100644 Binary files a/core/assets/maps/labyrinth.msav and b/core/assets/maps/labyrinth.msav differ diff --git a/core/src/io/anuke/mindustry/entities/effect/Decal.java b/core/src/io/anuke/mindustry/entities/effect/Decal.java index 72d251d9be..79b2c3276d 100644 --- a/core/src/io/anuke/mindustry/entities/effect/Decal.java +++ b/core/src/io/anuke/mindustry/entities/effect/Decal.java @@ -1,12 +1,12 @@ package io.anuke.mindustry.entities.effect; -import io.anuke.arc.graphics.Color; import io.anuke.arc.graphics.g2d.Draw; import io.anuke.arc.math.Mathf; import io.anuke.mindustry.entities.EntityGroup; import io.anuke.mindustry.entities.impl.TimedEntity; import io.anuke.mindustry.entities.traits.BelowLiquidTrait; import io.anuke.mindustry.entities.traits.DrawTrait; +import io.anuke.mindustry.graphics.Pal; import static io.anuke.mindustry.Vars.groundEffectGroup; @@ -14,7 +14,6 @@ import static io.anuke.mindustry.Vars.groundEffectGroup; * Class for creating block rubble on the ground. */ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, DrawTrait{ - private static final Color color = Color.valueOf("3a3635"); @Override public float lifetime(){ @@ -23,7 +22,7 @@ public abstract class Decal extends TimedEntity implements BelowLiquidTrait, Dra @Override public void draw(){ - Draw.color(color.r, color.g, color.b, 1f - Mathf.curve(fin(), 0.98f)); + Draw.color(Pal.rubble.r, Pal.rubble.g, Pal.rubble.b, 1f - Mathf.curve(fin(), 0.98f)); drawDecal(); Draw.color(); } diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java index e13ed16723..aa4ca6f7e7 100644 --- a/core/src/io/anuke/mindustry/graphics/Pal.java +++ b/core/src/io/anuke/mindustry/graphics/Pal.java @@ -35,6 +35,7 @@ public class Pal{ darkishGray = new Color(0.3f, 0.3f, 0.3f, 1f), darkerGray = new Color(0.2f, 0.2f, 0.2f, 1f), ammo = Color.valueOf("ff8947"), + rubble = Color.valueOf("1c1817"), boostTo = Color.valueOf("ffad4d"), boostFrom = Color.valueOf("ff7f57"),