From 18604a397d3abae0990f096009cbd0e21d65f7b6 Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Sat, 26 Sep 2020 19:11:55 +0300 Subject: [PATCH] Top For Liquid Turrets --- .../sprites/blocks/turrets/wave-top.png | Bin 0 -> 285 bytes .../blocks/defense/turrets/LiquidTurret.java | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/turrets/wave-top.png diff --git a/core/assets-raw/sprites/blocks/turrets/wave-top.png b/core/assets-raw/sprites/blocks/turrets/wave-top.png new file mode 100644 index 0000000000000000000000000000000000000000..66f99391019c3eb1782252196511b80fb39c2ae0 GIT binary patch literal 285 zcmeAS@N?(olHy`uVBq!ia0y~yU~m9o4mJh`hEk44ofy`glX=O&z`&C3 z=JnVTcLnZew4O7i=?XZCEE#+0DTdLW9cVXFv3wkE^1Aci$d86vzH@kn%X zPdwkqzOVc9pVOP`H!@B(x0s&p&+_A2sGM|S7W2Ef-^Sa|&HKapPwCJX=?_0R?s6s( fw!u5{HSfW2{)z+rM{hDPFfe$!`njxgN@xNAX~JdV literal 0 HcmV?d00001 diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index c834dbb6bb..eb112af13f 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -17,6 +17,7 @@ import static mindustry.Vars.tilesize; public class LiquidTurret extends Turret{ public ObjectMap ammoTypes = new ObjectMap<>(); public @Load("@-liquid") TextureRegion liquidRegion; + public @Load("@-top") TextureRegion topRegion; public LiquidTurret(String name){ super(name); @@ -63,8 +64,9 @@ public class LiquidTurret extends Turret{ Draw.color(liquids.current().color); Draw.alpha(liquids.total() / liquidCapacity); Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90); - Draw.color(); + Draw.reset(); } + if(Core.atlas.isFound(liquidRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90); } @Override