fix: clean up NukeWars mode implementation

- Remove merge conflicts from all files
- Fix WinCheckExecution.ts syntax issues
- Properly separate NukeWars from Team mode
- Clean implementation of preparation phase
- Consistent checks for GameMode.NukeWars across codebase
- Fix DefaultConfig numPreparationPhaseTurns implementation
This commit is contained in:
Restart2008
2025-10-25 11:42:20 -07:00
parent 76c46b24dd
commit 63dc0eb3fa
6 changed files with 32 additions and 34 deletions
-6
View File
@@ -323,12 +323,9 @@ export class DefaultConfig implements Config {
}
isUnitDisabled(unitType: UnitType): boolean {
<<<<<<< Updated upstream
=======
if (this._gameConfig.gameMode === GameMode.NukeWars) {
return unitType === UnitType.MIRV;
}
>>>>>>> Stashed changes
return this._gameConfig.disabledUnits?.includes(unitType) ?? false;
}
@@ -622,8 +619,6 @@ export class DefaultConfig implements Config {
numSpawnPhaseTurns(): number {
return this._gameConfig.gameType === GameType.Singleplayer ? 100 : 300;
}
<<<<<<< Updated upstream
=======
numPreparationPhaseTurns(): number {
if (this._gameConfig.gameMode === GameMode.NukeWars) {
@@ -631,7 +626,6 @@ export class DefaultConfig implements Config {
}
return 0;
}
>>>>>>> Stashed changes
numBots(): number {
return this.bots();
}