Fixes for game build 2024r175

SDraw · Apr 11, 2024 · e55f4b3 · e55f4b3
1 parent 971b4e7
commit e55f4b3
Show file tree

Hide file tree

Showing 25 changed files with 48 additions and 48 deletions.
diff --git a/README.md b/README.md
@@ -1,18 +1,18 @@
 Merged set of MelonLoader mods for ChilloutVR.
 
-**Table for game build 2023r173:**
+**Table for game build 2023r175:**
 | 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.7 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| Yes |
-| [Avatar Synced Look](/ml_asl/README.md) | ml_asl | 1.0.1 [:arrow_down:](../../releases/latest/download/ml_asl.dll)| Yes |
-| [Better Fingers Tracking](/ml_bft/README.md) | ml_bft | 1.0.0 [:arrow_down:](../../releases/latest/download/ml_bft.dll)| Yes<br>Update review |
-| [Desktop Head Tracking](/ml_dht/README.md) | ml_dht | 1.2.1 [:arrow_down:](../../releases/latest/download/ml_dht.dll) | Yes |
-| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.7 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| Yes<br>Update review |
-| [Pickup Arm Movement](/ml_pam/README.md)| ml_pam | 1.1.0 [:arrow_down:](../../releases/latest/download/ml_pam.dll)| Yes |
-| [Player Movement Copycat](/ml_pmc/README.md)| ml_pmc | 1.0.5 [:arrow_down:](../../releases/latest/download/ml_pmc.dll)| Yes |
-| [Player Ragdoll Mod](/ml_prm/README.md) | ml_prm | 1.1.3 [:arrow_down:](../../releases/latest/download/ml_prm.dll)| Yes |
-| [Players Instance Notifier](/ml_pin/README.md) | ml_pin | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_ml_pin.dll)| Yes |
-| [Vive Extended Input](/ml_vei/README.md) | ml_vei | 1.0.1 [:arrow_down:](../../releases/latest/download/ml_vei.dll)| Yes |
+| [Avatar Motion Tweaker](/ml_amt/README.md) | ml_amt | 1.3.8 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| Yes<br>Update review |
+| [Avatar Synced Look](/ml_asl/README.md) | ml_asl | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_asl.dll)| Yes<br>Update review |
+| [Better Fingers Tracking](/ml_bft/README.md) | ml_bft | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_bft.dll)| Yes<br>Update review |
+| [Desktop Head Tracking](/ml_dht/README.md) | ml_dht | 1.2.2 [:arrow_down:](../../releases/latest/download/ml_dht.dll) | Yes<br>Update review |
+| [Leap Motion Extension](/ml_lme/README.md)| ml_lme | 1.4.8 [:arrow_down:](../../releases/latest/download/ml_lme.dll)| Yes<br>Update review |
+| [Pickup Arm Movement](/ml_pam/README.md)| ml_pam | 1.1.1 [:arrow_down:](../../releases/latest/download/ml_pam.dll)| Yes<br>Update review |
+| [Player Movement Copycat](/ml_pmc/README.md)| ml_pmc | 1.0.6 [:arrow_down:](../../releases/latest/download/ml_pmc.dll)| Yes<br>Update review |
+| [Player Ragdoll Mod](/ml_prm/README.md) | ml_prm | 1.1.4 [:arrow_down:](../../releases/latest/download/ml_prm.dll)| Yes<br>Update review |
+| [Players Instance Notifier](/ml_pin/README.md) | ml_pin | 1.0.3 [:arrow_down:](../../releases/latest/download/ml_ml_pin.dll)| Yes<br>Update review |
+| [Vive Extended Input](/ml_vei/README.md) | ml_vei | 1.0.2 [:arrow_down:](../../releases/latest/download/ml_vei.dll)| Yes<br>Update review |
 
 **Archived mods:**
 | Full name | Short name | Notes |

diff --git a/ml_amt/AvatarParameter.cs b/ml_amt/AvatarParameter.cs
@@ -1,4 +1,4 @@
-using ABI_RC.Core;
+using ABI_RC.Core.Util.AnimatorManager;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -16,16 +16,16 @@ public enum ParameterType
         readonly int m_hash = 0;
         readonly bool m_sync;
         readonly AnimatorControllerParameterType m_innerType;
-        readonly CVRAnimatorManager m_manager = null;
+        readonly AvatarAnimatorManager m_manager = null;
 
