Ticket #2931: seed.2.diff

binaries/data/mods/public/simulation/helpers/InitGame.js

@@ -51 +51 @@
             cmpPlayer.SetResourceCounts(newResourceCounts);
         }
     }
+    let seed = settings.Seed ? settings.Seed : 0;
+    cmpAIManager.SetRNGSeed(seed);
     cmpAIManager.TryLoadSharedComponent();
     cmpAIManager.RunGamestateInit();
 }

source/ps/GameSetup/GameSetup.cpp

@@ -1162 +1162 @@
  * Command line options for autostart (keep synchronized with readme.txt):
  *
  * -autostart="TYPEDIR/MAPNAME"     enables autostart and sets MAPNAME; TYPEDIR is skirmishes, scenarios, or random
- * -autostart-ai=PLAYER:AI          sets the AI for PLAYER (e.g. 2:petra)
+ * -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: easy, 3: very hard)
  * -autostart-civ=PLAYER:CIV        sets PLAYER's civilisation to CIV (skirmish and random maps only)
+ * -autostart-seed=SEED         sets (AI + random map) SEED value (default 0, use -1 for random)
  * Multiplayer:
  * -autostart-playername=NAME       sets local player NAME (default 'anonymous')
- * -autostart-host                  sets multiplayer host mode
+ * -autostart-host              sets multiplayer host mode
  * -autostart-host-players=NUMBER   sets NUMBER of human players for multiplayer game (default 2)
- * -autostart-client=IP             sets multiplayer client to join host at given IP address
+ * -autostart-client=IP         sets multiplayer client to join host at given IP address
  * Random maps only:
- * -autostart-seed=SEED             sets random map SEED value (default 0, use -1 for random)
- * -autostart-size=TILES            sets random map size in TILES (default 192)
+ * -autostart-size=TILES        sets random map size in TILES (default 192)
  * -autostart-players=NUMBER        sets NUMBER of players on random map (default 2)
  *
  * Examples:
@@ -1218 +1218 @@
 
     if (mapDirectory == L"random")
     {
-        // Default seed is 0
-        u32 seed = 0;
-        CStr seedArg = args.Get("autostart-seed");
-
-        if (!seedArg.empty())
-        {
-            // Random seed value
-            if (seedArg != "-1")
-                seed = rand();
-            else
-                seed = seedArg.ToULong();
-        }
-        
         // Random map definition will be loaded from JSON file, so we need to parse it
         std::wstring scriptPath = L"maps/" + autoStartName.FromUTF8() + L".json";
         JS::RootedValue scriptData(cx);
@@ -1257 +1244 @@
             mapSize = size.ToUInt();
         }
 
-        scriptInterface.SetProperty(settings, "Seed", seed);        // Random seed
         scriptInterface.SetProperty(settings, "Size", mapSize);     // Random map size (in patches)
 
         // Get optional number of players (default 2)
@@ -1307 +1293 @@
     scriptInterface.SetProperty(attrs, "map", std::string("maps/" + autoStartName));
     scriptInterface.SetProperty(settings, "mapType", mapType);
 
+    // Random seed value for random maps and AIs, default is 0
+    u32 seed = 0;
+    if (args.Has("autostart-seed"))
+    {
+        CStr seedArg = args.Get("autostart-seed");
+        if (seedArg == "-1")
+            seed = rand();
+        else
+            seed = seedArg.ToULong();
+        LOGWARNING(L"Autostart: random seed %d ", seed);
+    }
+        scriptInterface.SetProperty(settings, "Seed", seed);
+
     // Set player data for AIs
     //      attrs.settings = { PlayerData: [ { AI: ... }, ... ] }:
     if (args.Has("autostart-ai"))

source/simulation2/components/CCmpAIManager.cpp

@@ -225 +225 @@
         m_HasSharedComponent(false)
     {
 
-        // TODO: ought to seed the RNG (in a network-synchronised way) before we use it
         m_ScriptInterface->ReplaceNondeterministicRNG(m_RNG);
         m_ScriptInterface->LoadGlobalScripts();
 
@@ -361 +360 @@
         tex_write(&t, filename);
     }
 
+    void SetRNGSeed(uint32_t seed)
+    {
+        m_RNG.seed(seed);
+    }
+
     bool TryLoadSharedComponent(bool hasTechs)
     {
         JSContext* cx = m_ScriptInterface->GetContext();
@@ -917 +921 @@
             cmpRangeManager->SetLosRevealAll(player, true);
     }
     
+    virtual void SetRNGSeed(uint32_t seed)
+    {
+        m_Worker.SetRNGSeed(seed);
+    }
+
     virtual void TryLoadSharedComponent()
     {
         ScriptInterface& scriptInterface = GetSimContext().GetScriptInterface();

source/simulation2/components/ICmpAIManager.cpp

@@ -26 +26 @@
 
 BEGIN_INTERFACE_WRAPPER(AIManager)
 DEFINE_INTERFACE_METHOD_3("AddPlayer", void, ICmpAIManager, AddPlayer, std::wstring, player_id_t, uint8_t)
+DEFINE_INTERFACE_METHOD_1("SetRNGSeed", void, ICmpAIManager, SetRNGSeed, uint32_t)
 DEFINE_INTERFACE_METHOD_0("TryLoadSharedComponent", void, ICmpAIManager, TryLoadSharedComponent)
 DEFINE_INTERFACE_METHOD_0("RunGamestateInit", void, ICmpAIManager, RunGamestateInit)
 END_INTERFACE_WRAPPER(AIManager)

source/simulation2/components/ICmpAIManager.h

@@ -31 +31 @@
      * to control player @p player.
      */
     virtual void AddPlayer(std::wstring id, player_id_t player, uint8_t difficulty) = 0;
+    virtual void SetRNGSeed(uint32_t seed) = 0;
     virtual void TryLoadSharedComponent() = 0;
     virtual void RunGamestateInit() = 0;