Merge branch 'reznal/1.6-working' into dev-1.6 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

SirrWilliam merged 44 commits into SirrWilliam:dev-1.6 from Reznal:1.6-working

Jul 16, 2025

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -151,10 +151,12 @@ publish/ @@
     # in these scripts will be unencrypted
     PublishScripts/
+    # Commented out .nupkg and **/packages/* so we can use a custom package
     # NuGet Packages
-    *.nupkg
+    # *.nupkg
     # The packages folder can be ignored because of Package Restore
-    **/packages/*
+    # **/packages/*
     # except build/, which is used as an MSBuild target.
     !**/packages/build/
     # Uncomment if necessary however generally it will be regenerated when needed
@@ Expand Down @@

Languages

Submodule Languages updated 6 files

+0 −27		English/Keyed/Multiplayer.xml
+13 −15		German/Keyed/Multiplayer.xml
+8 −9		Polish/Keyed/Multiplayer.xml
+2 −2		SpanishLatin/Keyed/Multiplayer.xml
+10 −12		Ukrainian/Keyed/Multiplayer.xml
+0 −51		update_l10n_tags.py

Source/Client/AsyncTime/AsyncTimeComp.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -10,6 +10,7 @@ @@
     using Multiplayer.Client.Patches;
     using Multiplayer.Client.Saving;
     using Multiplayer.Client.Util;
