From a438be7fcd22c8aa96c570762366302960cbc6a2 Mon Sep 17 00:00:00 2001 From: Matthew Peng <54301439+MEEPofFaith@users.noreply.github.com> Date: Tue, 2 Nov 2021 17:22:07 -0700 Subject: [PATCH] when and why was this hardcoded (#6289) --- core/src/mindustry/ai/types/MinerAI.java | 4 ++-- core/src/mindustry/game/Teams.java | 4 +--- core/src/mindustry/type/UnitType.java | 4 +++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/mindustry/ai/types/MinerAI.java b/core/src/mindustry/ai/types/MinerAI.java index f4a408800f..bc9b1a9da9 100644 --- a/core/src/mindustry/ai/types/MinerAI.java +++ b/core/src/mindustry/ai/types/MinerAI.java @@ -25,7 +25,7 @@ public class MinerAI extends AIController{ if(mining){ if(timer.get(timerTarget2, 60 * 4) || targetItem == null){ - targetItem = unit.team.data().mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i)); + targetItem = unit.type.mineItems.min(i -> indexer.hasOre(i) && unit.canMine(i), i -> core.items.get(i)); } //core full of the target item, do nothing @@ -75,4 +75,4 @@ public class MinerAI extends AIController{ circle(core, unit.type.range / 1.8f); } } -} +} \ No newline at end of file diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index f6f284ab35..0f3bf22c69 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -234,8 +234,6 @@ public class Teams{ public Queue blocks = new Queue<>(); /** The current command for units to follow. */ public UnitCommand command = UnitCommand.attack; - /** Target items to mine. */ - public Seq mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium); /** Quadtree for all buildings of this team. Null if not active. */ @Nullable @@ -370,4 +368,4 @@ public class Teams{ '}'; } } -} +} \ No newline at end of file diff --git a/core/src/mindustry/type/UnitType.java b/core/src/mindustry/type/UnitType.java index fcff622497..ac576f396d 100644 --- a/core/src/mindustry/type/UnitType.java +++ b/core/src/mindustry/type/UnitType.java @@ -88,6 +88,8 @@ public class UnitType extends UnlockableContent{ public BlockFlag[] targetFlags = {null}; /** targetFlags, as an override for "non-AI" teams. By default, units of this type will rush the core. */ public BlockFlag[] playerTargetFlags = {BlockFlag.core, null}; + /** Target items to mine. Used in MinerAI */ + public Seq mineItems = Seq.with(Items.copper, Items.lead, Items.titanium, Items.thorium); public Color outlineColor = Pal.darkerMetal; public int outlineRadius = 3; @@ -965,4 +967,4 @@ public class UnitType extends UnlockableContent{ //endregion -} +} \ No newline at end of file