From f51d565db863ce08b3d525e428201386a2116294 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 4 Jun 2019 22:06:17 -0400 Subject: [PATCH] Darker decals / map tweaks --- core/assets/maps/labyrinth.msav | Bin 11935 -> 11960 bytes .../mindustry/entities/effect/Decal.java | 5 ++--- core/src/io/anuke/mindustry/graphics/Pal.java | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/labyrinth.msav b/core/assets/maps/labyrinth.msav index 525ecf7b1c85d361a0ba15f22e72a9b71889b68f..ab7bf64c9da2cc81dda6bf82a2a85c8878ee207b 100644 GIT binary patch literal 11960 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 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"),