Add events for surveys completing

Pulsar4xDevs · Apr 5, 2024 · 602c157 · 602c157
1 parent 5456827
commit 602c157
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Pulsar4X/GameEngine/Engine/Processors/GeoSurveyProcessor.cs b/Pulsar4X/GameEngine/Engine/Processors/GeoSurveyProcessor.cs
@@ -1,5 +1,7 @@
 using System;
 using Pulsar4X.Datablobs;
+using Pulsar4X.Events;
+using Pulsar4X.Extensions;
 using Pulsar4X.Interfaces;
 
 namespace Pulsar4X.Engine;
@@ -27,9 +29,19 @@ internal override void ProcessEntity(Entity entity, DateTime atDateTime)
             if(!geoSurveyableDB.GeoSurveyStatus.ContainsKey(Fleet.FactionOwnerID))
                 geoSurveyableDB.GeoSurveyStatus[Fleet.FactionOwnerID] = geoSurveyableDB.PointsRequired;
 
-            if(totalSurveyPoints > geoSurveyableDB.GeoSurveyStatus[Fleet.FactionOwnerID])
+            if(totalSurveyPoints >= geoSurveyableDB.GeoSurveyStatus[Fleet.FactionOwnerID])
             {
+                // Survey is complete
                 geoSurveyableDB.GeoSurveyStatus[Fleet.FactionOwnerID] = 0;
+
+                EventManager.Instance.Publish(
+                    Event.Create(
+                        EventType.GeoSurveyCompleted,
+                        atDateTime,
+                        $"Geo Survey of {Target.GetName(Fleet.FactionOwnerID)} complete",
+                        Fleet.FactionOwnerID,
+                        Target.Manager.ManagerGuid,
+                        Target.Id));
             }
             else
             {

diff --git a/Pulsar4X/GameEngine/Engine/Processors/JPSurveyProcessor.cs b/Pulsar4X/GameEngine/Engine/Processors/JPSurveyProcessor.cs
@@ -1,5 +1,7 @@
 using System;
 using Pulsar4X.Datablobs;
+using Pulsar4X.Events;
+using Pulsar4X.Extensions;
 using Pulsar4X.Interfaces;
 
 namespace Pulsar4X.Engine;
@@ -27,9 +29,19 @@ internal override void ProcessEntity(Entity entity, DateTime atDateTime)
             if(!jpSurveyableDB.SurveyPointsRemaining.ContainsKey(Fleet.FactionOwnerID))
                 jpSurveyableDB.SurveyPointsRemaining[Fleet.FactionOwnerID] = jpSurveyableDB.PointsRequired;
 
-            if(totalSurveyPoints > jpSurveyableDB.SurveyPointsRemaining[Fleet.FactionOwnerID])
+            if(totalSurveyPoints >= jpSurveyableDB.SurveyPointsRemaining[Fleet.FactionOwnerID])
             {
+                // Survey is complete
                 jpSurveyableDB.SurveyPointsRemaining[Fleet.FactionOwnerID] = 0;
+
+                EventManager.Instance.Publish(
+                    Event.Create(
+                        EventType.JumpPointSurveyCompleted,
+                        atDateTime,
+                        $"Survey of {Target.GetName(Fleet.FactionOwnerID)} complete",
+                        Fleet.FactionOwnerID,
+                        Target.Manager.ManagerGuid,
+                        Target.Id));
             }
             else
             {

diff --git a/Pulsar4X/GameEngine/Events/EventTypes.cs b/Pulsar4X/GameEngine/Events/EventTypes.cs
@@ -327,6 +327,7 @@ public enum EventType
         NewJumpConnection,
         NewSystemDiscovered,
         JumpPointFound,
+        JumpPointSurveyCompleted,
 
         // Empire Events
         EmpireInDebt,