From 4dd439644598baf99055c2305871a8c5845590db Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 21 Oct 2022 17:27:28 -0400 Subject: [PATCH] Made RTS AI target drills too --- core/src/mindustry/ai/RtsAI.java | 2 +- core/src/mindustry/world/blocks/production/BeamDrill.java | 2 ++ core/src/mindustry/world/blocks/production/Drill.java | 1 + core/src/mindustry/world/blocks/production/WallCrafter.java | 2 ++ core/src/mindustry/world/meta/BlockFlag.java | 2 ++ 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/mindustry/ai/RtsAI.java b/core/src/mindustry/ai/RtsAI.java index 930ededf6d..78b6635121 100644 --- a/core/src/mindustry/ai/RtsAI.java +++ b/core/src/mindustry/ai/RtsAI.java @@ -31,7 +31,7 @@ public class RtsAI{ static final int timeUpdate = 0, timerSpawn = 1, maxTargetsChecked = 15; //in order of priority?? - static final BlockFlag[] flags = {BlockFlag.generator, BlockFlag.factory, BlockFlag.core, BlockFlag.battery}; + static final BlockFlag[] flags = {BlockFlag.generator, BlockFlag.factory, BlockFlag.core, BlockFlag.battery, BlockFlag.drill}; static final ObjectFloatMap weights = new ObjectFloatMap<>(); static final boolean debug = OS.hasProp("mindustry.debug"); diff --git a/core/src/mindustry/world/blocks/production/BeamDrill.java b/core/src/mindustry/world/blocks/production/BeamDrill.java index 0ffcf70386..fb0a7ac52c 100644 --- a/core/src/mindustry/world/blocks/production/BeamDrill.java +++ b/core/src/mindustry/world/blocks/production/BeamDrill.java @@ -5,6 +5,7 @@ import arc.graphics.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import arc.util.*; import arc.util.io.*; import mindustry.annotations.Annotations.*; @@ -64,6 +65,7 @@ public class BeamDrill extends Block{ ambientSound = Sounds.minebeam; envEnabled |= Env.space; + flags = EnumSet.of(BlockFlag.drill); } @Override diff --git a/core/src/mindustry/world/blocks/production/Drill.java b/core/src/mindustry/world/blocks/production/Drill.java index 7992934ebb..ce02a864be 100644 --- a/core/src/mindustry/world/blocks/production/Drill.java +++ b/core/src/mindustry/world/blocks/production/Drill.java @@ -79,6 +79,7 @@ public class Drill extends Block{ ambientSoundVolume = 0.018f; //drills work in space I guess envEnabled |= Env.space; + flags = EnumSet.of(BlockFlag.drill); } @Override diff --git a/core/src/mindustry/world/blocks/production/WallCrafter.java b/core/src/mindustry/world/blocks/production/WallCrafter.java index a5390beb0c..d499f2cfe3 100644 --- a/core/src/mindustry/world/blocks/production/WallCrafter.java +++ b/core/src/mindustry/world/blocks/production/WallCrafter.java @@ -5,6 +5,7 @@ import arc.func.*; import arc.graphics.g2d.*; import arc.math.*; import arc.math.geom.*; +import arc.struct.*; import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; @@ -48,6 +49,7 @@ public class WallCrafter extends Block{ regionRotated1 = 1; envEnabled |= Env.space; + flags = EnumSet.of(BlockFlag.drill); } @Override diff --git a/core/src/mindustry/world/meta/BlockFlag.java b/core/src/mindustry/world/meta/BlockFlag.java index d933412457..314c0424b6 100644 --- a/core/src/mindustry/world/meta/BlockFlag.java +++ b/core/src/mindustry/world/meta/BlockFlag.java @@ -20,6 +20,8 @@ public enum BlockFlag{ reactor, /** Blocks that extinguishes fires. */ extinguisher, + /** Is a drill. */ + drill, //special, internal identifiers launchPad,