Changeset 27637

Timestamp:

May 10, 2023, 5:34:38 PM (15 months ago)

Author:

Stan

Message:

Allow starting by command with sandbox AI.

takes 0 as false; ?? doesn't.

Patch by: @Freagarach
Accepted by: @sera, @Langbart

Fixes: #6771

Differential Revision: ​https://code.wildfiregames.com/D4975

Location:

ps/trunk

Files:

• binaries/data/mods/public/gamesettings/attributes/PlayerAI.js (modified) (1 diff)
• binaries/system/readme.txt (modified) (1 diff)
• source/ps/GameSetup/GameSetup.cpp (modified) (2 diffs)

ps/trunk/binaries/data/mods/public/gamesettings/attributes/PlayerAI.js

@@ -49 +49 @@
             this.set(+i, {
                 "bot": pData[i].AI,
-                "difficulty": pData[i].AIDiff || +Engine.ConfigDB_GetValue("user", "gui.gamesetup.aidifficulty"),
+                "difficulty": pData[i].AIDiff  +Engine.ConfigDB_GetValue("user", "gui.gamesetup.aidifficulty"),
                 "behavior": pData[i].AIBehavior || Engine.ConfigDB_GetValue("user", "gui.gamesetup.aibehavior"),
             });

ps/trunk/binaries/system/readme.txt

@@ -11 +11 @@
 -autostart-seed=SEED            sets randomization seed value (default 0, use -1 for random)
 -autostart-ai=PLAYER:AI         sets the AI for PLAYER (e.g. 2:petra)
--autostart-aidiff=PLAYER:DIFF   sets the DIFFiculty of PLAYER's AI (0: sandbox, 5: very hard)
+-autostart-aidiff=PLAYER:DIFF   sets the DIFFiculty of PLAYER's AI (0: sandbox, 5: very hard)
 -autostart-aiseed=AISEED        sets the seed used for the AI random generator (default 0, use -1 for random)
 -autostart-player=NUMBER        sets the playerID in non-networked games (default 1, use -1 for observer)

ps/trunk/source/ps/GameSetup/GameSetup.cpp

@@ -804 +804 @@
  * -autostart-ai=PLAYER:AI         sets the AI for PLAYER (e.g. 2:petra)
  * -autostart-aidiff=PLAYER:DIFF   sets the DIFFiculty of PLAYER's AI
- *                                 (0: sandbox, 5: very hard)
+ *                                 (0: sandbox, 5: very hard)
  * -autostart-aiseed=AISEED        sets the seed used for the AI random
  *                                 generator (default 0, use -1 for random)
@@ -844 +844 @@
  * -autostart-client=127.0.0.1 -autostart-playername="Alice"
  * The players use the developer overlay to control players.
- *
  * 2) Load Alpine Lakes random map with random seed, 2 players (Athens and Britons), and player 2 is PetraBot:
  * -autostart="random/alpine_lakes" -autostart-seed=-1 -autostart-players=2 -autostart-civ=1:athen -autostart-civ=2:brit -autostart-ai=2:petra
- *
- * 3) Observe the PetraBot on a triggerscript map:
- * -autostart="random/jebel_barkal" -autostart-seed=-1 -autostart-players=2 -autostart-civ=1:athen -autostart-civ=2:brit -autostart-ai=1:petra -autostart-ai=2:petra -autostart-player=-1
  */
 bool Autostart(const CmdLineArgs& args)