Merge branch 'dev' into more-random-multiplayer-state

Author: notfood

Source/Client/AsyncTime/AsyncTimeComp.cs

@@ -65,8 +65,22 @@ public void SetDesiredTimeSpeed(TimeSpeed speed)
 
         public int TickableId => map.uniqueID;
 
+        public int GameStartAbsTick
+        {
+            get
+            {
+                if (gameStartAbsTickMap == 0)
+                {
+                    gameStartAbsTickMap = Find.TickManager?.gameStartAbsTick ?? 0;
+                }
+
+                return gameStartAbsTickMap;
+            }
+        }
+
         public Map map;
         public int mapTicks;
+        private int gameStartAbsTickMap;
         private TimeSpeed timeSpeedInt;
         public bool forcedNormalSpeed;
         public int eventCount;
@@ -84,9 +98,10 @@ public void SetDesiredTimeSpeed(TimeSpeed speed)
 
         public Queue<ScheduledCommand> cmds = new();
 
-        public AsyncTimeComp(Map map)
+        public AsyncTimeComp(Map map, int gameStartAbsTick = 0)
         {
             this.map = map;
+            this.gameStartAbsTickMap = gameStartAbsTick;
 
             // Use the world's constant rand seed and map tile ID as our initial randState.
             // Only fill the seed part, leave the iterations out.
@@ -202,6 +217,8 @@ public void ExposeData()
             Scribe_Values.Look(ref mapTicks, "mapTicks");
             Scribe_Values.Look(ref timeSpeedInt, "timeSpeed");
 
+            Scribe_Values.Look(ref gameStartAbsTickMap, "gameStartAbsTickMap");
+
             Scribe_Deep.Look(ref storyteller, "storyteller");
 
             Scribe_Deep.Look(ref storyWatcher, "storyWatcher");
@@ -400,6 +417,8 @@ void RestoreState()
                     designator.DesignateThing(thing);
                     designator.Finalize(true);
                 }
+
+                SyncMethods.TryDirtyCurrentPawnTable(designator);
             }
             finally
             {
@@ -443,5 +462,4 @@ public enum DesignatorMode : byte
         MultiCell,
         Thing
     }
-
 }

Source/Client/AsyncTime/SetMapTime.cs

@@ -163,17 +163,31 @@ static void Prefix(ref Func<string> textGetter)
         }
     }
 
+    [HarmonyPatch(typeof(CompCauseGameCondition), nameof(CompCauseGameCondition.EnforceConditionOn))]
+    static class MapConditionCauserMapTime
+    {
+        static void Prefix(Map map, ref TimeSnapshot? __state)
+        {
+            if (Multiplayer.Client == null) return;
+            __state = TimeSnapshot.GetAndSetFromMap(map);
+        }
+
+        static void Finalizer(TimeSnapshot? __state) => __state?.Set();
+    }
+
     public struct TimeSnapshot
     {
         public int ticks;
         public TimeSpeed speed;
         public TimeSlower slower;
+        public int gameStartAbsTick;
 
         public void Set()
         {
             Find.TickManager.ticksGameInt = ticks;
             Find.TickManager.slower = slower;
             Find.TickManager.curTimeSpeed = speed;
+            Find.TickManager.gameStartAbsTick = gameStartAbsTick;
         }
 
         public static TimeSnapshot Current()
@@ -182,7 +196,8 @@ public static TimeSnapshot Current()
             {
                 ticks = Find.TickManager.ticksGameInt,
                 speed = Find.TickManager.curTimeSpeed,
-                slower = Find.TickManager.slower
+                slower = Find.TickManager.slower,
+                gameStartAbsTick = Find.TickManager.gameStartAbsTick
             };
         }
 
@@ -198,6 +213,7 @@ public static TimeSnapshot Current()
             tickManager.ticksGameInt = mapComp.mapTicks;
             tickManager.slower = mapComp.slower;
             tickManager.CurTimeSpeed = mapComp.DesiredTimeSpeed;
+            tickManager.gameStartAbsTick = mapComp.GameStartAbsTick;
 
             return prev;
         }

Source/Client/AsyncTime/StorytellerPatches.cs

@@ -139,3 +139,17 @@ static IEnumerable<IncidentTargetTagDef> Postfix(IEnumerable<IncidentTargetTagDe
         }
     }
 }
+
+[HarmonyPatch(typeof(StorytellerUtility), nameof(StorytellerUtility.DefaultThreatPointsNow))]
+static class FixMultifactionPocketMapDefaultThreatPointsNow
+{
+    static bool Prefix(IIncidentTarget target)
+    {
+        // StorytellerUtility.DefaultThreatPointsNow uses Find.AnyPlayerHomeMap if
+        // the target map is a pocket map. In such a situation, we stop the method
+        // from executing if Find.AnyPlayerHomeMap would return null, as otherwise
+        // we'll end up with a very frequent error spam from spectator faction and
+        // any other factions without a map.
+        return Multiplayer.Client == null || target is not Map { IsPocketMap: true } || Find.AnyPlayerHomeMap != null;
+    }
+}

