Basic Aurora timer syncing (#1033)

* basic aurora timer syncing

* requested changes

Author: nesrak1

NitroxServer/GameLogic/EventTriggerer.cs

@@ -1,33 +1,57 @@
 using System;
+using System.Diagnostics;
 using System.Timers;
 using NitroxModel.Logger;
 using NitroxModel.Packets;
+using NitroxServer.GameLogic.Bases;
 
 namespace NitroxServer.GameLogic
 {
     public class EventTriggerer
     {
-        PlayerManager playerManager;
-        public EventTriggerer(PlayerManager playerManager)
+        private PlayerManager playerManager;
+        private Stopwatch stopWatch;
+        public double ElapsedTime;
+        public double AuroraExplosionTime;
+        public EventTriggerer(PlayerManager playerManager, double elapsedTime, double? auroraExplosionTime)
         {
             this.playerManager = playerManager;
-            SetupEventTimers();
+            SetupEventTimers(elapsedTime, auroraExplosionTime);
         }
 
-        public void SetupEventTimers()
+        private void SetupEventTimers(double elapsedTime, double? auroraExplosionTime)
         {
             // eventually this should be on a better timer so it can be saved, paused, etc
             Log.Debug("Event Triggerer started!");
-            double auroraTimer = RandomNumber(2.3d, 4d) * 1200d * 1000d; //Time.deltaTime returns seconds so we need to multiply 1000
-            CreateTimer(auroraTimer * 0.2d, StoryEventType.PDA, "Story_AuroraWarning1");
-            CreateTimer(auroraTimer * 0.5d, StoryEventType.PDA, "Story_AuroraWarning2");
-            CreateTimer(auroraTimer * 0.8d, StoryEventType.PDA, "Story_AuroraWarning3");
-            CreateTimer(auroraTimer, StoryEventType.PDA, "Story_AuroraWarning4");
-            CreateTimer(auroraTimer + 24000, StoryEventType.EXTRA, "Story_AuroraExplosion");
+
+            ElapsedTime = elapsedTime;
+            if (auroraExplosionTime.HasValue)
+            {
+                AuroraExplosionTime = auroraExplosionTime.Value;
+            }
+            else
+            {
+                AuroraExplosionTime = RandomNumber(2.3d, 4d) * 1200d * 1000d; //Time.deltaTime returns seconds so we need to multiply 1000
+            }
+
+            CreateTimer(AuroraExplosionTime * 0.2d - ElapsedTime, StoryEventType.PDA, "Story_AuroraWarning1");
+            CreateTimer(AuroraExplosionTime * 0.5d - ElapsedTime, StoryEventType.PDA, "Story_AuroraWarning2");
+            CreateTimer(AuroraExplosionTime * 0.8d - ElapsedTime, StoryEventType.PDA, "Story_AuroraWarning3");
+            CreateTimer(AuroraExplosionTime - ElapsedTime, StoryEventType.PDA, "Story_AuroraWarning4");
+            CreateTimer(AuroraExplosionTime + 24000 - ElapsedTime, StoryEventType.EXTRA, "Story_AuroraExplosion");
+            //like the timers, except we can see how much time has passed
+            stopWatch = new Stopwatch();
+            stopWatch.Start();
         }
 
-        public Timer CreateTimer(double time, StoryEventType eventType, string key)
+        private Timer CreateTimer(double time, StoryEventType eventType, string key)
         {
+            //if timeOffset goes past the time
+            if (time <= 0)
+            {
+                return null;
+            }
+
             Timer timer = new Timer();
             timer.Elapsed += delegate
             {
@@ -40,10 +64,19 @@ public Timer CreateTimer(double time, StoryEventType eventType, string key)
             return timer;
         }
 
-        public double RandomNumber(double min, double max)
+        private double RandomNumber(double min, double max)
         {
             Random random = new Random();
             return random.NextDouble() * (max - min) + min;
         }
+
+        public double GetRealElapsedTime()
+        {
+            if (stopWatch == null)
+            {
+                return ElapsedTime;
+            }
+            return stopWatch.ElapsedMilliseconds + ElapsedTime;
+        }
     }
 }

NitroxServer/GameLogic/GameData.cs

@@ -13,5 +13,8 @@ public class GameData
 
         [ProtoMember(2)]
         public StoryGoalData StoryGoals { get; set; }
+        
+        [ProtoMember(3)]
+        public StoryTimingData StoryTiming { get; set; }
     }
 }

NitroxServer/GameLogic/StoryTimingData.cs

@@ -0,0 +1,24 @@
+using System;
+using ProtoBufNet;
+
+namespace NitroxServer.GameLogic
+{
+    [Serializable]
+    [ProtoContract]
+    public class StoryTimingData
+    {
+        [ProtoMember(1)]
+        public double ElapsedTime { get; set; }
+
+        [ProtoMember(2)]
+        public double? AuroraExplosionTime { get; set; }
+
+        public static StoryTimingData From(EventTriggerer eventTriggerer)
+        {
+            StoryTimingData inst = new StoryTimingData();
+            inst.ElapsedTime = eventTriggerer.GetRealElapsedTime();
+            inst.AuroraExplosionTime = eventTriggerer.AuroraExplosionTime;
+            return inst;
+        }
+    }
+}

