Fully working animation override fix

SDraw · Feb 26, 2023 · fc60219 · fc60219
1 parent 3940802
commit fc60219
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 15 deletions.
diff --git a/ml_amt/Main.cs b/ml_amt/Main.cs
@@ -75,16 +75,16 @@ public override void OnInitializeMelon()
                 null
             );
 
-            // AAS overriding "fix"
+            // AAS overriding fix
             HarmonyInstance.Patch(
-                typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.SetOverrideAnimation), BindingFlags.Instance),
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnAnimationOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
+                typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.SetOverrideAnimation)),
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             HarmonyInstance.Patch(
                 typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.RestoreOverrideAnimation)),
-                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnAnimationOverrideRestore_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                null
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
             MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());
@@ -256,14 +256,41 @@ Vector3 ____colliderCenter
             return false;
         }
 
-        static bool OnAnimationOverride_Prefix()
+        static void OnOverride_Prefix(ref CVRAnimatorManager __instance)
         {
-            return !Settings.OverrideFix;
+            try
+            {
+                if(Settings.OverrideFix)
+                {
+                    if(__instance.animator != null)
+                    {
+                        __instance.animator.enabled = false;
+                        __instance.animator.WriteDefaultValues();
+                    }
+                }
+            }
+            catch(System.Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
         }
-
-        static bool OnAnimationOverrideRestore_Prefix()
+        static void OnOverride_Postfix(ref CVRAnimatorManager __instance)
         {
-            return !Settings.OverrideFix;
+            try
+            {
+                if(Settings.OverrideFix)
+                {
+                    if(__instance.animator != null)
+                    {
+                        __instance.animator.enabled = true;
+                        __instance.animator.Update(0f);
+                    }
+                }
+            }
+            catch(System.Exception l_exception)
+            {
+                MelonLoader.MelonLogger.Error(l_exception);
+            }
         }
     }
 }
diff --git a/ml_amt/Settings.cs b/ml_amt/Settings.cs
@@ -36,7 +36,7 @@ enum ModSetting
         static bool ms_followHips = true;
         static bool ms_collisionScale = true;
         static bool ms_massCenter = true;
-        static bool ms_overrideFix = false;
+        static bool ms_overrideFix = true;
 
         static MelonLoader.MelonPreferences_Category ms_category = null;
         static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
@@ -73,7 +73,7 @@ internal static void Init()
                 ms_category.CreateEntry(ModSetting.FollowHips.ToString(), true),
                 ms_category.CreateEntry(ModSetting.CollisionScale.ToString(), true),
                 ms_category.CreateEntry(ModSetting.MassCenter.ToString(), true),
-                ms_category.CreateEntry(ModSetting.OverrideFix.ToString(), false)
+                ms_category.CreateEntry(ModSetting.OverrideFix.ToString(), true)
             };
 
             Load();

diff --git a/ml_amt/resources/menu.js b/ml_amt/resources/menu.js
@@ -265,9 +265,9 @@ function inp_toggle_mod_amt(_obj, _callbackName) {
         </div>
 
         <div class ="row-wrapper">
-            <div class ="option-caption">Prevent Unity animation override (chairs, etc.): </div>
+            <div class ="option-caption">Fix animation overrides (chairs, etc.): </div>
             <div class ="option-input">
-                <div id="OverrideFix" class ="inp_toggle no-scroll" data-current="false"></div>
+                <div id="OverrideFix" class ="inp_toggle no-scroll" data-current="true"></div>
             </div>
         </div>
     `;