Fixes #447 Fix JumpPoint generation, add some error checking around jump points/systems as well

Author: behindcurtain3

Pulsar4X/GameEngine/Engine/Game.cs

@@ -13,6 +13,7 @@
 using Pulsar4X.Factions;
 using Pulsar4X.Galaxy;
 using Pulsar4X.Energy;
+using Pulsar4X.JumpPoints;
 using Pulsar4X.Sensors;
 using Pulsar4X.Logistics;
 using Pulsar4X.Messaging;
@@ -249,6 +250,9 @@ public static Game Load(string json)
 
         public void PostNewGameInitialization()
         {
+            // Link all JumpPoints between systems
+            JPFactory.LinkAllJumpPoints(this);
+
             // There are few DB's that need to run the processor when the game begins
             foreach(var system in Systems)
             {

Pulsar4X/GameEngine/Galaxy/StarSystemFactory.cs

@@ -191,6 +191,7 @@ public StarSystem CreateTestSystem(Game game, int x = 0, int y = 0)
             SensorTools.PlanetEmmisionSig(sensorProfile, halleysBodyDB, halleysMVDB);
 
             JPSurveyFactory.GenerateJPSurveyPoints(sol);
+            JPFactory.GenerateJumpPoints(this, sol, sun.GetDataBlob<PositionDB>().Root);
 
             game.GameMasterFaction.GetDataBlob<FactionInfoDB>().KnownSystems.Add(sol.ID);
             return sol;
@@ -303,8 +304,8 @@ public StarSystem CreateSol(Game game)
             var halleysComet = SystemBodyFactory.Create(game, sol, sun, new System.DateTime(1994, 2, 17), new SensorProfileDB(), "Data/basemod/bodies/halleyscomet.json");
             _systemBodyFactory.MineralGeneration(game.StartingGameData.Minerals.Values.ToList(), sol, halleysComet);
 
-            // Clean up cached RNG:
             JPSurveyFactory.GenerateJPSurveyPoints(sol);
+            JPFactory.GenerateJumpPoints(this, sol, sun.GetDataBlob<PositionDB>().Root);
 
             // Go through all the created entities and set them to be neutral
             foreach(var entity in sol.GetAllEntites())
@@ -370,6 +371,11 @@ public StarSystem LoadSystemFromJson(Game game, string folder)
                 JPSurveyFactory.GenerateJPSurveyPoints(system);
             }
 
+            if(rootStar != null)
+            {
+                JPFactory.GenerateJumpPoints(this, system, rootStar.GetDataBlob<PositionDB>().Root);
+            }
+
             // Go through all the created entities and set them to be neutral
             foreach(var entity in system.GetAllEntites())
             {
@@ -418,6 +424,11 @@ public static StarSystem LoadFromBlueprint(Game game, SystemBlueprint systemBlue
                 JPSurveyFactory.GenerateJPSurveyPoints(system);
             }
 
+            if(rootStar != null)
+            {
+                JPFactory.GenerateJumpPoints(galaxyGen.StarSystemFactory, system, rootStar.GetDataBlob<PositionDB>().Root);
+            }
+
             // Go through all the created entities and set them to be neutral
             foreach(var entity in system.GetAllEntites())
             {

Pulsar4X/GameEngine/JumpPoints/JPFactory.cs

@@ -1,11 +1,13 @@
-using Pulsar4X.Orbital;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using Pulsar4X.Datablobs;
 using Pulsar4X.Engine;
-using Pulsar4X.Names;
-using Pulsar4X.Orbits;
 using Pulsar4X.Galaxy;
 using Pulsar4X.Movement;
+using Pulsar4X.Names;
+using Pulsar4X.Orbital;
+using Pulsar4X.Orbits;
 
 namespace Pulsar4X.JumpPoints
 {
@@ -102,6 +104,14 @@ public static void GenerateJumpPoints(StarSystemFactory ssf, StarSystem system,
         {
             int numJumpPoints = GetNumJPForSystem(system);
 
+            // Cap JumpPoints to maxSystems - 1 to ensure we don't create more than can be linked
+            // In a 2-system game, each system should have at most 1 JP
+            int maxSystems = system.Game.Settings.MaxSystems;
+            if (maxSystems > 1 && numJumpPoints > maxSystems - 1)
+            {
+                numJumpPoints = maxSystems - 1;
+            }
+
             while (numJumpPoints > 0)
             {
                 numJumpPoints--;
@@ -129,5 +139,71 @@ private static void LinkJumpPoints(Entity JP1, Entity JP2)
             jp1TransitableDB.DestinationId = JP2.Id;
             jp2TransitableDB.DestinationId = JP1.Id;
         }
+
+        /// <summary>
+        /// Links all unlinked JumpPoints across all systems in the game.
+        /// JumpPoints are paired between different systems to create inter-system connections.
+        /// </summary>
+        public static void LinkAllJumpPoints(Game game)
+        {
+            // Collect all unlinked JumpPoints grouped by system
+            var unlinkedBySystem = new Dictionary<string, List<Entity>>();
+
+            foreach (var system in game.Systems)
+            {
+                var jumpPoints = system.GetAllEntitiesWithDataBlob<JumpPointDB>()
+                    .Where(jp => jp.GetDataBlob<JumpPointDB>().DestinationId <= 0)
+                    .ToList();
+
+                if (jumpPoints.Count > 0)
+                {
+                    unlinkedBySystem[system.ID] = jumpPoints;
+                }
+            }
+
+            // If we have fewer than 2 systems with JumpPoints, nothing to link
+            if (unlinkedBySystem.Count < 2)
+                return;
+
+            var systemIds = unlinkedBySystem.Keys.ToList();
+            var random = new Random(game.Settings.MasterSeed);
+
+            // Keep linking JumpPoints until we can't make any more pairs
+            bool madeLink;
+            do
+            {
+                madeLink = false;
+
+                // Find two systems that both have unlinked JumpPoints
+                var systemsWithJPs = systemIds.Where(id => unlinkedBySystem[id].Count > 0).ToList();
+
+                if (systemsWithJPs.Count < 2)
+                    break;
+
+                // Pick two different systems randomly
+                int idx1 = random.Next(systemsWithJPs.Count);
+                string system1Id = systemsWithJPs[idx1];
+                systemsWithJPs.RemoveAt(idx1);
+
+                int idx2 = random.Next(systemsWithJPs.Count);
+                string system2Id = systemsWithJPs[idx2];
+
+                // Get one JumpPoint from each system
+                var jp1List = unlinkedBySystem[system1Id];
+                var jp2List = unlinkedBySystem[system2Id];
+
+                var jp1 = jp1List[random.Next(jp1List.Count)];
+                var jp2 = jp2List[random.Next(jp2List.Count)];
+
+                // Link them
+                LinkJumpPoints(jp1, jp2);
+
+                // Remove from unlinked lists
+                jp1List.Remove(jp1);
+                jp2List.Remove(jp2);
+
+                madeLink = true;
+            } while (madeLink);
+        }
     }
 }

Pulsar4X/GameEngine/JumpPoints/JPSurveyProcessor.cs

@@ -136,7 +136,12 @@ private void RollToDiscoverJumpPoint(DateTime atDateTime, Entity discoveringEnti
 
     private void RevealOtherSide(JumpPointDB jumpPointDB, DateTime atDateTime, Entity discoveringEntity)
     {
-        if(discoveringEntity.Manager.TryGetGlobalEntityById(jumpPointDB.DestinationId, out var destinationEntity))
+        // Skip if no destination is linked (DestinationId defaults to 0 which could match an unrelated entity)
+        if(jumpPointDB.DestinationId <= 0)
+            return;
+
+        if(discoveringEntity.Manager.TryGetGlobalEntityById(jumpPointDB.DestinationId, out var destinationEntity)
+            && destinationEntity.HasDataBlob<JumpPointDB>())
         {
             var factionInfoDB = discoveringEntity.Manager.Game.Factions[discoveringEntity.FactionOwnerID].GetDataBlob<FactionInfoDB>();
 

Pulsar4X/Pulsar4X.Client/State/GlobalUIState.cs

@@ -221,7 +221,8 @@ internal void SetFaction(Entity factionEntity, bool setAsPlayer = false)
             StarSystemStates = new SafeDictionary<string, SystemState>();
             foreach (var guid in factionInfo.KnownSystems)
             {
-                var system = Game.Systems.First(s => s.ID.Equals(guid));
+                var system = Game.Systems.FirstOrDefault(s => s.ID.Equals(guid));
+                if(system == null) continue;
                 StarSystemStates[guid] = new SystemState(system, factionEntity.Id);
             }
 
@@ -242,7 +243,13 @@ await Task.Run(() => {
                 if(message.SystemId != null)
                 {
                     if(!StarSystemStates.ContainsKey(message.SystemId)){
-                        StarSystemStates[message.SystemId] = new SystemState(Game.Systems.First(s => s.ID.Equals(message.SystemId)), Faction.Id);
+                        var system = Game.Systems.FirstOrDefault(s => s.ID.Equals(message.SystemId));
+                        if(system == null)
+                        {
+                            Console.WriteLine($"ERROR: {message.SystemId} was revealed but not found in the game systems.");
+                            return;
+                        }
+                        StarSystemStates[message.SystemId] = new SystemState(system, Faction.Id);
                     }
                     OnStarSystemAdded?.Invoke(this, message.SystemId);
                 }