Source/Client/Comp/Map/MultiplayerMapComp.cs

@@ -35,12 +35,12 @@ public MultiplayerMapComp(Map map)
             sessionManager = new(map);
         }
 
-        public CaravanFormingSession CreateCaravanFormingSession(bool reform, Action onClosed, bool mapAboutToBeRemoved, IntVec3? meetingSpot = null)
+        public CaravanFormingSession CreateCaravanFormingSession(Faction faction, bool reform, Action onClosed, bool mapAboutToBeRemoved, IntVec3? meetingSpot = null)
         {
             var caravanForming = sessionManager.GetFirstOfType<CaravanFormingSession>();
             if (caravanForming == null)
             {
-                caravanForming = new CaravanFormingSession(map, reform, onClosed, mapAboutToBeRemoved, meetingSpot);
+                caravanForming = new CaravanFormingSession(faction, map, reform, onClosed, mapAboutToBeRemoved, meetingSpot);
                 if (!sessionManager.AddSession(caravanForming))
                 {
                     // Shouldn't happen if the session doesn't exist already, show an error just in case
@@ -51,12 +51,12 @@ public CaravanFormingSession CreateCaravanFormingSession(bool reform, Action onC
             return caravanForming;
         }
 
-        public TransporterLoading CreateTransporterLoadingSession(List<CompTransporter> transporters)
+        public TransporterLoading CreateTransporterLoadingSession(Faction faction, List<CompTransporter> transporters)
         {
             var transporterLoading = sessionManager.GetFirstOfType<TransporterLoading>();
             if (transporterLoading == null)
             {
-                transporterLoading = new TransporterLoading(map, transporters);
+                transporterLoading = new TransporterLoading(faction, map, transporters);
                 if (!sessionManager.AddSession(transporterLoading))
                 {
                     // Shouldn't happen if the session doesn't exist already, show an error just in case

Source/Client/Comp/World/MultiplayerWorldComp.cs

@@ -37,7 +37,7 @@ public void ExposeData()
 
         sessionManager.ExposeSessions();
         // Ensure a pause lock session exists if there's any pause locks registered
-        if (!PauseLockSession.pauseLocks.NullOrEmpty())
+        if (!PauseLockSession.pauseLocks.NullOrEmpty() && Scribe.mode == LoadSaveMode.PostLoadInit)
             sessionManager.AddSession(new PauseLockSession(null));
 
         DoBackCompat();
@@ -78,6 +78,18 @@ void RemoveOpponentFaction()
             AddSpectatorFaction();
             RemoveOpponentFaction();
         }
+
+        // Fix old save files by ensuring all factions have access to Anomaly research if
+        // it was enabled. This needs to be done since Anomaly state is shared by all players.
+        var anomaly = Find.Anomaly;
+        // Don't use anomaly.Level, as it'll return 0 due to monolith not being
+        // spawned. If we want to include that check then we'd need to move this
+        // code into a postfix to Building_VoidMonolith:SpawnSetup.
+        if (anomaly.level > 0 && anomaly.monolith != null)
+        {
+            foreach (var (_, data) in factionData)
+                data.researchManager.Notify_MonolithLevelChanged(anomaly.level);
+        }
     }
 
     private void ExposeFactionData()

Source/Client/Desyncs/SaveableDesyncInfo.cs

@@ -93,6 +93,7 @@ private string GetDesyncDetails()
             .AppendLine($"Player Count|||{Multiplayer.session.players.Count}")
             .AppendLine($"Async time active|||{Multiplayer.GameComp.asyncTime}")
             .AppendLine($"Multifaction active|||{Multiplayer.GameComp.multifaction}")
+            .AppendLine($"Map Count|||{Find.Maps?.Count.ToStringSafe()}")
             .AppendLine("\n###CPU Info###")
             .AppendLine($"Processor Name|||{SystemInfo.processorType}")
             .AppendLine($"Processor Speed (MHz)|||{SystemInfo.processorFrequency}")

Source/Client/Factions/Blueprints.cs

@@ -177,8 +177,8 @@ static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> inst
     static class SpawnBuildingAsPossiblePatch
     {
         static MethodInfo SpawningWipes = AccessTools.Method(typeof(GenSpawn), nameof(GenSpawn.SpawningWipes));
-        public static MethodInfo ThingListGet = AccessTools.Method(typeof(List<Thing>), "get_Item");
-        static FieldInfo ThingDefField = AccessTools.Field(typeof(Thing), "def");
+        public static MethodInfo ThingListGet = AccessTools.IndexerGetter(typeof(List<Thing>), [typeof(int)]);
+        static FieldInfo ThingDefField = AccessTools.Field(typeof(Thing), nameof(Thing.def));
 
         static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> insts)
         {