Fixed Wraith Caller disconnection issues, resolved the endgame crash, addressed an issue where some roles’ DidWin wasn’t being called, and added the Feign Death sprite along with the Necromancer role icon

Author: CallOfCreator

NewMod/Buttons/Necromancer/ReviveButton.cs

@@ -7,7 +7,6 @@
 using NewMod.Utilities;
 using MiraAPI.Keybinds;
 using AmongUs.GameOptions;
-using Reactor.Utilities;
 using MiraAPI.Utilities;
 using System.Linq;
 
@@ -98,7 +97,7 @@ public override bool Enabled(RoleBehaviour role)
         public override bool CanUse()
         {
             var bodiesInRange = Helpers.GetNearestDeadBodies(
-                PlayerControl.LocalPlayer.transform.position,
+                PlayerControl.LocalPlayer.GetTruePosition(),
                 ShipStatus.Instance.MaxLightRadius,
                 Helpers.CreateFilter(Constants.NotShipMask));
 

NewMod/Buttons/Revenant/FeignDeathButton.cs

@@ -48,7 +48,7 @@ public class FeignDeathButton : CustomActionButton
         /// <summary>
         /// The icon or sprite used for this button. Here, set to an empty sprite.
         /// </summary>
-        public override LoadableAsset<Sprite> Sprite => MiraAssets.Empty;
+        public override LoadableAsset<Sprite> Sprite => NewModAsset.FeignDeath;
 
         /// <summary>
         /// Specifies whether the button is enabled for the given role, ensuring Feign Death hasn't been used yet.

NewMod/Buttons/RevivedKillButton.cs

@@ -2,7 +2,6 @@
 using MiraAPI.Keybinds;
 using MiraAPI.Utilities.Assets;
 using NewMod.Roles.ImpostorRoles;
-using Reactor.Utilities;
 using AmongUs.GameOptions;
 using UnityEngine;
 using MiraAPI.Networking;
@@ -22,7 +21,7 @@ public class RevivedKillButton : CustomActionButton<PlayerControl>
 
         public override bool Enabled(RoleBehaviour role)
         {
-            return NecromancerRole.RevivedPlayers.ContainsKey(PlayerControl.LocalPlayer.PlayerId);
+           return NecromancerRole.RevivedPlayers.ContainsKey(PlayerControl.LocalPlayer.PlayerId);
         }
 
         public override PlayerControl GetTarget()

NewMod/Buttons/WraithCaller/CallWraith.cs

@@ -85,7 +85,7 @@ protected override void OnClick()
                        player =>
                        {
                            menu.Close();
-                           WraithCallerUtilities.RpcRequestSummonNPC(PlayerControl.LocalPlayer, player);
+                          WraithCallerUtilities.RequestSummonNPC(PlayerControl.LocalPlayer, player);
                            SetTimerPaused(false);
                        });
 

NewMod/Components/WraithCallerNpc.cs

@@ -1,8 +1,7 @@
 using System;
-using System.Linq;
+using System.Collections;
 using Il2CppInterop.Runtime.Attributes;
 using MiraAPI.GameOptions;
-using MiraAPI.Modifiers;
 using MiraAPI.Networking;
 using NewMod.Options.Roles.WraithCallerOptions;
 using NewMod.Utilities;
