Fix airlaunches and other setrotation cases

KSP-RO · Nov 5, 2023 · 93e3112 · 93e3112
1 parent f5c4c0e
commit 93e3112
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 3 deletions.
diff --git a/Source/Harmony/Vessel.cs b/Source/Harmony/Vessel.cs
@@ -0,0 +1,34 @@
+using HarmonyLib;
+using UnityEngine;
+
+namespace RealismOverhaul.Harmony
+{
+    [HarmonyPatch(typeof(Vessel))]
+    internal class PatchVessel
+    {
+        [HarmonyPrefix]
+        [HarmonyPatch(nameof(Vessel.SetRotation), typeof(Quaternion), typeof(bool))]
+        internal static bool Prefix_SetRotation(Vessel __instance, Quaternion rotation, bool setPos)
+        {
+            VesselModuleRotationRO mod = null;
+            foreach (var vm in __instance.vesselModules)
+            {
+                if (vm is VesselModuleRotationRO vmr)
+                {
+                    mod = vmr;
+                    break;
+                }
+            }
+            if (mod == null)
+                return true;
+
+            mod.StoreRot(rotation);
+            if (!setPos)
+                return true;
+
+            mod.SetPosRot(rotation, __instance.transform.position);
+
+            return false;
+        }
+    }
+}
diff --git a/Source/RealismOverhaul.csproj b/Source/RealismOverhaul.csproj
@@ -39,6 +39,7 @@
     <Compile Include="DebugTools\DrawTools.cs" />
     <Compile Include="Harmony\ModuleEngines.cs" />
     <Compile Include="Harmony\KSPUtil.cs" />
+    <Compile Include="Harmony\Vessel.cs" />
     <Compile Include="Harmony\PartLoader.cs" />
     <Compile Include="Harmony\OrbitDriver.cs" />
     <Compile Include="Harmony\UIPartActionResourceEditor.cs" />

diff --git a/Source/VesselModuleRotationRO.cs b/Source/VesselModuleRotationRO.cs
@@ -105,9 +105,13 @@ private bool IsOverThreshold(Vector3 rot)
             return Mathf.Abs(rot.x) > thresh || Mathf.Abs(rot.y) > thresh || Mathf.Abs(rot.z) > thresh;
         }
 
-        private void StoreRot()
+        public void StoreRot()
+        {
+            StoreRot(vessel.transform.rotation);
+        }
+
+        public void StoreRot(QuaternionD rot)
         {
-            QuaternionD rot = vessel.transform.rotation;
             vesselRot = Planetarium.Zup.Rotation * rot.swizzle;
         }
 
@@ -124,7 +128,7 @@ private void SetRot()
             vessel.SetRotation(UnityRot(), true);
         }
 
-        private void SetPosRot(Quaternion rotation, Vector3d position)
+        public void SetPosRot(Quaternion rotation, Vector3d position)
         {
             if (!vessel.loaded)
             {