Fixes and features

Among-Us-Modding · Dec 30, 2023 · 417eab5 · 417eab5
1 parent 063940e
commit 417eab5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 5 deletions.
diff --git a/Laboratory/Buttons/CooldownButton.cs b/Laboratory/Buttons/CooldownButton.cs
@@ -157,7 +157,7 @@ public void SetButtonSaturation(bool saturated)
     public virtual bool ShouldBeVisible()
     {
         if (!ShipStatus.Instance) return false;
-        if (!HudManager.Instance.UseButton.gameObject.active) return false;
+        if (!HudManager.Instance.UseButton.gameObject.active && !HudManager.Instance.PetButton.gameObject.active) return false;
         PlayerControl localPlayer = PlayerControl.LocalPlayer;
         if (!localPlayer || localPlayer.Data == null) return false;
         if (localPlayer.Data.IsDead) return false;

diff --git a/Laboratory/Player/AnimationControllers/Patches/AnimationPatches.cs b/Laboratory/Player/AnimationControllers/Patches/AnimationPatches.cs
@@ -30,6 +30,11 @@ public static bool AdjustOffsets(PlayerPhysics __instance)
         Vector3 position = transform.position;
         position.z = (position.y - anim.RendererOffset.y) / 1000f + anim.ZOffset;
         transform.position = position;
+
+        foreach (var spriteAnimNodeSync in __instance.GetComponentsInChildren<SpriteAnimNodeSync>())
+        {
+            spriteAnimNodeSync.LateUpdate();
+        }
 
         return false;
     }

diff --git a/Laboratory/Player/Extensions/PlayerExtensions.cs b/Laboratory/Player/Extensions/PlayerExtensions.cs
@@ -1,3 +1,5 @@
+using System.Collections;
+using BepInEx.Unity.IL2CPP.Utils;
 using Laboratory.Effects.Managers;
 using Laboratory.Extensions;
 using Laboratory.Player.Managers;
@@ -19,4 +21,21 @@ public static PlayerEffectManager GetEffectManager(this GameObject player)
         return player.GetCachedComponent<PlayerEffectManager>();
     }
 
-    public static PlayerEffectManager GetEffectManager(this Component player) => player.gameObject.GetEffectManager(); }
+    public static PlayerEffectManager GetEffectManager(this Component player) => player.gameObject.GetEffectManager();
+
+    public static Coroutine AnimateCustom(this PlayerControl player, AnimationClip clip)
+    {
+        return player.StartCoroutine(player.CoAnimateCustom(clip));
+    }
+
+    private static IEnumerator CoAnimateCustom(this PlayerControl player, AnimationClip clip)
+    {
+        player.MyPhysics.DoingCustomAnimation = true;
+
+        yield return player.MyPhysics.Animations.CoPlayCustomAnimation(clip);
+        player.cosmetics.AnimateSkinIdle();
+        player.MyPhysics.Animations.PlayIdleAnimation();
+        player.cosmetics.SetBodyCosmeticsVisible(b: true);
+        player.MyPhysics.DoingCustomAnimation = false;
+    }
+}
diff --git a/Laboratory/Player/SizeModifier.cs b/Laboratory/Player/SizeModifier.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using HarmonyLib;
@@ -20,7 +21,7 @@ public static class SizeModifer
     public static void SetSizeModifier(this PlayerPhysics player, float value, object key)
     {
         Dictionary<object, float> set = sizeModifiers[player];
-        if (value == 1)
+        if (Math.Abs(value - 1) < 0.001)
         {
             set.Remove(key);
         }
@@ -39,13 +40,14 @@ public static void SetSizeModifier<T>(this PlayerPhysics player, float value)
 
     public static void Update(PlayerPhysics player)
     {
-        Vector3 size = DefaultSize;
+        var size = DefaultSize;
 
-        foreach ((object _, float v) in sizeModifiers[player])
+        foreach (var (_, v) in sizeModifiers[player])
         {
             size *= v;
         }
 
+        player.myPlayer.Collider.Cast<CircleCollider2D>().radius = 0.2233912f / (size.x / DefaultSize.x);
         player.transform.localScale = size;
     }