Removed animation override fix from AMT into GMF

README.md

@@ -3,7 +3,7 @@ Merged set of MelonLoader mods for ChilloutVR.
 **Table for game build 2022r171p2:**
 | 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.1 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| ✔ Yes |
+| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.2 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| ✔ Yes<br>:hourglass_flowing_sand: Update review |
 | [Desktop Head Tracking](/ml_dht/README.md)| ml_dht | - | ✔ Yes<br>:warning:Broken |
 | [Desktop Reticle Switch](/ml_drs/README.md)| ml_drs | 1.0.1 [:arrow_down:](../../releases/latest/download/ml_drs.dll)| ✔ Yes |
 | [Extended Game Notifications](/ml_egn/README.md) | ml_egn | 1.0.3 [:arrow_down:](../../releases/latest/download/ml_egn.dll)| ✔ Yes |

ml_amt/Main.cs

@@ -41,9 +41,8 @@ namespace ml_amt
                 new HarmonyLib.HarmonyMethod(typeof(AvatarMotionTweaker).GetMethod(nameof(OnPlayspaceScale_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
-            // Fixes
+            // Overhauls
-            Fixes.AnimatorOverrideControllerFix.Init(HarmonyInstance);
+            Overhauls.JumpHeight.Init(HarmonyInstance);
-            Fixes.MovementJumpFix.Init(HarmonyInstance);
 
             ModSupporter.Init();
             MelonLoader.MelonCoroutines.Start(WaitForLocalPlayer());

ml_amt/Overhauls/JumpHeight.cs

@@ -7,9 +7,9 @@ using System.Collections;
 using System.Reflection;
 using UnityEngine;
 
-namespace ml_amt.Fixes
+namespace ml_amt.Overhauls
 {
-    static class MovementJumpFix
+    static class JumpHeight
     {
         static FieldInfo ms_avatarHeight = typeof(PlayerSetup).GetField("_avatarHeight", BindingFlags.NonPublic | BindingFlags.Instance);
 
@@ -20,17 +20,17 @@ namespace ml_amt.Fixes
             p_instance.Patch(
                 typeof(PlayerSetup).GetMethod(nameof(PlayerSetup.SetupAvatar)),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(MovementJumpFix).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(JumpHeight).GetMethod(nameof(OnSetupAvatar_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             p_instance.Patch(
                 typeof(CVRWorld).GetMethod("SetupWorldRules", BindingFlags.NonPublic | BindingFlags.Instance),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(MovementJumpFix).GetMethod(nameof(OnWorldRulesSetup_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(JumpHeight).GetMethod(nameof(OnWorldRulesSetup_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             p_instance.Patch(
                 typeof(PlayerSetup).GetMethod("SetupIKScaling", BindingFlags.NonPublic | BindingFlags.Instance),
                 null,
-                new HarmonyLib.HarmonyMethod(typeof(MovementJumpFix).GetMethod(nameof(OnSetupIKScaling_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(JumpHeight).GetMethod(nameof(OnSetupIKScaling_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
 
             Settings.ScaledJumpChange += OnScaledJumpChange;

ml_amt/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.2", "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)]

ml_amt/README.md

@@ -24,8 +24,6 @@ Available mod's settings in `Settings - IK - Avatar Motion Tweaker`:
 #### Fixes/overhauls options
 * **Scaled locomotion jump:** scales locomotion jump according to relation between your player settings height and current avatar height (includes avatar scale); default value - `false`.
   * Note: Disabled in worlds that don't allow flight.
-* **Fix animation overrides (chairs, etc.):** fixes animations overriding for avatars with AAS; default value - `true`.
-  * Note: This option is made to address [broken animator in chairs and combat worlds issue](https://feedback.abinteractive.net/p/gestures-getting-stuck-locally-upon-entering-vehicles-chairs).
 
 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].

ml_amt/Settings.cs

@@ -16,8 +16,7 @@ namespace ml_amt
             DetectEmotes,
             FollowHips,
             ScaledJump,
-            MassCenter,
+            MassCenter
-            OverrideFix
         };
 
         public static float CrouchLimit { get; private set; } = 0.75f;
@@ -28,7 +27,6 @@ namespace ml_amt
         public static bool FollowHips { get; private set; } = true;
         public static bool MassCenter { get; private set; } = true;
         public static bool ScaledJump { get; private set; } = false;
-        public static bool OverrideFix { get; private set; } = true;
 
         static MelonLoader.MelonPreferences_Category ms_category = null;
         static List<MelonLoader.MelonPreferences_Entry> ms_entries = null;
@@ -56,8 +54,7 @@ namespace ml_amt
                 ms_category.CreateEntry(ModSetting.DetectEmotes.ToString(), DetectEmotes),
                 ms_category.CreateEntry(ModSetting.FollowHips.ToString(), FollowHips),
                 ms_category.CreateEntry(ModSetting.ScaledJump.ToString(), ScaledJump),
-                ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter),
+                ms_category.CreateEntry(ModSetting.MassCenter.ToString(), MassCenter)
-                ms_category.CreateEntry(ModSetting.OverrideFix.ToString(), OverrideFix)
             };
 
             CrouchLimit = ((int)ms_entries[(int)ModSetting.CrouchLimit].BoxedValue) * 0.01f;
@@ -68,7 +65,6 @@ namespace ml_amt
             FollowHips = (bool)ms_entries[(int)ModSetting.FollowHips].BoxedValue;
             MassCenter = (bool)ms_entries[(int)ModSetting.MassCenter].BoxedValue;
             ScaledJump = (bool)ms_entries[(int)ModSetting.ScaledJump].BoxedValue;
-            OverrideFix = (bool)ms_entries[(int)ModSetting.OverrideFix].BoxedValue;
 
             MelonLoader.MelonCoroutines.Start(WaitMainMenuUi());
         }
@@ -167,13 +163,6 @@ namespace ml_amt
                         ScaledJumpChange?.Invoke(ScaledJump);
                     }
                     break;
-
-                    case ModSetting.OverrideFix:
-                    {
-                        OverrideFix = bool.Parse(p_value);
-                        OverrideFixChange?.Invoke(OverrideFix);
-                    }
-                    break;
                 }
 
                 ms_entries[(int)l_setting].BoxedValue = bool.Parse(p_value);

ml_amt/Utils.cs

@@ -12,7 +12,6 @@ namespace ml_amt
         static readonly FieldInfo ms_grounded = typeof(MovementSystem).GetField("_isGrounded", BindingFlags.NonPublic | BindingFlags.Instance);
         static readonly FieldInfo ms_groundedRaw = typeof(MovementSystem).GetField("_isGroundedRaw", BindingFlags.NonPublic | BindingFlags.Instance);
         static readonly FieldInfo ms_hasToes = typeof(IKSolverVR).GetField("hasToes", BindingFlags.NonPublic | BindingFlags.Instance);
-        static MethodInfo ms_getSineKeyframes = typeof(IKSolverVR).GetMethod("GetSineKeyframes", BindingFlags.NonPublic | BindingFlags.Static);
 
         public static bool IsInVR() => ((ABI_RC.Core.Savior.CheckVR.Instance != null) && ABI_RC.Core.Savior.CheckVR.Instance.hasVrDeviceLoaded);
 
@@ -20,10 +19,6 @@ namespace ml_amt
         public static bool IsGroundedRaw(this MovementSystem p_instance) => (bool)ms_groundedRaw.GetValue(MovementSystem.Instance);
 
         public static bool HasToes(this IKSolverVR p_instance) => (bool)ms_hasToes.GetValue(p_instance);
-        public static Keyframe[] GetSineKeyframes(float p_mag)
-        {
-            return (Keyframe[])ms_getSineKeyframes.Invoke(null, new object[] { p_mag });
-        }
 
         public static bool IsWorldSafe() => ((CVRWorld.Instance != null) && CVRWorld.Instance.allowFlying);
         public static float GetWorldJumpHeight()

ml_amt/ml_amt.csproj

@@ -6,7 +6,7 @@
     <Company>None</Company>
     <Product>AvatarMotionTweaker</Product>
     <PackageId>AvatarMotionTweaker</PackageId>
-    <Version>1.3.1</Version>
+    <Version>1.3.2</Version>
     <Platforms>x64</Platforms>
     <AssemblyName>ml_amt</AssemblyName>
   </PropertyGroup>
@@ -16,6 +16,8 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>none</DebugType>
     <DebugSymbols>false</DebugSymbols>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>

ml_amt/resources/menu.js

@@ -237,13 +237,6 @@ function inp_toggle_mod_amt(_obj, _callbackName) {
                 <div id="ScaledJump" class ="inp_toggle no-scroll" data-current="false"></div>
             </div>
         </div>
-
-        <div class ="row-wrapper">
-            <div class ="option-caption">Fix animator overrides (chairs, etc.): </div>
-            <div class ="option-input">
-                <div id="OverrideFix" class ="inp_toggle no-scroll" data-current="true"></div>
-            </div>
-        </div>
     `;
     document.getElementById('settings-ik').appendChild(l_block);
 

ml_gmf/AnimatorAnalyzer.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEngine;
 
-namespace ml_amt.Fixes
+namespace ml_gmf
 {
     class AnimatorAnalyzer
     {

ml_gmf/Fixes/AnimationOverrides.cs

@@ -2,32 +2,30 @@
 using System;
 using System.Reflection;
 
-namespace ml_amt.Fixes
+namespace ml_gmf.Fixes
 {
-    static class AnimatorOverrideControllerFix
+    static class AnimationOverrides
     {
         internal static void Init(HarmonyLib.Harmony p_instance)
         {
-            // AAS overriding fix
             p_instance.Patch(
                 typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.SetOverrideAnimation)),
-                new HarmonyLib.HarmonyMethod(typeof(AnimatorOverrideControllerFix).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                new HarmonyLib.HarmonyMethod(typeof(AnimatorOverrideControllerFix).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
             p_instance.Patch(
                 typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.RestoreOverrideAnimation)),
-                new HarmonyLib.HarmonyMethod(typeof(AnimatorOverrideControllerFix).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
+                new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
-                new HarmonyLib.HarmonyMethod(typeof(AnimatorOverrideControllerFix).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+                new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
             );
         }
 
-        // AnimatorOverrideController runtime animation replacement fix
         static void OnOverride_Prefix(ref CVRAnimatorManager __instance, out AnimatorAnalyzer __state)
         {
             __state = new AnimatorAnalyzer();
             try
             {
-                if(Settings.OverrideFix && (__instance.animator != null))
+                if(__instance.animator != null)
                 {
                     __state.AnalyzeFrom(__instance.animator);
                     if(__state.IsEnabled())
@@ -44,7 +42,7 @@ namespace ml_amt.Fixes
         {
             try
             {
-                if(Settings.OverrideFix && (__instance.animator != null))
+                if(__instance.animator != null)
                 {
                     __state.ApplyTo(__instance.animator);
                     if(__state.IsEnabled())

ml_gmf/Main.cs

@@ -7,6 +7,7 @@
             Fixes.ViveControls.Init(HarmonyInstance);
             Fixes.AvatarOverrides.Init(HarmonyInstance);
             Fixes.PostProccesVolumes.Init();
+            Fixes.AnimationOverrides.Init(HarmonyInstance);
         }
     }
 }

ml_gmf/README.md

@@ -11,6 +11,7 @@ This mod fixes some issues that are present in game
   * Additional feature: Disables gestures when moving with Vive controllers
 * Fix of post-processing layer volume trigger for VR camera ([feedback post](https://feedback.abinteractive.net/p/2023r171ex1-post-process-volume-effects-are-applied-based-on-playspace-center-instead-of-camera-s-in-vr-mode))
 * Fix of shared `AnimatorOverrideController` between same avatars that leads to broken avatar animator
+* Fix of animation replacement (chairs, etc.) that leads to broken avatar animator ([feedback post](https://feedback.abinteractive.net/p/gestures-getting-stuck-locally-upon-entering-vehicles-chairs))
 
 # Notes
 Some of fixes will be implemented natively in game after 2023r172ex3