-        public AvatarParameter(ParameterType p_type, CVRAnimatorManager p_manager)
+        public AvatarParameter(ParameterType p_type, AvatarAnimatorManager p_manager)
         {
             m_type = p_type;
             m_name = p_type.ToString();
             m_manager = p_manager;
 
             Regex l_regex = new Regex("^#?" + m_name + '$');
-            foreach(var l_param in m_manager.animator.parameters)
+            foreach(var l_param in m_manager.Animator.parameters)
             {
                 if(l_regex.IsMatch(l_param.name))
                 {
@@ -55,9 +55,9 @@ void SetFloat(float p_value)
             if(m_innerType == AnimatorControllerParameterType.Float)
             {
                 if(m_sync)
-                    m_manager.SetAnimatorParameterFloat(m_name, p_value);
+                    m_manager.SetParameter(m_name, p_value);
                 else
-                    m_manager.animator.SetFloat(m_hash, p_value);
+                    m_manager.Animator.SetFloat(m_hash, p_value);
             }
         }
 
@@ -66,9 +66,9 @@ void SetBoolean(bool p_value)
             if(m_innerType == AnimatorControllerParameterType.Bool)
             {
                 if(m_sync)
-                    m_manager.SetAnimatorParameterBool(m_name, p_value);
+                    m_manager.SetParameter(m_name, p_value);
                 else
-                    m_manager.animator.SetBool(m_hash, p_value);
+                    m_manager.Animator.SetBool(m_hash, p_value);
             }
         }
     }

diff --git a/ml_amt/Properties/AssemblyInfo.cs b/ml_amt/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.7-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_amt.AvatarMotionTweaker), "AvatarMotionTweaker", "1.3.8", "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)]
diff --git a/ml_amt/ml_amt.csproj b/ml_amt/ml_amt.csproj
@@ -6,7 +6,7 @@
     <Company>None</Company>
     <Product>AvatarMotionTweaker</Product>
     <PackageId>AvatarMotionTweaker</PackageId>
-    <Version>1.3.7</Version>
+    <Version>1.3.8</Version>
     <Platforms>x64</Platforms>
     <AssemblyName>ml_amt</AssemblyName>
   </PropertyGroup>

diff --git a/ml_asl/Properties/AssemblyInfo.cs b/ml_asl/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_asl.AvatarSyncedLook), "AvatarSyncedLook", "1.0.2", "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)]
diff --git a/ml_asl/ml_asl.csproj b/ml_asl/ml_asl.csproj
@@ -7,7 +7,7 @@
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>AvatarSyncedLook</Product>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/ml_bft/Properties/AssemblyInfo.cs b/ml_bft/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_bft.BetterFingersTracking), "BetterFingersTracking", "1.0.2", "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)]
diff --git a/ml_bft/ml_bft.csproj b/ml_bft/ml_bft.csproj
@@ -7,7 +7,7 @@
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>BetterFingersTracking</Product>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/ml_dht/Properties/AssemblyInfo.cs b/ml_dht/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.2.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_dht.DesktopHeadTracking), "DesktopHeadTracking", "1.2.2", "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)]
diff --git a/ml_dht/ml_dht.csproj b/ml_dht/ml_dht.csproj
@@ -6,7 +6,7 @@
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>DesktopHeadTracking</Product>
-    <Version>1.2.1</Version>
+    <Version>1.2.2</Version>
     <Platforms>x64</Platforms>
   </PropertyGroup>
 

diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.4.7-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_lme.LeapMotionExtension), "LeapMotionExtension", "1.4.8", "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)]

diff --git a/ml_lme/ml_lme.csproj b/ml_lme/ml_lme.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>LeapMotionExtension</PackageId>
-    <Version>1.4.7</Version>
+    <Version>1.4.8</Version>
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>LeapMotionExtension</Product>

