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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2020-05-01 20:38:46 -04:00
parent 39f6bc30b7 9e9776971f
commit cc04537355
10 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/mindustry/world/blocks/liquid/Conduit.java
View File

@@ -1,6 +1,7 @@
package mindustry.world.blocks.liquid;
import arc.*;
import arc.graphics.*;
import arc.func.*;
import arc.graphics.g2d.*;
import arc.math.*;
@@ -16,7 +17,9 @@ import mindustry.world.blocks.*;
public class Conduit extends LiquidBlock implements Autotiler{
public final int timerFlow = timers++;
public Color botColor = Color.valueOf("565656");
public TextureRegion[] topRegions = new TextureRegion[7];
public TextureRegion[] botRegions = new TextureRegion[7];
@@ -47,7 +50,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
if(bits == null) return;
Draw.colorl(0.34f);
Draw.color(botColor);
Draw.alpha(0.5f);
Draw.rect(botRegions[bits[0]], req.drawx(), req.drawy(),
botRegions[bits[0]].getWidth() * Draw.scl * req.animScale, botRegions[bits[0]].getHeight() * Draw.scl * req.animScale,
@@ -91,7 +94,7 @@ public class Conduit extends LiquidBlock implements Autotiler{
public void draw(){
int rotation = rotation() * 90;
Draw.colorl(0.34f);
Draw.color(botColor);
Draw.rect(botRegions[blendbits], x, y, rotation);
Draw.color(liquids.current().color);