From 6145b1c95cf4c22e5b67060c40430c3372e205a9 Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Thu, 17 Sep 2020 16:34:34 +0300 Subject: [PATCH] Team Colors For Payload Conveyor and Router --- .../mindustry/world/blocks/distribution/PayloadConveyor.java | 4 ++-- .../mindustry/world/blocks/distribution/PayloadRouter.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java index 6d1e765fa6..8d2e0ee7e6 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadConveyor.java @@ -45,7 +45,7 @@ public class PayloadConveyor extends Block{ for(int i = 0; i < 4; i++){ Building other = world.build(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size); if(other != null && other.block.outputsPayload && other.block.size == size){ - Drawf.selected(other.tileX(), other.tileY(), other.block, Pal.accent); + Drawf.selected(other.tileX(), other.tileY(), other.block, other.team.color); } } } @@ -156,7 +156,7 @@ public class PayloadConveyor extends Block{ float dst = 0.8f; float glow = Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0); - Draw.mixcol(Pal.accent, glow); + Draw.mixcol(team.color, glow); float trnext = fract() * size * tilesize, trprev = size * tilesize * (fract() - 1), rot = rotdeg(); diff --git a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java index 3f277c82d3..3e1d2949dc 100644 --- a/core/src/mindustry/world/blocks/distribution/PayloadRouter.java +++ b/core/src/mindustry/world/blocks/distribution/PayloadRouter.java @@ -71,7 +71,7 @@ public class PayloadRouter extends PayloadConveyor{ float dst = 0.8f; - Draw.mixcol(Pal.accent, Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0)); + Draw.mixcol(team.color, Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0)); Draw.rect(topRegion, x, y, smoothRot); Draw.reset();