From 18604a397d3abae0990f096009cbd0e21d65f7b6 Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Sat, 26 Sep 2020 19:11:55 +0300
Subject: [PATCH 1/4] 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`hE<t`_ZS!$7>k44ofy`glX=O&z`&C3
z=<CS9u(6-}Pa-P=0|RG)M`SSr1K(i~W;~w1B87p0VUwqeV@O5Z+gXZyhaGqhto!|c
ze*TdKvyR>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<Liquid, BulletType> 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

From a72b1463b4c9c09280a687326f7d4fd6d07f0ee8 Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Sat, 26 Sep 2020 20:40:09 +0300
Subject: [PATCH 2/4] Fix

---
 .../world/blocks/defense/turrets/LiquidTurret.java         | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index eb112af13f..114b2e2433 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -56,6 +56,11 @@ public class LiquidTurret extends Turret{
 
     public class LiquidTurretBuild extends TurretBuild{
 
+        @Override
+        public TextureRegion[] icons(){
+            return new TextureRegion[]{baseRegion, region, topRegion}
+        }
+
         @Override
         public void draw(){
             super.draw();
@@ -66,7 +71,7 @@ public class LiquidTurret extends Turret{
                 Draw.rect(liquidRegion, x + tr2.x, y + tr2.y, rotation - 90);
                 Draw.reset();
             }
-            if(Core.atlas.isFound(liquidRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
+            if(Core.atlas.isFound(topRegion)) Draw.rect(topRegion, x + tr2.x, y + tr2.y, rotation - 90);
         }
 
         @Override

From 79aaec80c32e734942bfae259997871c63fafc29 Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Sat, 26 Sep 2020 20:45:15 +0300
Subject: [PATCH 3/4] Fix

---
 .../mindustry/world/blocks/defense/turrets/LiquidTurret.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index 114b2e2433..6a11b61c64 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -58,7 +58,7 @@ public class LiquidTurret extends Turret{
 
         @Override
         public TextureRegion[] icons(){
-            return new TextureRegion[]{baseRegion, region, topRegion}
+            return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons();
         }
 
         @Override

From 55081785d04f4d60d19a16c42c72266f2e0b2849 Mon Sep 17 00:00:00 2001
From: Voz-Duh <siryoja1@gmail.com>
Date: Sat, 26 Sep 2020 21:24:47 +0300
Subject: [PATCH 4/4] Fix

---
 .../world/blocks/defense/turrets/LiquidTurret.java    | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
index 6a11b61c64..efc6ca57ff 100644
--- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
+++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java
@@ -54,13 +54,12 @@ public class LiquidTurret extends Turret{
         });
     }
 
+    @Override
+    public TextureRegion[] icons(){
+        return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons();
+    }
+
     public class LiquidTurretBuild extends TurretBuild{
-
-        @Override
-        public TextureRegion[] icons(){
-            return Core.atlas.isFound(topRegion) ? new TextureRegion[]{baseRegion, region, topRegion} : super.icons();
-        }
-
         @Override
         public void draw(){
             super.draw();