@@ -17,124 +16,171 @@ public class WraithCallerNpc(IntPtr ptr) : MonoBehaviour(ptr)
     {
         public PlayerControl Owner { get; set; }
         public PlayerControl Target { get; set; }
-        public PlayerControl npc;
+        public PlayerControl Visual { get; set; }
+        public Rigidbody2D body;
+        public PlayerAnimations animations;
+
         public LightSource ownerLight;
         public bool isActive;
 
         [HideFromIl2Cpp]
+
         // Inspired by: https://github.com/NuclearPowered/Reactor/blob/e27a79249ea706318f3c06f3dc56a5c42d65b1cf/Reactor.Debugger/Window/Tabs/GameTab.cs#L70
-        public void Initialize(PlayerControl wraith, PlayerControl target, PlayerControl spawned)
+        public void Initialize(PlayerControl owner, PlayerControl target, Vector2 start)
         {
-            Owner = wraith;
+            Owner = owner;
             Target = target;
-            npc = spawned;
 
-            isActive = true;
+            Visual = Instantiate(AmongUsClient.Instance.PlayerPrefab);
+            Visual.transform.position = new Vector3(start.x, start.y, Owner.transform.position.z);
 
-            KillAnimation.SetMovement(npc, true);
+            Visual.notRealPlayer = true;
+            Visual.enabled = false;
+            Visual.NetTransform.enabled = false;
+            Visual.Collider.enabled = false;
+            Visual.MyPhysics.enabled = false;
 
-            npc.Collider.enabled = false;
-            npc.MyPhysics.Speed = OptionGroupSingleton<WraithCallerOptions>.Instance.NPCSpeed;
+            PlayerControl.AllPlayerControls.Remove(Visual);
 
-            if (!npc.TryGetComponent<ModifierComponent>(out _))
-                npc.gameObject.AddComponent<ModifierComponent>();
+            body = Visual.MyPhysics.body;
+            animations = Visual.MyPhysics.Animations;
 
-            if (AmongUsClient.Instance.AmHost)
-            {
-                NewMod.Instance.Log.LogMessage($"Host is setting cosmetics for NPC (ID: {npc.PlayerId}");
-                npc.NetTransform.RpcSnapTo(Owner.transform.position);
+            body.isKinematic = false;
 
-                var color = (byte)(npc.PlayerId % Palette.PlayerColors.Length);
-                npc.RpcSetName("Wraith NPC");
-                npc.RpcSetColor(color);
+            Visual.cosmetics.enabled = true;
+            Visual.cosmetics.Visible = true;
 
-                var noShadow = npc.gameObject.AddComponent<NoShadowBehaviour>();
-                if (noShadow != null)
-                {
-                    noShadow.rend = npc.cosmetics.currentBodySprite.BodySprite;
-                    noShadow.hitOverride = npc.Collider;
-                }
-            }
+            Visual.cosmetics.SetName("Wraith NPC");
+            Visual.cosmetics.ToggleName(true);
+            Visual.cosmetics.ToggleHat(false);
+            Visual.cosmetics.TogglePet(false);
+            Visual.cosmetics.ToggleVisor(false);
+
+            var color = Owner.PlayerId % Palette.PlayerColors.Length;
+            var bodySprite = Visual.cosmetics.currentBodySprite;
+
+            bodySprite.Visible = true;
+            PlayerMaterial.SetColors(color, bodySprite.BodySprite);
 
-            Coroutines.Start(WalkToTarget());
+            var noShadow = Visual.gameObject.AddComponent<NoShadowBehaviour>();
+            noShadow.rend = bodySprite.BodySprite;
+            noShadow.hitOverride = Visual.Collider;
 
-            if (OptionGroupSingleton<WraithCallerOptions>.Instance.ShouldSwitchCamToNPC)
+            isActive = true;
+            Coroutines.Start(CoMove());
+
+            if (Owner.AmOwner && OptionGroupSingleton<WraithCallerOptions>.Instance.ShouldSwitchCamToNPC)
             {
-                Camera.main.GetComponent<FollowerCamera>().SetTarget(npc);
+                Camera.main.GetComponent<FollowerCamera>().SetTarget(Visual);
                 ownerLight = Owner.lightSource;
-                ownerLight.transform.SetParent(npc.transform, false);
-                ownerLight.transform.localPosition = npc.Collider.offset;
+                ownerLight.transform.SetParent(Visual.transform, false);
+                ownerLight.transform.localPosition = Visual.Collider.offset;
             }
 
-            npc.cosmetics.enabled = true;
-            npc.enabled = false;
-
             if (Target.AmOwner)
                 SoundManager.Instance.PlaySound(NewModAsset.HeartbeatSound.LoadAsset(), false, 1f);
         }
 
         [HideFromIl2Cpp]
-        private System.Collections.IEnumerator WalkToTarget()
+        public IEnumerator CoMove()
         {
-            //yield return null;
-
-            if (!AmongUsClient.Instance.AmHost) yield break;
+            var speed = OptionGroupSingleton<WraithCallerOptions>.Instance.NPCSpeed;
 
             while (isActive && !MeetingHud.Instance)
             {
-                if (!Target || !Target.Data || Target.Data.IsDead)
+                if (Target.Data.IsDead || Target.Data.Disconnected)
                     break;
 
-                Vector2 npcPos = npc.GetTruePosition();
-                Vector2 targetPos = Target.GetTruePosition();
-                Vector2 dir = (targetPos - npcPos).normalized;
+                var npcPos = (Vector2)Visual.transform.position;
+                var targetPos = Target.GetTruePosition();
+                var delta = targetPos - npcPos;
+
+                var slowDown = Mathf.Clamp(delta.magnitude * 2f, 0.05f, 1f);
+                var velocity = delta.normalized * speed * slowDown;
 
-                npc.MyPhysics.SetNormalizedVelocity(dir);
+                body.velocity = velocity;
 
-                if (Vector2.Distance(npcPos, targetPos) <= 0.1f)
+                UpdateWalkAnimation(velocity);
+
+                if (AmongUsClient.Instance.AmHost && delta.magnitude <= 0.15f)
                 {
-                    npc.MyPhysics.SetNormalizedVelocity(Vector2.zero);
+                    body.velocity = Vector2.zero;
+                    UpdateWalkAnimation(Vector2.zero);
 
                     Owner.RpcCustomMurder(Target, true, teleportMurderer: false);
 
                     if (Target.AmOwner)
+                    {
                         CoroutinesHelper.CoNotify("<color=#FF4D4D><b>Oops!</b> The <i>Wraith NPC</i> got you...");
+                    }
 
                     WraithCallerUtilities.AddKillNPC(Owner.PlayerId);
                     break;
                 }
-                yield return new WaitForFixedUpdate();
+
+                yield return null;
             }
 
-            npc.MyPhysics.SetNormalizedVelocity(Vector2.zero);
+            body.velocity = Vector2.zero;
+            UpdateWalkAnimation(Vector2.zero);
             Dispose();
         }
+        [HideFromIl2Cpp]
+        public void UpdateWalkAnimation(Vector2 velocity)
+        {
+            bool moving = velocity.sqrMagnitude >= 0.01f;
 
+            if (velocity.x < -0.01f)
+                Visual.cosmetics.SetFlipXWithoutPet(true);
+            else if (velocity.x > 0.01f)
+                Visual.cosmetics.SetFlipXWithoutPet(false);
+
+            if (moving)
+            {
+                if (!animations.IsPlayingRunAnimation())
+                {
+                    animations.PlayRunAnimation();
+                }
+                if (Visual.cosmetics.HasSkinLoaded() && !Visual.cosmetics.IsSkinPlayingRunAnim())
+                {
+                    Visual.cosmetics.AnimateSkinRun();
+                }
+            }
+            else
+            {
+                if (animations.IsPlayingRunAnimation() || !animations.IsPlayingSomeAnimation())
+                {
+                    animations.PlayIdleAnimation();
+
+                    if (Visual.cosmetics.HasSkinLoaded())
+                    {
+                        Visual.cosmetics.AnimateSkinIdle();
+                    }
+                }
+            }
+            var pos = Visual.transform.position;
+            pos.z = pos.y / 1000f;
+            Visual.transform.position = pos;
+        }
         [HideFromIl2Cpp]
         public void Dispose()
         {
             if (!isActive) return;
+
             isActive = false;
 
-            if (OptionGroupSingleton<WraithCallerOptions>.Instance.ShouldSwitchCamToNPC)
+            if (Owner.AmOwner && OptionGroupSingleton<WraithCallerOptions>.Instance.ShouldSwitchCamToNPC)
             {
                 Camera.main.GetComponent<FollowerCamera>().SetTarget(Owner);
                 ownerLight.transform.SetParent(Owner.transform, false);
                 ownerLight.transform.localPosition = Owner.Collider.offset;
             }
 
-            if (AmongUsClient.Instance.AmHost)
-            {
-                var info = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(d => d.PlayerId == npc.PlayerId);
-                GameData.Instance.RemovePlayer(info.PlayerId);
-                PlayerControl.AllPlayerControls.Remove(npc);
-
-                npc.Despawn();
-                Destroy(npc.gameObject);
-                npc = null;
-            }
+            if (body)
+                body.velocity = Vector2.zero;
 
+            Destroy(Visual.gameObject);
             Destroy(gameObject);
         }
     }
