diff --git a/README.md b/README.md
index f347f5e..f429a88 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
Merged set of MelonLoader mods for ChilloutVR.
-**Table for game build 2022r171p2:**
+**Table for game build 2023r171p2 and 2023r172ex1:**
| 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.2 [:arrow_down:](../../releases/latest/download/ml_amt.dll)| ✔ Yes
:hourglass_flowing_sand: Update review |
diff --git a/ml_gmf/AnimatorAnalyzer.cs b/ml_gmf/AnimatorAnalyzer.cs
deleted file mode 100644
index 102179d..0000000
--- a/ml_gmf/AnimatorAnalyzer.cs
+++ /dev/null
@@ -1,71 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-
-namespace ml_gmf
-{
- class AnimatorAnalyzer
- {
- bool m_enabled = true;
- List m_parameters = null;
-
- public void AnalyzeFrom(Animator p_animator)
- {
- m_enabled = p_animator.enabled;
- m_parameters = p_animator.parameters?.ToList();
-
- if(m_parameters != null)
- {
- foreach(var l_param in m_parameters)
- {
- switch(l_param.type)
- {
- case AnimatorControllerParameterType.Bool:
- case AnimatorControllerParameterType.Trigger:
- l_param.defaultBool = p_animator.GetBool(l_param.nameHash);
- break;
- case AnimatorControllerParameterType.Float:
- l_param.defaultFloat = p_animator.GetFloat(l_param.nameHash);
- break;
- case AnimatorControllerParameterType.Int:
- l_param.defaultInt = p_animator.GetInteger(l_param.nameHash);
- break;
-
- }
- }
- }
- }
-
- public void ApplyTo(Animator p_animator)
- {
- p_animator.enabled = m_enabled;
-
- if(m_parameters != null)
- {
- foreach(var l_param in m_parameters)
- {
- switch(l_param.type)
- {
- case AnimatorControllerParameterType.Bool:
- p_animator.SetBool(l_param.nameHash, l_param.defaultBool);
- break;
- case AnimatorControllerParameterType.Float:
- p_animator.SetFloat(l_param.nameHash, l_param.defaultFloat);
- break;
- case AnimatorControllerParameterType.Int:
- p_animator.SetInteger(l_param.nameHash, l_param.defaultInt);
- break;
- case AnimatorControllerParameterType.Trigger:
- {
- if(l_param.defaultBool)
- p_animator.SetTrigger(l_param.nameHash);
- }
- break;
- }
- }
- }
- }
-
- public bool IsEnabled() => m_enabled;
- }
-}
diff --git a/ml_gmf/Fixes/AnimationOverrides.cs b/ml_gmf/Fixes/AnimationOverrides.cs
index 87e14f9..925ff4d 100644
--- a/ml_gmf/Fixes/AnimationOverrides.cs
+++ b/ml_gmf/Fixes/AnimationOverrides.cs
@@ -10,44 +10,20 @@ namespace ml_gmf.Fixes
{
p_instance.Patch(
typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.SetOverrideAnimation)),
- new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
- new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+ new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic))
);
p_instance.Patch(
typeof(CVRAnimatorManager).GetMethod(nameof(CVRAnimatorManager.RestoreOverrideAnimation)),
- new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic)),
- new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Postfix), BindingFlags.Static | BindingFlags.NonPublic))
+ new HarmonyLib.HarmonyMethod(typeof(AnimationOverrides).GetMethod(nameof(OnOverride_Prefix), BindingFlags.Static | BindingFlags.NonPublic))
);
}
- static void OnOverride_Prefix(ref CVRAnimatorManager __instance, out AnimatorAnalyzer __state)
+ static void OnOverride_Prefix(ref CVRAnimatorManager __instance)
{
- __state = new AnimatorAnalyzer();
try
{
if(__instance.animator != null)
- {
- __state.AnalyzeFrom(__instance.animator);
- if(__state.IsEnabled())
- __instance.animator.enabled = false;
__instance.animator.WriteDefaultValues();
- }
- }
- catch(Exception l_exception)
- {
- MelonLoader.MelonLogger.Error(l_exception);
- }
- }
- static void OnOverride_Postfix(ref CVRAnimatorManager __instance, AnimatorAnalyzer __state)
- {
- try
- {
- if(__instance.animator != null)
- {
- __state.ApplyTo(__instance.animator);
- if(__state.IsEnabled())
- __instance.animator.Update(0f);
- }
}
catch(Exception l_exception)
{
diff --git a/ml_lme/Properties/AssemblyInfo.cs b/ml_lme/Properties/AssemblyInfo.cs
index 8688d96..e191425 100644
--- a/ml_lme/Properties/AssemblyInfo.cs
+++ b/ml_lme/Properties/AssemblyInfo.cs
@@ -3,3 +3,4 @@
[assembly: MelonLoader.MelonOptionalDependencies("ml_pmc")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
+[assembly: MelonLoader.MelonAdditionalCredits("NotAKidOnSteam")]
diff --git a/ml_prm/Properties/AssemblyInfo.cs b/ml_prm/Properties/AssemblyInfo.cs
index ecb095f..a38953e 100644
--- a/ml_prm/Properties/AssemblyInfo.cs
+++ b/ml_prm/Properties/AssemblyInfo.cs
@@ -1,8 +1,7 @@
-using System.Reflection;
-
-[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.0.8", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
+[assembly: MelonLoader.MelonInfo(typeof(ml_prm.PlayerRagdollMod), "PlayerRagdollMod", "1.0.8", "SDraw", "https://github.com/SDraw/ml_mods_cvr")]
[assembly: MelonLoader.MelonGame(null, "ChilloutVR")]
[assembly: MelonLoader.MelonPriority(2)]
[assembly: MelonLoader.MelonOptionalDependencies("BTKUILib")]
[assembly: MelonLoader.MelonPlatform(MelonLoader.MelonPlatformAttribute.CompatiblePlatforms.WINDOWS_X64)]
-[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
\ No newline at end of file
+[assembly: MelonLoader.MelonPlatformDomain(MelonLoader.MelonPlatformDomainAttribute.CompatibleDomains.MONO)]
+[assembly: MelonLoader.MelonAdditionalCredits("kafeijao, NotAKidOnSteam")]
\ No newline at end of file