From ebcce194a0e6dd7fb47916534c9434be35317840 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 2 Apr 2019 11:26:02 -0400 Subject: [PATCH] Turret coolant use balancing --- core/src/io/anuke/mindustry/content/Blocks.java | 1 + .../io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java | 2 +- .../world/blocks/defense/turrets/CooledTurret.java | 4 ++-- .../world/blocks/defense/turrets/LaserTurret.java | 8 ++++++++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index ffe9881943..7209b7a7ac 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1507,6 +1507,7 @@ public class Blocks implements ContentList{ shootDuration = 220f; health = 165 * size * size; + consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false); }}; //endregion diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java index 01bd510b37..325c6d2007 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java @@ -212,7 +212,7 @@ public class SettingsMenuDialog extends SettingsDialog{ graphics.checkPref("minimap", !mobile); graphics.checkPref("fps", false); graphics.checkPref("indicators", true); - graphics.checkPref("animatedwater", !mobile); + graphics.checkPref("animatedwater", false); graphics.checkPref("lasers", true); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java index 8afd6d5d67..2a1cbe6e64 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/CooledTurret.java @@ -17,7 +17,7 @@ import static io.anuke.mindustry.Vars.tilesize; public class CooledTurret extends Turret{ /**How much reload is lowered by for each unit of liquid of heat capacity.*/ - protected float coolantMultiplier = 2f; + protected float coolantMultiplier = 5f; protected Effect coolEffect = Fx.fuelburn; public CooledTurret(String name){ @@ -25,7 +25,7 @@ public class CooledTurret extends Turret{ hasLiquids = true; liquidCapacity = 20f; - consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.5f)).update(false).optional(true); + consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.2f)).update(false).optional(true); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java index 1eadb0d9bc..ef83d2d455 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/turrets/LaserTurret.java @@ -12,6 +12,7 @@ import io.anuke.mindustry.world.Tile; import io.anuke.mindustry.world.consumers.ConsumeLiquidBase; import io.anuke.mindustry.world.consumers.ConsumeLiquidFilter; import io.anuke.mindustry.world.consumers.ConsumeType; +import io.anuke.mindustry.world.meta.BlockStat; import static io.anuke.mindustry.Vars.tilesize; @@ -26,6 +27,13 @@ public class LaserTurret extends PowerTurret{ consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.01f)).update(false); } + @Override + public void setStats(){ + super.setStats(); + + stats.remove(BlockStat.boostEffect); + } + @Override public void update(Tile tile) { super.update(tile);