Small 1.1.2 stuff

- Potential host hotswap fixes
- VR prefix compat fix
- Disable movement normalization

Author: DaXcess

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 1.1.2
+
+**Changes**:
+- Disabled movement normalization (configurable in input settings)
+
+**Fixes**:
+- Additional hotfixes with hotswapping as host
+- Fixed LobbyImprovements VR prefix issue
+
 # 1.1.1
 
 **Additions**:

Preload/RepoXR.Preload.csproj

@@ -4,7 +4,7 @@
         <TargetFramework>netstandard2.1</TargetFramework>
         <Description>RepoXR Preloader</Description>
         <Authors>DaXcess</Authors>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>latest</LangVersion>
         <Title>RepoXR.Preload</Title>

RepoXR.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <Description>Collecting Valuables in VR</Description>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
         <Authors>DaXcess</Authors>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
         <LangVersion>latest</LangVersion>

Source/Config.cs

@@ -93,6 +93,10 @@ public class Config(string assemblyPath, ConfigFile file)
             "The amount of rotation that is applied when performing a snap turn. Requires turn provider to be set to snap.",
             new AcceptableValueRange<float>(10, 180)));
 
+    [ConfigDescriptor]
+    public ConfigEntry<bool> NormalizeMovement { get; } = file.Bind("Input", nameof(NormalizeMovement), false,
+        "When enabled, any direction you move in will always be at full speed, even when the stick is only pushed slightly.");
+
     // Rendering configuration
 
     [ConfigDescriptor(stepSize: 5f, suffix: "%")]

Source/Managers/HotswapManager.cs

@@ -67,7 +67,11 @@ private static void RestartScene()
         }
 
         if (SemiFunc.IsMultiplayer())
-            RunManager.instance.gameOver = true;
+        {
+            NetworkManager.instance.DestroyAll();
+            RunManager.instance.ChangeLevel(false, false, RunManager.ChangeLevelType.LobbyMenu);
+            return;
+        }
 
         RunManager.instance.RestartScene();
     }

Source/Patches/Player/PlayerControllerPatches.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Reflection.Emit;
 using HarmonyLib;
 using UnityEngine;
@@ -22,4 +23,24 @@ private static IEnumerable<CodeInstruction> ApplyCorrectWalkingForce(IEnumerable
             .SetOperandAndAdvance(PropertyGetter(typeof(Transform), nameof(Transform.rotation)))
             .InstructionEnumeration();
     }
+
+    /// <summary>
+    /// Only apply movement normalization if it's configured to do so
+    /// </summary>
+    [HarmonyPatch(typeof(PlayerController), nameof(PlayerController.FixedUpdate))]
+    [HarmonyTranspiler]
+    private static IEnumerable<CodeInstruction> ConditionalApplyNormalizedMove(
+        IEnumerable<CodeInstruction> instructions)
+    {
+        return new CodeMatcher(instructions)
+            .MatchForward(false,
+                new CodeMatch(OpCodes.Call, PropertyGetter(typeof(Vector3), nameof(Vector3.normalized))))
+            .Set(OpCodes.Call, ((Func<Vector3, Vector3>)ConditionalNormalize).Method)
+            .Advance(-2)
+            .RemoveInstructions(2)
+            .InstructionEnumeration();
+
+        static Vector3 ConditionalNormalize(Vector3 input) =>
+            Plugin.Config.NormalizeMovement.Value ? input.normalized : input;
+    }
 }

Source/Patches/UI/PlayerNamePrefixPatches.cs

@@ -65,6 +65,7 @@ static bool HostIsInVR(MenuPageLobby lobby) => lobby.lobbyPlayers.Any(player =>
     /// </summary>
     [HarmonyPatch(typeof(MenuPageLobby), nameof(MenuPageLobby.Update))]
     [HarmonyPostfix]
+    [HarmonyPriority(Priority.Last)]
     private static void LobbyMenuShowPrefix(MenuPageLobby __instance)
     {
         foreach (var player in __instance.listObjects.Select(entry => entry.GetComponent<MenuPlayerListed>())

Source/Plugin.cs

@@ -20,7 +20,7 @@ public class Plugin : BaseUnityPlugin
 {
     public const string PLUGIN_GUID = "io.daxcess.repoxr";
     public const string PLUGIN_NAME = "RepoXR";
-    public const string PLUGIN_VERSION = "1.1.1";
+    public const string PLUGIN_VERSION = "1.1.2";
 
 #if DEBUG
     private const string SKIP_CHECKSUM_VAR = $"--repoxr-skip-checksum={PLUGIN_VERSION}-dev";