Progress on new unit control block

This commit is contained in:
Anuken
2020-08-16 16:34:14 -04:00
parent 8dd4e9feb0
commit 2bb2964790
4 changed files with 12 additions and 2 deletions

View File

@@ -82,7 +82,7 @@ public class StatusEffects implements ContentList{
effectChance = 0.1f; effectChance = 0.1f;
}}; }};
sporeSlowed = new StatusEffect("sapped"){{ sporeSlowed = new StatusEffect("spore-slowed"){{
speedMultiplier = 0.8f; speedMultiplier = 0.8f;
effect = Fx.sapped; effect = Fx.sapped;
effectChance = 0.04f; effectChance = 0.04f;

View File

@@ -3,7 +3,7 @@ package mindustry.entities.units;
import arc.*; import arc.*;
public enum UnitCommand{ public enum UnitCommand{
attack, retreat, rally; attack, retreat, rally, idle;
private final String localized; private final String localized;
public static final UnitCommand[] all = values(); public static final UnitCommand[] all = values();

View File

@@ -5,6 +5,7 @@ import arc.math.geom.*;
import arc.struct.*; import arc.struct.*;
import arc.util.ArcAnnotate.*; import arc.util.ArcAnnotate.*;
import mindustry.ai.*; import mindustry.ai.*;
import mindustry.entities.units.*;
import mindustry.gen.*; import mindustry.gen.*;
import mindustry.world.blocks.storage.CoreBlock.*; import mindustry.world.blocks.storage.CoreBlock.*;
@@ -146,8 +147,12 @@ public class Teams{
public final Seq<CoreBuild> cores = new Seq<>(); public final Seq<CoreBuild> cores = new Seq<>();
public final Team team; public final Team team;
public final BaseAI ai; public final BaseAI ai;
public Team[] enemies = {}; public Team[] enemies = {};
/** Planned blocks for drones. This is usually only blocks that have been broken. */
public Queue<BlockPlan> blocks = new Queue<>(); public Queue<BlockPlan> blocks = new Queue<>();
/** The current command for units to follow. */
public UnitCommand command = UnitCommand.attack;
public TeamData(Team team){ public TeamData(Team team){
this.team = team; this.team = team;

View File

@@ -1,5 +1,6 @@
package mindustry.world.blocks.units; package mindustry.world.blocks.units;
import mindustry.gen.*;
import mindustry.world.*; import mindustry.world.*;
public class ControlCenter extends Block{ public class ControlCenter extends Block{
@@ -8,4 +9,8 @@ public class ControlCenter extends Block{
super(name); super(name);
update = true; update = true;
} }
public class ControlCenterBuild extends Building{
}
} }