diff --git a/ml_pam/Properties/AssemblyInfo.cs b/ml_pam/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.1.0-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_pam.PickupArmMovement), "PickupArmMovement", "1.1.1", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
 [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
 [assembly: MelonLoader.MelonPriority(1)]
 [assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]

diff --git a/ml_pam/ml_pam.csproj b/ml_pam/ml_pam.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>PickupArmMovement</PackageId>
-    <Version>1.1.0</Version>
+    <Version>1.1.1</Version>
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>PickupArmMovement</Product>

diff --git a/ml_pin/Properties/AssemblyInfo.cs b/ml_pin/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.0.2-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_pin.PlayersInstanceNotifier), "PlayersInstanceNotifier", "1.0.3", "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)]
diff --git a/ml_pin/ml_pin.csproj b/ml_pin/ml_pin.csproj
@@ -7,7 +7,7 @@
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>PlayersInstanceNotifier</Product>
-    <Version>1.0.2</Version>
+    <Version>1.0.3</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/ml_pmc/PoseCopycat.cs b/ml_pmc/PoseCopycat.cs
@@ -312,9 +312,9 @@ public void SetTarget(PuppetMaster p_target)
             {
                 if(!m_active)
                 {
-                    if((p_target != null) && (p_target.animatorManager != null) && (p_target.animatorManager.animator != null) && p_target.animatorManager.animator.isHuman)
+                    if((p_target != null) && (p_target.animatorManager != null) && (p_target.animatorManager.Animator != null) && p_target.animatorManager.Animator.isHuman)
                     {
-                        m_puppetParser = p_target.animatorManager.animator.gameObject.AddComponent<PuppetParser>();
+                        m_puppetParser = p_target.animatorManager.Animator.gameObject.AddComponent<PuppetParser>();
                         m_puppetParser.m_puppetMaster = p_target;
                         m_distanceLimit = Utils.GetWorldMovementLimit();
 

diff --git a/ml_pmc/Properties/AssemblyInfo.cs b/ml_pmc/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.0.5-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_pmc.PlayerMovementCopycat), "PlayerMovementCopycat", "1.0.6", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
 [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
 [assembly: MelonLoader.MelonPriority(3)]
 [assembly: MelonLoader.MelonAdditionalDependencies("BTKUILib")]

diff --git a/ml_pmc/ml_pmc.csproj b/ml_pmc/ml_pmc.csproj
@@ -7,7 +7,7 @@
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>PlayerMovementCopycat</Product>
-    <Version>1.0.5</Version>
+    <Version>1.0.6</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

diff --git a/ml_prm/AvatarBoolParameter.cs b/ml_prm/AvatarBoolParameter.cs
@@ -1,4 +1,4 @@
-using ABI_RC.Core;
+using ABI_RC.Core.Util.AnimatorManager;
 using System.Text.RegularExpressions;
 using UnityEngine;
 
@@ -9,15 +9,15 @@ class AvatarBoolParameter
         public readonly string m_name;
         public readonly int m_hash = 0;
         public readonly bool m_sync;
-        readonly CVRAnimatorManager m_manager = null;
+        readonly AvatarAnimatorManager m_manager = null;
 
-        public AvatarBoolParameter(string p_name, CVRAnimatorManager p_manager)
+        public AvatarBoolParameter(string p_name, AvatarAnimatorManager 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)
+            foreach(var l_param in m_manager.Animator.parameters)
             {
                 if(l_regex.IsMatch(l_param.name) && (l_param.type == AnimatorControllerParameterType.Bool))
                 {
@@ -34,9 +34,9 @@ public void SetValue(bool p_value)
             if(m_hash != 0)
             {
                 if(m_sync)
-                    m_manager.SetAnimatorParameterBool(m_name, p_value);
+                    m_manager.SetParameter(m_name, p_value);
                 else
-                    m_manager.animator.SetBool(m_hash, p_value);
+                    m_manager.Animator.SetBool(m_hash, p_value);
             }
         }
     }

diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.1.3-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.1.4", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
 [assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
 [assembly: MelonLoader.MelonPriority(2)]
 [assembly: MelonLoader.MelonOptionalDependencies("BTKUILib")]

diff --git a/ml_prm/RagdollController.cs b/ml_prm/RagdollController.cs
@@ -644,7 +644,7 @@ public void SwitchRagdoll()
                         m_applyHipsRotation = IKSystem.Instance.applyOriginalHipRotation;
                         IKSystem.Instance.applyOriginalHipRotation = true;
 
-                        PlayerSetup.Instance.animatorManager.SetAnimatorParameterTrigger("CancelEmote");
+                        PlayerSetup.Instance.animatorManager.CancelEmote = true;
                         m_ragdolledParameter.SetValue(true);
 
                         if(!Utils.IsWorldSafe())

diff --git a/ml_prm/ml_prm.csproj b/ml_prm/ml_prm.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>PlayerRagdollMod</PackageId>
-    <Version>1.1.3</Version>
+    <Version>1.1.4</Version>
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>PlayerRagdollMod</Product>

diff --git a/ml_vei/Properties/AssemblyInfo.cs b/ml_vei/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.0.1-ex", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_vei.ViveExtendedInput), "ViveExtendedInput", "1.0.2", "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)]
diff --git a/ml_vei/ml_vei.csproj b/ml_vei/ml_vei.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.1</TargetFramework>
     <Platforms>x64</Platforms>
     <PackageId>ViveExtendedInput</PackageId>
-    <Version>1.0.1</Version>
+    <Version>1.0.2</Version>
     <Authors>SDraw</Authors>
     <Company>None</Company>
     <Product>ViveExtendedInput</Product>