Probably fixed the Revenant issues

Author: CallOfCreator

NewMod/Buttons/Revenant/DoomAwakening.cs

@@ -60,7 +60,7 @@ public class DoomAwakening : CustomActionButton
         /// <returns>True if the role is <see cref="RV"/>, otherwise false.</returns>
         public override bool Enabled(RoleBehaviour role)
         {
-            return role is RV;
+            return role is RV && RV.StalkingStates.ContainsKey(PlayerControl.LocalPlayer.PlayerId);
         }
 
         /// <summary>

NewMod/Roles/ImpostorRoles/Revenant.cs

@@ -28,7 +28,7 @@ public class Revenant : ImpostorRole, ICustomRole
         DefaultChance = 50,
         DefaultRoleCount = 1,
         CanModifyChance = true,
-        GhostRole = AmongUs.GameOptions.RoleTypes.Crewmate, //Indeed
+        GhostRole = (AmongUs.GameOptions.RoleTypes)RoleId.Get<Revenant>(),
         RoleHintType = RoleHintType.RoleTab
     };
     public static Dictionary<byte, FeignDeathInfo> FeignDeathStates = new Dictionary<byte, FeignDeathInfo>();

NewMod/Utilities/Utils.cs

@@ -815,6 +815,8 @@ public static IEnumerator StartFeignDeath(PlayerControl player)
         {
             var clip = NewModAsset.FeignDeathSound.LoadAsset();
 
+            SavePlayerRole(player.PlayerId, player.Data.Role);
+
             player.RpcCustomMurder(player,
                 didSucceed: true,
                 resetKillTimer: false,
@@ -853,16 +855,21 @@ public static IEnumerator StartFeignDeath(PlayerControl player)
                 if (info.Reported)
                 {
                     yield return CoroutinesHelper.CoNotify("<color=red>Your feign death has been reported. You remain dead.</color>");
+                    Revenant.FeignDeathStates.Remove(player.PlayerId);
                     SoundManager.Instance.StopSound(clip);
                     yield break;
                 }
             }
-            HandleRevive(player, player.PlayerId, (RoleTypes)RoleId.Get<Revenant>(), body.transform.position.x, body.transform.position.y);
+            Revenant.HasUsedFeignDeath = true;
+            Revenant.StalkingStates[player.PlayerId] = true;
+
+            var roleHistory = GetPlayerRolesHistory(player.PlayerId);
+            var roleToRestore = roleHistory.Count > 0 ? roleHistory[^1].Role : (RoleTypes)RoleId.Get<Revenant>();
+
+            HandleRevive(player, player.PlayerId, roleToRestore, body.transform.position.x, body.transform.position.y);
             yield return new WaitForSeconds(0.2f);
             player.RpcShapeshift(GetRandomPlayer(p => !p.Data.IsDead && !p.Data.Disconnected), false);
             Coroutines.Start(CoroutinesHelper.CoNotify("<color=green>You have been revived in a new body!</color>"));
-            Revenant.HasUsedFeignDeath = true;
-            Revenant.StalkingStates[player.PlayerId] = true;
             Revenant.FeignDeathStates.Remove(player.PlayerId);
 
             if (player.AmOwner)