Moved PlayerRagdollMod and DesktopHeadTracking to archived

Fixed for r173 game build

README.md

@@ -3,20 +3,20 @@ Merged set of MelonLoader mods for ChilloutVR.
 **Table for game build 2023r172p1:**
 | Full name | Short name | Latest version | Available in [CVRMA](https://github.com/knah/CVRMelonAssistant) |
 |:---------:|:----------:|:--------------:| :----------------------------------------------------------------|
-| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.3 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| ✔ Yes |
-| [Desktop Head Tracking](/ml_dht/README.md)| ml_dht | - | ✔ Yes<br>:warning:Broken |
-| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.3 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| ✔ Yes |
+| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.4 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| ✔ Yes<br>:hourglass_flowing_sand: Update review |
+| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.4 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| ✔ Yes<br>:hourglass_flowing_sand: Update review |
 | [Pickup Arm Movement](/ml_pam/README.md)| ml_pam | 1.0.8 [:arrow_down:](../../releases/latest/download/ml_pam.dll)| ✔ Yes |
 | [Player Movement Copycat](/ml_pmc/README.md)| ml_pmc | 1.0.3 [:arrow_down:](../../releases/latest/download/ml_pmc.dll)| ✔ Yes |
-| [Player Ragdoll Mod](/ml_prm/README.md)| ml_prm | 1.0.11 [:arrow_down:](../../releases/latest/download/ml_prm.dll)| ✔ Yes<br>:hourglass_flowing_sand: Update review |
 | [Vive Extended Input](/ml_vei/README.md) | ml_vei | 1.0.0 [:arrow_down:](../../releases/latest/download/ml_vei.dll)| ✔ Yes |
 
 **Archived mods:**
 | Full name | Short name | Notes |
 |:---------:|:----------:|-------|
-| Avatar Change Info | ml_aci | Superseded by `Extended Game Notifications`
-| Desktop Reticle Switch | ml_drs | Boring functionality
-| Extended Game Notifications | ml_egn | In-game feature sine 2023r172 update
-| Four Point Tracking | ml_fpt | In-game feature since 2022r170 update
-| Game Main Fixes | ml_gmf | In-game feature sine 2023r172 update
+| Avatar Change Info | ml_aci | Superseded by `Extended Game Notifications` |
+| Desktop Head Tracking | ml_dht | Unable to emulate fake data |
+| Desktop Reticle Switch | ml_drs | Boring functionality |
+| Extended Game Notifications | ml_egn | In-game feature sine 2023r172 update |
+| Four Point Tracking | ml_fpt | In-game feature since 2022r170 update |
+| Game Main Fixes | ml_gmf | In-game feature sine 2023r172 update |
+| Player Ragdoll Mod | ml_prm | Unable to fix offset problems |
 | Server Connection Info | ml_sci | Superseded by `Extended Game Notifications`

archived/ml_dht/HeadTracked.cs

@@ -1,185 +1,185 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.Player;
-using RootMotion.FinalIK;
-using System.Reflection;
-using UnityEngine;
-using ViveSR.anipal.Lip;
-
-namespace ml_dht
-{
-    [DisallowMultipleComponent]
-    class HeadTracked : MonoBehaviour
-    {
-        static FieldInfo ms_emotePlaying = typeof(PlayerSetup).GetField("_emotePlaying", BindingFlags.NonPublic | BindingFlags.Instance);
-
-        bool m_enabled = false;
-        bool m_headTracking = true;
-        bool m_blinking = true;
-        bool m_eyeTracking = true;
-        float m_smoothing = 0.5f;
-        bool m_mirrored = false;
-        bool m_faceOverride = true;
-
-        CVRAvatar m_avatarDescriptor = null;
-        LookAtIK m_lookIK = null;
-        Transform m_headBone = null;
-
-        Vector3 m_headPosition;
-        Quaternion m_headRotation;
-        Vector2 m_gazeDirection;
-        float m_blinkProgress = 0f;
-        Vector2 m_mouthShapes;
-        float m_eyebrowsProgress = 0f;
-
-        Quaternion m_bindRotation;
-        Quaternion m_lastHeadRotation;
-
-        // Unity events
-        void Start()
-        {
-            Settings.EnabledChange += this.SetEnabled;
-            Settings.HeadTrackingChange += this.SetHeadTracking;
-            Settings.EyeTrackingChange += this.SetEyeTracking;
-            Settings.BlinkingChange += this.SetBlinking;
-            Settings.SmoothingChange += this.SetSmoothing;
-            Settings.MirroredChange += this.SetMirrored;
-            Settings.FaceOverrideChange += this.SetFaceOverride;
-        }
-
-        void OnDestroy()
-        {
-            Settings.EnabledChange -= this.SetEnabled;
-            Settings.HeadTrackingChange -= this.SetHeadTracking;
-            Settings.EyeTrackingChange -= this.SetEyeTracking;
-            Settings.BlinkingChange -= this.SetBlinking;
-            Settings.SmoothingChange -= this.SetSmoothing;
-            Settings.MirroredChange -= this.SetMirrored;
-            Settings.FaceOverrideChange -= this.SetFaceOverride;
-        }
-
-        // Tracking updates
-        public void UpdateTrackingData(ref TrackingData p_data)
-        {
-            m_headPosition.Set(p_data.m_headPositionX * (m_mirrored ? -1f : 1f), p_data.m_headPositionY, p_data.m_headPositionZ);
-            m_headRotation.Set(p_data.m_headRotationX, p_data.m_headRotationY * (m_mirrored ? -1f : 1f), p_data.m_headRotationZ * (m_mirrored ? -1f : 1f), p_data.m_headRotationW);
-            m_gazeDirection.Set(m_mirrored ? (1f - p_data.m_gazeX) : p_data.m_gazeX, p_data.m_gazeY);
-            m_blinkProgress = p_data.m_blink;
-            m_mouthShapes.Set(p_data.m_mouthOpen, p_data.m_mouthShape);
-            m_eyebrowsProgress = p_data.m_brows;
-        }
-
-        void OnLookIKPostUpdate()
-        {
-            if(m_enabled && m_headTracking && (m_headBone != null))
-            {
-                m_lastHeadRotation = Quaternion.Slerp(m_lastHeadRotation, m_avatarDescriptor.transform.rotation * (m_headRotation * m_bindRotation), m_smoothing);
-
-                if(!(bool)ms_emotePlaying.GetValue(PlayerSetup.Instance))
-                    m_headBone.rotation = m_lastHeadRotation;
-            }
-        }
-
-        // Game events
-        internal void OnEyeControllerUpdate(CVREyeController p_component)
-        {
-            if(m_enabled)
-            {
-                // Gaze
-                if(m_eyeTracking)
-                {
-                    Transform l_camera = PlayerSetup.Instance.GetActiveCamera().transform;
-
-                    p_component.manualViewTarget = true;
-                    p_component.targetViewPosition = l_camera.position + l_camera.rotation * new Vector3((m_gazeDirection.x - 0.5f) * 2f, (m_gazeDirection.y - 0.5f) * 2f, 1f);
-                }
-
-                // Blink
-                if(m_blinking)
-                {
-                    p_component.manualBlinking = true;
-                    p_component.blinkProgress = m_blinkProgress;
-                }
-            }
-        }
-
-        internal void OnFaceTrackingUpdate(CVRFaceTracking p_component)
-        {
-            if(m_enabled && m_faceOverride)
-            {
-                if(m_avatarDescriptor != null)
-                    m_avatarDescriptor.useVisemeLipsync = false;
-
-                float l_weight = Mathf.Clamp01(Mathf.InverseLerp(0.25f, 1f, Mathf.Abs(m_mouthShapes.y))) * 100f;
-
-                p_component.BlendShapeValues[(int)LipShape_v2.Jaw_Open] = m_mouthShapes.x * 100f;
-                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Pout] = ((m_mouthShapes.y > 0f) ? l_weight : 0f);
-                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Smile_Left] = ((m_mouthShapes.y < 0f) ? l_weight : 0f);
-                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Smile_Right] = ((m_mouthShapes.y < 0f) ? l_weight : 0f);
-                p_component.LipSyncWasUpdated = true;
-                p_component.UpdateLipShapes();
-            }
-        }
-
-        internal void OnSetupAvatar()
-        {
-            m_avatarDescriptor = PlayerSetup.Instance._avatar.GetComponent<CVRAvatar>();
-            m_headBone = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Head);
-            m_lookIK = PlayerSetup.Instance._avatar.GetComponent<LookAtIK>();
-
-            if(m_headBone != null)
-                m_bindRotation = (m_avatarDescriptor.transform.GetMatrix().inverse * m_headBone.GetMatrix()).rotation;
-
-            if(m_lookIK != null)
-                m_lookIK.solver.OnPostUpdate += this.OnLookIKPostUpdate;
-
-        }
-        internal void OnAvatarClear()
-        {
-            m_avatarDescriptor = null;
-            m_lookIK = null;
-            m_headBone = null;
-            m_lastHeadRotation = Quaternion.identity;
-            m_bindRotation = Quaternion.identity;
-        }
-
-        // Settings
-        internal void SetEnabled(bool p_state)
-        {
-            if(m_enabled != p_state)
-            {
-                m_enabled = p_state;
-                if(m_enabled && m_headTracking)
-                    m_lastHeadRotation = ((m_headBone != null) ? m_headBone.rotation : m_bindRotation);
-            }
-        }
-        internal void SetHeadTracking(bool p_state)
-        {
-            if(m_headTracking != p_state)
-            {
-                m_headTracking = p_state;
-                if(m_enabled && m_headTracking)
-                    m_lastHeadRotation = ((m_headBone != null) ? m_headBone.rotation : m_bindRotation);
-            }
-        }
-        internal void SetEyeTracking(bool p_state)
-        {
-            m_eyeTracking = p_state;
-        }
-        internal void SetBlinking(bool p_state)
-        {
-            m_blinking = p_state;
-        }
-        internal void SetSmoothing(float p_value)
-        {
-            m_smoothing = 1f - Mathf.Clamp(p_value, 0f, 0.99f);
-        }
-        internal void SetMirrored(bool p_state)
-        {
-            m_mirrored = p_state;
-        }
-        internal void SetFaceOverride(bool p_state)
-        {
-            m_faceOverride = p_state;
-        }
-    }
-}
+using ABI.CCK.Components;
+using ABI_RC.Core.Player;
+using RootMotion.FinalIK;
+using System.Reflection;
+using UnityEngine;
+using ViveSR.anipal.Lip;
+
+namespace ml_dht
+{
+    [DisallowMultipleComponent]
+    class HeadTracked : MonoBehaviour
+    {
+        static FieldInfo ms_emotePlaying = typeof(PlayerSetup).GetField("_emotePlaying", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        bool m_enabled = false;
+        bool m_headTracking = true;
+        bool m_blinking = true;
+        bool m_eyeTracking = true;
+        float m_smoothing = 0.5f;
+        bool m_mirrored = false;
+        bool m_faceOverride = true;
+
+        CVRAvatar m_avatarDescriptor = null;
+        LookAtIK m_lookIK = null;
+        Transform m_headBone = null;
+
+        Vector3 m_headPosition;
+        Quaternion m_headRotation;
+        Vector2 m_gazeDirection;
+        float m_blinkProgress = 0f;
+        Vector2 m_mouthShapes;
+        float m_eyebrowsProgress = 0f;
+
+        Quaternion m_bindRotation;
+        Quaternion m_lastHeadRotation;
+
+        // Unity events
+        void Start()
+        {
+            Settings.EnabledChange += this.SetEnabled;
+            Settings.HeadTrackingChange += this.SetHeadTracking;
+            Settings.EyeTrackingChange += this.SetEyeTracking;
+            Settings.BlinkingChange += this.SetBlinking;
+            Settings.SmoothingChange += this.SetSmoothing;
+            Settings.MirroredChange += this.SetMirrored;
+            Settings.FaceOverrideChange += this.SetFaceOverride;
+        }
+
+        void OnDestroy()
+        {
+            Settings.EnabledChange -= this.SetEnabled;
+            Settings.HeadTrackingChange -= this.SetHeadTracking;
+            Settings.EyeTrackingChange -= this.SetEyeTracking;
+            Settings.BlinkingChange -= this.SetBlinking;
+            Settings.SmoothingChange -= this.SetSmoothing;
+            Settings.MirroredChange -= this.SetMirrored;
+            Settings.FaceOverrideChange -= this.SetFaceOverride;
+        }
+
+        // Tracking updates
+        public void UpdateTrackingData(ref TrackingData p_data)
+        {
+            m_headPosition.Set(p_data.m_headPositionX * (m_mirrored ? -1f : 1f), p_data.m_headPositionY, p_data.m_headPositionZ);
+            m_headRotation.Set(p_data.m_headRotationX, p_data.m_headRotationY * (m_mirrored ? -1f : 1f), p_data.m_headRotationZ * (m_mirrored ? -1f : 1f), p_data.m_headRotationW);
+            m_gazeDirection.Set(m_mirrored ? (1f - p_data.m_gazeX) : p_data.m_gazeX, p_data.m_gazeY);
+            m_blinkProgress = p_data.m_blink;
+            m_mouthShapes.Set(p_data.m_mouthOpen, p_data.m_mouthShape);
+            m_eyebrowsProgress = p_data.m_brows;
+        }
+
+        void OnLookIKPostUpdate()
+        {
+            if(m_enabled && m_headTracking && (m_headBone != null))
+            {
+                m_lastHeadRotation = Quaternion.Slerp(m_lastHeadRotation, m_avatarDescriptor.transform.rotation * (m_headRotation * m_bindRotation), m_smoothing);
+
+                if(!(bool)ms_emotePlaying.GetValue(PlayerSetup.Instance))
+                    m_headBone.rotation = m_lastHeadRotation;
+            }
+        }
+
+        // Game events
+        internal void OnEyeControllerUpdate(CVREyeController p_component)
+        {
+            if(m_enabled)
+            {
+                // Gaze
+                if(m_eyeTracking)
+                {
+                    Transform l_camera = PlayerSetup.Instance.GetActiveCamera().transform;
+
+                    p_component.manualViewTarget = true;
+                    p_component.targetViewPosition = l_camera.position + l_camera.rotation * new Vector3((m_gazeDirection.x - 0.5f) * 2f, (m_gazeDirection.y - 0.5f) * 2f, 1f);
+                }
+
+                // Blink
+                if(m_blinking)
+                {
+                    p_component.manualBlinking = true;
+                    p_component.blinkProgress = m_blinkProgress;
+                }
+            }
+        }
+
+        internal void OnFaceTrackingUpdate(CVRFaceTracking p_component)
+        {
+            if(m_enabled && m_faceOverride)
+            {
+                if(m_avatarDescriptor != null)
+                    m_avatarDescriptor.useVisemeLipsync = false;
+
+                float l_weight = Mathf.Clamp01(Mathf.InverseLerp(0.25f, 1f, Mathf.Abs(m_mouthShapes.y))) * 100f;
+
+                p_component.BlendShapeValues[(int)LipShape_v2.Jaw_Open] = m_mouthShapes.x * 100f;
+                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Pout] = ((m_mouthShapes.y > 0f) ? l_weight : 0f);
+                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Smile_Left] = ((m_mouthShapes.y < 0f) ? l_weight : 0f);
+                p_component.BlendShapeValues[(int)LipShape_v2.Mouth_Smile_Right] = ((m_mouthShapes.y < 0f) ? l_weight : 0f);
+                p_component.LipSyncWasUpdated = true;
+                p_component.UpdateLipShapes();
+            }
+        }
+
+        internal void OnSetupAvatar()
+        {
+            m_avatarDescriptor = PlayerSetup.Instance._avatar.GetComponent<CVRAvatar>();
+            m_headBone = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Head);
+            m_lookIK = PlayerSetup.Instance._avatar.GetComponent<LookAtIK>();
+
+            if(m_headBone != null)
+                m_bindRotation = (m_avatarDescriptor.transform.GetMatrix().inverse * m_headBone.GetMatrix()).rotation;
+
+            if(m_lookIK != null)
+                m_lookIK.solver.OnPostUpdate += this.OnLookIKPostUpdate;
+
+        }
+        internal void OnAvatarClear()
+        {
+            m_avatarDescriptor = null;
+            m_lookIK = null;
+            m_headBone = null;
+            m_lastHeadRotation = Quaternion.identity;
+            m_bindRotation = Quaternion.identity;
+        }
+
+        // Settings
+        internal void SetEnabled(bool p_state)
+        {
+            if(m_enabled != p_state)
+            {
+                m_enabled = p_state;
+                if(m_enabled && m_headTracking)
+                    m_lastHeadRotation = ((m_headBone != null) ? m_headBone.rotation : m_bindRotation);
+            }
+        }
+        internal void SetHeadTracking(bool p_state)
+        {
+            if(m_headTracking != p_state)
+            {
+                m_headTracking = p_state;
+                if(m_enabled && m_headTracking)
+                    m_lastHeadRotation = ((m_headBone != null) ? m_headBone.rotation : m_bindRotation);
+            }
+        }
+        internal void SetEyeTracking(bool p_state)
+        {
+            m_eyeTracking = p_state;
+        }
+        internal void SetBlinking(bool p_state)
+        {
+            m_blinking = p_state;
+        }
+        internal void SetSmoothing(float p_value)
+        {
+            m_smoothing = 1f - Mathf.Clamp(p_value, 0f, 0.99f);
+        }
+        internal void SetMirrored(bool p_state)
+        {
+            m_mirrored = p_state;
+        }
+        internal void SetFaceOverride(bool p_state)
+        {
+            m_faceOverride = p_state;
+        }
+    }
+}

archived/ml_dht/Main.cs

