Correctly load the system bodies listed in the SystemBlueprint

Pulsar4xDevs · Dec 30, 2024 · da61bc6 · da61bc6
1 parent 811d308
commit da61bc6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json b/Pulsar4X/GameEngine/Data/basemod/blueprints/luna.json
@@ -2,7 +2,7 @@
   {
     "Type": "SystemBody",
     "Payload": {
-      "UniqueID": "luna",
+      "UniqueID": "moon-luna",
       "Name": "Luna",
       "Parent": "Earth",
       "Colonizable": true,

diff --git a/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json b/Pulsar4X/GameEngine/Data/basemod/blueprints/sol.json
@@ -25,7 +25,17 @@
         "sol"
       ],
       "Bodies": [
-        "planet-earth"
+        "mercury",
+        "venus",
+        "planet-earth",
+        "moon-luna",
+        "mars",
+        "jupiter",
+        "moon-io",
+        "saturn",
+        "moon-titan",
+        "uranus",
+        "neptune"
       ],
       "SurveyRings": [
         { "RingRadiusInAU": 2, "Count": 2 }

diff --git a/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs b/Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs
@@ -393,7 +393,7 @@ public static StarSystem LoadFromBlueprint(Game game, SystemBlueprint systemBlue
             }
 
             // Load bodies
-            foreach(var (id, body) in game.StartingGameData.SystemBodies)
+            foreach(var id in systemBlueprint.Bodies)
             {
                 var bodyEntity = SystemBodyFactory.CreateFromBlueprint(game, system, rootStar, galaxyGen.Settings.J2000, new SensorProfileDB(), game.StartingGameData.SystemBodies[id]);
             }