diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b90fff0130..1979fba833 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -454,7 +454,6 @@ public class Blocks{ speedMultiplier = 0.3f; variants = 0; liquidDrop = Liquids.arkycite; - liquidMultiplier = 1.5f; isLiquid = true; //TODO no status for now //status = StatusEffects.slow; @@ -3163,6 +3162,7 @@ public class Blocks{ Liquids.water,new LiquidBulletType(Liquids.water){{ knockback = 0.7f; drag = 0.01f; + layer = Layer.bullet - 2f; }}, Liquids.slag, new LiquidBulletType(Liquids.slag){{ damage = 4; @@ -3173,6 +3173,7 @@ public class Blocks{ }}, Liquids.oil, new LiquidBulletType(Liquids.oil){{ drag = 0.01f; + layer = Layer.bullet - 2f; }} ); size = 2; @@ -3439,6 +3440,7 @@ public class Blocks{ ammoMultiplier = 0.4f; statusDuration = 60f * 4f; damage = 0.2f; + layer = Layer.bullet - 2f; }}, Liquids.slag, new LiquidBulletType(Liquids.slag){{ lifetime = 49f; @@ -3472,6 +3474,7 @@ public class Blocks{ ammoMultiplier = 0.4f; statusDuration = 60f * 4f; damage = 0.2f; + layer = Layer.bullet - 2f; }} ); size = 3; diff --git a/core/src/mindustry/world/blocks/production/Pump.java b/core/src/mindustry/world/blocks/production/Pump.java index 0935cc4b4d..72f50b7eb1 100644 --- a/core/src/mindustry/world/blocks/production/Pump.java +++ b/core/src/mindustry/world/blocks/production/Pump.java @@ -58,10 +58,11 @@ public class Pump extends LiquidBlock{ if(liquidDrop != null){ float width = drawPlaceText(Core.bundle.formatFloat("bar.pumpspeed", amount * pumpAmount * 60f, 0), x, y, valid); float dx = x * tilesize + offset - width/2f - 4f, dy = y * tilesize + offset + size * tilesize / 2f + 5, s = iconSmall / 4f; + float ratio = (float)liquidDrop.fullIcon.width / liquidDrop.fullIcon.height; Draw.mixcol(Color.darkGray, 1f); - Draw.rect(liquidDrop.fullIcon, dx, dy - 1, s, s); + Draw.rect(liquidDrop.fullIcon, dx, dy - 1, s * ratio, s); Draw.reset(); - Draw.rect(liquidDrop.fullIcon, dx, dy, s, s); + Draw.rect(liquidDrop.fullIcon, dx, dy, s * ratio, s); } }