mirror of
https://github.com/openfrontio/OpenFrontIO.git
synced 2026-07-15 14:35:48 +00:00
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:
@@ -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();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user