From cfbbee8746226205a49559d43cbb7e07484a3ad2 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 26 Sep 2024 11:44:48 -0400 Subject: [PATCH] Removed RTS AI difficulty modifier --- core/src/mindustry/content/Planets.java | 2 -- core/src/mindustry/game/CampaignRules.java | 16 ---------------- core/src/mindustry/type/Planet.java | 2 -- .../ui/dialogs/CampaignRulesDialog.java | 3 --- 4 files changed, 23 deletions(-) diff --git a/core/src/mindustry/content/Planets.java b/core/src/mindustry/content/Planets.java index 1413b40a3a35..a37488943c43 100644 --- a/core/src/mindustry/content/Planets.java +++ b/core/src/mindustry/content/Planets.java @@ -87,7 +87,6 @@ public static void load(){ }; campaignRuleDefaults.fog = true; campaignRuleDefaults.showSpawns = true; - campaignRuleDefaults.rtsAI = true; unlockedOnLand.add(Blocks.coreBastion); }}; @@ -147,7 +146,6 @@ public static void load(){ r.placeRangeCheck = false; r.showSpawns = false; }; - showRtsAIRule = true; iconColor = Color.valueOf("7d4dff"); atmosphereColor = Color.valueOf("3c1b8f"); atmosphereRadIn = 0.02f; diff --git a/core/src/mindustry/game/CampaignRules.java b/core/src/mindustry/game/CampaignRules.java index 8512825adc48..7ed813cab7a6 100644 --- a/core/src/mindustry/game/CampaignRules.java +++ b/core/src/mindustry/game/CampaignRules.java @@ -1,7 +1,5 @@ package mindustry.game; -import mindustry.*; -import mindustry.gen.*; import mindustry.type.*; public class CampaignRules{ @@ -10,26 +8,12 @@ public class CampaignRules{ public boolean showSpawns; public boolean sectorInvasion; public boolean randomWaveAI; - public boolean rtsAI; public void apply(Planet planet, Rules rules){ rules.staticFog = rules.fog = fog; rules.showSpawns = showSpawns; rules.randomWaveAI = randomWaveAI; rules.objectiveTimerMultiplier = difficulty.waveTimeMultiplier; - if(planet.showRtsAIRule && rules.attackMode){ - boolean swapped = rules.teams.get(rules.waveTeam).rtsAi != rtsAI; - rules.teams.get(rules.waveTeam).rtsAi = rtsAI; - rules.teams.get(rules.waveTeam).rtsMinWeight = 1.2f * difficulty.enemyHealthMultiplier; - - if(swapped && Vars.state.isGame()){ - Groups.unit.each(u -> { - if(u.team == rules.waveTeam && !u.isPlayer()){ - u.resetController(); - } - }); - } - } rules.teams.get(rules.waveTeam).blockHealthMultiplier = difficulty.enemyHealthMultiplier; rules.teams.get(rules.waveTeam).unitHealthMultiplier = difficulty.enemyHealthMultiplier; rules.teams.get(rules.waveTeam).unitCostMultiplier = 1f / difficulty.enemySpawnMultiplier; diff --git a/core/src/mindustry/type/Planet.java b/core/src/mindustry/type/Planet.java index 41344793f342..bbffb0901f62 100644 --- a/core/src/mindustry/type/Planet.java +++ b/core/src/mindustry/type/Planet.java @@ -161,8 +161,6 @@ public class Planet extends UnlockableContent{ public CampaignRules campaignRuleDefaults = new CampaignRules(); /** Sets up rules on game load for any sector on this planet. */ public Cons ruleSetter = r -> {}; - /** If true, RTS AI can be customized. */ - public boolean showRtsAIRule = false; /** @deprecated no-op, do not use. */ @Deprecated diff --git a/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java b/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java index 64adb4df2c10..55e6fda0e727 100644 --- a/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java +++ b/core/src/mindustry/ui/dialogs/CampaignRulesDialog.java @@ -68,9 +68,6 @@ void rebuild(){ check("@rules.fog", b -> rules.fog = b, () -> rules.fog); check("@rules.showspawns", b -> rules.showSpawns = b, () -> rules.showSpawns); check("@rules.randomwaveai", b -> rules.randomWaveAI = b, () -> rules.randomWaveAI); - if(planet.showRtsAIRule){ - check("@rules.rtsai.campaign", b -> rules.rtsAI = b, () -> rules.rtsAI); - } }).growY(); }