-}
+}

NewMod/NewMod.cs

@@ -47,7 +47,7 @@ public override void Load()
     {
         Instance = this;
         AddComponent<DebugWindow>();
-        ReactorCredits.Register("NewMod", "v1.2.9 Hotfix 2", true, ReactorCredits.AlwaysShow);
+        ReactorCredits.Register("NewMod", "v1.2.9 Hotfix 3", true, ReactorCredits.AlwaysShow);
         Harmony.PatchAll();
         NewModEventHandler.RegisterEventsLogs();
 
@@ -59,16 +59,6 @@ public override void Load()
         ShouldEnableBepInExConsole = Config.Bind("NewMod", "Console", true, "Whether to enable BepInEx Console for debugging");
         if (!ShouldEnableBepInExConsole.Value) ConsoleManager.DetachConsole();
 
-        var bundle = NewModAsset.Bundle;
-        var assetNames = bundle.GetAllAssetNames();
-
-        Instance.Log.LogMessage($"AssetBundle '{bundle.name}' contains {assetNames.Length} assets");
-
-        foreach (var name in assetNames)
-        {
-            Instance.Log.LogMessage($"{name}");
-        }
-
         Instance.Log.LogMessage($"Loaded Successfully NewMod v{ModVersion} With MiraAPI Version : {MiraApiPlugin.Version}");
     }
 

