diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 600220abc9..8fe9cdb52f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1388,15 +1388,6 @@ public class Blocks implements ContentList{ range = 110f; health = 250 * size * size; shootSound = Sounds.splash; - - drawer = (tile, entity) -> { - Draw.rect(region, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - - Draw.color(entity.liquids.current().color); - Draw.alpha(entity.liquids.total() / liquidCapacity); - Draw.rect(name + "-liquid", tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); - Draw.color(); - }; }}; lancer = new ChargeTurret("lancer"){{ diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index caafd51d2f..42336ea1d9 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -1,5 +1,7 @@ package mindustry.world.blocks.defense.turrets; +import arc.*; +import arc.graphics.g2d.*; import arc.struct.*; import mindustry.entities.*; import mindustry.entities.bullet.*; @@ -16,11 +18,13 @@ import static mindustry.Vars.*; public class LiquidTurret extends Turret{ public ObjectMap ammo = new ObjectMap<>(); + public int liquidRegion; public LiquidTurret(String name){ super(name); hasLiquids = true; activeSound = Sounds.spray; + liquidRegion = reg("-liquid"); } /** Initializes accepted ammo map. Format: [liquid1, bullet1, liquid2, bullet2...] */ @@ -28,6 +32,19 @@ public class LiquidTurret extends Turret{ ammo = OrderedMap.of(objects); } + @Override + public void drawLayer(Tile tile){ + super.drawLayer(tile); + TurretEntity entity = tile.ent(); + + if(Core.atlas.isFound(reg(liquidRegion))){ + Draw.color(entity.liquids.current().color); + Draw.alpha(entity.liquids.total() / liquidCapacity); + Draw.rect(reg(liquidRegion), tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90); + Draw.color(); + } + } + @Override public void setStats(){ super.setStats();