dallasgroot/0ad
1
0
Fork 0
mirror of https://gitea.wildfiregames.com/0ad/0ad synced 2026-06-16 05:13:58 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix autostart issues reported by langbart in 2535e5f5b4

Browse source
This commit is contained in:
Lancelot de Ferrière 2024-12-29 20:46:43 +01:00
parent da761ca501
commit 6ab5483550
6 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
binaries/data/mods/public/autostart/autostart.js
View file

@ -15,7 +15,7 @@ class AutoStart
parseCmdLineArgs(this.settings, cmdLineArgs);
this.settings.launchGame(this.playerAssignments, !cmdLineArgs['autostart-disable-replay']);
this.settings.launchGame(this.playerAssignments, !('autostart-disable-replay' in cmdLineArgs));
this.onLaunch();
}

4
binaries/data/mods/public/autostart/autostart_client.js
View file

@ -8,8 +8,8 @@ class AutoStartClient
{
const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
const ip = cmdLineArgs['autostart-client'] ?? "127.0.0.1";
const port = cmdLineArgs['autostart-port'] ?? 5073;
Engine.StartNetworkJoin(playerName, ip, port, !cmdLineArgs['autostart-disable-replay']);
const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
Engine.StartNetworkJoin(playerName, ip, port, !('autostart-disable-replay' in cmdLineArgs));
}
catch (e)
{

4
binaries/data/mods/public/autostart/autostart_host.js
View file

@ -11,10 +11,10 @@ class AutoStartHost
try
{
const playerName = cmdLineArgs['autostart-playername'] || "anonymous";
const port = cmdLineArgs['autostart-port'] ?? 5073;
const port = +cmdLineArgs?.['autostart-port'] ?? 5073;
// Stun and password not implemented for autostart.
Engine.StartNetworkHost(playerName, port, false, "", !cmdLineArgs['autostart-disable-replay']);
Engine.StartNetworkHost(playerName, port, false, "", !('autostart-disable-replay' in cmdLineArgs));
}
catch (e)
{

35
binaries/data/mods/public/autostart/cmd_line_args.js
View file

@ -19,7 +19,7 @@
* (default 0 minutes)
* -autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME
* located in simulation/data/settings/victory_conditions/
* (default conquest). When the first given SCRIPTNAME is
* (default conquest). When the only given SCRIPTNAME is
* "endless", no victory conditions will apply.
* -autostart-wonderduration=NUM sets the victory duration NUM for wonder victory condition
* (default 10 minutes)
@ -71,10 +71,10 @@ function parseCmdLineArgs(settings, cmdLineArgs)
settings.mapSize.setSize(+cmdLineArgs['autostart-size'] || 192);
settings.biome.setBiome(cmdLineArgs['autostart-biome'] || "random");
settings.playerCount.setNb(cmdLineArgs['autostart-players'] || 2);
settings.playerCount.setNb(+cmdLineArgs['autostart-players'] || 2);
const getPlayer = (key, i) => {
if (!cmdLineArgs['autostart-' + key])
if (!(('autostart-' + key) in cmdLineArgs))
return;
var value = cmdLineArgs['autostart-' + key];
if (!Array.isArray(value))
@ -89,25 +89,25 @@ function parseCmdLineArgs(settings, cmdLineArgs)
if (civ)
settings.playerCiv.setValue(i - 1, civ);
const team = getPlayer("team", i)
const team = +getPlayer("team", i)
if (team)
settings.playerTeam.setValue(i - 1, team);
settings.playerTeam.setValue(i - 1, team - 1);
const ai = getPlayer("ai", i)
if (ai)
settings.playerAI.set(i - 1, {
"bot": ai,
"difficulty": getPlayer("aidiff") || 3,
"behavior": getPlayer("aibehavior") || "balanced",
"difficulty": +(getPlayer("aidiff", i) ?? 3),
"behavior": getPlayer("aibehavior", i) ?? "balanced",
});
}
// Seeds default to random so we only need to set specific values.
if (cmdLineArgs?.['autostart-seed'] != -1)
settings.seeds.seed = cmdLineArgs?.['autostart-seed'] || 0;
settings.seeds.seed = +cmdLineArgs?.['autostart-seed'] || 0;
if (cmdLineArgs?.['autostart-aiseed'] != -1)
settings.seeds.AIseed = cmdLineArgs?.['autostart-aiseed'] || 0;
settings.seeds.AIseed = +cmdLineArgs?.['autostart-aiseed'] || 0;
if (cmdLineArgs['autostart-ceasefire'])
settings.seeds.ceaserfire.setValue(+cmdLineArgs['autostart-ceasefire']);
@ -117,15 +117,16 @@ function parseCmdLineArgs(settings, cmdLineArgs)
const victoryConditions = cmdLineArgs["autostart-victory"];
if (Array.isArray(victoryConditions))
for (const cond of victoryConditions)
settings.victoryConditions.setEnabled(cond, true);
else if (victoryConditions && victoryConditions !== "endless")
settings.victoryConditions.setEnabled(victoryConditions, true);
settings.victoryConditions.fromList(victoryConditions);
else if (victoryConditions === "endless")
settings.victoryConditions.setEnabled("conquest", false);
else if (victoryConditions)
// Enable only the specific condition chosen
settings.victoryConditions.fromList([victoryConditions]);
settings.wonder.setDuration(cmdLineArgs['autostart-wonderduration'] || 10);
settings.relic.setDuration(cmdLineArgs['autostart-relicduration'] || 10);
settings.relic.setCount(cmdLineArgs['autostart-reliccount'] || 2);
settings.wonder.setDuration(+(cmdLineArgs['autostart-wonderduration'] ?? 10));
settings.relic.setDuration(+(cmdLineArgs['autostart-relicduration'] ?? 10));
settings.relic.setCount(+(cmdLineArgs['autostart-reliccount'] ?? 2));
return settings;
}

2
binaries/data/mods/public/gamesettings/GameSettings.js
View file

@ -20,7 +20,7 @@ class GameSettings
});
Object.defineProperty(this, "savegameID", {
"value": savegameID,
"value": !!savegameID,
});
// Load all possible civ data - don't presume that some will be available.

2
binaries/system/readme.txt
View file

@ -18,7 +18,7 @@ Autostart:
-autostart-team=PLAYER:TEAM sets the team for PLAYER (e.g. 2:2).
-autostart-ceasefire=NUM sets a ceasefire duration NUM (default 0 minutes)
-autostart-nonvisual disable any graphics and sounds
-autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME located in simulation/data/settings/victory_conditions/ (default conquest). When the first given SCRIPTNAME is "endless", no victory conditions will apply.
-autostart-victory=SCRIPTNAME sets the victory conditions with SCRIPTNAME located in simulation/data/settings/victory_conditions/ (default conquest). When the only given SCRIPTNAME is "endless", no victory conditions will apply.
-autostart-wonderduration=NUM sets the victory duration NUM for wonder victory condition (default 10 minutes)
-autostart-relicduration=NUM sets the victory duration NUM for relic victory condition (default 10 minutes)
-autostart-reliccount=NUM sets the number of relics for relic victory condition (default 2 relics)