From 2bb2964790f39e28fda5b60a19dfb0639fe8138b Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 16 Aug 2020 16:34:14 -0400 Subject: [PATCH] Progress on new unit control block --- core/src/mindustry/content/StatusEffects.java | 2 +- core/src/mindustry/entities/units/UnitCommand.java | 2 +- core/src/mindustry/game/Teams.java | 5 +++++ core/src/mindustry/world/blocks/units/ControlCenter.java | 5 +++++ 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/core/src/mindustry/content/StatusEffects.java b/core/src/mindustry/content/StatusEffects.java index d50428ff56..65814e5cb1 100644 --- a/core/src/mindustry/content/StatusEffects.java +++ b/core/src/mindustry/content/StatusEffects.java @@ -82,7 +82,7 @@ public class StatusEffects implements ContentList{ effectChance = 0.1f; }}; - sporeSlowed = new StatusEffect("sapped"){{ + sporeSlowed = new StatusEffect("spore-slowed"){{ speedMultiplier = 0.8f; effect = Fx.sapped; effectChance = 0.04f; diff --git a/core/src/mindustry/entities/units/UnitCommand.java b/core/src/mindustry/entities/units/UnitCommand.java index dada524b84..d04d2481aa 100644 --- a/core/src/mindustry/entities/units/UnitCommand.java +++ b/core/src/mindustry/entities/units/UnitCommand.java @@ -3,7 +3,7 @@ package mindustry.entities.units; import arc.*; public enum UnitCommand{ - attack, retreat, rally; + attack, retreat, rally, idle; private final String localized; public static final UnitCommand[] all = values(); diff --git a/core/src/mindustry/game/Teams.java b/core/src/mindustry/game/Teams.java index ad6915134e..81d861e952 100644 --- a/core/src/mindustry/game/Teams.java +++ b/core/src/mindustry/game/Teams.java @@ -5,6 +5,7 @@ import arc.math.geom.*; import arc.struct.*; import arc.util.ArcAnnotate.*; import mindustry.ai.*; +import mindustry.entities.units.*; import mindustry.gen.*; import mindustry.world.blocks.storage.CoreBlock.*; @@ -146,8 +147,12 @@ public class Teams{ public final Seq cores = new Seq<>(); public final Team team; public final BaseAI ai; + public Team[] enemies = {}; + /** Planned blocks for drones. This is usually only blocks that have been broken. */ public Queue blocks = new Queue<>(); + /** The current command for units to follow. */ + public UnitCommand command = UnitCommand.attack; public TeamData(Team team){ this.team = team; diff --git a/core/src/mindustry/world/blocks/units/ControlCenter.java b/core/src/mindustry/world/blocks/units/ControlCenter.java index 48a78c0b58..ab99470b93 100644 --- a/core/src/mindustry/world/blocks/units/ControlCenter.java +++ b/core/src/mindustry/world/blocks/units/ControlCenter.java @@ -1,5 +1,6 @@ package mindustry.world.blocks.units; +import mindustry.gen.*; import mindustry.world.*; public class ControlCenter extends Block{ @@ -8,4 +9,8 @@ public class ControlCenter extends Block{ super(name); update = true; } + + public class ControlCenterBuild extends Building{ + + } }