NewMod/NewModAsset.cs

@@ -42,6 +42,7 @@ public static class NewModAsset
     public static LoadableResourceAsset Shield { get; } = new("NewMod.Resources.Shield.png");
     public static LoadableResourceAsset Slash { get; } = new("NewMod.Resources.Slash.png");
     public static LoadableResourceAsset DeployZone { get; } = new("NewMod.Resources.deployzone.png");
+    public static LoadableResourceAsset FeignDeath { get; } = new("NewMod.Resources.feigndeath.png");
     public static LoadableResourceAsset VanillaKillButton { get; } = new("NewMod.Resources.killbutton.png");
 
     // SFX
@@ -64,6 +65,7 @@ public static class NewModAsset
     public static LoadableResourceAsset RadarIcon { get; } = new("NewMod.Resources.RoleIcons.RadarIcon.png");
     public static LoadableResourceAsset SlashIcon { get; } = new("NewMod.Resources.RoleIcons.SlashIcon.png");
     public static LoadableResourceAsset DeployZoneIcon { get; } = new("NewMod.Resources.RoleIcons.DeployzoneIcon.png");
+     public static LoadableResourceAsset ReviveIcon { get; } = new("NewMod.Resources.RoleIcons.ReviveIcon.png");
 
     // Notif Icons
     public static LoadableResourceAsset VisionDebuff { get; } = new("NewMod.Resources.NotifIcons.vision_debuff.png");

NewMod/Resources/RoleIcons/ReviveIcon.png

@@ -19,7 +19,7 @@ public class NecromancerRole : ImpostorRole, ICustomRole
     public RoleOptionsGroup RoleOptionsGroup { get; } = RoleOptionsGroup.Impostor;
     public CustomRoleConfiguration Configuration => new(this)
     {
-        Icon = MiraAssets.Empty,
+        Icon = NewModAsset.ReviveIcon,
         OptionsScreenshot = NewModAsset.Banner,
         MaxRoleCount = 3,
     };
@@ -41,7 +41,6 @@ public override bool DidWin(GameOverReason reason)
         {
             return false;
         }
-
-        return base.DidWin(reason);
+        return true;
     }
 }