Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

RTS AI fixes / Silicon gated behind Frozen Forest / Tainted woods guardian nerf

Browse Source
This commit is contained in:
Anuken
2025-04-30 19:07:57 -04:00
parent bad43e8fa9
commit 37f32d3317
7 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/game/CampaignRules.java
View File

@@ -18,9 +18,11 @@ public class CampaignRules{
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;
if(planet.showRtsAIRule){
boolean enabled = rtsAI && rules.attackMode; //if attackMode becomes false (waves enabled), turn off RTS AI
boolean swapped = rules.teams.get(rules.waveTeam).rtsAi != enabled;
rules.teams.get(rules.waveTeam).rtsAi = enabled;
rules.teams.get(rules.waveTeam).rtsMaxSquad = 15;
if(swapped && Vars.state.isGame()){

2
core/src/mindustry/game/Team.java
View File

@@ -110,7 +110,7 @@ public class Team implements Comparable<Team>, Senseable{
/** @return whether this team is supposed to be AI-controlled. */
public boolean isAI(){
return (state.rules.waves || state.rules.attackMode) && this != state.rules.defaultTeam && !state.rules.pvp;
return (state.rules.waves || state.rules.attackMode || state.isCampaign()) && this != state.rules.defaultTeam && !state.rules.pvp;
}
/** @return whether this team is solely comprised of AI (with no players possible). */

1
core/src/mindustry/game/Universe.java
View File

@@ -285,6 +285,7 @@ public class Universe{
state.rules.winWave = waveMax;
state.rules.waves = true;
state.rules.attackMode = false;
planet.campaignRules.apply(planet, state.rules); //enabling waves may force changes in campaign rules
//update rules in multiplayer
if(net.server()){
Call.setRules(state.rules);