From ecaa0a4eaa9b8365fba2d2e6a36b85511dc5eea0 Mon Sep 17 00:00:00 2001 From: Sunny Kim <58885089+sk7725@users.noreply.github.com> Date: Fri, 30 Oct 2020 16:44:54 +0900 Subject: [PATCH 1/2] Some liquid turrets are not caring enough --- .../mindustry/world/blocks/defense/turrets/LiquidTurret.java | 3 ++- 1 file changed, 2 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 5d2f7d9622..8ab8b5cb41 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/LiquidTurret.java @@ -19,6 +19,7 @@ public class LiquidTurret extends Turret{ public ObjectMap ammoTypes = new ObjectMap<>(); public @Load("@-liquid") TextureRegion liquidRegion; public @Load("@-top") TextureRegion topRegion; + public boolean extinguish = true; public LiquidTurret(String name){ super(name); @@ -86,7 +87,7 @@ public class LiquidTurret extends Turret{ @Override protected void findTarget(){ - if(liquids.current().canExtinguish()){ + if(extinguish && liquids.current().canExtinguish()){ int tr = (int)(range / tilesize); for(int x = -tr; x <= tr; x++){ for(int y = -tr; y <= tr; y++){ From 36fdf4afbcc91755ab0ca20cd814f943c4d808a2 Mon Sep 17 00:00:00 2001 From: Voz-Duh Date: Fri, 30 Oct 2020 14:21:13 +0300 Subject: [PATCH 2/2] Full Unit In Menu --- core/src/mindustry/graphics/MenuRenderer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/graphics/MenuRenderer.java b/core/src/mindustry/graphics/MenuRenderer.java index 2899efcdba..87ab169670 100644 --- a/core/src/mindustry/graphics/MenuRenderer.java +++ b/core/src/mindustry/graphics/MenuRenderer.java @@ -244,7 +244,7 @@ public class MenuRenderer implements Disposable{ float size = Math.max(icon.width, icon.height) * Draw.scl * 1.6f; flyers((x, y) -> { - Draw.rect(flyerType.region, x - 12f, y - 13f, flyerRot - 90); + Draw.rect(icon, x - 12f, y - 13f, flyerRot - 90); }); flyers((x, y) -> { @@ -264,7 +264,7 @@ public class MenuRenderer implements Disposable{ (engineSize + Mathf.absin(Time.time(), 2f, engineSize / 4f)) / 2f); Draw.color(); - Draw.rect(flyerType.region, x, y, flyerRot - 90); + Draw.rect(icon, x, y, flyerRot - 90); }); }