From 1462443f7cef292a68a1a08ef1b91f7c3aa6f999 Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 5 Jul 2021 10:55:36 -0400 Subject: [PATCH] Unit drowning outline color fix --- core/src/mindustry/Vars.java | 2 +- core/src/mindustry/type/UnitType.java | 5 +++++ .../world/blocks/payloads/PayloadDeconstructor.java | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/Vars.java b/core/src/mindustry/Vars.java index ac5268e59b..2f61b463c7 100644 --- a/core/src/mindustry/Vars.java +++ b/core/src/mindustry/Vars.java @@ -377,7 +377,7 @@ public class Vars implements Loadable{ log.log(level, text); try{ - writer.write("[" + Character.toUpperCase(level.name().charAt(0)) +"] " + Log.removeColors(text) + "\n"); + writer.write("[" + Character.toUpperCase(level.name().charAt(0)) + "] " + Log.removeColors(text) + "\n"); writer.flush(); }catch(IOException e){ e.printStackTrace(); diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index 57d62394b4..3dc461f57a 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -749,6 +749,11 @@ public class UnitType extends UnlockableContent{ if(unit.isBoss()){ Draw.mixcol(unit.team.color, Mathf.absin(7f, 1f)); } + + Floor floor = unit.isFlying() ? Blocks.air.asFloor() : unit.floorOn(); + if(floor.isLiquid){ + Draw.color(Color.white, floor.mapColor, unit.drownTime() * 0.4f); + } } public void drawOutline(Unit unit){ diff --git a/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java index 126c5dde12..5150c7659a 100644 --- a/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java +++ b/core/src/mindustry/world/blocks/payloads/PayloadDeconstructor.java @@ -198,7 +198,5 @@ public class PayloadDeconstructor extends PayloadBlock{ } deconstructing = Payload.read(read); } - - } }