@@ -1,146 +1,146 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.Player;
-using System.Reflection;
-
-namespace ml_dht
-{
-    public class DesktopHeadTracking : MelonLoader.MelonMod
-    {
-        static DesktopHeadTracking ms_instance = null;
-
-        MemoryMapReader m_mapReader = null;
-        byte[] m_buffer = null;
-        TrackingData m_trackingData;
-
-        HeadTracked m_localTracked = null;
-
-        public override void OnInitializeMelon()
-        {
-            if(ms_instance == null)
-                ms_instance = this;
-
-            Settings.Init();
-
-            m_mapReader = new MemoryMapReader();
-            m_buffer = new byte[1024];
-
-            m_mapReader.Open("head/data");
-
-            // Patches
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(CVREyeController).GetMethod("Update", BindingFlags.Instance | BindingFlags.NonPublic),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnEyeControllerUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(CVRFaceTracking).GetMethod("Update", BindingFlags.Instance | BindingFlags.NonPublic),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnFaceTrackingUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-
-            MelonLoader.MelonCoroutines.Start(WaitForPlayer());
-        }
-
-        System.Collections.IEnumerator WaitForPlayer()
-        {
-            while(PlayerSetup.Instance == null)
-                yield return null;
-
-            m_localTracked = PlayerSetup.Instance.gameObject.AddComponent<HeadTracked>();
-            m_localTracked.SetEnabled(Settings.Enabled);
-            m_localTracked.SetHeadTracking(Settings.HeadTracking);
-            m_localTracked.SetEyeTracking(Settings.EyeTracking);
-            m_localTracked.SetBlinking(Settings.Blinking);
-            m_localTracked.SetMirrored(Settings.Mirrored);
-            m_localTracked.SetSmoothing(Settings.Smoothing);
-            m_localTracked.SetFaceOverride(Settings.FaceOverride);
-        }
-
-        public override void OnDeinitializeMelon()
-        {
-            if(ms_instance == this)
-                ms_instance = null;
-
-            m_mapReader?.Close();
-            m_mapReader = null;
-            m_buffer = null;
-            m_localTracked = null;
-        }
-
-        public override void OnUpdate()
-        {
-            if(Settings.Enabled && m_mapReader.Read(ref m_buffer))
-            {
-                m_trackingData = TrackingData.ToObject(m_buffer);
-                if(m_localTracked != null)
-                    m_localTracked.UpdateTrackingData(ref m_trackingData);
-            }
-        }
-
-        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
-        void OnSetupAvatar()
-        {
-            try
-            {
-                if(m_localTracked != null)
-                    m_localTracked.OnSetupAvatar();
-            }
-            catch(System.Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
-        void OnAvatarClear()
-        {
-            try
-            {
-                if(m_localTracked != null)
-                    m_localTracked.OnAvatarClear();
-            }
-            catch(System.Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnEyeControllerUpdate_Postfix(ref CVREyeController __instance) => ms_instance?.OnEyeControllerUpdate(__instance);
-        void OnEyeControllerUpdate(CVREyeController p_component)
-        {
-            try
-            {
-                if(p_component.isLocal && (m_localTracked != null))
-                    m_localTracked.OnEyeControllerUpdate(p_component);
-            }
-            catch(System.Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnFaceTrackingUpdate_Postfix(ref CVRFaceTracking __instance) => ms_instance?.OnFaceTrackingUpdate(__instance);
-        void OnFaceTrackingUpdate(CVRFaceTracking p_component)
-        {
-            try
-            {
-                if(p_component.isLocal && (m_localTracked != null))
-                    m_localTracked.OnFaceTrackingUpdate(p_component);
-            }
-            catch(System.Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-    }
+using ABI.CCK.Components;
+using ABI_RC.Core.Player;
+using System.Reflection;
+
+namespace ml_dht
+{
+    public class DesktopHeadTracking : MelonLoader.MelonMod
+    {
+        static DesktopHeadTracking ms_instance = null;
+
+        MemoryMapReader m_mapReader = null;
+        byte[] m_buffer = null;
+        TrackingData m_trackingData;
+
+        HeadTracked m_localTracked = null;
+
+        public override void OnInitializeMelon()
+        {
+            if(ms_instance == null)
+                ms_instance = this;
+
+            Settings.Init();
+
+            m_mapReader = new MemoryMapReader();
+            m_buffer = new byte[1024];
+
+            m_mapReader.Open("head/data");
+
+            // Patches
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(CVREyeController).GetMethod("Update", BindingFlags.Instance | BindingFlags.NonPublic),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnEyeControllerUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(CVRFaceTracking).GetMethod("Update", BindingFlags.Instance | BindingFlags.NonPublic),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(DesktopHeadTracking).GetMethod(nameof(OnFaceTrackingUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+
+            MelonLoader.MelonCoroutines.Start(WaitForPlayer());
+        }
+
+        System.Collections.IEnumerator WaitForPlayer()
+        {
+            while(PlayerSetup.Instance == null)
+                yield return null;
+
+            m_localTracked = PlayerSetup.Instance.gameObject.AddComponent<HeadTracked>();
+            m_localTracked.SetEnabled(Settings.Enabled);
+            m_localTracked.SetHeadTracking(Settings.HeadTracking);
+            m_localTracked.SetEyeTracking(Settings.EyeTracking);
+            m_localTracked.SetBlinking(Settings.Blinking);
+            m_localTracked.SetMirrored(Settings.Mirrored);
+            m_localTracked.SetSmoothing(Settings.Smoothing);
+            m_localTracked.SetFaceOverride(Settings.FaceOverride);
+        }
+
+        public override void OnDeinitializeMelon()
+        {
+            if(ms_instance == this)
+                ms_instance = null;
+
+            m_mapReader?.Close();
+            m_mapReader = null;
+            m_buffer = null;
+            m_localTracked = null;
+        }
+
+        public override void OnUpdate()
+        {
+            if(Settings.Enabled && m_mapReader.Read(ref m_buffer))
+            {
+                m_trackingData = TrackingData.ToObject(m_buffer);
+                if(m_localTracked != null)
+                    m_localTracked.UpdateTrackingData(ref m_trackingData);
+            }
+        }
+
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
+        {
+            try
+            {
+                if(m_localTracked != null)
+                    m_localTracked.OnSetupAvatar();
+            }
+            catch(System.Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
+        void OnAvatarClear()
+        {
+            try
+            {
+                if(m_localTracked != null)
+                    m_localTracked.OnAvatarClear();
+            }
+            catch(System.Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnEyeControllerUpdate_Postfix(ref CVREyeController __instance) => ms_instance?.OnEyeControllerUpdate(__instance);
+        void OnEyeControllerUpdate(CVREyeController p_component)
+        {
+            try
+            {
+                if(p_component.isLocal && (m_localTracked != null))
+                    m_localTracked.OnEyeControllerUpdate(p_component);
+            }
+            catch(System.Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnFaceTrackingUpdate_Postfix(ref CVRFaceTracking __instance) => ms_instance?.OnFaceTrackingUpdate(__instance);
+        void OnFaceTrackingUpdate(CVRFaceTracking p_component)
+        {
+            try
+            {
+                if(p_component.isLocal && (m_localTracked != null))
+                    m_localTracked.OnFaceTrackingUpdate(p_component);
+            }
+            catch(System.Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+    }
 }

archived/ml_dht/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.1.2-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
-[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
-[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
+[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.1.2-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
+[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
 [assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

archived/ml_dht/README.md

@@ -1,29 +1,29 @@
-# Desktop Head Tracking
-This mod adds desktop head tracking based on data from memory-mapped file `head/data`.  
-Refer to `TrackingData.cs` for reference in case of implementing own software.
-
-[![](.github/img_01.png)](https://youtu.be/jgcFhSNi9DM)
-
-# Features
-* Head rotation
-* Eyes gaze direction
-* Blinking
-* Basic mouth shapes
-
-# Installation
-* Install [latest MelonLoader](https://github.com/LavaGang/MelonLoader)
-* Get [latest release DLL](../../../releases/latest):
-  * Put `ml_dht.dll` in `Mods` folder of game
-
-# Usage
-Available mod's settings in `Settings - Implementation - Desktop Head Tracking`:
-* **Enabled:** enables mod's activity; default value - `false`.
-* **Use head tracking:** enables head tracking; default value - `true`.
-* **Use eyes tracking:** uses eyes tracking from data; default value - `true`.
-* **Use blinking:** uses blinking from data; default value - `true`.
-* **Mirrored movement:** mirrors movement and gaze along 0YZ plane; default value - `false`.
-* **Movement smoothing:** smoothing factor between new and old movement data; default value - `50`.
-* **Override face tracking:** overrides and activates avatar's `VRC Face Tracking` components. List of used shapes: `Jaw_Open`, `Mouth_Pout`, `Mouth_Smile_Left`, `Mouth_Smile_Right`; default value - `true`.
-
-# Known compatible tracking software
-* [VSeeFace](https://www.vseeface.icu) with [Tracking Data Parser mod](https://github.com/SDraw/ml_mods_vsf)
+# Desktop Head Tracking
+This mod adds desktop head tracking based on data from memory-mapped file `head/data`.  
+Refer to `TrackingData.cs` for reference in case of implementing own software.
+
+[![](.github/img_01.png)](https://youtu.be/jgcFhSNi9DM)
+
+# Features
+* Head rotation
+* Eyes gaze direction
+* Blinking
+* Basic mouth shapes
+
+# Installation
+* Install [latest MelonLoader](https://github.com/LavaGang/MelonLoader)
+* Get [latest release DLL](../../../releases/latest):
+  * Put `ml_dht.dll` in `Mods` folder of game
+
+# Usage
+Available mod's settings in `Settings - Implementation - Desktop Head Tracking`:
+* **Enabled:** enables mod's activity; default value - `false`.
+* **Use head tracking:** enables head tracking; default value - `true`.
+* **Use eyes tracking:** uses eyes tracking from data; default value - `true`.
+* **Use blinking:** uses blinking from data; default value - `true`.
+* **Mirrored movement:** mirrors movement and gaze along 0YZ plane; default value - `false`.
+* **Movement smoothing:** smoothing factor between new and old movement data; default value - `50`.
+* **Override face tracking:** overrides and activates avatar's `VRC Face Tracking` components. List of used shapes: `Jaw_Open`, `Mouth_Pout`, `Mouth_Smile_Left`, `Mouth_Smile_Right`; default value - `true`.
+
+# Known compatible tracking software
+* [VSeeFace](https://www.vseeface.icu) with [Tracking Data Parser mod](https://github.com/SDraw/ml_mods_vsf)

archived/ml_dht/Scripts.cs

@@ -1,26 +1,26 @@
-using System;
-using System.IO;
-using System.Reflection;
-
-namespace ml_dht
-{
-    static class Scripts
-    {
-        public static string GetEmbeddedScript(string p_name)
-        {
-            string l_result = "";
-            Assembly l_assembly = Assembly.GetExecutingAssembly();
-            string l_assemblyName = l_assembly.GetName().Name;
-
-            try
-            {
-                Stream l_libraryStream = l_assembly.GetManifestResourceStream(l_assemblyName + ".resources." + p_name);
-                StreamReader l_streadReader = new StreamReader(l_libraryStream);
-                l_result = l_streadReader.ReadToEnd();
-            }
-            catch(Exception) { }
-
-            return l_result;
-        }
-    }
-}
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace ml_dht
+{
+    static class Scripts
+    {
+        public static string GetEmbeddedScript(string p_name)
+        {
+            string l_result = "";
+            Assembly l_assembly = Assembly.GetExecutingAssembly();
+            string l_assemblyName = l_assembly.GetName().Name;
+
+            try
+            {
+                Stream l_libraryStream = l_assembly.GetManifestResourceStream(l_assemblyName + ".resources." + p_name);
+                StreamReader l_streadReader = new StreamReader(l_libraryStream);
+                l_result = l_streadReader.ReadToEnd();
+            }
+            catch(Exception) { }
+
+            return l_result;
+        }
+    }
+}

archived/ml_dht/Settings.cs

@@ -1,163 +1,163 @@
-using ABI_RC.Core.InteractionSystem;
-using System;
-using System.Collections.Generic;
-
-namespace ml_dht
-{
-    static class Settings
-    {
-        enum ModSetting
-        {
-            Enabled = 0,
-            HeadTracking,
-            EyeTracking,
-            Blinking,
-            Mirrored,
-            Smoothing,
-            FaceOverride
-        }
-
-        public static bool Enabled { get; private set; } = false;
-        public static bool HeadTracking { get; private set; } = true;
-        public static bool EyeTracking { get; private set; } = true;
-        public static bool Blinking { get; private set; } = true;
-        public static bool Mirrored { get; private set; } = false;
-        public static float Smoothing { get; private set; } = 0.5f;
-        public static bool FaceOverride { get; private set; } = true;
-
-        static MelonLoader.MelonPreferences_Category ms_category = null;
-        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
-
-        static public event Action<bool> EnabledChange;
-        static public event Action<bool> HeadTrackingChange;
-        static public event Action<bool> EyeTrackingChange;
-        static public event Action<bool> BlinkingChange;
-        static public event Action<bool> MirroredChange;
-        static public event Action<float> SmoothingChange;
-        static public event Action<bool> FaceOverrideChange;
-
-        internal static void Init()
-        {
-            ms_category = MelonLoader.MelonPreferences.CreateCategory("DHT");
-
-            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
-            {
-                ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled),
-                ms_category.CreateEntry(ModSetting.HeadTracking.ToString(), HeadTracking),
-                ms_category.CreateEntry(ModSetting.EyeTracking.ToString(), EyeTracking),
-                ms_category.CreateEntry(ModSetting.Blinking.ToString(), Blinking),
-                ms_category.CreateEntry(ModSetting.Mirrored.ToString(), Mirrored),
-                ms_category.CreateEntry(ModSetting.Smoothing.ToString(), (int)(Smoothing * 50f)),
-                ms_category.CreateEntry(ModSetting.FaceOverride.ToString(), FaceOverride)
-            };
-
-            Load();
-
-            MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
-        }
-
-        static System.Collections.IEnumerator WaitMainMenuUi()
-        {
-            while(ViewManager.Instance == null)
-                yield return null;
-            while(ViewManager.Instance.gameMenuView == null)
-                yield return null;
-            while(ViewManager.Instance.gameMenuView.Listener == null)
-                yield return null;
-
-            ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () =>
-            {
-                ViewManager.Instance.gameMenuView.View.BindCall("MelonMod_DHT_Call_InpSlider", new Action<string, string>(OnSliderUpdate));
-                ViewManager.Instance.gameMenuView.View.BindCall("MelonMod_DHT_Call_InpToggle", new Action<string, string>(OnToggleUpdate));
-            };
-            ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
-            {
-                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("menu.js"));
-                foreach(var l_entry in ms_entries)
-                    ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSettingDHT", l_entry.DisplayName, l_entry.GetValueAsString());
-            };
-        }
-
-        static void Load()
-        {
-            Enabled = (bool)ms_entries[(int)ModSetting.Enabled].BoxedValue;
-            HeadTracking = (bool)ms_entries[(int)ModSetting.HeadTracking].BoxedValue;
-            EyeTracking = (bool)ms_entries[(int)ModSetting.EyeTracking].BoxedValue;
-            Blinking = (bool)ms_entries[(int)ModSetting.Blinking].BoxedValue;
-            Mirrored = (bool)ms_entries[(int)ModSetting.Mirrored].BoxedValue;
-            Smoothing = ((int)ms_entries[(int)ModSetting.Smoothing].BoxedValue) * 0.01f;
-            FaceOverride = (bool)ms_entries[(int)ModSetting.FaceOverride].BoxedValue;
-        }
-
-        static void OnSliderUpdate(string p_name, string p_value)
-        {
-            if(Enum.TryParse(p_name, out ModSetting l_setting))
-            {
-                switch(l_setting)
-                {
-                    case ModSetting.Smoothing:
-                    {
-                        Smoothing = int.Parse(p_value) * 0.01f;
-                        SmoothingChange?.Invoke(Smoothing);
-                    }
-                    break;
-                }
-
-                ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
-            }
-        }
-
-        static void OnToggleUpdate(string p_name, string p_value)
-        {
-            if(Enum.TryParse(p_name, out ModSetting l_setting))
-            {
-                switch(l_setting)
-                {
-                    case ModSetting.Enabled:
-                    {
-                        Enabled = bool.Parse(p_value);
-                        EnabledChange?.Invoke(Enabled);
-                    }
-                    break;
-
-                    case ModSetting.HeadTracking:
-                    {
-                        HeadTracking = bool.Parse(p_value);
-                        HeadTrackingChange?.Invoke(HeadTracking);
-                    }
-                    break;
-
-                    case ModSetting.EyeTracking:
-                    {
-                        EyeTracking = bool.Parse(p_value);
-                        EyeTrackingChange?.Invoke(EyeTracking);
-                    }
-                    break;
-
-                    case ModSetting.Blinking:
-                    {
-                        Blinking = bool.Parse(p_value);
-                        BlinkingChange?.Invoke(Blinking);
-                    }
-                    break;
-
-                    case ModSetting.Mirrored:
-                    {
-                        Mirrored = bool.Parse(p_value);
-                        MirroredChange?.Invoke(Mirrored);
-                    }
-                    break;
-
-                    case ModSetting.FaceOverride:
-                    {
-                        FaceOverride = bool.Parse(p_value);
-                        FaceOverrideChange?.Invoke(FaceOverride);
-                    }
-                    break;
-                }
-
-                ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);
-            }
-        }
-    }
-}
+using ABI_RC.Core.InteractionSystem;
+using System;
+using System.Collections.Generic;
+
+namespace ml_dht
+{
+    static class Settings
+    {
+        enum ModSetting
+        {
+            Enabled = 0,
+            HeadTracking,
+            EyeTracking,
+            Blinking,
+            Mirrored,
+            Smoothing,
+            FaceOverride
+        }
+
+        public static bool Enabled { get; private set; } = false;
+        public static bool HeadTracking { get; private set; } = true;
+        public static bool EyeTracking { get; private set; } = true;
+        public static bool Blinking { get; private set; } = true;
+        public static bool Mirrored { get; private set; } = false;
+        public static float Smoothing { get; private set; } = 0.5f;
+        public static bool FaceOverride { get; private set; } = true;
+
+        static MelonLoader.MelonPreferences_Category ms_category = null;
+        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
+
+        static public event Action<bool> EnabledChange;
+        static public event Action<bool> HeadTrackingChange;
+        static public event Action<bool> EyeTrackingChange;
+        static public event Action<bool> BlinkingChange;
+        static public event Action<bool> MirroredChange;
+        static public event Action<float> SmoothingChange;
+        static public event Action<bool> FaceOverrideChange;
+
+        internal static void Init()
+        {
+            ms_category = MelonLoader.MelonPreferences.CreateCategory("DHT");
+
+            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
+            {
+                ms_category.CreateEntry(ModSetting.Enabled.ToString(), Enabled),
+                ms_category.CreateEntry(ModSetting.HeadTracking.ToString(), HeadTracking),
+                ms_category.CreateEntry(ModSetting.EyeTracking.ToString(), EyeTracking),
+                ms_category.CreateEntry(ModSetting.Blinking.ToString(), Blinking),
+                ms_category.CreateEntry(ModSetting.Mirrored.ToString(), Mirrored),
+                ms_category.CreateEntry(ModSetting.Smoothing.ToString(), (int)(Smoothing * 50f)),
+                ms_category.CreateEntry(ModSetting.FaceOverride.ToString(), FaceOverride)
+            };
+
+            Load();
+
+            MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
+        }
+
+        static System.Collections.IEnumerator WaitMainMenuUi()
+        {
+            while(ViewManager.Instance == null)
+                yield return null;
+            while(ViewManager.Instance.gameMenuView == null)
+                yield return null;
+            while(ViewManager.Instance.gameMenuView.Listener == null)
+                yield return null;
+
+            ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () =>
+            {
+                ViewManager.Instance.gameMenuView.View.BindCall("MelonMod_DHT_Call_InpSlider", new Action<string, string>(OnSliderUpdate));
+                ViewManager.Instance.gameMenuView.View.BindCall("MelonMod_DHT_Call_InpToggle", new Action<string, string>(OnToggleUpdate));
+            };
+            ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
+            {
+                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("menu.js"));
+                foreach(var l_entry in ms_entries)
+                    ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSettingDHT", l_entry.DisplayName, l_entry.GetValueAsString());
+            };
+        }
+
+        static void Load()
+        {
+            Enabled = (bool)ms_entries[(int)ModSetting.Enabled].BoxedValue;
+            HeadTracking = (bool)ms_entries[(int)ModSetting.HeadTracking].BoxedValue;
+            EyeTracking = (bool)ms_entries[(int)ModSetting.EyeTracking].BoxedValue;
+            Blinking = (bool)ms_entries[(int)ModSetting.Blinking].BoxedValue;
+            Mirrored = (bool)ms_entries[(int)ModSetting.Mirrored].BoxedValue;
+            Smoothing = ((int)ms_entries[(int)ModSetting.Smoothing].BoxedValue) * 0.01f;
+            FaceOverride = (bool)ms_entries[(int)ModSetting.FaceOverride].BoxedValue;
+        }
+
+        static void OnSliderUpdate(string p_name, string p_value)
+        {
+            if(Enum.TryParse(p_name, out ModSetting l_setting))
+            {
+                switch(l_setting)
+                {
+                    case ModSetting.Smoothing:
+                    {
+                        Smoothing = int.Parse(p_value) * 0.01f;
+                        SmoothingChange?.Invoke(Smoothing);
+                    }
+                    break;
+                }
+
+                ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
+            }
+        }
+
+        static void OnToggleUpdate(string p_name, string p_value)
+        {
+            if(Enum.TryParse(p_name, out ModSetting l_setting))
+            {
+                switch(l_setting)
+                {
+                    case ModSetting.Enabled:
+                    {
+                        Enabled = bool.Parse(p_value);
+                        EnabledChange?.Invoke(Enabled);
+                    }
+                    break;
+
+                    case ModSetting.HeadTracking:
+                    {
+                        HeadTracking = bool.Parse(p_value);
+                        HeadTrackingChange?.Invoke(HeadTracking);
+                    }
+                    break;
+
+                    case ModSetting.EyeTracking:
+                    {
+                        EyeTracking = bool.Parse(p_value);
+                        EyeTrackingChange?.Invoke(EyeTracking);
+                    }
+                    break;
+
+                    case ModSetting.Blinking:
+                    {
+                        Blinking = bool.Parse(p_value);
+                        BlinkingChange?.Invoke(Blinking);
+                    }
+                    break;
+
+                    case ModSetting.Mirrored:
+                    {
+                        Mirrored = bool.Parse(p_value);
+                        MirroredChange?.Invoke(Mirrored);
+                    }
+                    break;
+
+                    case ModSetting.FaceOverride:
+                    {
+                        FaceOverride = bool.Parse(p_value);
+                        FaceOverrideChange?.Invoke(FaceOverride);
+                    }
+                    break;
+                }
+
+                ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);
+            }
+        }
+    }
+}

archived/ml_dht/Utils.cs

@@ -1,18 +1,18 @@
-using ABI_RC.Core.UI;
-using System.Reflection;
-using UnityEngine;
-
-namespace ml_dht
-{
-    static class Utils
-    {
-        static FieldInfo ms_cohtmlView = typeof(CohtmlControlledViewDisposable).GetField("_view", BindingFlags.NonPublic | BindingFlags.Instance);
-
-        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
-        {
-            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.localScale : Vector3.one);
-        }
-
-        public static void ExecuteScript(this CohtmlControlledViewDisposable p_viewDisposable, string p_script) => ((cohtml.Net.View)ms_cohtmlView.GetValue(p_viewDisposable))?.ExecuteScript(p_script);
-    }
-}
+using ABI_RC.Core.UI;
+using System.Reflection;
+using UnityEngine;
+
+namespace ml_dht
+{
+    static class Utils
+    {
+        static FieldInfo ms_cohtmlView = typeof(CohtmlControlledViewDisposable).GetField("_view", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
+        {
+            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.localScale : Vector3.one);
+        }
+
+        public static void ExecuteScript(this CohtmlControlledViewDisposable p_viewDisposable, string p_script) => ((cohtml.Net.View)ms_cohtmlView.GetValue(p_viewDisposable))?.ExecuteScript(p_script);
+    }
+}

archived/ml_dht/ml_dht.csproj

@@ -1,71 +1,71 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <PackageId>DesktopHeadTracking</PackageId>
-    <Authors>SDraw</Authors>
-    <Company>None</Company>
-    <Product>DesktopHeadTracking</Product>
-    <Version>1.1.2</Version>
-    <Platforms>x64</Platforms>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="DesktopHeadTracking.json" />
-    <None Remove="resources\menu.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="resources\menu.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\0Harmony.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="cohtml.Net">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Cohtml.Runtime">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="MelonLoader">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\MelonLoader.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
-  </Target>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <PackageId>DesktopHeadTracking</PackageId>
+    <Authors>SDraw</Authors>
+    <Company>None</Company>
+    <Product>DesktopHeadTracking</Product>
+    <Version>1.1.2</Version>
+    <Platforms>x64</Platforms>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <None Remove="DesktopHeadTracking.json" />
+    <None Remove="resources\menu.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="resources\menu.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\0Harmony.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="cohtml.Net">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Cohtml.Runtime">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="MelonLoader">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\MelonLoader\MelonLoader.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.AnimationModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
+  </Target>
+
+</Project>

archived/ml_dht/resources/menu.js

@@ -1,245 +1,245 @@
-// Add settings
-var g_modSettingsDHT = [];
-
-engine.on('updateModSettingDHT', function (_name, _value) {
-    for (var i = 0; i < g_modSettingsDHT.length; i++) {
-        if (g_modSettingsDHT[i].name == _name) {
-            g_modSettingsDHT[i].updateValue(_value);
-            break;
-        }
-    }
-});
-
-// Modified from original `inp` types, because I have no js knowledge to hook stuff
-function inp_slider_mod_dht(_obj, _callbackName) {
-    this.obj = _obj;
-    this.callbackName = _callbackName;
-    this.minValue = parseFloat(_obj.getAttribute('data-min'));
-    this.maxValue = parseFloat(_obj.getAttribute('data-max'));
-    this.percent = 0;
-    this.value = parseFloat(_obj.getAttribute('data-current'));
-    this.dragActive = false;
-    this.name = _obj.id;
-    this.type = _obj.getAttribute('data-type');
-    this.stepSize = _obj.getAttribute('data-stepSize') || 0;
-    this.format = _obj.getAttribute('data-format') || '{value}';
-
-    var self = this;
-
-    if (this.stepSize != 0)
-        this.value = Math.round(this.value / this.stepSize) * this.stepSize;
-    else
-        this.value = Math.round(this.value);
-
-    this.valueLabelBackground = document.createElement('div');
-    this.valueLabelBackground.className = 'valueLabel background';
-    this.valueLabelBackground.innerHTML = this.format.replace('{value}', this.value);
-    this.obj.appendChild(this.valueLabelBackground);
-
-    this.valueBar = document.createElement('div');
-    this.valueBar.className = 'valueBar';
-    this.valueBar.setAttribute('style', 'width: ' + (((this.value - this.minValue) / (this.maxValue - this.minValue)) * 100) + '%;');
-    this.obj.appendChild(this.valueBar);
-
-    this.valueLabelForeground = document.createElement('div');
-    this.valueLabelForeground.className = 'valueLabel foreground';
-    this.valueLabelForeground.innerHTML = this.format.replace('{value}', this.value);
-    this.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / ((this.value - this.minValue) / (this.maxValue - this.minValue)) * 100) + '%;');
-    this.valueBar.appendChild(this.valueLabelForeground);
-
-    this.mouseDown = function (_e) {
-        self.dragActive = true;
-        self.mouseMove(_e, false);
-    }
-
-    this.mouseMove = function (_e, _write) {
-        if (self.dragActive) {
-            var rect = _obj.getBoundingClientRect();
-            var start = rect.left;
-            var end = rect.right;
-            self.percent = Math.min(Math.max((_e.clientX - start) / rect.width, 0), 1);
-            var value = self.percent;
-            value *= (self.maxValue - self.minValue);
-            value += self.minValue;
-            if (self.stepSize != 0) {
-                value = Math.round(value / self.stepSize);
-                self.value = value * self.stepSize;
-                self.percent = (self.value - self.minValue) / (self.maxValue - self.minValue);
-            }
-            else
-                self.value = Math.round(value);
-
-            self.valueBar.setAttribute('style', 'width: ' + (self.percent * 100) + '%;');
-            self.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / self.percent * 100) + '%;');
-            self.valueLabelBackground.innerHTML = self.valueLabelForeground.innerHTML = self.format.replace('{value}', self.value);
-
-            engine.call(self.callbackName, self.name, "" + self.value);
-            self.displayImperial();
-        }
-    }
-
-    this.mouseUp = function (_e) {
-        self.mouseMove(_e, true);
-        self.dragActive = false;
-    }
-
-    _obj.addEventListener('mousedown', this.mouseDown);
-    document.addEventListener('mousemove', this.mouseMove);
-    document.addEventListener('mouseup', this.mouseUp);
-
-    this.getValue = function () {
-        return self.value;
-    }
-
-    this.updateValue = function (value) {
-        if (self.stepSize != 0)
-            self.value = Math.round(value * self.stepSize) / self.stepSize;
-        else
-            self.value = Math.round(value);
-        self.percent = (self.value - self.minValue) / (self.maxValue - self.minValue);
-        self.valueBar.setAttribute('style', 'width: ' + (self.percent * 100) + '%;');
-        self.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / self.percent * 100) + '%;');
-        self.valueLabelBackground.innerHTML = self.valueLabelForeground.innerHTML = self.format.replace('{value}', self.value);
-        self.displayImperial();
-    }
-
-    this.displayImperial = function () {
-        var displays = document.querySelectorAll('.imperialDisplay');
-        for (var i = 0; i < displays.length; i++) {
-            var binding = displays[i].getAttribute('data-binding');
-            if (binding == self.name) {
-                var realFeet = ((self.value * 0.393700) / 12);
-                var feet = Math.floor(realFeet);
-                var inches = Math.floor((realFeet - feet) * 12);
-                displays[i].innerHTML = feet + "&apos;" + inches + '&apos;&apos;';
-            }
-        }
-    }
-
-    return {
-        name: this.name,
-        value: this.getValue,
-        updateValue: this.updateValue
-    }
-}
-
-// Modified from original `inp` types, because I have no js knowledge to hook stuff
-function inp_toggle_mod_dht(_obj, _callbackName) {
-    this.obj = _obj;
-    this.callbackName = _callbackName;
-    this.value = _obj.getAttribute('data-current');
-    this.name = _obj.id;
-    this.type = _obj.getAttribute('data-type');
-
-    var self = this;
-
-    this.mouseDown = function (_e) {
-        self.value = self.value == "True" ? "False" : "True";
-        self.updateState();
-    }
-
-    this.updateState = function () {
-        self.obj.classList.remove("checked");
-        if (self.value == "True") {
-            self.obj.classList.add("checked");
-        }
-
-        engine.call(self.callbackName, self.name, self.value);
-    }
-
-    _obj.addEventListener('mousedown', this.mouseDown);
-
-    this.getValue = function () {
-        return self.value;
-    }
-
-    this.updateValue = function (value) {
-        self.value = value;
-
-        self.obj.classList.remove("checked");
-        if (self.value == "True") {
-            self.obj.classList.add("checked");
-        }
-    }
-
-    this.updateValue(this.value);
-
-    return {
-        name: this.name,
-        value: this.getValue,
-        updateValue: this.updateValue
-    }
-}
-
-// Add own menu
-{
-    let l_block = document.createElement('div');
-    l_block.innerHTML = `
-        <div class ="settings-subcategory">
-            <div class ="subcategory-name">Desktop Head Tracking</div>
-            <div class ="subcategory-description"></div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Enabled: </div>
-            <div class ="option-input">
-                <div id="Enabled" class ="inp_toggle no-scroll" data-current="false"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Use head tracking: </div>
-            <div class ="option-input">
-                <div id="HeadTracking" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Use eyes tracking: </div>
-            <div class ="option-input">
-                <div id="EyeTracking" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Use blinking: </div>
-            <div class ="option-input">
-                <div id="Blinking" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-        
-        <div class ="row-wrapper">
-            <div class ="option-caption">Mirrored movement: </div>
-            <div class ="option-input">
-                <div id="Mirrored" class ="inp_toggle no-scroll" data-current="false"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Movement smoothing: </div>
-            <div class ="option-input">
-                <div id="Smoothing" class ="inp_slider no-scroll" data-min="0" data-max="99" data-current="50"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Override face tracking: </div>
-            <div class ="option-input">
-                <div id="FaceOverride" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-    `;
-    document.getElementById('settings-implementation').appendChild(l_block);
-
-    // Update sliders in new menu block
-    let l_sliders = l_block.querySelectorAll('.inp_slider');
-    for (var i = 0; i < l_sliders.length; i++) {
-        g_modSettingsDHT[g_modSettingsDHT.length] = new inp_slider_mod_dht(l_sliders[i], 'MelonMod_DHT_Call_InpSlider');
-    }
-
-    // Update toggles in new menu block
-    let l_toggles = l_block.querySelectorAll('.inp_toggle');
-    for (var i = 0; i < l_toggles.length; i++) {
-        g_modSettingsDHT[g_modSettingsDHT.length] = new inp_toggle_mod_dht(l_toggles[i], 'MelonMod_DHT_Call_InpToggle');
-    }
-}
+// Add settings
+var g_modSettingsDHT = [];
+
+engine.on('updateModSettingDHT', function (_name, _value) {
+    for (var i = 0; i < g_modSettingsDHT.length; i++) {
+        if (g_modSettingsDHT[i].name == _name) {
+            g_modSettingsDHT[i].updateValue(_value);
+            break;
+        }
+    }
+});
+
+// Modified from original `inp` types, because I have no js knowledge to hook stuff
+function inp_slider_mod_dht(_obj, _callbackName) {
+    this.obj = _obj;
+    this.callbackName = _callbackName;
+    this.minValue = parseFloat(_obj.getAttribute('data-min'));
+    this.maxValue = parseFloat(_obj.getAttribute('data-max'));
+    this.percent = 0;
+    this.value = parseFloat(_obj.getAttribute('data-current'));
+    this.dragActive = false;
+    this.name = _obj.id;
+    this.type = _obj.getAttribute('data-type');
+    this.stepSize = _obj.getAttribute('data-stepSize') || 0;
+    this.format = _obj.getAttribute('data-format') || '{value}';
+
+    var self = this;
+
+    if (this.stepSize != 0)
+        this.value = Math.round(this.value / this.stepSize) * this.stepSize;
+    else
+        this.value = Math.round(this.value);
+
+    this.valueLabelBackground = document.createElement('div');
+    this.valueLabelBackground.className = 'valueLabel background';
+    this.valueLabelBackground.innerHTML = this.format.replace('{value}', this.value);
+    this.obj.appendChild(this.valueLabelBackground);
+
+    this.valueBar = document.createElement('div');
+    this.valueBar.className = 'valueBar';
+    this.valueBar.setAttribute('style', 'width: ' + (((this.value - this.minValue) / (this.maxValue - this.minValue)) * 100) + '%;');
+    this.obj.appendChild(this.valueBar);
+
+    this.valueLabelForeground = document.createElement('div');
+    this.valueLabelForeground.className = 'valueLabel foreground';
+    this.valueLabelForeground.innerHTML = this.format.replace('{value}', this.value);
+    this.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / ((this.value - this.minValue) / (this.maxValue - this.minValue)) * 100) + '%;');
+    this.valueBar.appendChild(this.valueLabelForeground);
+
+    this.mouseDown = function (_e) {
+        self.dragActive = true;
+        self.mouseMove(_e, false);
+    }
+
+    this.mouseMove = function (_e, _write) {
+        if (self.dragActive) {
+            var rect = _obj.getBoundingClientRect();
+            var start = rect.left;
+            var end = rect.right;
+            self.percent = Math.min(Math.max((_e.clientX - start) / rect.width, 0), 1);
+            var value = self.percent;
+            value *= (self.maxValue - self.minValue);
+            value += self.minValue;
+            if (self.stepSize != 0) {
+                value = Math.round(value / self.stepSize);
+                self.value = value * self.stepSize;
+                self.percent = (self.value - self.minValue) / (self.maxValue - self.minValue);
+            }
+            else
+                self.value = Math.round(value);
+
+            self.valueBar.setAttribute('style', 'width: ' + (self.percent * 100) + '%;');
+            self.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / self.percent * 100) + '%;');
+            self.valueLabelBackground.innerHTML = self.valueLabelForeground.innerHTML = self.format.replace('{value}', self.value);
+
+            engine.call(self.callbackName, self.name, "" + self.value);
+            self.displayImperial();
+        }
+    }
+
+    this.mouseUp = function (_e) {
+        self.mouseMove(_e, true);
+        self.dragActive = false;
+    }
+
+    _obj.addEventListener('mousedown', this.mouseDown);
+    document.addEventListener('mousemove', this.mouseMove);
+    document.addEventListener('mouseup', this.mouseUp);
+
+    this.getValue = function () {
+        return self.value;
+    }
+
+    this.updateValue = function (value) {
+        if (self.stepSize != 0)
+            self.value = Math.round(value * self.stepSize) / self.stepSize;
+        else
+            self.value = Math.round(value);
+        self.percent = (self.value - self.minValue) / (self.maxValue - self.minValue);
+        self.valueBar.setAttribute('style', 'width: ' + (self.percent * 100) + '%;');
+        self.valueLabelForeground.setAttribute('style', 'width: ' + (1.0 / self.percent * 100) + '%;');
+        self.valueLabelBackground.innerHTML = self.valueLabelForeground.innerHTML = self.format.replace('{value}', self.value);
+        self.displayImperial();
+    }
+
+    this.displayImperial = function () {
+        var displays = document.querySelectorAll('.imperialDisplay');
+        for (var i = 0; i < displays.length; i++) {
+            var binding = displays[i].getAttribute('data-binding');
+            if (binding == self.name) {
+                var realFeet = ((self.value * 0.393700) / 12);
+                var feet = Math.floor(realFeet);
+                var inches = Math.floor((realFeet - feet) * 12);
+                displays[i].innerHTML = feet + "&apos;" + inches + '&apos;&apos;';
+            }
+        }
+    }
+
+    return {
+        name: this.name,
+        value: this.getValue,
+        updateValue: this.updateValue
+    }
+}
+
+// Modified from original `inp` types, because I have no js knowledge to hook stuff
+function inp_toggle_mod_dht(_obj, _callbackName) {
+    this.obj = _obj;
+    this.callbackName = _callbackName;
+    this.value = _obj.getAttribute('data-current');
+    this.name = _obj.id;
+    this.type = _obj.getAttribute('data-type');
+
+    var self = this;
+
+    this.mouseDown = function (_e) {
+        self.value = self.value == "True" ? "False" : "True";
+        self.updateState();
+    }
+
+    this.updateState = function () {
+        self.obj.classList.remove("checked");
+        if (self.value == "True") {
+            self.obj.classList.add("checked");
+        }
+
+        engine.call(self.callbackName, self.name, self.value);
+    }
+
+    _obj.addEventListener('mousedown', this.mouseDown);
+
+    this.getValue = function () {
+        return self.value;
+    }
+
+    this.updateValue = function (value) {
+        self.value = value;
+
+        self.obj.classList.remove("checked");
+        if (self.value == "True") {
+            self.obj.classList.add("checked");
+        }
+    }
+
+    this.updateValue(this.value);
+
+    return {
+        name: this.name,
+        value: this.getValue,
+        updateValue: this.updateValue
+    }
+}
+
+// Add own menu
+{
+    let l_block = document.createElement('div');
+    l_block.innerHTML = `
+        <div class ="settings-subcategory">
+            <div class ="subcategory-name">Desktop Head Tracking</div>
+            <div class ="subcategory-description"></div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Enabled: </div>
+            <div class ="option-input">
+                <div id="Enabled" class ="inp_toggle no-scroll" data-current="false"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Use head tracking: </div>
+            <div class ="option-input">
+                <div id="HeadTracking" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Use eyes tracking: </div>
+            <div class ="option-input">
+                <div id="EyeTracking" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Use blinking: </div>
+            <div class ="option-input">
+                <div id="Blinking" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+        
+        <div class ="row-wrapper">
+            <div class ="option-caption">Mirrored movement: </div>
+            <div class ="option-input">
+                <div id="Mirrored" class ="inp_toggle no-scroll" data-current="false"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Movement smoothing: </div>
+            <div class ="option-input">
+                <div id="Smoothing" class ="inp_slider no-scroll" data-min="0" data-max="99" data-current="50"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Override face tracking: </div>
+            <div class ="option-input">
+                <div id="FaceOverride" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+    `;
+    document.getElementById('settings-implementation').appendChild(l_block);
+
+    // Update sliders in new menu block
+    let l_sliders = l_block.querySelectorAll('.inp_slider');
+    for (var i = 0; i < l_sliders.length; i++) {
+        g_modSettingsDHT[g_modSettingsDHT.length] = new inp_slider_mod_dht(l_sliders[i], 'MelonMod_DHT_Call_InpSlider');
+    }
+
+    // Update toggles in new menu block
+    let l_toggles = l_block.querySelectorAll('.inp_toggle');
+    for (var i = 0; i < l_toggles.length; i++) {
+        g_modSettingsDHT[g_modSettingsDHT.length] = new inp_toggle_mod_dht(l_toggles[i], 'MelonMod_DHT_Call_InpToggle');
+    }
+}

archived/ml_prm/AvatarBoolParameter.cs

@@ -1,43 +1,43 @@
-using ABI_RC.Core;
-using System.Text.RegularExpressions;
-using UnityEngine;
-
-namespace ml_prm
-{
-    class AvatarBoolParameter
-    {
-        public readonly string m_name;
-        public readonly int m_hash = 0;
-        public readonly bool m_sync;
-        readonly CVRAnimatorManager m_manager = null;
-
-        public AvatarBoolParameter(string p_name, CVRAnimatorManager p_manager)
-        {
-            m_name = p_name;
-            m_manager = p_manager;
-
-            Regex l_regex = new Regex("^#?" + p_name + '$');
-            foreach(var l_param in m_manager.animator.parameters)
-            {
-                if(l_regex.IsMatch(l_param.name) && (l_param.type == AnimatorControllerParameterType.Bool))
-                {
-                    m_name = l_param.name;
-                    m_hash = l_param.nameHash;
-                    m_sync = (l_param.name[0] != '#');
-                    break;
-                }
-            }
-        }
-
-        public void SetValue(bool p_value)
-        {
-            if(m_hash != 0)
-            {
-                if(m_sync)
-                    m_manager.SetAnimatorParameterBool(m_name, p_value);
-                else
-                    m_manager.animator.SetBool(m_hash, p_value);
-            }
-        }
-    }
-}
+using ABI_RC.Core;
+using System.Text.RegularExpressions;
+using UnityEngine;
+
+namespace ml_prm
+{
+    class AvatarBoolParameter
+    {
+        public readonly string m_name;
+        public readonly int m_hash = 0;
+        public readonly bool m_sync;
+        readonly CVRAnimatorManager m_manager = null;
+
+        public AvatarBoolParameter(string p_name, CVRAnimatorManager p_manager)
+        {
+            m_name = p_name;
+            m_manager = p_manager;
+
+            Regex l_regex = new Regex("^#?" + p_name + '$');
+            foreach(var l_param in m_manager.animator.parameters)
+            {
+                if(l_regex.IsMatch(l_param.name) && (l_param.type == AnimatorControllerParameterType.Bool))
+                {
+                    m_name = l_param.name;
+                    m_hash = l_param.nameHash;
+                    m_sync = (l_param.name[0] != '#');
+                    break;
+                }
+            }
+        }
+
+        public void SetValue(bool p_value)
+        {
+            if(m_hash != 0)
+            {
+                if(m_sync)
+                    m_manager.SetAnimatorParameterBool(m_name, p_value);
+                else
+                    m_manager.animator.SetBool(m_hash, p_value);
+            }
+        }
+    }
+}

archived/ml_prm/Main.cs

@@ -1,216 +1,216 @@
-using ABI.CCK.Components;
-using ABI_RC.Core;
-using ABI_RC.Core.InteractionSystem;
-using ABI_RC.Core.Player;
-using ABI_RC.Core.Util.AssetFiltering;
-using ABI_RC.Systems.IK.SubSystems;
-using ABI_RC.Systems.MovementSystem;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-
-namespace ml_prm
-{
-    public class PlayerRagdollMod : MelonLoader.MelonMod
-    {
-        static PlayerRagdollMod ms_instance = null;
-
-        RagdollController m_localController = null;
-
-        public override void OnInitializeMelon()
-        {
-            if(ms_instance == null)
-                ms_instance = this;
-
-            Settings.Init();
-            ModUi.Init();
-
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
-            );
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod("SetupIKScaling", BindingFlags.NonPublic | BindingFlags.Instance),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnSetupIKScaling_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(CVRSeat).GetMethod(nameof(CVRSeat.SitDown)),
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnCVRSeatSitDown_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
-            );
-            HarmonyInstance.Patch(
-                typeof(BodySystem).GetMethod(nameof(BodySystem.StartCalibration)),
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnStartCalibration_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
-            );
-            HarmonyInstance.Patch(
-                typeof(RootLogic).GetMethod(nameof(RootLogic.SpawnOnWorldInstance)),
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnWorldSpawn_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
-            );
-            HarmonyInstance.Patch(
-                typeof(CombatSystem).GetMethods().First(m => (!m.IsGenericMethod && m.Name == nameof(CombatSystem.Down))),
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnCombatDown_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
-            );
-            HarmonyInstance.Patch(
-                typeof(MovementSystem).GetMethod(nameof(MovementSystem.ChangeFlight)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnChangeFlight_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-
-            // Whitelist the toggle script
-            (typeof(SharedFilter).GetField("_localComponentWhitelist", BindingFlags.NonPublic | BindingFlags.Static)?.GetValue(null) as HashSet<Type>)?.Add(typeof(RagdollToggle));
-
-            MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
-        }
-
-        public override void OnDeinitializeMelon()
-        {
-            if(ms_instance == this)
-                ms_instance = null;
-
-            m_localController = null;
-        }
-
-        System.Collections.IEnumerator WaitForLocalPlayer()
-        {
-            while(PlayerSetup.Instance == null)
-                yield return null;
-
-            m_localController = PlayerSetup.Instance.gameObject.AddComponent<RagdollController>();
-            ModUi.SwitchChange += this.OnSwitchActivation;
-        }
-
-        void OnSwitchActivation()
-        {
-            if(m_localController != null)
-                m_localController.SwitchRagdoll();
-        }
-
-        // Patches
-        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
-        void OnAvatarClear()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnAvatarClear();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
-        void OnSetupAvatar()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnAvatarSetup();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnSetupIKScaling_Postfix(ref UnityEngine.Vector3 ___scaleDifference) => ms_instance?.OnSetupIKScaling(___scaleDifference.y);
-        void OnSetupIKScaling(float p_scaleDifference)
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnAvatarScaling(1f + p_scaleDifference);
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnCVRSeatSitDown_Prefix(ref CVRSeat __instance) => ms_instance?.OnCVRSeatSitDown(__instance);
-        void OnCVRSeatSitDown(CVRSeat p_seat)
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnSeatSitDown(p_seat);
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnStartCalibration_Prefix() => ms_instance?.OnStartCalibration();
-        void OnStartCalibration()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnStartCalibration();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnWorldSpawn_Prefix() => ms_instance?.OnWorldSpawn();
-        void OnWorldSpawn()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnWorldSpawn();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnCombatDown_Prefix(ref CombatSystem __instance)
-        {
-            if((__instance == CombatSystem.Instance) && !__instance.isDown)
-                ms_instance?.OnCombatDown();
-        }
-        void OnCombatDown()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnCombatDown();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-
-        static void OnChangeFlight_Postfix() => ms_instance?.OnChangeFlight();
-        void OnChangeFlight()
-        {
-            try
-            {
-                if(m_localController != null)
-                    m_localController.OnChangeFlight();
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-    }
-}
+using ABI.CCK.Components;
+using ABI_RC.Core;
+using ABI_RC.Core.InteractionSystem;
+using ABI_RC.Core.Player;
+using ABI_RC.Core.Util.AssetFiltering;
+using ABI_RC.Systems.IK.SubSystems;
+using ABI_RC.Systems.MovementSystem;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection;
+
+namespace ml_prm
+{
+    public class PlayerRagdollMod : MelonLoader.MelonMod
+    {
+        static PlayerRagdollMod ms_instance = null;
+
+        RagdollController m_localController = null;
+
+        public override void OnInitializeMelon()
+        {
+            if(ms_instance == null)
+                ms_instance = this;
+
+            Settings.Init();
+            ModUi.Init();
+
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
+            );
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod("SetupIKScaling", BindingFlags.NonPublic | BindingFlags.Instance),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnSetupIKScaling_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(CVRSeat).GetMethod(nameof(CVRSeat.SitDown)),
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnCVRSeatSitDown_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                null
+            );
+            HarmonyInstance.Patch(
+                typeof(BodySystem).GetMethod(nameof(BodySystem.StartCalibration)),
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnStartCalibration_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                null
+            );
+            HarmonyInstance.Patch(
+                typeof(RootLogic).GetMethod(nameof(RootLogic.SpawnOnWorldInstance)),
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnWorldSpawn_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                null
+            );
+            HarmonyInstance.Patch(
+                typeof(CombatSystem).GetMethods().First(m => (!m.IsGenericMethod && m.Name == nameof(CombatSystem.Down))),
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnCombatDown_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                null
+            );
+            HarmonyInstance.Patch(
+                typeof(MovementSystem).GetMethod(nameof(MovementSystem.ChangeFlight)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(PlayerRagdollMod).GetMethod(nameof(OnChangeFlight_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+
+            // Whitelist the toggle script
+            (typeof(SharedFilter).GetField("_localComponentWhitelist", BindingFlags.NonPublic | BindingFlags.Static)?.GetValue(null) as HashSet<Type>)?.Add(typeof(RagdollToggle));
+
+            MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
+        }
+
+        public override void OnDeinitializeMelon()
+        {
+            if(ms_instance == this)
+                ms_instance = null;
+
+            m_localController = null;
+        }
+
+        System.Collections.IEnumerator WaitForLocalPlayer()
+        {
+            while(PlayerSetup.Instance == null)
+                yield return null;
+
+            m_localController = PlayerSetup.Instance.gameObject.AddComponent<RagdollController>();
+            ModUi.SwitchChange += this.OnSwitchActivation;
+        }
+
+        void OnSwitchActivation()
+        {
+            if(m_localController != null)
+                m_localController.SwitchRagdoll();
+        }
+
+        // Patches
+        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
+        void OnAvatarClear()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnAvatarClear();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnAvatarSetup();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnSetupIKScaling_Postfix(ref UnityEngine.Vector3 ___scaleDifference) => ms_instance?.OnSetupIKScaling(___scaleDifference.y);
+        void OnSetupIKScaling(float p_scaleDifference)
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnAvatarScaling(1f + p_scaleDifference);
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnCVRSeatSitDown_Prefix(ref CVRSeat __instance) => ms_instance?.OnCVRSeatSitDown(__instance);
+        void OnCVRSeatSitDown(CVRSeat p_seat)
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnSeatSitDown(p_seat);
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnStartCalibration_Prefix() => ms_instance?.OnStartCalibration();
+        void OnStartCalibration()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnStartCalibration();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnWorldSpawn_Prefix() => ms_instance?.OnWorldSpawn();
+        void OnWorldSpawn()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnWorldSpawn();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnCombatDown_Prefix(ref CombatSystem __instance)
+        {
+            if((__instance == CombatSystem.Instance) && !__instance.isDown)
+                ms_instance?.OnCombatDown();
+        }
+        void OnCombatDown()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnCombatDown();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+
+        static void OnChangeFlight_Postfix() => ms_instance?.OnChangeFlight();
+        void OnChangeFlight()
+        {
+            try
+            {
+                if(m_localController != null)
+                    m_localController.OnChangeFlight();
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+    }
+}

archived/ml_prm/ModUi.cs

@@ -1,198 +1,198 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Reflection;
-
-namespace ml_prm
-{
-    static class ModUi
-    {
-        enum UiIndex
-        {
-            Hotkey = 0,
-            Gravity,
-            PointersReaction,
-            IgnoreLocal,
-            CombatReaction,
-            AutoRecover,
-            Slipperiness,
-            Bounciness,
-            ViewVelocity,
-            JumpRecover,
-            VelocityMultiplier,
-            MovementDrag,
-            AngularDrag,
-            RecoverDelay
-        }
-
-        static public event Action SwitchChange;
-
-        static List<object> ms_uiElements = null;
-
-        internal static void Init()
-        {
-            ms_uiElements = new List<object>();
-
-            if(MelonLoader.MelonMod.RegisteredMelons.FirstOrDefault(m => m.Info.Name == "BTKUILib") != null)
-                CreateUi();
-        }
-
-        // Separated method, otherwise exception is thrown, funny CSharp and optional references, smh
-        static void CreateUi()
-        {
-            BTKUILib.QuickMenuAPI.PrepareIcon("PlayerRagdollMod", "PRM-Person", GetIconStream("person.png"));
-
-            var l_modRoot = new BTKUILib.UIObjects.Page("PlayerRagdollMod", "MainPage", true, "PRM-Person");
-            l_modRoot.MenuTitle = "Player Ragdoll Mod";
-            l_modRoot.MenuSubtitle = "Become a ragdoll and change various settings for people amusement";
-
-            var l_modCategory = l_modRoot.AddCategory("Settings");
-
-            l_modCategory.AddButton("Switch ragdoll", "PRM-Person", "Switch between normal and ragdoll state").OnPress += () => SwitchChange?.Invoke();
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Use hotkey", "Switch ragdoll mode with 'R' key", Settings.Hotkey));
-            (ms_uiElements[(int)UiIndex.Hotkey] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Hotkey, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Use gravity", "Apply gravity to ragdoll", Settings.Gravity));
-            (ms_uiElements[(int)UiIndex.Gravity] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Gravity, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Pointers reaction", "React to trigger colliders with CVRPointer component of 'ragdoll' type", Settings.PointersReaction));
-            (ms_uiElements[(int)UiIndex.PointersReaction] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.PointersReaction, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Ignore local pointers", "Ignore local avatar's CVRPointer components of 'ragdoll' type", Settings.IgnoreLocal));
-            (ms_uiElements[(int)UiIndex.IgnoreLocal] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.IgnoreLocal, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Combat reaction", "Ragdoll upon combat system death", Settings.CombatReaction));
-            (ms_uiElements[(int)UiIndex.CombatReaction] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.CombatReaction, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Auto recover", "Automatically unragdoll after set recover delay", Settings.AutoRecover));
-            (ms_uiElements[(int)UiIndex.AutoRecover] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.AutoRecover, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Slipperiness", "Enables/disables friction of ragdoll", Settings.Slipperiness));
-            (ms_uiElements[(int)UiIndex.Slipperiness] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Slipperiness, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Bounciness", "Enables/disables bounciness of ragdoll", Settings.Bounciness));
-            (ms_uiElements[(int)UiIndex.Bounciness] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Bounciness, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("View direction velocity", "Apply velocity to camera view direction", Settings.ViewVelocity));
-            (ms_uiElements[(int)UiIndex.ViewVelocity] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.ViewVelocity, state);
-
-            ms_uiElements.Add(l_modCategory.AddToggle("Jump recover", "Recover from ragdoll state by jumping", Settings.JumpRecover));
-            (ms_uiElements[(int)UiIndex.JumpRecover] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.JumpRecover, state);
-
-            ms_uiElements.Add(l_modRoot.AddSlider("Velocity multiplier", "Velocity multiplier upon entering ragdoll state", Settings.VelocityMultiplier, 1f, 50f));
-            (ms_uiElements[(int)UiIndex.VelocityMultiplier] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.VelocityMultiplier, value);
-
-            ms_uiElements.Add(l_modRoot.AddSlider("Movement drag", "Movement resistance", Settings.MovementDrag, 0f, 50f));
-            (ms_uiElements[(int)UiIndex.MovementDrag] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.MovementDrag, value);
-
-            ms_uiElements.Add(l_modRoot.AddSlider("Angular movement drag", "Rotation movement resistance", Settings.AngularDrag, 0f, 50f));
-            (ms_uiElements[(int)UiIndex.AngularDrag] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.AngularDrag, value);
-
-            ms_uiElements.Add(l_modRoot.AddSlider("Recover delay (seconds)", "Recover delay for automatic recover", Settings.RecoverDelay, 1f, 10f));
-            (ms_uiElements[(int)UiIndex.RecoverDelay] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.RecoverDelay, value);
-
-            l_modCategory.AddButton("Reset settings", "", "Reset mod settings to default").OnPress += Reset;
-        }
-
-        static void OnToggleUpdate(UiIndex p_index, bool p_state, bool p_force = false)
-        {
-            switch(p_index)
-            {
-                case UiIndex.Hotkey:
-                    Settings.SetSetting(Settings.ModSetting.Hotkey, p_state);
-                    break;
-
-                case UiIndex.Gravity:
-                    Settings.SetSetting(Settings.ModSetting.Gravity, p_state);
-                    break;
-
-                case UiIndex.PointersReaction:
-                    Settings.SetSetting(Settings.ModSetting.PointersReaction, p_state);
-                    break;
-
-                case UiIndex.IgnoreLocal:
-                    Settings.SetSetting(Settings.ModSetting.IgnoreLocal, p_state);
-                    break;
-
-                case UiIndex.CombatReaction:
-                    Settings.SetSetting(Settings.ModSetting.CombatReaction, p_state);
-                    break;
-
-                case UiIndex.AutoRecover:
-                    Settings.SetSetting(Settings.ModSetting.AutoRecover, p_state);
-                    break;
-
-                case UiIndex.Slipperiness:
-                    Settings.SetSetting(Settings.ModSetting.Slipperiness, p_state);
-                    break;
-
-                case UiIndex.Bounciness:
-                    Settings.SetSetting(Settings.ModSetting.Bounciness, p_state);
-                    break;
-
-                case UiIndex.ViewVelocity:
-                    Settings.SetSetting(Settings.ModSetting.ViewVelocity, p_state);
-                    break;
-
-                case UiIndex.JumpRecover:
-                    Settings.SetSetting(Settings.ModSetting.JumpRecover, p_state);
-                    break;
-            }
-
-            if(p_force)
-                (ms_uiElements[(int)p_index] as BTKUILib.UIObjects.Components.ToggleButton).ToggleValue = p_state;
-        }
-
-        static void OnSliderUpdate(UiIndex p_index, float p_value, bool p_force = false)
-        {
-            switch(p_index)
-            {
-                case UiIndex.VelocityMultiplier:
-                    Settings.SetSetting(Settings.ModSetting.VelocityMultiplier, p_value);
-                    break;
-
-                case UiIndex.MovementDrag:
-                    Settings.SetSetting(Settings.ModSetting.MovementDrag, p_value);
-                    break;
-
-                case UiIndex.AngularDrag:
-                    Settings.SetSetting(Settings.ModSetting.AngularDrag, p_value);
-                    break;
-
-                case UiIndex.RecoverDelay:
-                    Settings.SetSetting(Settings.ModSetting.RecoverDelay, p_value);
-                    break;
-            }
-
-            if(p_force)
-                (ms_uiElements[(int)p_index] as BTKUILib.UIObjects.Components.SliderFloat).SetSliderValue(p_value);
-        }
-
-        static void Reset()
-        {
-            OnToggleUpdate(UiIndex.Hotkey, true, true);
-            OnToggleUpdate(UiIndex.Gravity, true, true);
-            OnToggleUpdate(UiIndex.PointersReaction, true, true);
-            OnToggleUpdate(UiIndex.IgnoreLocal, true, true);
-            OnToggleUpdate(UiIndex.CombatReaction, true, true);
-            OnToggleUpdate(UiIndex.AutoRecover, false, true);
-            OnToggleUpdate(UiIndex.Slipperiness, false, true);
-            OnToggleUpdate(UiIndex.Bounciness, false, true);
-            OnToggleUpdate(UiIndex.ViewVelocity, false, true);
-            OnToggleUpdate(UiIndex.JumpRecover, false, true);
-            OnSliderUpdate(UiIndex.VelocityMultiplier, 2f, true);
-            OnSliderUpdate(UiIndex.MovementDrag, 2f, true);
-            OnSliderUpdate(UiIndex.AngularDrag, 2f, true);
-            OnSliderUpdate(UiIndex.RecoverDelay, 3f, true);
-        }
-
-        static Stream GetIconStream(string p_name)
-        {
-            Assembly l_assembly = Assembly.GetExecutingAssembly();
-            string l_assemblyName = l_assembly.GetName().Name;
-            return l_assembly.GetManifestResourceStream(l_assemblyName + ".resources." + p_name);
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+
+namespace ml_prm
+{
+    static class ModUi
+    {
+        enum UiIndex
+        {
+            Hotkey = 0,
+            Gravity,
+            PointersReaction,
+            IgnoreLocal,
+            CombatReaction,
+            AutoRecover,
+            Slipperiness,
+            Bounciness,
+            ViewVelocity,
+            JumpRecover,
+            VelocityMultiplier,
+            MovementDrag,
+            AngularDrag,
+            RecoverDelay
+        }
+
+        static public event Action SwitchChange;
+
+        static List<object> ms_uiElements = null;
+
+        internal static void Init()
+        {
+            ms_uiElements = new List<object>();
+
+            if(MelonLoader.MelonMod.RegisteredMelons.FirstOrDefault(m => m.Info.Name == "BTKUILib") != null)
+                CreateUi();
+        }
+
+        // Separated method, otherwise exception is thrown, funny CSharp and optional references, smh
+        static void CreateUi()
+        {
+            BTKUILib.QuickMenuAPI.PrepareIcon("PlayerRagdollMod", "PRM-Person", GetIconStream("person.png"));
+
+            var l_modRoot = new BTKUILib.UIObjects.Page("PlayerRagdollMod", "MainPage", true, "PRM-Person");
+            l_modRoot.MenuTitle = "Player Ragdoll Mod";
+            l_modRoot.MenuSubtitle = "Become a ragdoll and change various settings for people amusement";
+
+            var l_modCategory = l_modRoot.AddCategory("Settings");
+
+            l_modCategory.AddButton("Switch ragdoll", "PRM-Person", "Switch between normal and ragdoll state").OnPress += () => SwitchChange?.Invoke();
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Use hotkey", "Switch ragdoll mode with 'R' key", Settings.Hotkey));
+            (ms_uiElements[(int)UiIndex.Hotkey] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Hotkey, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Use gravity", "Apply gravity to ragdoll", Settings.Gravity));
+            (ms_uiElements[(int)UiIndex.Gravity] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Gravity, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Pointers reaction", "React to trigger colliders with CVRPointer component of 'ragdoll' type", Settings.PointersReaction));
+            (ms_uiElements[(int)UiIndex.PointersReaction] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.PointersReaction, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Ignore local pointers", "Ignore local avatar's CVRPointer components of 'ragdoll' type", Settings.IgnoreLocal));
+            (ms_uiElements[(int)UiIndex.IgnoreLocal] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.IgnoreLocal, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Combat reaction", "Ragdoll upon combat system death", Settings.CombatReaction));
+            (ms_uiElements[(int)UiIndex.CombatReaction] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.CombatReaction, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Auto recover", "Automatically unragdoll after set recover delay", Settings.AutoRecover));
+            (ms_uiElements[(int)UiIndex.AutoRecover] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.AutoRecover, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Slipperiness", "Enables/disables friction of ragdoll", Settings.Slipperiness));
+            (ms_uiElements[(int)UiIndex.Slipperiness] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Slipperiness, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Bounciness", "Enables/disables bounciness of ragdoll", Settings.Bounciness));
+            (ms_uiElements[(int)UiIndex.Bounciness] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.Bounciness, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("View direction velocity", "Apply velocity to camera view direction", Settings.ViewVelocity));
+            (ms_uiElements[(int)UiIndex.ViewVelocity] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.ViewVelocity, state);
+
+            ms_uiElements.Add(l_modCategory.AddToggle("Jump recover", "Recover from ragdoll state by jumping", Settings.JumpRecover));
+            (ms_uiElements[(int)UiIndex.JumpRecover] as BTKUILib.UIObjects.Components.ToggleButton).OnValueUpdated += (state) => OnToggleUpdate(UiIndex.JumpRecover, state);
+
+            ms_uiElements.Add(l_modRoot.AddSlider("Velocity multiplier", "Velocity multiplier upon entering ragdoll state", Settings.VelocityMultiplier, 1f, 50f));
+            (ms_uiElements[(int)UiIndex.VelocityMultiplier] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.VelocityMultiplier, value);
+
+            ms_uiElements.Add(l_modRoot.AddSlider("Movement drag", "Movement resistance", Settings.MovementDrag, 0f, 50f));
+            (ms_uiElements[(int)UiIndex.MovementDrag] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.MovementDrag, value);
+
+            ms_uiElements.Add(l_modRoot.AddSlider("Angular movement drag", "Rotation movement resistance", Settings.AngularDrag, 0f, 50f));
+            (ms_uiElements[(int)UiIndex.AngularDrag] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.AngularDrag, value);
+
+            ms_uiElements.Add(l_modRoot.AddSlider("Recover delay (seconds)", "Recover delay for automatic recover", Settings.RecoverDelay, 1f, 10f));
+            (ms_uiElements[(int)UiIndex.RecoverDelay] as BTKUILib.UIObjects.Components.SliderFloat).OnValueUpdated += (value) => OnSliderUpdate(UiIndex.RecoverDelay, value);
+
+            l_modCategory.AddButton("Reset settings", "", "Reset mod settings to default").OnPress += Reset;
+        }
+
+        static void OnToggleUpdate(UiIndex p_index, bool p_state, bool p_force = false)
+        {
+            switch(p_index)
+            {
+                case UiIndex.Hotkey:
+                    Settings.SetSetting(Settings.ModSetting.Hotkey, p_state);
+                    break;
+
+                case UiIndex.Gravity:
+                    Settings.SetSetting(Settings.ModSetting.Gravity, p_state);
+                    break;
+
+                case UiIndex.PointersReaction:
+                    Settings.SetSetting(Settings.ModSetting.PointersReaction, p_state);
+                    break;
+
+                case UiIndex.IgnoreLocal:
+                    Settings.SetSetting(Settings.ModSetting.IgnoreLocal, p_state);
+                    break;
+
+                case UiIndex.CombatReaction:
+                    Settings.SetSetting(Settings.ModSetting.CombatReaction, p_state);
+                    break;
+
+                case UiIndex.AutoRecover:
+                    Settings.SetSetting(Settings.ModSetting.AutoRecover, p_state);
+                    break;
+
+                case UiIndex.Slipperiness:
+                    Settings.SetSetting(Settings.ModSetting.Slipperiness, p_state);
+                    break;
+
+                case UiIndex.Bounciness:
+                    Settings.SetSetting(Settings.ModSetting.Bounciness, p_state);
+                    break;
+
+                case UiIndex.ViewVelocity:
+                    Settings.SetSetting(Settings.ModSetting.ViewVelocity, p_state);
+                    break;
+
+                case UiIndex.JumpRecover:
+                    Settings.SetSetting(Settings.ModSetting.JumpRecover, p_state);
+                    break;
+            }
+
+            if(p_force)
+                (ms_uiElements[(int)p_index] as BTKUILib.UIObjects.Components.ToggleButton).ToggleValue = p_state;
+        }
+
+        static void OnSliderUpdate(UiIndex p_index, float p_value, bool p_force = false)
+        {
+            switch(p_index)
+            {
+                case UiIndex.VelocityMultiplier:
+                    Settings.SetSetting(Settings.ModSetting.VelocityMultiplier, p_value);
+                    break;
+
+                case UiIndex.MovementDrag:
+                    Settings.SetSetting(Settings.ModSetting.MovementDrag, p_value);
+                    break;
+
+                case UiIndex.AngularDrag:
+                    Settings.SetSetting(Settings.ModSetting.AngularDrag, p_value);
+                    break;
+
+                case UiIndex.RecoverDelay:
+                    Settings.SetSetting(Settings.ModSetting.RecoverDelay, p_value);
+                    break;
+            }
+
+            if(p_force)
+                (ms_uiElements[(int)p_index] as BTKUILib.UIObjects.Components.SliderFloat).SetSliderValue(p_value);
+        }
+
+        static void Reset()
+        {
+            OnToggleUpdate(UiIndex.Hotkey, true, true);
+            OnToggleUpdate(UiIndex.Gravity, true, true);
+            OnToggleUpdate(UiIndex.PointersReaction, true, true);
+            OnToggleUpdate(UiIndex.IgnoreLocal, true, true);
+            OnToggleUpdate(UiIndex.CombatReaction, true, true);
+            OnToggleUpdate(UiIndex.AutoRecover, false, true);
+            OnToggleUpdate(UiIndex.Slipperiness, false, true);
+            OnToggleUpdate(UiIndex.Bounciness, false, true);
+            OnToggleUpdate(UiIndex.ViewVelocity, false, true);
+            OnToggleUpdate(UiIndex.JumpRecover, false, true);
+            OnSliderUpdate(UiIndex.VelocityMultiplier, 2f, true);
+            OnSliderUpdate(UiIndex.MovementDrag, 2f, true);
+            OnSliderUpdate(UiIndex.AngularDrag, 2f, true);
+            OnSliderUpdate(UiIndex.RecoverDelay, 3f, true);
+        }
+
+        static Stream GetIconStream(string p_name)
+        {
+            Assembly l_assembly = Assembly.GetExecutingAssembly();
+            string l_assemblyName = l_assembly.GetName().Name;
+            return l_assembly.GetManifestResourceStream(l_assemblyName + ".resources." + p_name);
+        }
+    }
+}

archived/ml_prm/RagdollToggle.cs

@@ -1,12 +1,12 @@
-using UnityEngine;
-
-namespace ml_prm
-{
-    public class RagdollToggle : MonoBehaviour
-    {
-        [Tooltip("Whether or not is should use the isOn property to override the current Ragdoll State of the Avatar.")]
-        [SerializeField] public bool shouldOverride;
-        [Tooltip("Whether Ragdoll State is active or not on the Avatar. Requires shouldOverride to be true to work.")]
-        [SerializeField] public bool isOn;
-    }
-}
+using UnityEngine;
+
+namespace ml_prm
+{
+    public class RagdollToggle : MonoBehaviour
+    {
+        [Tooltip("Whether or not is should use the isOn property to override the current Ragdoll State of the Avatar.")]
+        [SerializeField] public bool shouldOverride;
+        [Tooltip("Whether Ragdoll State is active or not on the Avatar. Requires shouldOverride to be true to work.")]
+        [SerializeField] public bool isOn;
+    }
+}

archived/ml_prm/Settings.cs

@@ -1,223 +1,223 @@
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ml_prm
-{
-    static class Settings
-    {
-        public enum ModSetting
-        {
-            Hotkey = 0,
-            HotkeyKey,
-            VelocityMultiplier,
-            MovementDrag,
-            AngularDrag,
-            Gravity,
-            PointersReaction,
-            IgnoreLocal,
-            CombatReaction,
-            AutoRecover,
-            RecoverDelay,
-            Slipperiness,
-            Bounciness,
-            ViewVelocity,
-            JumpRecover
-        }
-
-        public static bool Hotkey { get; private set; } = true;
-        public static KeyCode HotkeyKey { get; private set; } = KeyCode.R;
-        public static float VelocityMultiplier { get; private set; } = 2f;
-        public static float MovementDrag { get; private set; } = 2f;
-        public static float AngularDrag { get; private set; } = 2f;
-        public static bool Gravity { get; private set; } = true;
-        public static bool PointersReaction { get; private set; } = true;
-        public static bool IgnoreLocal { get; private set; } = true;
-        public static bool CombatReaction { get; private set; } = true;
-        public static bool AutoRecover { get; private set; } = false;
-        public static float RecoverDelay { get; private set; } = 3f;
-        public static bool Slipperiness { get; private set; } = false;
-        public static bool Bounciness { get; private set; } = false;
-        public static bool ViewVelocity { get; private set; } = false;
-        public static bool JumpRecover { get; private set; } = false;
-
-        static public event Action<bool> HotkeyChange;
-        static public event Action<KeyCode> HotkeyKeyChange;
-        static public event Action<float> VelocityMultiplierChange;
-        static public event Action<float> MovementDragChange;
-        static public event Action<float> AngularDragChange;
-        static public event Action<bool> GravityChange;
-        static public event Action<bool> PointersReactionChange;
-        static public event Action<bool> IgnoreLocalChange;
-        static public event Action<bool> CombatReactionChange;
-        static public event Action<bool> AutoRecoverChange;
-        static public event Action<float> RecoverDelayChange;
-        static public event Action<bool> SlipperinessChange;
-        static public event Action<bool> BouncinessChange;
-        static public event Action<bool> ViewVelocityChange;
-        static public event Action<bool> JumpRecoverChange;
-
-        static MelonLoader.MelonPreferences_Category ms_category = null;
-        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
-
-        internal static void Init()
-        {
-            ms_category = MelonLoader.MelonPreferences.CreateCategory("PRM", "Player Ragdoll Mod");
-
-            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
-            {
-                ms_category.CreateEntry(ModSetting.Hotkey.ToString(), Hotkey, null, null, true),
-                ms_category.CreateEntry(ModSetting.HotkeyKey.ToString(), HotkeyKey, "Hotkey"),
-                ms_category.CreateEntry(ModSetting.VelocityMultiplier.ToString(), VelocityMultiplier, null, null, true),
-                ms_category.CreateEntry(ModSetting.MovementDrag.ToString(), MovementDrag, null, null, true),
-                ms_category.CreateEntry(ModSetting.AngularDrag.ToString(), AngularDrag, null, null, true),
-                ms_category.CreateEntry(ModSetting.Gravity.ToString(), Gravity, null, null, true),
-                ms_category.CreateEntry(ModSetting.PointersReaction.ToString(), PointersReaction, null, null, true),
-                ms_category.CreateEntry(ModSetting.IgnoreLocal.ToString(), IgnoreLocal, null, null, true),
-                ms_category.CreateEntry(ModSetting.CombatReaction.ToString(), CombatReaction, null, null, true),
-                ms_category.CreateEntry(ModSetting.AutoRecover.ToString(), AutoRecover, null, null, true),
-                ms_category.CreateEntry(ModSetting.RecoverDelay.ToString(), RecoverDelay, null, null, true),
-                ms_category.CreateEntry(ModSetting.Slipperiness.ToString(), Slipperiness, null, null, true),
-                ms_category.CreateEntry(ModSetting.Bounciness.ToString(), Bounciness, null, null, true),
-                ms_category.CreateEntry(ModSetting.ViewVelocity.ToString(), ViewVelocity, null, null, true),
-                ms_category.CreateEntry(ModSetting.JumpRecover.ToString(), JumpRecover, null, null, true)
-            };
-
-            ms_entries[(int)ModSetting.HotkeyKey].OnEntryValueChangedUntyped.Subscribe(OnMelonSettingSave_HotkeyKey);
-
-            Hotkey = (bool)ms_entries[(int)ModSetting.Hotkey].BoxedValue;
-            HotkeyKey = (KeyCode)ms_entries[(int)ModSetting.HotkeyKey].BoxedValue;
-            VelocityMultiplier = Mathf.Clamp((float)ms_entries[(int)ModSetting.VelocityMultiplier].BoxedValue, 1f, 50f);
-            MovementDrag = Mathf.Clamp((float)ms_entries[(int)ModSetting.MovementDrag].BoxedValue, 0f, 50f);
-            AngularDrag = Mathf.Clamp((float)ms_entries[(int)ModSetting.AngularDrag].BoxedValue, 0f, 50f);
-            Gravity = (bool)ms_entries[(int)ModSetting.Gravity].BoxedValue;
-            PointersReaction = (bool)ms_entries[(int)ModSetting.PointersReaction].BoxedValue;
-            IgnoreLocal = (bool)ms_entries[(int)ModSetting.IgnoreLocal].BoxedValue;
-            CombatReaction = (bool)ms_entries[(int)ModSetting.CombatReaction].BoxedValue;
-            AutoRecover = (bool)ms_entries[(int)ModSetting.AutoRecover].BoxedValue;
-            RecoverDelay = Mathf.Clamp((float)ms_entries[(int)ModSetting.RecoverDelay].BoxedValue, 1f, 10f);
-            Slipperiness = (bool)ms_entries[(int)ModSetting.Slipperiness].BoxedValue;
-            Bounciness = (bool)ms_entries[(int)ModSetting.Bounciness].BoxedValue;
-            ViewVelocity = (bool)ms_entries[(int)ModSetting.ViewVelocity].BoxedValue;
-            JumpRecover = (bool)ms_entries[(int)ModSetting.JumpRecover].BoxedValue;
-        }
-
-        static void OnMelonSettingSave_HotkeyKey(object p_oldValue, object p_newValue)
-        {
-            if(p_newValue is KeyCode)
-            {
-                HotkeyKey = (KeyCode)p_newValue;
-                HotkeyKeyChange?.Invoke(HotkeyKey);
-            }
-        }
-
-        public static void SetSetting(ModSetting p_settings, object p_value)
-        {
-            switch(p_settings)
-            {
-                // Booleans
-                case ModSetting.Hotkey:
-                {
-                    Hotkey = (bool)p_value;
-                    HotkeyChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.Gravity:
-                {
-                    Gravity = (bool)p_value;
-                    GravityChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.PointersReaction:
-                {
-                    PointersReaction = (bool)p_value;
-                    PointersReactionChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.IgnoreLocal:
-                {
-                    IgnoreLocal = (bool)p_value;
-                    IgnoreLocalChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.CombatReaction:
-                {
-                    CombatReaction = (bool)p_value;
-                    CombatReactionChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.AutoRecover:
-                {
-                    AutoRecover = (bool)p_value;
-                    AutoRecoverChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.Slipperiness:
-                {
-                    Slipperiness = (bool)p_value;
-                    SlipperinessChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.Bounciness:
-                {
-                    Bounciness = (bool)p_value;
-                    BouncinessChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.ViewVelocity:
-                {
-                    ViewVelocity = (bool)p_value;
-                    ViewVelocityChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                case ModSetting.JumpRecover:
-                {
-                    JumpRecover = (bool)p_value;
-                    JumpRecoverChange?.Invoke((bool)p_value);
-                }
-                break;
-
-                // Floats
-                case ModSetting.VelocityMultiplier:
-                {
-                    VelocityMultiplier = (float)p_value;
-                    VelocityMultiplierChange?.Invoke((float)p_value);
-                }
-                break;
-
-                case ModSetting.MovementDrag:
-                {
-                    MovementDrag = (float)p_value;
-                    MovementDragChange?.Invoke((float)p_value);
-                }
-                break;
-
-                case ModSetting.AngularDrag:
-                {
-                    AngularDrag = (float)p_value;
-                    AngularDragChange?.Invoke((float)p_value);
-                }
-                break;
-
-                case ModSetting.RecoverDelay:
-                {
-                    RecoverDelay = (float)p_value;
-                    RecoverDelayChange?.Invoke((float)p_value);
-                }
-                break;
-            }
-
-            if(ms_entries != null)
-                ms_entries[(int)p_settings].BoxedValue = p_value;
-        }
-    }
-}
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ml_prm
+{
+    static class Settings
+    {
+        public enum ModSetting
+        {
+            Hotkey = 0,
+            HotkeyKey,
+            VelocityMultiplier,
+            MovementDrag,
+            AngularDrag,
+            Gravity,
+            PointersReaction,
+            IgnoreLocal,
+            CombatReaction,
+            AutoRecover,
+            RecoverDelay,
+            Slipperiness,
+            Bounciness,
+            ViewVelocity,
+            JumpRecover
+        }
+
+        public static bool Hotkey { get; private set; } = true;
+        public static KeyCode HotkeyKey { get; private set; } = KeyCode.R;
+        public static float VelocityMultiplier { get; private set; } = 2f;
+        public static float MovementDrag { get; private set; } = 2f;
+        public static float AngularDrag { get; private set; } = 2f;
+        public static bool Gravity { get; private set; } = true;
+        public static bool PointersReaction { get; private set; } = true;
+        public static bool IgnoreLocal { get; private set; } = true;
+        public static bool CombatReaction { get; private set; } = true;
+        public static bool AutoRecover { get; private set; } = false;
+        public static float RecoverDelay { get; private set; } = 3f;
+        public static bool Slipperiness { get; private set; } = false;
+        public static bool Bounciness { get; private set; } = false;
+        public static bool ViewVelocity { get; private set; } = false;
+        public static bool JumpRecover { get; private set; } = false;
+
+        static public event Action<bool> HotkeyChange;
+        static public event Action<KeyCode> HotkeyKeyChange;
+        static public event Action<float> VelocityMultiplierChange;
+        static public event Action<float> MovementDragChange;
+        static public event Action<float> AngularDragChange;
+        static public event Action<bool> GravityChange;
+        static public event Action<bool> PointersReactionChange;
+        static public event Action<bool> IgnoreLocalChange;
+        static public event Action<bool> CombatReactionChange;
+        static public event Action<bool> AutoRecoverChange;
+        static public event Action<float> RecoverDelayChange;
+        static public event Action<bool> SlipperinessChange;
+        static public event Action<bool> BouncinessChange;
+        static public event Action<bool> ViewVelocityChange;
+        static public event Action<bool> JumpRecoverChange;
+
+        static MelonLoader.MelonPreferences_Category ms_category = null;
+        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
+
+        internal static void Init()
+        {
+            ms_category = MelonLoader.MelonPreferences.CreateCategory("PRM", "Player Ragdoll Mod");
+
+            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
+            {
+                ms_category.CreateEntry(ModSetting.Hotkey.ToString(), Hotkey, null, null, true),
+                ms_category.CreateEntry(ModSetting.HotkeyKey.ToString(), HotkeyKey, "Hotkey"),
+                ms_category.CreateEntry(ModSetting.VelocityMultiplier.ToString(), VelocityMultiplier, null, null, true),
+                ms_category.CreateEntry(ModSetting.MovementDrag.ToString(), MovementDrag, null, null, true),
+                ms_category.CreateEntry(ModSetting.AngularDrag.ToString(), AngularDrag, null, null, true),
+                ms_category.CreateEntry(ModSetting.Gravity.ToString(), Gravity, null, null, true),
+                ms_category.CreateEntry(ModSetting.PointersReaction.ToString(), PointersReaction, null, null, true),
+                ms_category.CreateEntry(ModSetting.IgnoreLocal.ToString(), IgnoreLocal, null, null, true),
+                ms_category.CreateEntry(ModSetting.CombatReaction.ToString(), CombatReaction, null, null, true),
+                ms_category.CreateEntry(ModSetting.AutoRecover.ToString(), AutoRecover, null, null, true),
+                ms_category.CreateEntry(ModSetting.RecoverDelay.ToString(), RecoverDelay, null, null, true),
+                ms_category.CreateEntry(ModSetting.Slipperiness.ToString(), Slipperiness, null, null, true),
+                ms_category.CreateEntry(ModSetting.Bounciness.ToString(), Bounciness, null, null, true),
+                ms_category.CreateEntry(ModSetting.ViewVelocity.ToString(), ViewVelocity, null, null, true),
+                ms_category.CreateEntry(ModSetting.JumpRecover.ToString(), JumpRecover, null, null, true)
+            };
+
+            ms_entries[(int)ModSetting.HotkeyKey].OnEntryValueChangedUntyped.Subscribe(OnMelonSettingSave_HotkeyKey);
+
+            Hotkey = (bool)ms_entries[(int)ModSetting.Hotkey].BoxedValue;
+            HotkeyKey = (KeyCode)ms_entries[(int)ModSetting.HotkeyKey].BoxedValue;
+            VelocityMultiplier = Mathf.Clamp((float)ms_entries[(int)ModSetting.VelocityMultiplier].BoxedValue, 1f, 50f);
+            MovementDrag = Mathf.Clamp((float)ms_entries[(int)ModSetting.MovementDrag].BoxedValue, 0f, 50f);
+            AngularDrag = Mathf.Clamp((float)ms_entries[(int)ModSetting.AngularDrag].BoxedValue, 0f, 50f);
+            Gravity = (bool)ms_entries[(int)ModSetting.Gravity].BoxedValue;
+            PointersReaction = (bool)ms_entries[(int)ModSetting.PointersReaction].BoxedValue;
+            IgnoreLocal = (bool)ms_entries[(int)ModSetting.IgnoreLocal].BoxedValue;
+            CombatReaction = (bool)ms_entries[(int)ModSetting.CombatReaction].BoxedValue;
+            AutoRecover = (bool)ms_entries[(int)ModSetting.AutoRecover].BoxedValue;
+            RecoverDelay = Mathf.Clamp((float)ms_entries[(int)ModSetting.RecoverDelay].BoxedValue, 1f, 10f);
+            Slipperiness = (bool)ms_entries[(int)ModSetting.Slipperiness].BoxedValue;
+            Bounciness = (bool)ms_entries[(int)ModSetting.Bounciness].BoxedValue;
+            ViewVelocity = (bool)ms_entries[(int)ModSetting.ViewVelocity].BoxedValue;
+            JumpRecover = (bool)ms_entries[(int)ModSetting.JumpRecover].BoxedValue;
+        }
+
+        static void OnMelonSettingSave_HotkeyKey(object p_oldValue, object p_newValue)
+        {
+            if(p_newValue is KeyCode)
+            {
+                HotkeyKey = (KeyCode)p_newValue;
+                HotkeyKeyChange?.Invoke(HotkeyKey);
+            }
+        }
+
+        public static void SetSetting(ModSetting p_settings, object p_value)
+        {
+            switch(p_settings)
+            {
+                // Booleans
+                case ModSetting.Hotkey:
+                {
+                    Hotkey = (bool)p_value;
+                    HotkeyChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.Gravity:
+                {
+                    Gravity = (bool)p_value;
+                    GravityChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.PointersReaction:
+                {
+                    PointersReaction = (bool)p_value;
+                    PointersReactionChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.IgnoreLocal:
+                {
+                    IgnoreLocal = (bool)p_value;
+                    IgnoreLocalChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.CombatReaction:
+                {
+                    CombatReaction = (bool)p_value;
+                    CombatReactionChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.AutoRecover:
+                {
+                    AutoRecover = (bool)p_value;
+                    AutoRecoverChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.Slipperiness:
+                {
+                    Slipperiness = (bool)p_value;
+                    SlipperinessChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.Bounciness:
+                {
+                    Bounciness = (bool)p_value;
+                    BouncinessChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.ViewVelocity:
+                {
+                    ViewVelocity = (bool)p_value;
+                    ViewVelocityChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                case ModSetting.JumpRecover:
+                {
+                    JumpRecover = (bool)p_value;
+                    JumpRecoverChange?.Invoke((bool)p_value);
+                }
+                break;
+
+                // Floats
+                case ModSetting.VelocityMultiplier:
+                {
+                    VelocityMultiplier = (float)p_value;
+                    VelocityMultiplierChange?.Invoke((float)p_value);
+                }
+                break;
+
+                case ModSetting.MovementDrag:
+                {
+                    MovementDrag = (float)p_value;
+                    MovementDragChange?.Invoke((float)p_value);
+                }
+                break;
+
+                case ModSetting.AngularDrag:
+                {
+                    AngularDrag = (float)p_value;
+                    AngularDragChange?.Invoke((float)p_value);
+                }
+                break;
+
+                case ModSetting.RecoverDelay:
+                {
+                    RecoverDelay = (float)p_value;
+                    RecoverDelayChange?.Invoke((float)p_value);
+                }
+                break;
+            }
+
+            if(ms_entries != null)
+                ms_entries[(int)p_settings].BoxedValue = p_value;
+        }
+    }
+}

archived/ml_prm/Utils.cs

@@ -1,39 +1,39 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.Savior;
-using ABI_RC.Systems.MovementSystem;
-using System.Reflection;
-using UnityEngine;
-
-namespace ml_prm
-{
-    static class Utils
-    {
-        static readonly FieldInfo ms_groundedRaw = typeof(MovementSystem).GetField("_isGroundedRaw", BindingFlags.NonPublic | BindingFlags.Instance);
-        static readonly FieldInfo ms_appliedGravity = typeof(MovementSystem).GetField("_appliedGravity", BindingFlags.NonPublic | BindingFlags.Instance);
-
-        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
-        public static bool IsWorldSafe() => ((CVRWorld.Instance != null) && CVRWorld.Instance.allowFlying);
-        public static float GetWorldMovementLimit()
-        {
-            float l_result = 1f;
-            if(CVRWorld.Instance != null)
-            {
-                l_result = CVRWorld.Instance.baseMovementSpeed;
-                l_result *= CVRWorld.Instance.sprintMultiplier;
-                l_result *= CVRWorld.Instance.inAirMovementMultiplier;
-                l_result *= CVRWorld.Instance.flyMultiplier;
-            }
-            return l_result;
-        }
-
-        public static bool IsGrounded(this MovementSystem p_instance) => (bool)ms_groundedRaw.GetValue(p_instance);
-        public static Vector3 GetAppliedGravity(this MovementSystem p_instance) => (Vector3)ms_appliedGravity.GetValue(p_instance);
-        public static void SetAppliedGravity(this MovementSystem p_instance, Vector3 p_vec) => ms_appliedGravity.SetValue(p_instance, p_vec);
-
-        public static void CopyGlobal(this Transform p_source, Transform p_target)
-        {
-            p_target.position = p_source.position;
-            p_target.rotation = p_source.rotation;
-        }
-    }
-}
+using ABI.CCK.Components;
+using ABI_RC.Core.Savior;
+using ABI_RC.Systems.MovementSystem;
+using System.Reflection;
+using UnityEngine;
+
+namespace ml_prm
+{
+    static class Utils
+    {
+        static readonly FieldInfo ms_groundedRaw = typeof(MovementSystem).GetField("_isGroundedRaw", BindingFlags.NonPublic | BindingFlags.Instance);
+        static readonly FieldInfo ms_appliedGravity = typeof(MovementSystem).GetField("_appliedGravity", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
+        public static bool IsWorldSafe() => ((CVRWorld.Instance != null) && CVRWorld.Instance.allowFlying);
+        public static float GetWorldMovementLimit()
+        {
+            float l_result = 1f;
+            if(CVRWorld.Instance != null)
+            {
+                l_result = CVRWorld.Instance.baseMovementSpeed;
+                l_result *= CVRWorld.Instance.sprintMultiplier;
+                l_result *= CVRWorld.Instance.inAirMovementMultiplier;
+                l_result *= CVRWorld.Instance.flyMultiplier;
+            }
+            return l_result;
+        }
+
+        public static bool IsGrounded(this MovementSystem p_instance) => (bool)ms_groundedRaw.GetValue(p_instance);
+        public static Vector3 GetAppliedGravity(this MovementSystem p_instance) => (Vector3)ms_appliedGravity.GetValue(p_instance);
+        public static void SetAppliedGravity(this MovementSystem p_instance, Vector3 p_vec) => ms_appliedGravity.SetValue(p_instance, p_vec);
+
+        public static void CopyGlobal(this Transform p_source, Transform p_target)
+        {
+            p_target.position = p_source.position;
+            p_target.rotation = p_source.rotation;
+        }
+    }
+}

ml_amt/Main.cs

@@ -1,120 +1,118 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.Player;
-using ABI_RC.Systems.IK.SubSystems;
-using System;
-using System.Collections;
-using System.Reflection;
-
-namespace ml_amt
-{
-    public class AvatarMotionTweaker : MelonLoader.MelonMod
-    {
-        static AvatarMotionTweaker ms_instance = null;
-
-        MotionTweaker m_localTweaker = null;
-
-        public override void OnInitializeMelon()
-        {
-            if(ms_instance == null)
-                ms_instance = this;
-
-            Settings.Init();
-
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
-            );
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(BodySystem).GetMethod(nameof(BodySystem.Calibrate)),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnCalibrate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-            HarmonyInstance.Patch(
-                typeof(PlayerSetup).GetMethod("SetPlaySpaceScale", BindingFlags.NonPublic | BindingFlags.Instance),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnPlayspaceScale_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-
-            ModSupporter.Init();
-            MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
-        }
-
-        IEnumerator WaitForLocalPlayer()
-        {
-            while(PlayerSetup.Instance == null)
-                yield return null;
-
-            m_localTweaker = PlayerSetup.Instance.gameObject.AddComponent<MotionTweaker>();
-        }
-
-        public override void OnDeinitializeMelon()
-        {
-            if(ms_instance == this)
-                ms_instance = null;
-
-            m_localTweaker = null;
-        }
-
-        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
-        void OnAvatarClear()
-        {
-            try
-            {
-                if(m_localTweaker != null)
-                    m_localTweaker.OnAvatarClear();
-            }
-            catch(Exception l_exception)
-            {
-                MelonLoader.MelonLogger.Error(l_exception);
-            }
-        }
-
-        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
-        void OnSetupAvatar()
-        {
-            try
-            {
-                if(m_localTweaker != null)
-                    m_localTweaker.OnSetupAvatar();
-            }
-            catch(Exception l_exception)
-            {
-                MelonLoader.MelonLogger.Error(l_exception);
-            }
-        }
-
-        static void OnCalibrate_Postfix() => ms_instance?.OnCalibrate();
-        void OnCalibrate()
-        {
-            try
-            {
-                if(m_localTweaker != null)
-                    m_localTweaker.OnCalibrate();
-            }
-            catch(Exception l_exception)
-            {
-                MelonLoader.MelonLogger.Error(l_exception);
-            }
-        }
-
-        static void OnPlayspaceScale_Postfix() => ms_instance?.OnPlayspaceScale();
-        void OnPlayspaceScale()
-        {
-            try
-            {
-                if(m_localTweaker != null)
-                    m_localTweaker.OnPlayspaceScale();
-            }
-            catch(Exception l_exception)
-            {
-                MelonLoader.MelonLogger.Error(l_exception);
-            }
-        }
-    }
-}
+using ABI_RC.Core.Player;
+using ABI_RC.Systems.IK.SubSystems;
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace ml_amt
+{
+    public class AvatarMotionTweaker : MelonLoader.MelonMod
+    {
+        static AvatarMotionTweaker ms_instance = null;
+
+        MotionTweaker m_localTweaker = null;
+
+        public override void OnInitializeMelon()
+        {
+            if(ms_instance == null)
+                ms_instance = this;
+
+            Settings.Init();
+
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.ClearAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnAvatarClear_Postfix), BindingFlags.NonPublic | BindingFlags.Static))
+            );
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(BodySystem).GetMethod(nameof(BodySystem.Calibrate)),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnCalibrate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+            HarmonyInstance.Patch(
+                typeof(PlayerSetup).GetMethod("SetPlaySpaceScale", BindingFlags.NonPublic | BindingFlags.Instance),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnPlayspaceScale_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+
+            MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
+        }
+
+        IEnumerator WaitForLocalPlayer()
+        {
+            while(PlayerSetup.Instance == null)
+                yield return null;
+
+            m_localTweaker = PlayerSetup.Instance.gameObject.AddComponent<MotionTweaker>();
+        }
+
+        public override void OnDeinitializeMelon()
+        {
+            if(ms_instance == this)
+                ms_instance = null;
+
+            m_localTweaker = null;
+        }
+
+        static void OnAvatarClear_Postfix() => ms_instance?.OnAvatarClear();
+        void OnAvatarClear()
+        {
+            try
+            {
+                if(m_localTweaker != null)
+                    m_localTweaker.OnAvatarClear();
+            }
+            catch(Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
+        }
+
+        static void OnSetupAvatar_Postfix() => ms_instance?.OnSetupAvatar();
+        void OnSetupAvatar()
+        {
+            try
+            {
+                if(m_localTweaker != null)
+                    m_localTweaker.OnSetupAvatar();
+            }
+            catch(Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
+        }
+
+        static void OnCalibrate_Postfix() => ms_instance?.OnCalibrate();
+        void OnCalibrate()
+        {
+            try
+            {
+                if(m_localTweaker != null)
+                    m_localTweaker.OnCalibrate();
+            }
+            catch(Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
+        }
+
+        static void OnPlayspaceScale_Postfix() => ms_instance?.OnPlayspaceScale();
+        void OnPlayspaceScale()
+        {
+            try
+            {
+                if(m_localTweaker != null)
+                    m_localTweaker.OnPlayspaceScale();
+            }
+            catch(Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
+        }
+    }
+}

ml_amt/ModSupporter.cs

@@ -1,49 +0,0 @@
-using System.Collections;
-using System.Linq;
-
-namespace ml_amt
-{
-    static class ModSupporter
-    {
-        static bool ms_ragdollMod = false;
-        static bool ms_copycatMod = false;
-
-        public static void Init()
-        {
-            if(MelonLoader.MelonMod.RegisteredMelons.FirstOrDefault(m => m.Info.Name == "PlayerRagdollMod") != null)
-                MelonLoader.MelonCoroutines.Start(WaitForRagdollInstance());
-            if(MelonLoader.MelonMod.RegisteredMelons.FirstOrDefault(m => m.Info.Name == "PlayerMovementCopycat") != null)
-                MelonLoader.MelonCoroutines.Start(WaitForCopycatInstance());
-        }
-
-        // PlayerRagdollMod support
-        static IEnumerator WaitForRagdollInstance()
-        {
-            while(ml_prm.RagdollController.Instance == null)
-                yield return null;
-
-            ms_ragdollMod = true;
-        }
-        static bool IsRagdolled() => ml_prm.RagdollController.Instance.IsRagdolled();
-
-        // PlayerMovementCopycat support
-        static IEnumerator WaitForCopycatInstance()
-        {
-            while(ml_pmc.PoseCopycat.Instance == null)
-                yield return null;
-
-            ms_copycatMod = true;
-        }
-        static bool IsCopycating() => ml_pmc.PoseCopycat.Instance.IsActive();
-
-        public static bool SkipHipsOverride()
-        {
-            bool l_result = false;
-            l_result |= (ms_ragdollMod && IsRagdolled());
-            l_result |= (ms_copycatMod && IsCopycating());
-            return l_result;
-        }
-
-
-    }
-}

ml_amt/MotionTweaker.cs

@@ -1,345 +1,316 @@
-using ABI_RC.Core.Player;
-using ABI_RC.Systems.IK;
-using ABI_RC.Systems.IK.SubSystems;
-using ABI_RC.Systems.MovementSystem;
-using RootMotion.FinalIK;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace ml_amt
-{
-    [DisallowMultipleComponent]
-    class MotionTweaker : MonoBehaviour
-    {
-        struct IKState
-        {
-            public float m_weight;
-            public float m_locomotionWeight;
-            public bool m_plantFeet;
-            public bool m_bendNormalLeft;
-            public bool m_bendNormalRight;
-        }
-
-        static readonly Vector4 ms_pointVector = new Vector4(0f, 0f, 0f, 1f);
-        static readonly int ms_emoteHash = Animator.StringToHash("Emote");
-
-        IKState m_ikState;
-        VRIK m_vrIk = null;
-        int m_locomotionLayer = 0;
-        float m_avatarScale = 1f;
-        Vector3 m_locomotionOffset = Vector3.zero; // Original locomotion offset
-        Transform m_avatarHips = null;
-        bool m_inVR = false;
-
-        bool m_avatarReady = false;
-        bool m_grounded = false;
-        bool m_groundedRaw = false;
-        bool m_moving = false;
-        bool m_locomotionOverride = false;
-
-        bool m_ikOverrideFly = true;
-        bool m_ikOverrideJump = true;
-
-        bool m_detectEmotes = true;
-        bool m_emoteActive = false;
-
-        bool m_followHips = true;
-        Vector3 m_hipsToPlayer = Vector3.zero;
-
-        Vector3 m_massCenter = Vector3.zero;
-
-        Transform m_ikLimits = null;
-
-        readonly List<AvatarParameter> m_parameters = null;
-
-        internal MotionTweaker()
-        {
-            m_parameters = new List<AvatarParameter>();
-        }
-
-        // Unity events
-        void Start()
-        {
-            m_inVR = Utils.IsInVR();
-
-            SetCrouchLimit(Settings.CrouchLimit);
-            SetProneLimit(Settings.ProneLimit);
-            SetIKOverrideFly(Settings.IKOverrideFly);
-            SetIKOverrideJump(Settings.IKOverrideJump);
-            SetDetectEmotes(Settings.DetectEmotes);
-            SetFollowHips(Settings.FollowHips);
-
-            Settings.CrouchLimitChange += this.SetCrouchLimit;
-            Settings.ProneLimitChange += this.SetProneLimit;
-            Settings.IKOverrideFlyChange += this.SetIKOverrideFly;
-            Settings.IKOverrideJumpChange += this.SetIKOverrideJump;
-            Settings.DetectEmotesChange += this.SetDetectEmotes;
-            Settings.FollowHipsChange += this.SetFollowHips;
-            Settings.MassCenterChange += this.OnMassCenterChange;
-        }
-
-        void OnDestroy()
-        {
-            Settings.CrouchLimitChange -= this.SetCrouchLimit;
-            Settings.ProneLimitChange -= this.SetProneLimit;
-            Settings.IKOverrideFlyChange -= this.SetIKOverrideFly;
-            Settings.IKOverrideJumpChange -= this.SetIKOverrideJump;
-            Settings.DetectEmotesChange -= this.SetDetectEmotes;
-            Settings.FollowHipsChange -= this.SetFollowHips;
-            Settings.MassCenterChange -= this.OnMassCenterChange;
-        }
-
-        void Update()
-        {
-            if(m_avatarReady)
-            {
-                m_grounded = MovementSystem.Instance.IsGrounded();
-                m_groundedRaw = MovementSystem.Instance.IsGroundedRaw();
-                m_moving = !Mathf.Approximately(MovementSystem.Instance.movementVector.magnitude, 0f);
-
-                UpdateIKLimits();
-
-                if(m_avatarHips != null)
-                {
-                    Vector4 l_hipsToPoint = (PlayerSetup.Instance.transform.GetMatrix().inverse * m_avatarHips.GetMatrix()) * ms_pointVector;
-                    m_hipsToPlayer.Set(l_hipsToPoint.x, 0f, l_hipsToPoint.z);
-                }
-
-                m_emoteActive = false;
-                if(m_detectEmotes && (m_locomotionLayer >= 0))
-                {
-                    AnimatorStateInfo l_animState = PlayerSetup.Instance._animator.GetCurrentAnimatorStateInfo(m_locomotionLayer);
-                    m_emoteActive = (l_animState.tagHash == ms_emoteHash);
-                }
-
-                if(m_parameters.Count > 0)
-                {
-                    foreach(AvatarParameter l_param in m_parameters)
-                        l_param.Update(this);
-                }
-            }
-        }
-
-        // Game events
-        internal void OnAvatarClear()
-        {
-            m_vrIk = null;
-            m_locomotionLayer = -1;
-            m_grounded = false;
-            m_groundedRaw = false;
-            m_avatarReady = false;
-            m_avatarScale = 1f;
-            m_locomotionOffset = Vector3.zero;
-            m_emoteActive = false;
-            m_moving = false;
-            m_locomotionOverride = false;
-            m_hipsToPlayer = Vector3.zero;
-            m_avatarHips = null;
-            m_massCenter = Vector3.zero;
-            m_ikLimits = null;
-            m_parameters.Clear();
-
-            PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(Settings.CrouchLimit);
-            PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(Settings.ProneLimit);
-        }
-
-        internal void OnSetupAvatar()
-        {
-            m_inVR = Utils.IsInVR();
-            m_vrIk = PlayerSetup.Instance._avatar.GetComponent<VRIK>();
-            m_locomotionLayer = PlayerSetup.Instance._animator.GetLayerIndex("Locomotion/Emotes");
-            m_avatarHips = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Hips);
-            m_avatarScale = Mathf.Abs(PlayerSetup.Instance._avatar.transform.localScale.y);
-
-            // Parse animator parameters
-            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.Upright, PlayerSetup.Instance.animatorManager));
-            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.GroundedRaw, PlayerSetup.Instance.animatorManager));
-            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.Moving, PlayerSetup.Instance.animatorManager));
-            m_parameters.RemoveAll(p => !p.IsValid());
-
-            // Avatar custom IK limits
-            m_ikLimits = PlayerSetup.Instance._avatar.transform.Find("[IKLimits]");
-            UpdateIKLimits();
-
-            // Apply VRIK tweaks
-            if(m_vrIk != null)
-            {
-                m_locomotionOffset = m_vrIk.solver.locomotion.offset;
-                m_massCenter = m_locomotionOffset;
-
-                if(m_vrIk.solver.HasToes())
-                {
-                    Transform l_foot = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftFoot);
-                    if(l_foot == null)
-                        l_foot = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightFoot);
-
-                    Transform l_toe = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftToes);
-                    if(l_toe == null)
-                        l_toe = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightToes);
-
-                    if((l_foot != null) && (l_toe != null))
-                    {
-                        Vector3 l_footPos = (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_foot.GetMatrix()) * ms_pointVector;
-                        Vector3 l_toePos = (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_toe.GetMatrix()) * ms_pointVector;
-                        m_massCenter = new Vector3(0f, 0f, l_toePos.z - l_footPos.z);
-                    }
-                }
-
-                m_vrIk.solver.locomotion.offset = (Settings.MassCenter ? m_massCenter : m_locomotionOffset);
-
-                m_vrIk.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
-                m_vrIk.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
-            }
-
-            m_avatarReady = true;
-        }
-
-        internal void OnCalibrate()
-        {
-            if(m_avatarReady && (m_vrIk != null) && (m_vrIk.solver.spine.pelvisTarget != null) && (m_vrIk.solver.leftLeg.target == null) && (m_vrIk.solver.rightLeg.target == null))
-            {
-                // Do not consider 4PT as FBT (!!!)
-                m_vrIk.solver.spine.bodyPosStiffness = 0.55f;
-                m_vrIk.solver.spine.bodyRotStiffness = 0.1f;
-                m_vrIk.solver.spine.neckStiffness = 0.5f;
-                m_vrIk.solver.spine.chestClampWeight = 0.55f;
-                m_vrIk.solver.spine.moveBodyBackWhenCrouching = 0.5f;
-                m_vrIk.solver.spine.maxRootAngle = 25f;
-                m_vrIk.fixTransforms = false;
-
-                BodySystem.isCalibratedAsFullBody = false;
-                BodySystem.TrackingLeftLegEnabled = false;
-                BodySystem.TrackingRightLegEnabled = false;
-                BodySystem.TrackingLocomotionEnabled = true;
-
-                IKSystem.Instance.applyOriginalHipRotation = true;
-            }
-        }
-
-        internal void OnPlayspaceScale()
-        {
-            if((m_vrIk != null) && Settings.MassCenter)
-                m_vrIk.solver.locomotion.offset = m_massCenter * GetRelativeScale();
-        }
-
-        // IK events
-        void OnIKPreUpdate()
-        {
-            bool l_locomotionOverride = false;
-
-            m_ikState.m_weight = m_vrIk.solver.IKPositionWeight;
-            m_ikState.m_locomotionWeight = m_vrIk.solver.locomotion.weight;
-            m_ikState.m_plantFeet = m_vrIk.solver.plantFeet;
-            m_ikState.m_bendNormalLeft = m_vrIk.solver.leftLeg.useAnimatedBendNormal;
-            m_ikState.m_bendNormalRight = m_vrIk.solver.rightLeg.useAnimatedBendNormal;
-
-            if(m_detectEmotes && m_emoteActive)
-                m_vrIk.solver.IKPositionWeight = 0f;
-
-            if(!BodySystem.isCalibratedAsFullBody)
-            {
-                if(PlayerSetup.Instance.avatarUpright <= PlayerSetup.Instance.avatarCrouchLimit)
-                {
-                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
-                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
-                    l_locomotionOverride = true;
-                }
-
-                if(m_ikOverrideFly && MovementSystem.Instance.flying)
-                {
-                    m_vrIk.solver.locomotion.weight = 0f;
-                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
-                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
-                    l_locomotionOverride = true;
-                }
-                if(m_ikOverrideJump && !m_grounded && !MovementSystem.Instance.flying)
-                {
-                    m_vrIk.solver.locomotion.weight = 0f;
-                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
-                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
-                    l_locomotionOverride = true;
-                }
-            }
-
-            bool l_solverActive = !Mathf.Approximately(m_vrIk.solver.IKPositionWeight, 0f);
-            if(l_locomotionOverride && l_solverActive && (m_followHips && !MovementSystem.Instance.sitting) && (!m_moving || (PlayerSetup.Instance.avatarUpright <= PlayerSetup.Instance.avatarCrouchLimit)) && m_inVR && !BodySystem.isCalibratedAsFullBody && !ModSupporter.SkipHipsOverride())
-            {
-                m_vrIk.solver.plantFeet = false;
-                if((IKSystem.VrikRootController != null) && !MovementSystem.Instance.sitting)
-                    IKSystem.VrikRootController.enabled = false;
-                PlayerSetup.Instance._avatar.transform.localPosition = m_hipsToPlayer;
-            }
-
-            if(m_locomotionOverride && !l_locomotionOverride)
-            {
-                m_vrIk.solver.Reset();
-                if((IKSystem.VrikRootController != null) && !MovementSystem.Instance.sitting)
-                    IKSystem.VrikRootController.enabled = true;
-            }
-            m_locomotionOverride = l_locomotionOverride;
-        }
-
-        void OnIKPostUpdate()
-        {
-            m_vrIk.solver.IKPositionWeight = m_ikState.m_weight;
-            m_vrIk.solver.locomotion.weight = m_ikState.m_locomotionWeight;
-            m_vrIk.solver.plantFeet = m_ikState.m_plantFeet;
-            m_vrIk.solver.leftLeg.useAnimatedBendNormal = m_ikState.m_bendNormalLeft;
-            m_vrIk.solver.rightLeg.useAnimatedBendNormal = m_ikState.m_bendNormalRight;
-        }
-
-        // Settings
-        internal void SetCrouchLimit(float p_value)
-        {
-            if(m_ikLimits == null)
-                PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(p_value);
-        }
-        internal void SetProneLimit(float p_value)
-        {
-            if(m_ikLimits == null)
-                PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(p_value);
-        }
-        internal void SetIKOverrideFly(bool p_state)
-        {
-            m_ikOverrideFly = p_state;
-        }
-        internal void SetIKOverrideJump(bool p_state)
-        {
-            m_ikOverrideJump = p_state;
-        }
-        internal void SetDetectEmotes(bool p_state)
-        {
-            m_detectEmotes = p_state;
-        }
-        internal void SetFollowHips(bool p_state)
-        {
-            m_followHips = p_state;
-        }
-        void OnMassCenterChange(bool p_state)
-        {
-            if(m_vrIk != null)
-                m_vrIk.solver.locomotion.offset = (Settings.MassCenter ? (m_massCenter * GetRelativeScale()) : m_locomotionOffset);
-        }
-
-        // Arbitrary
-        float GetRelativeScale()
-        {
-            return ((m_avatarScale > 0f) ? (PlayerSetup.Instance._avatar.transform.localScale.y / m_avatarScale) : 0f);
-        }
-
-        void UpdateIKLimits()
-        {
-            if(m_ikLimits != null)
-            {
-                Vector3 l_values = m_ikLimits.localPosition;
-                PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(l_values.x);
-                PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(l_values.y);
-            }
-        }
-
-        // Parameters access
-        public float GetUpright() => PlayerSetup.Instance.avatarUpright;
-        public bool GetGroundedRaw() => m_groundedRaw;
-        public bool GetMoving() => m_moving;
-    }
-}
+using ABI_RC.Core.Player;
+using ABI_RC.Systems.IK;
+using ABI_RC.Systems.IK.SubSystems;
+using ABI_RC.Systems.MovementSystem;
+using RootMotion.FinalIK;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace ml_amt
+{
+    [DisallowMultipleComponent]
+    class MotionTweaker : MonoBehaviour
+    {
+        struct IKState
+        {
+            public float m_weight;
+            public float m_locomotionWeight;
+            public bool m_plantFeet;
+            public bool m_bendNormalLeft;
+            public bool m_bendNormalRight;
+        }
+
+        static readonly Vector4 ms_pointVector = new Vector4(0f, 0f, 0f, 1f);
+        static readonly int ms_emoteHash = Animator.StringToHash("Emote");
+
+        IKState m_ikState;
+        VRIK m_vrIk = null;
+        int m_locomotionLayer = 0;
+        float m_avatarScale = 1f;
+        Vector3 m_locomotionOffset = Vector3.zero; // Original locomotion offset
+        bool m_inVR = false;
+
+        bool m_avatarReady = false;
+        bool m_grounded = false;
+        bool m_groundedRaw = false;
+        bool m_moving = false;
+        bool m_locomotionOverride = false;
+
+        bool m_ikOverrideFly = true;
+        bool m_ikOverrideJump = true;
+
+        bool m_detectEmotes = true;
+        bool m_emoteActive = false;
+
+        Vector3 m_massCenter = Vector3.zero;
+
+        Transform m_ikLimits = null;
+
+        readonly List<AvatarParameter> m_parameters = null;
+
+        internal MotionTweaker()
+        {
+            m_parameters = new List<AvatarParameter>();
+        }
+
+        // Unity events
+        void Start()
+        {
+            m_inVR = Utils.IsInVR();
+
+            SetCrouchLimit(Settings.CrouchLimit);
+            SetProneLimit(Settings.ProneLimit);
+            SetIKOverrideFly(Settings.IKOverrideFly);
+            SetIKOverrideJump(Settings.IKOverrideJump);
+            SetDetectEmotes(Settings.DetectEmotes);
+
+            Settings.CrouchLimitChange += this.SetCrouchLimit;
+            Settings.ProneLimitChange += this.SetProneLimit;
+            Settings.IKOverrideFlyChange += this.SetIKOverrideFly;
+            Settings.IKOverrideJumpChange += this.SetIKOverrideJump;
+            Settings.DetectEmotesChange += this.SetDetectEmotes;
+            Settings.MassCenterChange += this.OnMassCenterChange;
+        }
+
+        void OnDestroy()
+        {
+            Settings.CrouchLimitChange -= this.SetCrouchLimit;
+            Settings.ProneLimitChange -= this.SetProneLimit;
+            Settings.IKOverrideFlyChange -= this.SetIKOverrideFly;
+            Settings.IKOverrideJumpChange -= this.SetIKOverrideJump;
+            Settings.DetectEmotesChange -= this.SetDetectEmotes;
+            Settings.MassCenterChange -= this.OnMassCenterChange;
+        }
+
+        void Update()
+        {
+            if(m_avatarReady)
+            {
+                m_grounded = MovementSystem.Instance.IsGrounded();
+                m_groundedRaw = MovementSystem.Instance.IsGroundedRaw();
+                m_moving = !Mathf.Approximately(MovementSystem.Instance.movementVector.magnitude, 0f);
+
+                UpdateIKLimits();
+
+                m_emoteActive = false;
+                if(m_detectEmotes && (m_locomotionLayer >= 0))
+                {
+                    AnimatorStateInfo l_animState = PlayerSetup.Instance._animator.GetCurrentAnimatorStateInfo(m_locomotionLayer);
+                    m_emoteActive = (l_animState.tagHash == ms_emoteHash);
+                }
+
+                if(m_parameters.Count > 0)
+                {
+                    foreach(AvatarParameter l_param in m_parameters)
+                        l_param.Update(this);
+                }
+            }
+        }
+
+        // Game events
+        internal void OnAvatarClear()
+        {
+            m_vrIk = null;
+            m_locomotionLayer = -1;
+            m_grounded = false;
+            m_groundedRaw = false;
+            m_avatarReady = false;
+            m_avatarScale = 1f;
+            m_locomotionOffset = Vector3.zero;
+            m_emoteActive = false;
+            m_moving = false;
+            m_locomotionOverride = false;
+            m_massCenter = Vector3.zero;
+            m_ikLimits = null;
+            m_parameters.Clear();
+
+            PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(Settings.CrouchLimit);
+            PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(Settings.ProneLimit);
+        }
+
+        internal void OnSetupAvatar()
+        {
+            m_inVR = Utils.IsInVR();
+            m_vrIk = PlayerSetup.Instance._avatar.GetComponent<VRIK>();
+            m_locomotionLayer = PlayerSetup.Instance._animator.GetLayerIndex("Locomotion/Emotes");
+            m_avatarScale = Mathf.Abs(PlayerSetup.Instance._avatar.transform.localScale.y);
+
+            // Parse animator parameters
+            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.Upright, PlayerSetup.Instance.animatorManager));
+            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.GroundedRaw, PlayerSetup.Instance.animatorManager));
+            m_parameters.Add(new AvatarParameter(AvatarParameter.ParameterType.Moving, PlayerSetup.Instance.animatorManager));
+            m_parameters.RemoveAll(p => !p.IsValid());
+
+            // Avatar custom IK limits
+            m_ikLimits = PlayerSetup.Instance._avatar.transform.Find("[IKLimits]");
+            UpdateIKLimits();
+
+            // Apply VRIK tweaks
+            if(m_vrIk != null)
+            {
+                m_locomotionOffset = m_vrIk.solver.locomotion.offset;
+                m_massCenter = m_locomotionOffset;
+
+                if(m_vrIk.solver.HasToes())
+                {
+                    Transform l_foot = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftFoot);
+                    if(l_foot == null)
+                        l_foot = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightFoot);
+
+                    Transform l_toe = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.LeftToes);
+                    if(l_toe == null)
+                        l_toe = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightToes);
+
+                    if((l_foot != null) && (l_toe != null))
+                    {
+                        Vector3 l_footPos = (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_foot.GetMatrix()) * ms_pointVector;
+                        Vector3 l_toePos = (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_toe.GetMatrix()) * ms_pointVector;
+                        m_massCenter = new Vector3(0f, 0f, l_toePos.z - l_footPos.z);
+                    }
+                }
+
+                m_vrIk.solver.locomotion.offset = (Settings.MassCenter ? m_massCenter : m_locomotionOffset);
+
+                m_vrIk.onPreSolverUpdate.AddListener(this.OnIKPreUpdate);
+                m_vrIk.onPostSolverUpdate.AddListener(this.OnIKPostUpdate);
+            }
+
+            m_avatarReady = true;
+        }
+
+        internal void OnCalibrate()
+        {
+            if(m_avatarReady && (m_vrIk != null) && (m_vrIk.solver.spine.pelvisTarget != null) && (m_vrIk.solver.leftLeg.target == null) && (m_vrIk.solver.rightLeg.target == null))
+            {
+                // Do not consider 4PT as FBT (!!!)
+                m_vrIk.solver.spine.bodyPosStiffness = 0.55f;
+                m_vrIk.solver.spine.bodyRotStiffness = 0.1f;
+                m_vrIk.solver.spine.neckStiffness = 0.5f;
+                m_vrIk.solver.spine.chestClampWeight = 0.55f;
+                m_vrIk.solver.spine.moveBodyBackWhenCrouching = 0.5f;
+                m_vrIk.solver.spine.maxRootAngle = 25f;
+                m_vrIk.fixTransforms = false;
+
+                BodySystem.isCalibratedAsFullBody = false;
+                BodySystem.TrackingLeftLegEnabled = false;
+                BodySystem.TrackingRightLegEnabled = false;
+                BodySystem.TrackingLocomotionEnabled = true;
+
+                IKSystem.Instance.applyOriginalHipRotation = true;
+            }
+        }
+
+        internal void OnPlayspaceScale()
+        {
+            if((m_vrIk != null) && Settings.MassCenter)
+                m_vrIk.solver.locomotion.offset = m_massCenter * GetRelativeScale();
+        }
+
+        // IK events
+        void OnIKPreUpdate()
+        {
+            bool l_locomotionOverride = false;
+
+            m_ikState.m_weight = m_vrIk.solver.IKPositionWeight;
+            m_ikState.m_locomotionWeight = m_vrIk.solver.locomotion.weight;
+            m_ikState.m_plantFeet = m_vrIk.solver.plantFeet;
+            m_ikState.m_bendNormalLeft = m_vrIk.solver.leftLeg.useAnimatedBendNormal;
+            m_ikState.m_bendNormalRight = m_vrIk.solver.rightLeg.useAnimatedBendNormal;
+
+            if(m_detectEmotes && m_emoteActive)
+                m_vrIk.solver.IKPositionWeight = 0f;
+
+            if(!BodySystem.isCalibratedAsFullBody)
+            {
+                if(PlayerSetup.Instance.avatarUpright <= PlayerSetup.Instance.avatarCrouchLimit)
+                {
+                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
+                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
+                    l_locomotionOverride = true;
+                }
+
+                if(m_ikOverrideFly && MovementSystem.Instance.flying)
+                {
+                    m_vrIk.solver.locomotion.weight = 0f;
+                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
+                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
+                    l_locomotionOverride = true;
+                }
+                if(m_ikOverrideJump && !m_grounded && !MovementSystem.Instance.flying)
+                {
+                    m_vrIk.solver.locomotion.weight = 0f;
+                    m_vrIk.solver.leftLeg.useAnimatedBendNormal = true;
+                    m_vrIk.solver.rightLeg.useAnimatedBendNormal = true;
+                    l_locomotionOverride = true;
+                }
+            }
+
+            if(m_locomotionOverride && !l_locomotionOverride)
+            {
+                m_vrIk.solver.Reset();
+                if((IKSystem.VrikRootController != null) && !MovementSystem.Instance.sitting)
+                    IKSystem.VrikRootController.enabled = true;
+            }
+            m_locomotionOverride = l_locomotionOverride;
+        }
+
+        void OnIKPostUpdate()
+        {
+            m_vrIk.solver.IKPositionWeight = m_ikState.m_weight;
+            m_vrIk.solver.locomotion.weight = m_ikState.m_locomotionWeight;
+            m_vrIk.solver.plantFeet = m_ikState.m_plantFeet;
+            m_vrIk.solver.leftLeg.useAnimatedBendNormal = m_ikState.m_bendNormalLeft;
+            m_vrIk.solver.rightLeg.useAnimatedBendNormal = m_ikState.m_bendNormalRight;
+        }
+
+        // Settings
+        internal void SetCrouchLimit(float p_value)
+        {
+            if(m_ikLimits == null)
+                PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(p_value);
+        }
+        internal void SetProneLimit(float p_value)
+        {
+            if(m_ikLimits == null)
+                PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(p_value);
+        }
+        internal void SetIKOverrideFly(bool p_state)
+        {
+            m_ikOverrideFly = p_state;
+        }
+        internal void SetIKOverrideJump(bool p_state)
+        {
+            m_ikOverrideJump = p_state;
+        }
+        internal void SetDetectEmotes(bool p_state)
+        {
+            m_detectEmotes = p_state;
+        }
+        void OnMassCenterChange(bool p_state)
+        {
+            if(m_vrIk != null)
+                m_vrIk.solver.locomotion.offset = (Settings.MassCenter ? (m_massCenter * GetRelativeScale()) : m_locomotionOffset);
+        }
+
+        // Arbitrary
+        float GetRelativeScale()
+        {
+            return ((m_avatarScale > 0f) ? (PlayerSetup.Instance._avatar.transform.localScale.y / m_avatarScale) : 0f);
+        }
+
+        void UpdateIKLimits()
+        {
+            if(m_ikLimits != null)
+            {
+                Vector3 l_values = m_ikLimits.localPosition;
+                PlayerSetup.Instance.avatarCrouchLimit = Mathf.Clamp01(l_values.x);
+                PlayerSetup.Instance.avatarProneLimit = Mathf.Clamp01(l_values.y);
+            }
+        }
+
+        // Parameters access
+        public float GetUpright() => PlayerSetup.Instance.avatarUpright;
+        public bool GetGroundedRaw() => m_groundedRaw;
+        public bool GetMoving() => m_moving;
+    }
+}

ml_amt/Properties/AssemblyInfo.cs

@@ -1,5 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
-[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
-[assembly: MelonLoader.MelonOptionalDependencies("ml_prm", "ml_pmc")]
-[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
-[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
+[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
+[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
+[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]

ml_amt/README.md

@@ -1,36 +1,33 @@
-# Avatar Motion Tweaker
-This mod adds features for AAS animator and avatar locomotion behaviour.
-
-![](.github/img_01.png)
-
-# Installation
-* Install [latest MelonLoader](https://github.com/LavaGang/MelonLoader)
-* Get [latest release DLL](../../../releases/latest):
-  * Put `ml_amt.dll` in `Mods` folder of game
-
-# Usage
-Available mod's settings in `Settings - IK - Avatar Motion Tweaker`:
-* **Crouch limit:** defines crouch limit; default value - `75`.
-* **Prone limit:** defines prone limit; default value - `40`.
-* **IK override while flying:** disables legs locomotion/autostep in fly mode; default value - `true`.
-* **IK override while jumping:** disables legs locomotion/autostep in jump; default value - `true`.
-* **Follow hips on IK override:** adjusts avatar position to overcome animation snapping on IK override; default value - `true`.
-  * Note: Works best with animations that have root transform position (XZ) based on center of mass.
-  * Note: Made for four point tracking (head, hands and hips) in mind.
-* **Detect animations emote tag:** disables avatar's IK entirely if current animator state has `Emote` tag; default value - `true`.
-  * Note: Created as example for [propoused game feature](https://feedback.abinteractive.net/p/disabling-vr-ik-for-emotes-via-animator-state-tag-7b80d963-053a-41c0-86ac-e3d53c61c1e2).
-* **Adjusted locomotion mass center:** automatically changes IK locomotion center if avatar has toe bones; default value - `true`.
-  * Note: Compatible with [DesktopVRIK](https://github.com/NotAKidOnSteam/DesktopVRIK) and [FuckToes](https://github.com/NotAKidOnSteam/FuckToes).
-
-Available additional parameters for AAS animator:
-* **`Upright`:** defines linear coefficient between current viewpoint height and avatar's viewpoint height; float, range - [0.0, 1.0].
-  * Note: Can be set as local-only (not synced) if starts with `#` character.
-  * Note: Shouldn't be used for transitions between poses in desktop mode. In desktop mode its value is driven by avatar animations. Use `CVR Parameter Stream` for detecting desktop/VR modes and change AAS animator transitions accordingly.
-* **`GroundedRaw`:** defines instant grounding state of player instead of delayed default parameter `Grounded`; boolean.
-  * Note: Can be set as local-only (not synced) if starts with `#` character.
-* **`Moving`:** defines movement state of player; boolean.
-  * Note: Can be set as local-only (not synced) if starts with `#` character.
-
-Additional mod's behaviour:
-* Overrides and fixes IK behaviour in 4PT mode (head, hands and hips).
+# Avatar Motion Tweaker
+This mod adds features for AAS animator and avatar locomotion behaviour.
+
+![](.github/img_01.png)
+
+# Installation
+* Install [latest MelonLoader](https://github.com/LavaGang/MelonLoader)
+* Get [latest release DLL](../../../releases/latest):
+  * Put `ml_amt.dll` in `Mods` folder of game
+
+# Usage
+Available mod's settings in `Settings - IK - Avatar Motion Tweaker`:
+* **Crouch limit:** defines crouch limit; default value - `75`.
+* **Prone limit:** defines prone limit; default value - `40`.
+* **IK override while flying:** disables legs locomotion/autostep in fly mode; default value - `true`.
+* **IK override while jumping:** disables legs locomotion/autostep in jump; default value - `true`.
+* **Detect animations emote tag:** disables avatar's IK entirely if current animator state has `Emote` tag; default value - `true`.
+  * Note: Created as example for [propoused game feature](https://feedback.abinteractive.net/p/disabling-vr-ik-for-emotes-via-animator-state-tag-7b80d963-053a-41c0-86ac-e3d53c61c1e2).
+* **Adjusted locomotion mass center:** automatically changes IK locomotion center if avatar has toe bones; default value - `true`.
+  * Note: Compatible with [DesktopVRIK](https://github.com/NotAKidOnSteam/DesktopVRIK) and [FuckToes](https://github.com/NotAKidOnSteam/FuckToes).
+
+Available additional parameters for AAS animator:
+* **`Upright`:** defines linear coefficient between current viewpoint height and avatar's viewpoint height; float, range - [0.0, 1.0].
+  * Note: Can be set as local-only (not synced) if starts with `#` character.
+  * Note: Shouldn't be used for transitions between poses in desktop mode. In desktop mode its value is driven by avatar animations. Use `CVR Parameter Stream` for detecting desktop/VR modes and change AAS animator transitions accordingly.
+* **`GroundedRaw`:** defines instant grounding state of player instead of delayed default parameter `Grounded`; boolean.
+  * Note: Can be set as local-only (not synced) if starts with `#` character.
+* **`Moving`:** defines movement state of player; boolean.
+  * Note: Can be set as local-only (not synced) if starts with `#` character.
+
+Additional mod's behaviour:
+* Overrides and fixes IK behaviour in 4PT mode (head, hands and hips).
 * Avatars can have controlled IK crouch and prone limits. For that create `[IKLimits]` GameObject parented to avatar's root. Its local X and Y positions will be used as crouch and prone limits respectively and can be changed via animations. Values should be in range of [0;1].

ml_amt/Settings.cs

@@ -1,159 +1,148 @@
-using ABI_RC.Core.InteractionSystem;
-using System;
-using System.Collections.Generic;
-
-namespace ml_amt
-{
-    static class Settings
-    {
-        enum ModSetting
-        {
-            CrouchLimit,
-            ProneLimit,
-            IKOverrideFly,
-            IKOverrideJump,
-            DetectEmotes,
-            FollowHips,
-            MassCenter
-        };
-
-        public static float CrouchLimit { get; private set; } = 0.75f;
-        public static float ProneLimit { get; private set; } = 0.4f;
-        public static bool IKOverrideFly { get; private set; } = true;
-        public static bool IKOverrideJump { get; private set; } = true;
-        public static bool DetectEmotes { get; private set; } = true;
-        public static bool FollowHips { get; private set; } = true;
-        public static bool MassCenter { get; private set; } = true;
-
-        static MelonLoader.MelonPreferences_Category ms_category = null;
-        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
-
-        static public event Action<float> CrouchLimitChange;
-        static public event Action<float> ProneLimitChange;
-        static public event Action<bool> IKOverrideFlyChange;
-        static public event Action<bool> IKOverrideJumpChange;
-        static public event Action<bool> DetectEmotesChange;
-        static public event Action<bool> FollowHipsChange;
-        static public event Action<bool> MassCenterChange;
-
-        internal static void Init()
-        {
-            ms_category = MelonLoader.MelonPreferences.CreateCategory("AMT", null, true);
-
-            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
-            {
-                ms_category.CreateEntry(ModSetting.CrouchLimit.ToString(), (int)(CrouchLimit * 100f)),
-                ms_category.CreateEntry(ModSetting.ProneLimit.ToString(), (int)(ProneLimit * 100f)),
-                ms_category.CreateEntry(ModSetting.IKOverrideFly.ToString(), IKOverrideFly),
-                ms_category.CreateEntry(ModSetting.IKOverrideJump.ToString(), IKOverrideJump),
-                ms_category.CreateEntry(ModSetting.DetectEmotes.ToString(), DetectEmotes),
-                ms_category.CreateEntry(ModSetting.FollowHips.ToString(), FollowHips),
-                ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter)
-            };
-
-            CrouchLimit = ((int)ms_entries[(int)ModSetting.CrouchLimit].BoxedValue) * 0.01f;
-            ProneLimit = ((int)ms_entries[(int)ModSetting.ProneLimit].BoxedValue) * 0.01f;
-            IKOverrideFly = (bool)ms_entries[(int)ModSetting.IKOverrideFly].BoxedValue;
-            IKOverrideJump = (bool)ms_entries[(int)ModSetting.IKOverrideJump].BoxedValue;
-            DetectEmotes = (bool)ms_entries[(int)ModSetting.DetectEmotes].BoxedValue;
-            FollowHips = (bool)ms_entries[(int)ModSetting.FollowHips].BoxedValue;
-            MassCenter = (bool)ms_entries[(int)ModSetting.MassCenter].BoxedValue;
-
-            MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
-        }
-
-        static System.Collections.IEnumerator WaitMainMenuUi()
-        {
-            while(ViewManager.Instance == null)
-                yield return null;
-            while(ViewManager.Instance.gameMenuView == null)
-                yield return null;
-            while(ViewManager.Instance.gameMenuView.Listener == null)
-                yield return null;
-
-            ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () =>
-            {
-                ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action<string, string>(OnSliderUpdate));
-                ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action<string, string>(OnToggleUpdate));
-            };
-            ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
-            {
-                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("mods_extension.js"));
-                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("mod_menu.js"));
-                foreach(var l_entry in ms_entries)
-                    ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString());
-            };
-        }
-
-        static void OnSliderUpdate(string p_name, string p_value)
-        {
-            if(Enum.TryParse(p_name, out ModSetting l_setting))
-            {
-                switch(l_setting)
-                {
-                    case ModSetting.CrouchLimit:
-                    {
-                        CrouchLimit = int.Parse(p_value) * 0.01f;
-                        CrouchLimitChange?.Invoke(CrouchLimit);
-                    }
-                    break;
-
-                    case ModSetting.ProneLimit:
-                    {
-                        ProneLimit = int.Parse(p_value) * 0.01f;
-                        ProneLimitChange?.Invoke(ProneLimit);
-                    }
-                    break;
-                }
-
-                ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
-            }
-        }
-
-        static void OnToggleUpdate(string p_name, string p_value)
-        {
-            if(Enum.TryParse(p_name, out ModSetting l_setting))
-            {
-                switch(l_setting)
-                {
-                    case ModSetting.IKOverrideFly:
-                    {
-                        IKOverrideFly = bool.Parse(p_value);
-                        IKOverrideFlyChange?.Invoke(IKOverrideFly);
-                    }
-                    break;
-
-                    case ModSetting.IKOverrideJump:
-                    {
-                        IKOverrideJump = bool.Parse(p_value);
-                        IKOverrideJumpChange?.Invoke(IKOverrideJump);
-                    }
-                    break;
-
-                    case ModSetting.DetectEmotes:
-                    {
-                        DetectEmotes = bool.Parse(p_value);
-                        DetectEmotesChange?.Invoke(DetectEmotes);
-                    }
-                    break;
-
-                    case ModSetting.FollowHips:
-                    {
-                        FollowHips = bool.Parse(p_value);
-                        FollowHipsChange?.Invoke(FollowHips);
-                    }
-                    break;
-
-                    case ModSetting.MassCenter:
-                    {
-                        MassCenter = bool.Parse(p_value);
-                        MassCenterChange?.Invoke(MassCenter);
-                    }
-                    break;
-                }
-
-                ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);
-            }
-        }
-    }
-}
+using ABI_RC.Core.InteractionSystem;
+using System;
+using System.Collections.Generic;
+
+namespace ml_amt
+{
+    static class Settings
+    {
+        enum ModSetting
+        {
+            CrouchLimit,
+            ProneLimit,
+            IKOverrideFly,
+            IKOverrideJump,
+            DetectEmotes,
+            FollowHips,
+            MassCenter
+        };
+
+        public static float CrouchLimit { get; private set; } = 0.75f;
+        public static float ProneLimit { get; private set; } = 0.4f;
+        public static bool IKOverrideFly { get; private set; } = true;
+        public static bool IKOverrideJump { get; private set; } = true;
+        public static bool DetectEmotes { get; private set; } = true;
+        public static bool MassCenter { get; private set; } = true;
+
+        static MelonLoader.MelonPreferences_Category ms_category = null;
+        static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
+
+        static public event Action<float> CrouchLimitChange;
+        static public event Action<float> ProneLimitChange;
+        static public event Action<bool> IKOverrideFlyChange;
+        static public event Action<bool> IKOverrideJumpChange;
+        static public event Action<bool> DetectEmotesChange;
+        static public event Action<bool> MassCenterChange;
+
+        internal static void Init()
+        {
+            ms_category = MelonLoader.MelonPreferences.CreateCategory("AMT", null, true);
+
+            ms_entries = new List<MelonLoader.MelonPreferences_Entry>()
+            {
+                ms_category.CreateEntry(ModSetting.CrouchLimit.ToString(), (int)(CrouchLimit * 100f)),
+                ms_category.CreateEntry(ModSetting.ProneLimit.ToString(), (int)(ProneLimit * 100f)),
+                ms_category.CreateEntry(ModSetting.IKOverrideFly.ToString(), IKOverrideFly),
+                ms_category.CreateEntry(ModSetting.IKOverrideJump.ToString(), IKOverrideJump),
+                ms_category.CreateEntry(ModSetting.DetectEmotes.ToString(), DetectEmotes),
+                ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter)
+            };
+
+            CrouchLimit = ((int)ms_entries[(int)ModSetting.CrouchLimit].BoxedValue) * 0.01f;
+            ProneLimit = ((int)ms_entries[(int)ModSetting.ProneLimit].BoxedValue) * 0.01f;
+            IKOverrideFly = (bool)ms_entries[(int)ModSetting.IKOverrideFly].BoxedValue;
+            IKOverrideJump = (bool)ms_entries[(int)ModSetting.IKOverrideJump].BoxedValue;
+            DetectEmotes = (bool)ms_entries[(int)ModSetting.DetectEmotes].BoxedValue;
+            MassCenter = (bool)ms_entries[(int)ModSetting.MassCenter].BoxedValue;
+
+            MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
+        }
+
+        static System.Collections.IEnumerator WaitMainMenuUi()
+        {
+            while(ViewManager.Instance == null)
+                yield return null;
+            while(ViewManager.Instance.gameMenuView == null)
+                yield return null;
+            while(ViewManager.Instance.gameMenuView.Listener == null)
+                yield return null;
+
+            ViewManager.Instance.gameMenuView.Listener.ReadyForBindings += () =>
+            {
+                ViewManager.Instance.gameMenuView.View.BindCall("OnSliderUpdate_" + ms_category.Identifier, new Action<string, string>(OnSliderUpdate));
+                ViewManager.Instance.gameMenuView.View.BindCall("OnToggleUpdate_" + ms_category.Identifier, new Action<string, string>(OnToggleUpdate));
+            };
+            ViewManager.Instance.gameMenuView.Listener.FinishLoad += (_) =>
+            {
+                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("mods_extension.js"));
+                ViewManager.Instance.gameMenuView.View.ExecuteScript(Scripts.GetEmbeddedScript("mod_menu.js"));
+                foreach(var l_entry in ms_entries)
+                    ViewManager.Instance.gameMenuView.View.TriggerEvent("updateModSetting", ms_category.Identifier, l_entry.DisplayName, l_entry.GetValueAsString());
+            };
+        }
+
+        static void OnSliderUpdate(string p_name, string p_value)
+        {
+            if(Enum.TryParse(p_name, out ModSetting l_setting))
+            {
+                switch(l_setting)
+                {
+                    case ModSetting.CrouchLimit:
+                    {
+                        CrouchLimit = int.Parse(p_value) * 0.01f;
+                        CrouchLimitChange?.Invoke(CrouchLimit);
+                    }
+                    break;
+
+                    case ModSetting.ProneLimit:
+                    {
+                        ProneLimit = int.Parse(p_value) * 0.01f;
+                        ProneLimitChange?.Invoke(ProneLimit);
+                    }
+                    break;
+                }
+
+                ms_entries[(int)l_setting].BoxedValue = int.Parse(p_value);
+            }
+        }
+
+        static void OnToggleUpdate(string p_name, string p_value)
+        {
+            if(Enum.TryParse(p_name, out ModSetting l_setting))
+            {
+                switch(l_setting)
+                {
+                    case ModSetting.IKOverrideFly:
+                    {
+                        IKOverrideFly = bool.Parse(p_value);
+                        IKOverrideFlyChange?.Invoke(IKOverrideFly);
+                    }
+                    break;
+
+                    case ModSetting.IKOverrideJump:
+                    {
+                        IKOverrideJump = bool.Parse(p_value);
+                        IKOverrideJumpChange?.Invoke(IKOverrideJump);
+                    }
+                    break;
+
+                    case ModSetting.DetectEmotes:
+                    {
+                        DetectEmotes = bool.Parse(p_value);
+                        DetectEmotesChange?.Invoke(DetectEmotes);
+                    }
+                    break;
+
+                    case ModSetting.MassCenter:
+                    {
+                        MassCenter = bool.Parse(p_value);
+                        MassCenterChange?.Invoke(MassCenter);
+                    }
+                    break;
+                }
+
+                ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);
+            }
+        }
+    }
+}

ml_amt/ml_amt.csproj

@@ -1,95 +1,87 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Authors>SDraw</Authors>
-    <Company>None</Company>
-    <Product>AvatarMotionTweaker</Product>
-    <PackageId>AvatarMotionTweaker</PackageId>
-    <Version>1.3.3</Version>
-    <Platforms>x64</Platforms>
-    <AssemblyName>ml_amt</AssemblyName>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
-    <DefineConstants>TRACE</DefineConstants>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="Test.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="AvatarMotionTweaker.json" />
-    <None Remove="resources\mod_menu.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="resources\mod_menu.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="cohtml.Net">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Cohtml.Runtime">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="MelonLoader">
-      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="ml_pmc">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\ml_pmc.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="ml_prm">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\ml_prm.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.PhysicsModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
-  </Target>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Authors>SDraw</Authors>
+    <Company>None</Company>
+    <Product>AvatarMotionTweaker</Product>
+    <PackageId>AvatarMotionTweaker</PackageId>
+    <Version>1.3.4</Version>
+    <Platforms>x64</Platforms>
+    <AssemblyName>ml_amt</AssemblyName>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <PlatformTarget>x64</PlatformTarget>
+    <WarningLevel>4</WarningLevel>
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <DefineConstants>TRACE</DefineConstants>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="Test.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="AvatarMotionTweaker.json" />
+    <None Remove="resources\mod_menu.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="resources\mod_menu.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="cohtml.Net">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Cohtml.Runtime">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="MelonLoader">
+      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.AnimationModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.PhysicsModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.PhysicsModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
+  </Target>
+
+</Project>

ml_amt/resources/mod_menu.js

@@ -1,68 +1,61 @@
-// Add own menu
-{
-    let l_block = document.createElement('div');
-    l_block.innerHTML = `
-        <div class ="settings-subcategory">
-            <div class ="subcategory-name">Avatar Motion Tweaker</div>
-            <div class ="subcategory-description"></div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Crouch limit: </div>
-            <div class ="option-input">
-                <div id="CrouchLimit" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="75"></div>
-            </div>
-        </div>
-        
-        <div class ="row-wrapper">
-            <div class ="option-caption">Prone limit: </div>
-            <div class ="option-input">
-                <div id="ProneLimit" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="40"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">IK override while flying: </div>
-            <div class ="option-input">
-                <div id="IKOverrideFly" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-        
-        <div class ="row-wrapper">
-            <div class ="option-caption">IK override while jumping: </div>
-            <div class ="option-input">
-                <div id="IKOverrideJump" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Follow hips on IK override: </div>
-            <div class ="option-input">
-                <div id="FollowHips" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-        
-        <div class ="row-wrapper">
-            <div class ="option-caption">Detect animations emote tag: </div>
-            <div class ="option-input">
-                <div id="DetectEmotes" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Adjusted locomotion mass center: </div>
-            <div class ="option-input">
-                <div id="MassCenter" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
-    `;
-    document.getElementById('settings-ik').appendChild(l_block);
-
-    // Toggles
-    for (let l_toggle of l_block.querySelectorAll('.inp_toggle'))
-        modsExtension.addSetting('AMT', l_toggle.id, modsExtension.createToggle(l_toggle, 'OnToggleUpdate_AMT'));
-
-    // Sliders
-    for (let l_slider of l_block.querySelectorAll('.inp_slider'))
-        modsExtension.addSetting('AMT', l_slider.id, modsExtension.createSlider(l_slider, 'OnSliderUpdate_AMT'));
-}
+// Add own menu
+{
+    let l_block = document.createElement('div');
+    l_block.innerHTML = `
+        <div class ="settings-subcategory">
+            <div class ="subcategory-name">Avatar Motion Tweaker</div>
+            <div class ="subcategory-description"></div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Crouch limit: </div>
+            <div class ="option-input">
+                <div id="CrouchLimit" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="75"></div>
+            </div>
+        </div>
+        
+        <div class ="row-wrapper">
+            <div class ="option-caption">Prone limit: </div>
+            <div class ="option-input">
+                <div id="ProneLimit" class ="inp_slider no-scroll" data-min="0" data-max="100" data-current="40"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">IK override while flying: </div>
+            <div class ="option-input">
+                <div id="IKOverrideFly" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Follow hips on IK override: </div>
+            <div class ="option-input">
+                <div id="FollowHips" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+        
+        <div class ="row-wrapper">
+            <div class ="option-caption">Detect animations emote tag: </div>
+            <div class ="option-input">
+                <div id="DetectEmotes" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+
+        <div class ="row-wrapper">
+            <div class ="option-caption">Adjusted locomotion mass center: </div>
+            <div class ="option-input">
+                <div id="MassCenter" class ="inp_toggle no-scroll" data-current="true"></div>
+            </div>
+        </div>
+    `;
+    document.getElementById('settings-ik').appendChild(l_block);
+
+    // Toggles
+    for (let l_toggle of l_block.querySelectorAll('.inp_toggle'))
+        modsExtension.addSetting('AMT', l_toggle.id, modsExtension.createToggle(l_toggle, 'OnToggleUpdate_AMT'));
+
+    // Sliders
+    for (let l_slider of l_block.querySelectorAll('.inp_slider'))
+        modsExtension.addSetting('AMT', l_slider.id, modsExtension.createSlider(l_slider, 'OnSliderUpdate_AMT'));
+}

ml_lme/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.4.3", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
-[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
-[assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")]
-[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
-[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
-[assembly: MelonLoader.MelonAdditionalCredits("NotAKidOnSteam")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.4.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
+[assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")]
+[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
+[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
+[assembly: MelonLoader.MelonAdditionalCredits("NotAKidOnSteam")]

ml_lme/Utils.cs

@@ -1,50 +1,50 @@
-using ABI_RC.Core.Savior;
-using ABI_RC.Core.UI;
-using ABI_RC.Systems.InputManagement;
-using System.Reflection;
-using UnityEngine;
-
-namespace ml_lme
-{
-    static class Utils
-    {
-        static readonly FieldInfo ms_view = typeof(CohtmlControlledViewWrapper).GetField("_view", BindingFlags.NonPublic | BindingFlags.Instance);
-
-        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
-        public static bool AreKnucklesInUse() => ((CVRInputManager.Instance._leftController == ABI_RC.Systems.InputManagement.XR.EXRControllerType.Index) || (CVRInputManager.Instance._rightController == ABI_RC.Systems.InputManagement.XR.EXRControllerType.Index));
-        public static bool IsLeftHandTracked() => (CVRInputManager.Instance._leftController != ABI_RC.Systems.InputManagement.XR.EXRControllerType.None);
-        public static bool IsRightHandTracked() => (CVRInputManager.Instance._rightController != ABI_RC.Systems.InputManagement.XR.EXRControllerType.None);
-
-        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
-        {
-            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.lossyScale : Vector3.one);
-        }
-
-        public static void ShowHUDNotification(string p_title, string p_message, string p_small = "", bool p_immediate = false)
-        {
-            if(CohtmlHud.Instance != null)
-            {
-                if(p_immediate)
-                    CohtmlHud.Instance.ViewDropTextImmediate(p_title, p_message, p_small);
-                else
-                    CohtmlHud.Instance.ViewDropText(p_title, p_message, p_small);
-            }
-        }
-
-        static public void ExecuteScript(this CohtmlControlledViewWrapper p_instance, string p_script) => ((cohtml.Net.View)ms_view.GetValue(p_instance)).ExecuteScript(p_script);
-
-        public static void Swap<T>(ref T lhs, ref T rhs)
-        {
-            T temp = lhs;
-            lhs = rhs;
-            rhs = temp;
-        }
-
-        public static float InverseLerpUnclamped(float a, float b, float value)
-        {
-            if(a != b)
-                return (value - a) / (b - a);
-            return 0f;
-        }
-    }
-}
+using ABI_RC.Core.Savior;
+using ABI_RC.Core.UI;
+using ABI_RC.Systems.InputManagement;
+using System.Reflection;
+using UnityEngine;
+
+namespace ml_lme
+{
+    static class Utils
+    {
+        static readonly FieldInfo ms_view = typeof(CohtmlControlledViewWrapper).GetField("_view", BindingFlags.NonPublic | BindingFlags.Instance);
+
+        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
+        public static bool AreKnucklesInUse() => ((CVRInputManager.Instance._leftController == ABI_RC.Systems.InputManagement.XR.eXRControllerType.Index) || (CVRInputManager.Instance._rightController == ABI_RC.Systems.InputManagement.XR.eXRControllerType.Index));
+        public static bool IsLeftHandTracked() => (CVRInputManager.Instance._leftController != ABI_RC.Systems.InputManagement.XR.eXRControllerType.None);
+        public static bool IsRightHandTracked() => (CVRInputManager.Instance._rightController != ABI_RC.Systems.InputManagement.XR.eXRControllerType.None);
+
+        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
+        {
+            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.lossyScale : Vector3.one);
+        }
+
+        public static void ShowHUDNotification(string p_title, string p_message, string p_small = "", bool p_immediate = false)
+        {
+            if(CohtmlHud.Instance != null)
+            {
+                if(p_immediate)
+                    CohtmlHud.Instance.ViewDropTextImmediate(p_title, p_message, p_small);
+                else
+                    CohtmlHud.Instance.ViewDropText(p_title, p_message, p_small);
+            }
+        }
+
+        static public void ExecuteScript(this CohtmlControlledViewWrapper p_instance, string p_script) => ((cohtml.Net.View)ms_view.GetValue(p_instance)).ExecuteScript(p_script);
+
+        public static void Swap<T>(ref T lhs, ref T rhs)
+        {
+            T temp = lhs;
+            lhs = rhs;
+            rhs = temp;
+        }
+
+        public static float InverseLerpUnclamped(float a, float b, float value)
+        {
+            if(a != b)
+                return (value - a) / (b - a);
+            return 0f;
+        }
+    }
+}

ml_lme/ml_lme.csproj

@@ -1,103 +1,103 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
-    <Platforms>x64</Platforms>
-    <PackageId>LeapMotionExtension</PackageId>
-    <Version>1.4.3</Version>
-    <Authors>SDraw</Authors>
-    <Company>None</Company>
-    <Product>LeapMotionExtension</Product>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <DebugType>none</DebugType>
-    <DebugSymbols>false</DebugSymbols>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Remove="vendor\LeapSDK\**" />
-    <EmbeddedResource Remove="vendor\LeapSDK\**" />
-    <None Remove="vendor\LeapSDK\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Remove="LeapMotionExtension.json" />
-    <None Remove="resources\leapmotion_controller.asset" />
-    <None Remove="resources\leapmotion_hands.asset" />
-    <None Remove="resources\mod_menu.js" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <EmbeddedResource Include="resources\leapmotion_controller.asset" />
-    <EmbeddedResource Include="resources\leapmotion_hands.asset" />
-    <EmbeddedResource Include="resources\mod_menu.js" />
-    <EmbeddedResource Include="vendor\LeapSDK\lib\x64\LeapC.dll">
-      <Link>resources/LeapC.dll</Link>
-    </EmbeddedResource>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Reference Include="0Harmony">
-      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Assembly-CSharp-firstpass">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="cohtml.Net">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="Cohtml.Runtime">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="MelonLoader">
-      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="ml_pmc">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\ml_pmc.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.AnimationModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.AssetBundleModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.CoreModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-    <Reference Include="UnityEngine.XRModule">
-      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll</HintPath>
-      <Private>false</Private>
-    </Reference>
-  </ItemGroup>
-  
-  <ItemGroup>
-    <Folder Include="vendor\LeapCSharp\" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
-  </ItemGroup>
-
-  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
-  </Target>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.1</TargetFramework>
+    <Platforms>x64</Platforms>
+    <PackageId>LeapMotionExtension</PackageId>
+    <Version>1.4.4</Version>
+    <Authors>SDraw</Authors>
+    <Company>None</Company>
+    <Product>LeapMotionExtension</Product>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <DebugType>none</DebugType>
+    <DebugSymbols>false</DebugSymbols>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Remove="vendor\LeapSDK\**" />
+    <EmbeddedResource Remove="vendor\LeapSDK\**" />
+    <None Remove="vendor\LeapSDK\**" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Remove="LeapMotionExtension.json" />
+    <None Remove="resources\leapmotion_controller.asset" />
+    <None Remove="resources\leapmotion_hands.asset" />
+    <None Remove="resources\mod_menu.js" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <EmbeddedResource Include="resources\leapmotion_controller.asset" />
+    <EmbeddedResource Include="resources\leapmotion_hands.asset" />
+    <EmbeddedResource Include="resources\mod_menu.js" />
+    <EmbeddedResource Include="vendor\LeapSDK\lib\x64\LeapC.dll">
+      <Link>resources/LeapC.dll</Link>
+    </EmbeddedResource>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Reference Include="0Harmony">
+      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\0Harmony.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Assembly-CSharp-firstpass">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Assembly-CSharp-firstpass.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="cohtml.Net">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\cohtml.Net.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="Cohtml.Runtime">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\Cohtml.Runtime.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="MelonLoader">
+      <HintPath>D:\Games\Steam\steamapps\common\ChilloutVR\MelonLoader\net35\MelonLoader.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="ml_pmc">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\Mods\ml_pmc.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.AnimationModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AnimationModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.AssetBundleModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.AssetBundleModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.CoreModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.CoreModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+    <Reference Include="UnityEngine.XRModule">
+      <HintPath>D:\games\Steam\steamapps\common\ChilloutVR\ChilloutVR_Data\Managed\UnityEngine.XRModule.dll</HintPath>
+      <Private>false</Private>
+    </Reference>
+  </ItemGroup>
+  
+  <ItemGroup>
+    <Folder Include="vendor\LeapCSharp\" />
+  </ItemGroup>
+  
+  <ItemGroup>
+    <EmbeddedResource Include="..\js\mods_extension.js" Link="resources\mods_extension.js" />
+  </ItemGroup>
+
+  <Target Name="PostBuild" AfterTargets="PostBuildEvent">
+    <Exec Command="copy /y &quot;$(TargetPath)&quot; &quot;D:\Games\Steam\steamapps\common\ChilloutVR\Mods\&quot;" />
+  </Target>
+
+</Project>

ml_pam/ArmMover.cs

@@ -1,299 +1,299 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.InteractionSystem;
-using ABI_RC.Core.Player;
-using RootMotion.FinalIK;
-using System.Reflection;
-using UnityEngine;
-
-namespace ml_pam
-{
-    [DisallowMultipleComponent]
-    class ArmMover : MonoBehaviour
-    {
-        const float c_offsetLimit = 0.5f;
-
-        static readonly float[] ms_tposeMuscles = typeof(ABI_RC.Systems.IK.SubSystems.BodySystem).GetField("TPoseMuscles", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null) as float[];
-        static readonly Vector4 ms_pointVector = new Vector4(0f, 0f, 0f, 1f);
-        static readonly Quaternion ms_offsetRight = Quaternion.Euler(0f, 0f, 90f);
-        static readonly Quaternion ms_offsetRightDesktop = Quaternion.Euler(0f, 270f, 0f);
-        static readonly Quaternion ms_palmToLeft = Quaternion.Euler(0f, 0f, -90f);
-
-        bool m_inVR = false;
-        VRIK m_vrIK = null;
-        Vector2 m_armWeight = Vector2.zero;
-        Transform m_origRightHand = null;
-        float m_playspaceScale = 1f;
-
-        bool m_enabled = true;
-        ArmIK m_armIK = null;
-        Transform m_target = null;
-        Transform m_rotationTarget = null;
-        CVRPickupObject m_pickup = null;
-        Matrix4x4 m_offset = Matrix4x4.identity;
-        bool m_targetActive = false;
-
-        // Unity events
-        void Start()
-        {
-            m_inVR = Utils.IsInVR();
-
-            m_target = new GameObject("ArmPickupTarget").transform;
-            m_target.parent = PlayerSetup.Instance.GetActiveCamera().transform;
-            m_target.localPosition = Vector3.zero;
-            m_target.localRotation = Quaternion.identity;
-
-            m_rotationTarget = new GameObject("RotationTarget").transform;
-            m_rotationTarget.parent = m_target;
-            m_rotationTarget.localPosition = new Vector3(c_offsetLimit * Settings.GrabOffset, 0f, 0f);
-            m_rotationTarget.localRotation = Quaternion.identity;
-
-            m_enabled = Settings.Enabled;
-
-            Settings.EnabledChange += this.SetEnabled;
-            Settings.GrabOffsetChange += this.SetGrabOffset;
-        }
-
-        void OnDestroy()
-        {
-            Settings.EnabledChange -= this.SetEnabled;
-            Settings.GrabOffsetChange -= this.SetGrabOffset;
-        }
-
-        void Update()
-        {
-            if(m_enabled && !ReferenceEquals(m_pickup, null))
-            {
-                if(m_pickup != null)
-                {
-                    Matrix4x4 l_result = m_pickup.transform.GetMatrix() * m_offset;
-                    m_target.position = l_result * ms_pointVector;
-                }
-                else
-                    this.OnPickupDrop(m_pickup);
-            }
-        }
-
-        // IK updates
-        void OnIKPreUpdate()
-        {
-            m_armWeight.Set(m_vrIK.solver.rightArm.positionWeight, m_vrIK.solver.rightArm.rotationWeight);
-
-            if(m_targetActive && (Mathf.Approximately(m_armWeight.x, 0f) || Mathf.Approximately(m_armWeight.y, 0f)))
-            {
-                m_vrIK.solver.rightArm.positionWeight = 1f;
-                m_vrIK.solver.rightArm.rotationWeight = 1f;
-            }
-        }
-        void OnIKPostUpdate()
-        {
-            m_vrIK.solver.rightArm.positionWeight = m_armWeight.x;
-            m_vrIK.solver.rightArm.rotationWeight = m_armWeight.y;
-        }
-
-        // Settings
-        void SetEnabled(bool p_state)
-        {
-            m_enabled = p_state;
-
-            RefreshArmIK();
-            if(m_enabled)
-                RestorePickup();
-            else
-                RestoreVRIK();
-        }
-
-        void SetGrabOffset(float p_value)
-        {
-            if(m_rotationTarget != null)
-                m_rotationTarget.localPosition = new Vector3(c_offsetLimit * m_playspaceScale * p_value, 0f, 0f);
-        }
-
-        // Game events
-        internal void OnAvatarClear()
-        {
-            m_vrIK = null;
-            m_origRightHand = null;
-            m_armIK = null;
-            m_targetActive = false;
-        }
-
-        internal void OnAvatarSetup()
-        {
-            // Recheck if user could switch to VR
-            if(m_inVR != Utils.IsInVR())
-            {
-                m_target.parent = PlayerSetup.Instance.GetActiveCamera().transform;
-                m_target.localPosition = Vector3.zero;
-                m_target.localRotation = Quaternion.identity;
-            }
-
-            m_inVR = Utils.IsInVR();
-            m_vrIK = PlayerSetup.Instance._animator.GetComponent<VRIK>();
-
-            if(PlayerSetup.Instance._animator.isHuman)
-            {
-                Vector3 l_hipsPos = Vector3.zero;
-                Transform l_hips = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Hips);
-                if(l_hips != null)
-                    l_hipsPos = l_hips.localPosition;
-                
-                HumanPose l_currentPose = new HumanPose();
-                HumanPoseHandler l_poseHandler = null;
-
-                if(!m_inVR)
-                {
-                    l_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._avatar.transform);
-                    l_poseHandler.GetHumanPose(ref l_currentPose);
-
-                    HumanPose l_tPose = new HumanPose
-                    {
-                        bodyPosition = l_currentPose.bodyPosition,
-                        bodyRotation = l_currentPose.bodyRotation,
-                        muscles = new float[l_currentPose.muscles.Length]
-                    };
-                    for(int i = 0; i < l_tPose.muscles.Length; i++)
-                        l_tPose.muscles[i] = ms_tposeMuscles[i];
-
-                    l_poseHandler.SetHumanPose(ref l_tPose);
-                }
-
-                Transform l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand);
-                if(l_hand != null)
-                    m_rotationTarget.localRotation = (ms_palmToLeft * (m_inVR ? ms_offsetRight : ms_offsetRightDesktop)) * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
-
-                if(m_vrIK == null)
-                {
-                    Transform l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.UpperChest);
-                    if(l_chest == null)
-                        l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Chest);
-                    if(l_chest == null)
-                        l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Spine);
-
-                    m_armIK = PlayerSetup.Instance._avatar.AddComponent<ArmIK>();
-                    m_armIK.solver.isLeft = false;
-                    m_armIK.solver.SetChain(
-                        l_chest,
-                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightShoulder),
-                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightUpperArm),
-                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightLowerArm),
-                        l_hand,
-                        PlayerSetup.Instance._animator.transform
-                    );
-                    m_armIK.solver.arm.target = m_rotationTarget;
-                    m_armIK.solver.arm.positionWeight = 1f;
-                    m_armIK.solver.arm.rotationWeight = 1f;
-                    m_armIK.solver.IKPositionWeight = 0f;
-                    m_armIK.solver.IKRotationWeight = 0f;
-                    m_armIK.enabled = m_enabled;
-                }
-                else
-                {
-                    m_origRightHand = m_vrIK.solver.rightArm.target;
-                    m_vrIK.solver.OnPreUpdate += this.OnIKPreUpdate;
-                    m_vrIK.solver.OnPostUpdate += this.OnIKPostUpdate;
-                }
-
-                l_poseHandler?.SetHumanPose(ref l_currentPose);
-                l_poseHandler?.Dispose();
-
-                if(l_hips != null)
-                    l_hips.localPosition = l_hipsPos;
-            }
-
-            if(m_enabled)
-                RestorePickup();
-        }
-
-        internal void OnPickupGrab(CVRPickupObject p_pickup, ControllerRay p_ray, Vector3 p_hit)
-        {
-            if(p_ray == ViewManager.Instance.desktopControllerRay)
-            {
-                m_pickup = p_pickup;
-
-                // Set offsets
-                if(m_pickup.gripType == CVRPickupObject.GripType.Origin)
-                {
-                    if(m_pickup.ikReference != null)
-                        m_offset = (m_pickup.transform.GetMatrix().inverse * m_pickup.ikReference.GetMatrix());
-                    else
-                    {
-                        if(m_pickup.gripOrigin != null)
-                            m_offset = m_pickup.transform.GetMatrix().inverse * m_pickup.gripOrigin.GetMatrix();
-                    }
-                }
-                else
-                    m_offset = m_pickup.transform.GetMatrix().inverse * Matrix4x4.Translate(p_hit);
-
-                if(m_enabled)
-                {
-                    if((m_vrIK != null) && !m_targetActive)
-                    {
-                        m_vrIK.solver.rightArm.target = m_rotationTarget;
-                        m_targetActive = true;
-                    }
-
-                    if(m_armIK != null)
-                    {
-                        m_armIK.solver.IKPositionWeight = 1f;
-                        m_armIK.solver.IKRotationWeight = 1f;
-                    }
-                }
-            }
-        }
-
-        internal void OnPickupDrop(CVRPickupObject p_pickup)
-        {
-            if(m_pickup == p_pickup)
-            {
-                m_pickup = null;
-
-                if(m_enabled)
-                {
-                    RestoreVRIK();
-
-                    if(m_armIK != null)
-                    {
-                        m_armIK.solver.IKPositionWeight = 0f;
-                        m_armIK.solver.IKRotationWeight = 0f;
-                    }
-                }
-            }
-        }
-
-        internal void OnPlayspaceScale(float p_relation)
-        {
-            m_playspaceScale = p_relation;
-            SetGrabOffset(Settings.GrabOffset);
-        }
-
-        // Arbitrary
-        void RestorePickup()
-        {
-            if((m_vrIK != null) && (m_pickup != null))
-            {
-                m_vrIK.solver.rightArm.target = m_rotationTarget;
-                m_targetActive = true;
-            }
-            if((m_armIK != null) && (m_pickup != null))
-            {
-                m_armIK.solver.IKPositionWeight = 1f;
-                m_armIK.solver.IKRotationWeight = 1f;
-            }
-        }
-
-        void RestoreVRIK()
-        {
-            if((m_vrIK != null) && m_targetActive)
-            {
-                m_vrIK.solver.rightArm.target = m_origRightHand;
-                m_targetActive = false;
-            }
-        }
-
-        void RefreshArmIK()
-        {
-            if(m_armIK != null)
-                m_armIK.enabled = m_enabled;
-        }
-    }
-}
+using ABI.CCK.Components;
+using ABI_RC.Core.InteractionSystem;
+using ABI_RC.Core.Player;
+using RootMotion.FinalIK;
+using System.Reflection;
+using UnityEngine;
+
+namespace ml_pam
+{
+    [DisallowMultipleComponent]
+    class ArmMover : MonoBehaviour
+    {
+        const float c_offsetLimit = 0.5f;
+
+        static readonly float[] ms_tposeMuscles = typeof(ABI_RC.Systems.IK.SubSystems.BodySystem).GetField("TPoseMuscles", BindingFlags.Static | BindingFlags.NonPublic).GetValue(null) as float[];
+        static readonly Vector4 ms_pointVector = new Vector4(0f, 0f, 0f, 1f);
+        static readonly Quaternion ms_offsetRight = Quaternion.Euler(0f, 0f, 90f);
+        static readonly Quaternion ms_offsetRightDesktop = Quaternion.Euler(0f, 270f, 0f);
+        static readonly Quaternion ms_palmToLeft = Quaternion.Euler(0f, 0f, -90f);
+
+        bool m_inVR = false;
+        VRIK m_vrIK = null;
+        Vector2 m_armWeight = Vector2.zero;
+        Transform m_origRightHand = null;
+        float m_playspaceScale = 1f;
+
+        bool m_enabled = true;
+        ArmIK m_armIK = null;
+        Transform m_target = null;
+        Transform m_rotationTarget = null;
+        CVRPickupObject m_pickup = null;
+        Matrix4x4 m_offset = Matrix4x4.identity;
+        bool m_targetActive = false;
+
+        // Unity events
+        void Start()
+        {
+            m_inVR = Utils.IsInVR();
+
+            m_target = new GameObject("ArmPickupTarget").transform;
+            m_target.parent = PlayerSetup.Instance.GetActiveCamera().transform;
+            m_target.localPosition = Vector3.zero;
+            m_target.localRotation = Quaternion.identity;
+
+            m_rotationTarget = new GameObject("RotationTarget").transform;
+            m_rotationTarget.parent = m_target;
+            m_rotationTarget.localPosition = new Vector3(c_offsetLimit * Settings.GrabOffset, 0f, 0f);
+            m_rotationTarget.localRotation = Quaternion.identity;
+
+            m_enabled = Settings.Enabled;
+
+            Settings.EnabledChange += this.SetEnabled;
+            Settings.GrabOffsetChange += this.SetGrabOffset;
+        }
+
+        void OnDestroy()
+        {
+            Settings.EnabledChange -= this.SetEnabled;
+            Settings.GrabOffsetChange -= this.SetGrabOffset;
+        }
+
+        void Update()
+        {
+            if(m_enabled && !ReferenceEquals(m_pickup, null))
+            {
+                if(m_pickup != null)
+                {
+                    Matrix4x4 l_result = m_pickup.transform.GetMatrix() * m_offset;
+                    m_target.position = l_result * ms_pointVector;
+                }
+                else
+                    this.OnPickupDrop(m_pickup);
+            }
+        }
+
+        // IK updates
+        void OnIKPreUpdate()
+        {
+            m_armWeight.Set(m_vrIK.solver.rightArm.positionWeight, m_vrIK.solver.rightArm.rotationWeight);
+
+            if(m_targetActive && (Mathf.Approximately(m_armWeight.x, 0f) || Mathf.Approximately(m_armWeight.y, 0f)))
+            {
+                m_vrIK.solver.rightArm.positionWeight = 1f;
+                m_vrIK.solver.rightArm.rotationWeight = 1f;
+            }
+        }
+        void OnIKPostUpdate()
+        {
+            m_vrIK.solver.rightArm.positionWeight = m_armWeight.x;
+            m_vrIK.solver.rightArm.rotationWeight = m_armWeight.y;
+        }
+
+        // Settings
+        void SetEnabled(bool p_state)
+        {
+            m_enabled = p_state;
+
+            RefreshArmIK();
+            if(m_enabled)
+                RestorePickup();
+            else
+                RestoreVRIK();
+        }
+
+        void SetGrabOffset(float p_value)
+        {
+            if(m_rotationTarget != null)
+                m_rotationTarget.localPosition = new Vector3(c_offsetLimit * m_playspaceScale * p_value, 0f, 0f);
+        }
+
+        // Game events
+        internal void OnAvatarClear()
+        {
+            m_vrIK = null;
+            m_origRightHand = null;
+            m_armIK = null;
+            m_targetActive = false;
+        }
+
+        internal void OnAvatarSetup()
+        {
+            // Recheck if user could switch to VR
+            if(m_inVR != Utils.IsInVR())
+            {
+                m_target.parent = PlayerSetup.Instance.GetActiveCamera().transform;
+                m_target.localPosition = Vector3.zero;
+                m_target.localRotation = Quaternion.identity;
+            }
+
+            m_inVR = Utils.IsInVR();
+            m_vrIK = PlayerSetup.Instance._animator.GetComponent<VRIK>();
+
+            if(PlayerSetup.Instance._animator.isHuman)
+            {
+                Vector3 l_hipsPos = Vector3.zero;
+                Transform l_hips = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Hips);
+                if(l_hips != null)
+                    l_hipsPos = l_hips.localPosition;
+                
+                HumanPose l_currentPose = new HumanPose();
+                HumanPoseHandler l_poseHandler = null;
+
+                if(!m_inVR)
+                {
+                    l_poseHandler = new HumanPoseHandler(PlayerSetup.Instance._animator.avatar, PlayerSetup.Instance._avatar.transform);
+                    l_poseHandler.GetHumanPose(ref l_currentPose);
+
+                    HumanPose l_tPose = new HumanPose
+                    {
+                        bodyPosition = l_currentPose.bodyPosition,
+                        bodyRotation = l_currentPose.bodyRotation,
+                        muscles = new float[l_currentPose.muscles.Length]
+                    };
+                    for(int i = 0; i < l_tPose.muscles.Length; i++)
+                        l_tPose.muscles[i] = ms_tposeMuscles[i];
+
+                    l_poseHandler.SetHumanPose(ref l_tPose);
+                }
+
+                Transform l_hand = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightHand);
+                if(l_hand != null)
+                    m_rotationTarget.localRotation = (ms_palmToLeft * (m_inVR ? ms_offsetRight : ms_offsetRightDesktop)) * (PlayerSetup.Instance._avatar.transform.GetMatrix().inverse * l_hand.GetMatrix()).rotation;
+
+                if(m_vrIK == null)
+                {
+                    Transform l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.UpperChest);
+                    if(l_chest == null)
+                        l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Chest);
+                    if(l_chest == null)
+                        l_chest = PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.Spine);
+
+                    m_armIK = PlayerSetup.Instance._avatar.AddComponent<ArmIK>();
+                    m_armIK.solver.isLeft = false;
+                    m_armIK.solver.SetChain(
+                        l_chest,
+                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightShoulder),
+                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightUpperArm),
+                        PlayerSetup.Instance._animator.GetBoneTransform(HumanBodyBones.RightLowerArm),
+                        l_hand,
+                        PlayerSetup.Instance._animator.transform
+                    );
+                    m_armIK.solver.arm.target = m_rotationTarget;
+                    m_armIK.solver.arm.positionWeight = 1f;
+                    m_armIK.solver.arm.rotationWeight = 1f;
+                    m_armIK.solver.IKPositionWeight = 0f;
+                    m_armIK.solver.IKRotationWeight = 0f;
+                    m_armIK.enabled = m_enabled;
+                }
+                else
+                {
+                    m_origRightHand = m_vrIK.solver.rightArm.target;
+                    m_vrIK.solver.OnPreUpdate += this.OnIKPreUpdate;
+                    m_vrIK.solver.OnPostUpdate += this.OnIKPostUpdate;
+                }
+
+                l_poseHandler?.SetHumanPose(ref l_currentPose);
+                l_poseHandler?.Dispose();
+
+                if(l_hips != null)
+                    l_hips.localPosition = l_hipsPos;
+            }
+
+            if(m_enabled)
+                RestorePickup();
+        }
+
+        internal void OnPickupGrab(CVRPickupObject p_pickup, ControllerRay p_ray, Vector3 p_hit)
+        {
+            if(p_ray == ViewManager.Instance.desktopControllerRay)
+            {
+                m_pickup = p_pickup;
+
+                // Set offsets
+                if(m_pickup.gripType == CVRPickupObject.GripType.Origin)
+                {
+                    if(m_pickup.ikReference != null)
+                        m_offset = (m_pickup.transform.GetMatrix().inverse * m_pickup.ikReference.GetMatrix());
+                    else
+                    {
+                        if(m_pickup.gripOrigin != null)
+                            m_offset = m_pickup.transform.GetMatrix().inverse * m_pickup.gripOrigin.GetMatrix();
+                    }
+                }
+                else
+                    m_offset = m_pickup.transform.GetMatrix().inverse * Matrix4x4.Translate(p_hit);
+
+                if(m_enabled)
+                {
+                    if((m_vrIK != null) && !m_targetActive)
+                    {
+                        m_vrIK.solver.rightArm.target = m_rotationTarget;
+                        m_targetActive = true;
+                    }
+
+                    if(m_armIK != null)
+                    {
+                        m_armIK.solver.IKPositionWeight = 1f;
+                        m_armIK.solver.IKRotationWeight = 1f;
+                    }
+                }
+            }
+        }
+
+        internal void OnPickupDrop(CVRPickupObject p_pickup)
+        {
+            if(m_pickup == p_pickup)
+            {
+                m_pickup = null;
+
+                if(m_enabled)
+                {
+                    RestoreVRIK();
+
+                    if(m_armIK != null)
+                    {
+                        m_armIK.solver.IKPositionWeight = 0f;
+                        m_armIK.solver.IKRotationWeight = 0f;
+                    }
+                }
+            }
+        }
+
+        internal void OnPlayspaceScale(float p_relation)
+        {
+            m_playspaceScale = p_relation;
+            SetGrabOffset(Settings.GrabOffset);
+        }
+
+        // Arbitrary
+        void RestorePickup()
+        {
+            if((m_vrIK != null) && (m_pickup != null))
+            {
+                m_vrIK.solver.rightArm.target = m_rotationTarget;
+                m_targetActive = true;
+            }
+            if((m_armIK != null) && (m_pickup != null))
+            {
+                m_armIK.solver.IKPositionWeight = 1f;
+                m_armIK.solver.IKRotationWeight = 1f;
+            }
+        }
+
+        void RestoreVRIK()
+        {
+            if((m_vrIK != null) && m_targetActive)
+            {
+                m_vrIK.solver.rightArm.target = m_origRightHand;
+                m_targetActive = false;
+            }
+        }
+
+        void RefreshArmIK()
+        {
+            if(m_armIK != null)
+                m_armIK.enabled = m_enabled;
+        }
+    }
+}

ml_pmc/Utils.cs

@@ -1,79 +1,79 @@
-using ABI.CCK.Components;
-using ABI_RC.Core.Player;
-using ABI_RC.Core.Savior;
-using ABI_RC.Systems.InputManagement;
-using System.Linq;
-using System.Reflection;
-using UnityEngine;
-
-namespace ml_pmc
-{
-    static class Utils
-    {
-        static readonly (int, int)[] ms_sideMuscles = new (int, int)[]
-        {
-            (29,21), (30,22), (31,23), (32,24), (33,25), (34,26), (35,27), (36,28),
-            (46,37), (47,38), (48,39), (49,40), (50,41), (51,42), (52,43), (53,44), (54,45),
-            (75,55), (76,56), (77,57), (78,58), (79,59), (80,60), (81,61), (82,62), (83,63), (84,64),
-            (85,65), (86,66), (87,67), (88,68), (89, 69), (90,70), (91,71), (92,72), (93,73), (94,74)
-        };
-        static readonly int[] ms_centralMuscles = new int[] { 1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 18, 20 };
-
-        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
-        public static bool AreKnucklesInUse() => ((CVRInputManager.Instance._leftController == ABI_RC.Systems.InputManagement.XR.EXRControllerType.Index) || (CVRInputManager.Instance._rightController == ABI_RC.Systems.InputManagement.XR.EXRControllerType.Index));
-
-        public static bool IsWorldSafe() => ((CVRWorld.Instance != null) && CVRWorld.Instance.allowFlying);
-        public static bool IsCombatSafe() => ((CombatSystem.Instance == null) || !CombatSystem.Instance.isDown);
-
-        public static float GetWorldMovementLimit()
-        {
-            float l_result = 1f;
-            if(CVRWorld.Instance != null)
-            {
-                l_result = CVRWorld.Instance.baseMovementSpeed;
-                l_result *= CVRWorld.Instance.sprintMultiplier;
-                l_result *= CVRWorld.Instance.inAirMovementMultiplier;
-                l_result *= CVRWorld.Instance.flyMultiplier;
-            }
-            return l_result;
-        }
-
-        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
-        {
-            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.lossyScale : Vector3.one);
-        }
-
-        public static void CopyTo(this HumanPose p_source, ref HumanPose p_target)
-        {
-            p_target.bodyPosition = p_source.bodyPosition;
-            p_target.bodyRotation = p_source.bodyRotation;
-
-            int l_count = Mathf.Min(p_source.muscles.Length, p_target.muscles.Length);
-            for(int i = 0; i < l_count; i++)
-                p_target.muscles[i] = p_source.muscles[i];
-        }
-
-        public static void MirrorPose(ref HumanPose p_pose)
-        {
-            int l_count = p_pose.muscles.Length;
-            foreach(var l_pair in ms_sideMuscles)
-            {
-                if((l_count > l_pair.Item1) && (l_count > l_pair.Item2))
-                {
-                    float l_temp = p_pose.muscles[l_pair.Item1];
-                    p_pose.muscles[l_pair.Item1] = p_pose.muscles[l_pair.Item2];
-                    p_pose.muscles[l_pair.Item2] = l_temp;
-                }
-            }
-            foreach(int l_index in ms_centralMuscles)
-            {
-                if(l_count > l_index)
-                    p_pose.muscles[l_index] *= -1f;
-            }
-
-            p_pose.bodyRotation.x *= -1f;
-            p_pose.bodyRotation.w *= -1f;
-            p_pose.bodyPosition.x *= -1f;
-        }
-    }
-}
+using ABI.CCK.Components;
+using ABI_RC.Core.Player;
+using ABI_RC.Core.Savior;
+using ABI_RC.Systems.InputManagement;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+
+namespace ml_pmc
+{
+    static class Utils
+    {
+        static readonly (int, int)[] ms_sideMuscles = new (int, int)[]
+        {
+            (29,21), (30,22), (31,23), (32,24), (33,25), (34,26), (35,27), (36,28),
+            (46,37), (47,38), (48,39), (49,40), (50,41), (51,42), (52,43), (53,44), (54,45),
+            (75,55), (76,56), (77,57), (78,58), (79,59), (80,60), (81,61), (82,62), (83,63), (84,64),
+            (85,65), (86,66), (87,67), (88,68), (89, 69), (90,70), (91,71), (92,72), (93,73), (94,74)
+        };
+        static readonly int[] ms_centralMuscles = new int[] { 1, 2, 4, 5, 7, 8, 10, 11, 13, 14, 16, 18, 20 };
+
+        public static bool IsInVR() => ((CheckVR.Instance != null) && CheckVR.Instance.hasVrDeviceLoaded);
+        public static bool AreKnucklesInUse() => ((CVRInputManager.Instance._leftController == ABI_RC.Systems.InputManagement.XR.eXRControllerType.Index) || (CVRInputManager.Instance._rightController == ABI_RC.Systems.InputManagement.XR.eXRControllerType.Index));
+
+        public static bool IsWorldSafe() => ((CVRWorld.Instance != null) && CVRWorld.Instance.allowFlying);
+        public static bool IsCombatSafe() => ((CombatSystem.Instance == null) || !CombatSystem.Instance.isDown);
+
+        public static float GetWorldMovementLimit()
+        {
+            float l_result = 1f;
+            if(CVRWorld.Instance != null)
+            {
+                l_result = CVRWorld.Instance.baseMovementSpeed;
+                l_result *= CVRWorld.Instance.sprintMultiplier;
+                l_result *= CVRWorld.Instance.inAirMovementMultiplier;
+                l_result *= CVRWorld.Instance.flyMultiplier;
+            }
+            return l_result;
+        }
+
+        public static Matrix4x4 GetMatrix(this Transform p_transform, bool p_pos = true, bool p_rot = true, bool p_scl = false)
+        {
+            return Matrix4x4.TRS(p_pos ? p_transform.position : Vector3.zero, p_rot ? p_transform.rotation : Quaternion.identity, p_scl ? p_transform.lossyScale : Vector3.one);
+        }
+
+        public static void CopyTo(this HumanPose p_source, ref HumanPose p_target)
+        {
+            p_target.bodyPosition = p_source.bodyPosition;
+            p_target.bodyRotation = p_source.bodyRotation;
+
+            int l_count = Mathf.Min(p_source.muscles.Length, p_target.muscles.Length);
+            for(int i = 0; i < l_count; i++)
+                p_target.muscles[i] = p_source.muscles[i];
+        }
+
+        public static void MirrorPose(ref HumanPose p_pose)
+        {
+            int l_count = p_pose.muscles.Length;
+            foreach(var l_pair in ms_sideMuscles)
+            {
+                if((l_count > l_pair.Item1) && (l_count > l_pair.Item2))
+                {
+                    float l_temp = p_pose.muscles[l_pair.Item1];
+                    p_pose.muscles[l_pair.Item1] = p_pose.muscles[l_pair.Item2];
+                    p_pose.muscles[l_pair.Item2] = l_temp;
+                }
+            }
+            foreach(int l_index in ms_centralMuscles)
+            {
+                if(l_count > l_index)
+                    p_pose.muscles[l_index] *= -1f;
+            }
+
+            p_pose.bodyRotation.x *= -1f;
+            p_pose.bodyRotation.w *= -1f;
+            p_pose.bodyPosition.x *= -1f;
+        }
+    }
+}

ml_vei/Main.cs

@@ -1,56 +1,56 @@
-using ABI_RC.Systems.InputManagement;
-using ABI_RC.Systems.InputManagement.XR;
-using System;
-using System.Reflection;
-
-namespace ml_vei
-{
-    public class ViveExtendedInput : MelonLoader.MelonMod
-    {
-        public override void OnInitializeMelon()
-        {
-            Settings.Init();
-
-            HarmonyInstance.Patch(
-                typeof(CVRXRModule).GetMethod("Update_Gestures_Vive", BindingFlags.NonPublic | BindingFlags.Instance),
-                null,
-                new HarmonyLib.HarmonyMethod(typeof(ViveExtendedInput).GetMethod(nameof(OnViveGesturesUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
-            );
-        }
-
-        static void OnViveGesturesUpdate_Postfix(ref CVRXRModule __instance)
-        {
-            try
-            {
-                if(Settings.Gestures)
-                {
-                    float l_mag = ((!__instance.HasEmoteOverride) ? __instance.Primary2DAxis : __instance.EmoteOverride).magnitude;
-                    if(__instance.ViveDirectionPressed && (l_mag >= CVRInputManager.VrViveGestureDeadZone))
-                    {
-                        if(Settings.GripTrigger)
-                        {
-                            switch(Settings.AxisPriority)
-                            {
-                                case Settings.PriorityAxis.Grip:
-                                    __instance.GestureRaw = ((__instance.Grip > 0.5f) ? -1f : __instance.Trigger);
-                                    break;
-
-                                case Settings.PriorityAxis.Trigger:
-                                    __instance.GestureRaw = (!UnityEngine.Mathf.Approximately(__instance.Trigger, 0f) ? __instance.Trigger : ((__instance.Grip > 0.5f) ? -1f : 0f));
-                                    break;
-                            }
-                        }
-                        else
-                            __instance.GestureRaw = 0f;
-
-                        __instance.Gesture = __instance.GestureRaw;
-                    }
-                }
-            }
-            catch(Exception e)
-            {
-                MelonLoader.MelonLogger.Error(e);
-            }
-        }
-    }
-}
+using ABI_RC.Systems.InputManagement;
+using ABI_RC.Systems.InputManagement.XR;
+using System;
+using System.Reflection;
+
+namespace ml_vei
+{
+    public class ViveExtendedInput : MelonLoader.MelonMod
+    {
+        public override void OnInitializeMelon()
+        {
+            Settings.Init();
+
+            HarmonyInstance.Patch(
+                typeof(CVRXRModule).GetMethod("Update_Gestures_Vive", BindingFlags.NonPublic | BindingFlags.Instance),
+                null,
+                new HarmonyLib.HarmonyMethod(typeof(ViveExtendedInput).GetMethod(nameof(OnViveGesturesUpdate_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+            );
+        }
+
+        static void OnViveGesturesUpdate_Postfix(ref CVRXRModule __instance)
+        {
+            try
+            {
+                if(Settings.Gestures)
+                {
+                    float l_mag = ((!__instance.HasEmoteOverride) ? __instance.Primary2DAxis : __instance.EmoteOverride).magnitude;
+                    if(__instance.ViveDirectionPressed && (l_mag >= CVRInputManager.VrViveGestureDeadZone))
+                    {
+                        if(Settings.GripTrigger)
+                        {
+                            switch(Settings.AxisPriority)
+                            {
+                                case Settings.PriorityAxis.Grip:
+                                    __instance.GestureRaw = ((__instance.Grip > 0.5f) ? -1f : __instance.Trigger);
+                                    break;
+
+                                case Settings.PriorityAxis.Trigger:
+                                    __instance.GestureRaw = (!UnityEngine.Mathf.Approximately(__instance.Trigger, 0f) ? __instance.Trigger : ((__instance.Grip > 0.5f) ? -1f : 0f));
+                                    break;
+                            }
+                        }
+                        else
+                            __instance.GestureRaw = 0f;
+
+                        __instance.Gesture = __instance.GestureRaw;
+                    }
+                }
+            }
+            catch(Exception e)
+            {
+                MelonLoader.MelonLogger.Error(e);
+            }
+        }
+    }
+}