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 0000000000..66f9939101 Binary files /dev/null and b/core/assets-raw/sprites/blocks/turrets/wave-top.png differ diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java index c834dbb6bb..efc6ca57ff 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); @@ -53,8 +54,12 @@ public class LiquidTurret extends Turret{ }); } - public class LiquidTurretBuild extends TurretBuild{ + @Override + public TextureRegion[] icons(){ + return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons(); + } + public class LiquidTurretBuild extends TurretBuild{ @Override public void draw(){ super.draw(); @@ -63,8 +68,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(topRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90); } @Override