+    using System.Linq;
     namespace Multiplayer.Client
     {
@@ Expand Down Expand Up / @@ -98,6 +99,9 @@ public int GameStartAbsTick @@
             public Queue<ScheduledCommand> cmds = new();
+            public int CurrentPlayerCount { get; private set; } = 0;
+            public int VTR => CurrentPlayerCount > 0 ? VTRSync.MinimumVtr : VTRSync.MaximumVtr;
             public AsyncTimeComp(Map map, int gameStartAbsTick = 0)
             {
                 this.map = map;
@@ Expand Down Expand Up / @@ -228,6 +232,9 @@ public void ExposeData() @@
                 Scribe_Custom.LookULong(ref randState, "randState", 1);
             }
+            public void IncreasePlayerCount() => CurrentPlayerCount++;
+            public void DecreasePlayerCount() => CurrentPlayerCount = Math.Max(0, CurrentPlayerCount - 1);
             public void FinalizeInit()
             {
                 cmds = new Queue<ScheduledCommand>(
@@ Expand Down @@

Source/Client/AsyncTime/AsyncTimePatches.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -147,7 +147,7 @@ static class TickManagerPausedPatch @@
             static void Postfix(ref bool __result)
             {
                 if (Multiplayer.Client == null) return;
-                if (WorldRendererUtility.WorldRendered) return;
+                if (WorldRendererUtility.WorldSelected) return;
                 if (FactionCreator.generatingMap) return;
                 var asyncTime = Find.CurrentMap.AsyncTime();
@@ Expand Down @@

Source/Client/AsyncTime/AsyncWorldTimeComp.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -223,6 +223,19 @@ public void ExecuteCmd(ScheduledCommand cmd) @@
                     var canUseDevMode = data.ReadBool();
                     Multiplayer.GameComp.playerData[playerId] = new PlayerData { canUseDevMode = canUseDevMode };
                 }
+                if (cmdType == CommandType.PlayerCount)
+                {
+                    int previousMapId = data.ReadInt32();
+                    int newMapId = data.ReadInt32();
+                    int mapCount = Find.Maps.Count;
+                    if (0 <= previousMapId && previousMapId < mapCount)
+                        Find.Maps[previousMapId]?.AsyncTime()?.DecreasePlayerCount();
+                    if (0 <= newMapId && newMapId < mapCount)
+                        Find.Maps[newMapId]?.AsyncTime()?.IncreasePlayerCount();
+                }
             }
             catch (Exception e)
             {
@@ Expand Down @@

Source/Client/Multiplayer.cs

-Original file line number
+Diff line change
@@ Expand Up / @@ -65,6 +65,7 @@ public static class Multiplayer @@
             public static string ReplaysDir => GenFilePaths.FolderUnderSaveData("MpReplays");
             public static string DesyncsDir => GenFilePaths.FolderUnderSaveData("MpDesyncs");
+            public static string MpLogsDir => GenFilePaths.FolderUnderSaveData("MpLogs");
             public static Stopwatch clock = Stopwatch.StartNew();
@@ Expand Down @@

Source/Client/OnMainThread.cs

-Original file line number
+Diff line change
@@ -1,3 +1,4 @@
+    using Multiplayer.Client.DebugUi;
     using Multiplayer.Client.Networking;
     using Multiplayer.Common;
     using System;
@@ Expand Down Expand Up / @@ -42,6 +43,11 @@ public void Update() @@
                 Multiplayer.session.Update();
                 SyncFieldUtil.UpdateSync();
+                if (PerformanceRecorder.IsRecording)
+                {
+                    PerformanceRecorder.RecordFrame();
+                }
                 if (!Multiplayer.arbiterInstance && Application.isFocused && !TickPatch.Simulating && !Multiplayer.session.desynced)
                     Multiplayer.session.playerCursors.SendVisuals();
@@ Expand Down @@

Source/Client/Patches/VTRSyncPatch.cs

-Original file line number
+Diff line change
@@ -0,0 +1,128 @@
+    using HarmonyLib;
+    using Multiplayer.Client.Patches;
+    using Multiplayer.Client.Util;
+    using Multiplayer.Common;
+    using RimWorld.Planet;
+    using System;
+    using Verse;
+    namespace Multiplayer.Client.Patches
+    {
+        [HarmonyPatch(typeof(GenTicks), nameof(GenTicks.GetCameraUpdateRate))]
+        public static class VTRSyncPatch
+        {
+            static bool Prefix(Thing thing, ref int __result)
+            {
+                if (Multiplayer.Client == null)
+                    return true;
+                __result = VTRSync.GetSynchronizedUpdateRate(thing);
+                return false;
+            }
+        }
+        [HarmonyPatch(typeof(Projectile), nameof(Projectile.UpdateRateTicks), MethodType.Getter)]
+        public static class VtrSyncProjectilePatch
+        {
+            static bool Prefix(ref int __result, Projectile __instance)
+            {
+                if (Multiplayer.Client == null)
+                    return true;
+                __result = __instance.Spawned ? VTRSync.GetSynchronizedUpdateRate(__instance) : VTRSync.MaximumVtr;
+                return false;
+            }
+        }
+        [HarmonyPatch(typeof(WorldObject), nameof(WorldObject.UpdateRateTicks), MethodType.Getter)]
+        public static class VtrSyncWorldObjectPatch
+        {
+            static bool Prefix(ref int __result, WorldObject __instance)
+            {
+                if (Multiplayer.Client == null)
+                    return true;
+                __result = VTRSync.MaximumVtr;
+                return false;
+            }
+        }
+        static class VTRSync
+        {
+            // Special identifier for world map (since it doesn't have a uniqueID like regular maps)
+            public const int WorldMapId = -2;
+            public static int lastMovedToMap = -1;
+            public static int lastSentTick = -1;
+            // Vtr rates
+            public const int MaximumVtr = 15;
+            public const int MinimumVtr = 1;
+            public static int GetSynchronizedUpdateRate(Thing thing) => thing?.MapHeld?.AsyncTime()?.VTR ?? VTRSync.MaximumVtr;
+        }
+        [HarmonyPatch(typeof(Game), nameof(Game.CurrentMap), MethodType.Setter)]
+        static class MapSwitchPatch
+        {
+            static void Prefix(Map value)
+            {
+                if (Multiplayer.Client == null || Client.Multiplayer.session == null) return;
+                try
+                {
+                    int previousMap = Find.CurrentMap?.uniqueID ?? -1;
+                    int newMap = value?.uniqueID ?? -1;
+                    int currentTick = Find.TickManager?.TicksGame ?? 0;
+                    // If no change in map, do nothing
+                    if (previousMap == newMap)
+                        return;
+                    // Prevent duplicate commands for the same transition, but allow retry after a tick
+                    if (VTRSync.lastMovedToMap == newMap && currentTick == VTRSync.lastSentTick)
+                        return;
+                    // Send map change command to server
+                    // Send as global command since it affects multiple maps
+                    Multiplayer.Client.SendCommand(CommandType.PlayerCount, ScheduledCommand.Global, ByteWriter.GetBytes(previousMap, newMap));
+                    // Track this command to prevent duplicates
+                    VTRSync.lastMovedToMap = newMap;
+                    VTRSync.lastSentTick = currentTick;
+                }
+                catch (Exception ex)
+                {
+                    MpLog.Error($"VTR MapSwitchPatch error: {ex.Message}");
+                }
+            }
+        }
+        [HarmonyPatch(typeof(WorldRendererUtility), nameof(WorldRendererUtility.CurrentWorldRenderMode), MethodType.Getter)]
+        static class WorldRenderModePatch
+        {
+            private static WorldRenderMode lastRenderMode = WorldRenderMode.None;
+            static void Postfix(WorldRenderMode __result)
+            {
+                if (Multiplayer.Client == null) return;
+                try
+                {
+                    // Detect transition to world map (Planet mode)
+                    if (__result == WorldRenderMode.Planet && lastRenderMode != WorldRenderMode.Planet)
+                    {
+                        if (VTRSync.lastMovedToMap != -1)
+                        {
+                            Multiplayer.Client.SendCommand(CommandType.PlayerCount, ScheduledCommand.Global, ByteWriter.GetBytes(VTRSync.lastMovedToMap, VTRSync.WorldMapId));
+                        }
+                    }
+                    lastRenderMode = __result;
+                }
+                catch (Exception ex)
+                {
+                    MpLog.Error($"WorldRenderModePatch error: {ex.Message}");
+                }
+            }
+        }
+    }

Source/Client/Persistent/CaravanFormingPatches.cs

-Original file line number
+Diff line change
@@ Expand Up @@
                         // RNG shouldn't be invoked but TryAddWaypoint is quite complex and calls pathfinding
                         Rand.PushState();
-                        var worldRoutePlanner = Find.WorldRoutePlanner;
+                        WorldRoutePlanner worldRoutePlanner = Find.WorldRoutePlanner;
                         worldRoutePlanner.Start(dialog);
                         worldRoutePlanner.TryAddWaypoint(routePlannerWaypoint.Value);
                     }
@@ Expand Down @@

Source/Client/UI/DebugPanel/DebugLine.cs

-Original file line number
+Diff line change
@@ -0,0 +1,20 @@
+    using UnityEngine;
+    namespace Multiplayer.Client.DebugUi
+    {
+        // Data structures for organizing debug sections
+        internal struct DebugLine
+        {
+            public string Label;
+            public string Value;
+            public Color Color;
+            public DebugLine(string label, string value, Color color)
+            {
+                Label = label;
+                Value = value;
+                Color = color;
+            }
+        }
+    }

Source/Client/UI/DebugPanel/DebugSection.cs

-Original file line number
+Diff line change
@@ -0,0 +1,14 @@
+    namespace Multiplayer.Client.DebugUi
+    {
+        internal struct DebugSection
+        {
+            public string Title;
+            public DebugLine[] Lines;
+            public DebugSection(string title, DebugLine[] lines)
+            {
+                Title = title;
+                Lines = lines;
+            }
+        }
+    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge branch 'reznal/1.6-working' into dev-1.6 #1

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!