NitroxServer/NitroxServer.csproj

@@ -328,6 +328,7 @@
     <Compile Include="GameLogic\Entities\Spawning\EntitySpawnPointFactory.cs" />
     <Compile Include="GameLogic\EscapePodData.cs" />
     <Compile Include="GameLogic\Items\InventoryManager.cs" />
+    <Compile Include="GameLogic\StoryTimingData.cs" />
     <Compile Include="GameLogic\Unlockables\StoryGoalData.cs" />
     <Compile Include="GameLogic\Vehicles\VehicleManager.cs" />
     <Compile Include="Serialization\Resources\Datastructures\AssetIdentifier.cs" />

NitroxServer/Serialization/World/PersistedWorldData.cs

@@ -1,4 +1,5 @@
-using NitroxServer.GameLogic.Bases;
+using NitroxServer.GameLogic;
+using NitroxServer.GameLogic.Bases;
 using NitroxServer.GameLogic.Players;
 using ProtoBufNet;
 
@@ -15,7 +16,7 @@ public class PersistedWorldData
 
         [ProtoMember(3)]
         public PlayerData PlayerData { get; set; }
-
+        
         public bool IsValid()
         {
             return (WorldData.IsValid()) &&

NitroxServer/Serialization/World/WorldData.cs

@@ -36,6 +36,9 @@ public class WorldData
         [ProtoMember(7)]
         public EscapePodData EscapePodData { get; set; }
 
+        [ProtoMember(8)]
+        public StoryTimingData StoryTimingData { get; set; }
+
         public bool IsValid()
         {
             return (ParsedBatchCells != null) && // Always returns false on empty saves
@@ -45,7 +48,8 @@ public bool IsValid()
                    (GameData != null) &&
                    (EntityData != null) &&
                    (EntityData.Entities.Count > 0) &&
-                   (EscapePodData != null);
+                   (EscapePodData != null) &&
+                   (StoryTimingData != null);
         }
     }
 }

NitroxServer/Serialization/World/WorldPersistence.cs

@@ -44,6 +44,7 @@ public void Save(World world)
                 persistedData.WorldData.InventoryData = InventoryData.From(world.InventoryManager.GetAllInventoryItems(), world.InventoryManager.GetAllStorageSlotItems());
                 persistedData.PlayerData = PlayerData.From(world.PlayerManager.GetAllPlayers());
                 persistedData.WorldData.GameData = world.GameData;
+                persistedData.WorldData.StoryTimingData = StoryTimingData.From(world.EventTriggerer);
                 persistedData.WorldData.EscapePodData = EscapePodData.From(world.EscapePodManager.GetEscapePods());
 
                 if (!Directory.Exists(config.SaveName))
@@ -136,6 +137,7 @@ private Optional<World> LoadFromFile()
                                           persistedData.WorldData.GameData,
                                           persistedData.WorldData.ParsedBatchCells,
                                           persistedData.WorldData.EscapePodData.EscapePods,
+                                          persistedData.WorldData.StoryTimingData,
                                           config.GameMode);
 
                 return Optional.Of(world);
@@ -171,7 +173,7 @@ private World CreateFreshWorld()
                 new List<VehicleModel>(), new List<Player>(), new List<ItemData>(),
                 new List<ItemData>(),
                 new GameData() { PDAState = new PDAStateData(), StoryGoals = new StoryGoalData() },
-                new List<Int3>(), new List<EscapePodModel>(), config.GameMode);
+                new List<Int3>(), new List<EscapePodModel>(), new StoryTimingData(), config.GameMode);
         }
 
         private World CreateWorld(DateTime serverStartTime,
@@ -185,6 +187,7 @@ private World CreateWorld(DateTime serverStartTime,
                                   GameData gameData,
                                   List<Int3> parsedBatchCells,
                                   List<EscapePodModel> escapePods,
+                                  StoryTimingData storyTimingData,
                                   string gameMode)
         {
             World world = new World();
@@ -193,7 +196,7 @@ private World CreateWorld(DateTime serverStartTime,
 
             world.SimulationOwnershipData = new SimulationOwnershipData();
             world.PlayerManager = new PlayerManager(players, config);
-            world.EventTriggerer = new EventTriggerer(world.PlayerManager);
+            world.EventTriggerer = new EventTriggerer(world.PlayerManager, storyTimingData.ElapsedTime, storyTimingData.AuroraExplosionTime);
             world.BaseManager = new BaseManager(partiallyConstructedPieces, completedBasePieceHistory);
             world.InventoryManager = new InventoryManager(inventoryItems, storageSlotItems);
             world.VehicleManager = new VehicleManager(vehicles, world.InventoryManager);