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

Merge pull request #2575 from Voz-Duh/team-colors-for-payload-distributions

Browse Source 
Team Colors For Payload Conveyor and Router
This commit is contained in:
Anuken
2020-11-16 12:35:27 -05:00
committed by GitHub
parent 33e8489f42 6145b1c95c
commit 272a7af1ae
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/distribution/PayloadConveyor.java
View File

@@ -46,7 +46,7 @@ public class PayloadConveyor extends Block{
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
Building other = world.build(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size); Building other = world.build(x + Geometry.d4x[i] * size, y + Geometry.d4y[i] * size);
if(other != null && other.block.outputsPayload && other.block.size == 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);
} }
} }
} }
@@ -162,7 +162,7 @@ public class PayloadConveyor extends Block{
float dst = 0.8f; float dst = 0.8f;
float glow = Math.max((dst - (Math.abs(fract() - 0.5f) * 2)) / dst, 0); 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(); float trnext = fract() * size * tilesize, trprev = size * tilesize * (fract() - 1), rot = rotdeg();

2
core/src/mindustry/world/blocks/distribution/PayloadRouter.java
View File

@@ -71,7 +71,7 @@ public class PayloadRouter extends PayloadConveyor{
float dst = 0.8f; 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.rect(topRegion, x, y, smoothRot);
Draw.reset(); Draw.reset();