From 46489f9893400504388e737d0b3ae4a3c35b3e05 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 6 Mar 2022 16:22:37 -0500 Subject: [PATCH] Bugfixes --- core/src/mindustry/ai/Pathfinder.java | 9 ++++++--- core/src/mindustry/ui/dialogs/LoadDialog.java | 6 ++++-- .../world/blocks/defense/turrets/ReloadTurret.java | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/ai/Pathfinder.java b/core/src/mindustry/ai/Pathfinder.java index d8416dd860..faaa19a45b 100644 --- a/core/src/mindustry/ai/Pathfinder.java +++ b/core/src/mindustry/ai/Pathfinder.java @@ -39,7 +39,8 @@ public class Pathfinder implements Runnable{ public static final Seq costTypes = Seq.with( //ground - (team, tile) -> (PathTile.allDeep(tile) || (PathTile.team(tile) == team || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 + + (team, tile) -> + (PathTile.allDeep(tile) || (PathTile.team(tile) == team || PathTile.team(tile) == 0) && PathTile.solid(tile)) ? impassable : 1 + PathTile.health(tile) * 5 + (PathTile.nearSolid(tile) ? 2 : 0) + (PathTile.nearLiquid(tile) ? 6 : 0) + @@ -47,12 +48,14 @@ public class Pathfinder implements Runnable{ (PathTile.damages(tile) ? 30 : 0), //legs - (team, tile) -> PathTile.legSolid(tile) ? impassable : 1 + + (team, tile) -> + PathTile.legSolid(tile) ? impassable : 1 + (PathTile.deep(tile) ? 6000 : 0) + //leg units can now drown (PathTile.solid(tile) ? 5 : 0), //water - (team, tile) -> (PathTile.solid(tile) || !PathTile.liquid(tile) ? 6000 : 1) + + (team, tile) -> + (PathTile.solid(tile) || !PathTile.liquid(tile) ? 6000 : 1) + (PathTile.nearGround(tile) || PathTile.nearSolid(tile) ? 14 : 0) + (PathTile.deep(tile) ? 0 : 1) + (PathTile.damages(tile) ? 35 : 0) diff --git a/core/src/mindustry/ui/dialogs/LoadDialog.java b/core/src/mindustry/ui/dialogs/LoadDialog.java index b6dfccde38..f77bbfcf55 100644 --- a/core/src/mindustry/ui/dialogs/LoadDialog.java +++ b/core/src/mindustry/ui/dialogs/LoadDialog.java @@ -27,7 +27,6 @@ public class LoadDialog extends BaseDialog{ Gamemode filteredMode; TextField searchField; ScrollPane pane; - BaseDialog dialog; public LoadDialog(){ this("@loadgame"); @@ -37,7 +36,10 @@ public class LoadDialog extends BaseDialog{ super(title); setup(); - shown(this::setup); + shown(() -> { + searchString = ""; + setup(); + }); onResize(this::setup); addCloseButton(); diff --git a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java index f167b312ce..24f6ecaf87 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ReloadTurret.java @@ -33,7 +33,7 @@ public class ReloadTurret extends BaseTurret{ } protected void updateCooling(){ - if(reloadCounter < reload && coolant != null && coolant.efficiency(this) > 0){ + if(reloadCounter < reload && coolant != null && coolant.efficiency(this) > 0 && efficiency > 0){ float capacity = coolant instanceof ConsumeLiquidFilter filter ? filter.getConsumed(this).heatCapacity : 1f; coolant.update(this); reloadCounter += coolant.amount * edelta() * capacity * coolantMultiplier;