From 1f59d4354a31d02127f24f2918b91c70cc44b036 Mon Sep 17 00:00:00 2001 From: Anuken Date: Tue, 7 Aug 2018 18:26:16 -0400 Subject: [PATCH] Fixed retreat command, more pathfinding --- core/src/io/anuke/mindustry/ui/fragments/HudFragment.java | 2 +- .../anuke/mindustry/world/blocks/units/CommandCenter.java | 2 +- .../anuke/mindustry/world/blocks/units/ResupplyPoint.java | 2 +- .../io/anuke/mindustry/world/blocks/units/UnitPad.java | 2 +- core/src/io/anuke/mindustry/world/meta/BlockFlag.java | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 1948bd1c68..f606b7b9ea 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -131,7 +131,7 @@ public class HudFragment extends Fragment{ //paused table parent.fill(t -> { t.top().visible(() -> state.is(State.paused) && !Net.active()); - t.table("pane", top -> top.add("[orange]< " + Bundles.get("text.paused") + " >").pad(6).get().setFontScale(fontScale * 1.5f)); + t.table("clear", top -> top.add("[orange]< " + Bundles.get("text.paused") + " >").pad(6).get().setFontScale(fontScale * 1.5f)); }); //'core is under attack' table diff --git a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java index 0061567938..83b4f6f4ab 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/CommandCenter.java @@ -38,7 +38,7 @@ public class CommandCenter extends Block{ public CommandCenter(String name){ super(name); - flags = EnumSet.of(BlockFlag.comandCenter, BlockFlag.target); + flags = EnumSet.of(BlockFlag.comandCenter); destructible = true; solid = true; configurable = true; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/ResupplyPoint.java b/core/src/io/anuke/mindustry/world/blocks/units/ResupplyPoint.java index 12aa4b3ce6..6f0c5a6281 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/ResupplyPoint.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/ResupplyPoint.java @@ -32,7 +32,7 @@ public class ResupplyPoint extends Block{ super(name); update = true; solid = true; - flags = EnumSet.of(BlockFlag.resupplyPoint, BlockFlag.target); + flags = EnumSet.of(BlockFlag.resupplyPoint); layer = Layer.laser; hasItems = true; hasPower = true; diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java index 0fb80c4d10..5b7f96e837 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitPad.java @@ -54,7 +54,7 @@ public class UnitPad extends Block{ hasItems = true; solid = false; itemCapacity = 10; - flags = EnumSet.of(BlockFlag.target); + flags = EnumSet.of(BlockFlag.producer); consumes.require(ConsumeItems.class); } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java b/core/src/io/anuke/mindustry/world/meta/BlockFlag.java index 4ed8056324..e43631b7db 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockFlag.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockFlag.java @@ -8,15 +8,15 @@ public enum BlockFlag{ /**Point to drop off resources.*/ dropPoint(Float.MAX_VALUE), /**Producer of important goods.*/ - producer(20), + producer(Float.MAX_VALUE), /**Just a turret.*/ - turret(20), + turret(Float.MAX_VALUE), /**Producer or storage unit of volatile materials.*/ - explosive(10), + explosive(Float.MAX_VALUE), /**Repair point.*/ repair(Float.MAX_VALUE), /**Special flag for command center blocks.*/ - comandCenter(30); + comandCenter(Float.MAX_VALUE); public final float cost;