mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-01-27 06:51:30 -08:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Anuken 2020-11-16 14:21:39 -05:00
commit 3b47cb03bc
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++){
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);
}
}
}
@ -162,7 +162,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();

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

@ -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();