1.1.2 update

ChaosTokens/Buttons/TokenKillButton.cs

@@ -1,5 +1,4 @@
-using AmongUs.GameOptions;
-using ChaosTokens.Modifiers.Effects;
+using ChaosTokens.Modifiers.Effects;
 using MiraAPI.GameOptions;
 using MiraAPI.Hud;
 using MiraAPI.Modifiers;
@@ -53,6 +52,7 @@ public override bool Enabled(RoleBehaviour role)
 
     protected override void FixedUpdate(PlayerControl playerControl)
     {
+        if (!Button) return;
         Button.graphic.sprite = HudManager.Instance?.KillButton?.graphic?.sprite ?? MiraAssets.Empty.LoadAsset();
         Button.graphic.color = ChaosTokensPlugin.MainColor;
     }

ChaosTokens/ChaosTokens.csproj

@@ -5,7 +5,7 @@
         <DebugType>embedded</DebugType>
 
         <Authors>Chipseq</Authors>
-        <Version>1.1.1</Version>
+        <Version>1.1.2</Version>
     </PropertyGroup>
 
     <ItemGroup>

ChaosTokens/ChaosTokensRpc.cs

@@ -196,6 +196,11 @@
                     Reroll();
                     break;
                 }
+                if (player.HasModifier<TokenInvisible>())
+                {
+                    Reroll();
+                    break;
+                }
 
                 player.RpcAddModifier<TokenTransparent>(Random.RandomRange(0f, 0.8f));
                 break;
@@ -256,6 +261,11 @@
                     Reroll();
                     break;
                 }
+                if (player.HasModifier<TokenTransparent>())
+                {
+                    Reroll();
+                    break;
+                }
 
                 player.RpcAddModifier<TokenInvisible>();
                 break;
@@ -310,9 +320,6 @@
                 player.RpcAddModifier<TokenDrunk>();
                 break;
             case ChaosEffects.FakeRevealSelf:
-                // The player will reveal as ANY role
-                // disabled, vanilla, ghost roles included
-                // why? because it's funny
                 if (player.HasModifier<TokenReveal>())
                 {
                     Reroll();
@@ -325,7 +332,10 @@
                     break;
                 }
 
-                player.RpcAddModifier<TokenReveal>(RoleManager.Instance.AllRoles.Random().Role, player.Data.PlayerId);
+                var validRoles = CustomRoleManager.CustomMiraRoles
+                    .Where(r => r.Team != player.GetTownOfUsRole()?.Team)
+                    .Select(r => (r as RoleBehaviour).Role);
+                player.RpcAddModifier<TokenReveal>(validRoles.Random(), player.Data.PlayerId);
                 break;
             case ChaosEffects.Hyperactive:
                 if (player.HasModifier<TokenHyperactive>())
@@ -340,7 +350,7 @@
                 Reroll();
                 break;
 
                 if (player.HasModifier<TokenColorblind>() || player.HasModifier<TokenNausea>())
                 {
                     Reroll();
                     break;

ChaosTokens/DebugMenu.cs

@@ -80,11 +80,25 @@ public void WindowFunction(int windowID)
         GUILayout.Space(5f);
         GUILayout.Label("Effects");
 
+        var player = PlayerControl.LocalPlayer;
         foreach (var modifier in ModifierManager.Modifiers.OfType<TokenEffect>())
         {
             if (GUILayout.Button(modifier.ModifierName.Replace("Token ", string.Empty)))
             {
-                ChaosTokensRpc.ApplyEffect(PlayerControl.LocalPlayer, modifier.Effect);
+                ChaosTokensRpc.ApplyEffect(player, modifier.Effect);
+            }
+
+            if (modifier.ModifierName == "Token Reveal")
+            {
+                if (GUILayout.Button("Fake Reveal") && !player.HasModifier<TokenReveal>())
+                {
+                    ChaosTokensRpc.ApplyEffect(player, ChaosEffects.FakeRevealSelf);
+                }
+
+                if (GUILayout.Button("Random Person Reveal"))
+                {
+                    ChaosTokensRpc.ApplyEffect(player, ChaosEffects.RevealRandom);
+                }
             }
         }
 

ChaosTokens/Modifiers/Effects/TokenHyperactive.cs

@@ -25,18 +25,21 @@ public override void FixedUpdate()
         {
             EffectActive = !EffectActive;
         }
-        
-        foreach (var ability in CustomButtonManager.Buttons)
+
+        if (Player.AmOwner)
         {
-            random = Random.RandomRangeInt(1, 100);
-            if (random == 1)
+            foreach (var ability in CustomButtonManager.Buttons)
             {
-                if (!ability.Button.isActiveAndEnabled) continue;
-                if (ability.Location == ButtonLocation.BottomLeft) continue; // not the best solution, but stops modifier buttons from being pressed
-                if (!ability.CanClick()) continue;
-                if (ability.EffectActive) continue;
+                random = Random.RandomRangeInt(1, 100);
+                if (random == 1)
+                {
+                    if (!ability.Button?.isActiveAndEnabled ?? false) continue;
+                    if (ability.Location == ButtonLocation.BottomLeft) continue; // not the best solution, but stops modifier buttons from being pressed
+                    if (!ability.CanClick()) continue;
+                    if (ability.EffectActive) continue;
 
-                ability.ClickHandler();
+                    ability.ClickHandler();
+                }
             }
         }
     }

ChaosTokens/Modifiers/Effects/TokenInvisible.cs

@@ -1,5 +1,4 @@
 using System;
-using Reactor.Utilities;
 using TownOfUs.Modifiers.Game.Universal;
 using TownOfUs.Roles.Impostor;
 using TownOfUs.Utilities;
@@ -11,7 +10,7 @@ public sealed class TokenInvisible : TokenEffect
 {
     public override ChaosEffects Effect => ChaosEffects.Invisible;
     public override string ModifierName => "Token Invisible";
-    public override string Notification => "You have now become... invisible?";
+    public override string Notification => "You have now become... invisible?"; // no one got the reference :cry:
     public override bool Negative => false;
 
     private const float InvisDelay = 1f;

ChaosTokens/Modifiers/Effects/TokenMedium.cs

@@ -1,6 +1,12 @@
-using System.Linq;
+using System.Collections;
+using System.Linq;
 using HarmonyLib;
 using MiraAPI.Modifiers;
+using Reactor.Utilities;
+using Reactor.Utilities.Extensions;
+using TownOfUs;
+using TownOfUs.Utilities;
+using UnityEngine;
 
 namespace ChaosTokens.Modifiers.Effects;
 
@@ -23,6 +29,12 @@ public override void OnActivate()
                 .Where(x => !x.HasModifier<VisibleGhost>())
                 .Do(x => x.AddModifier<VisibleGhost>());
         }
+
+        if (PlayerControl.LocalPlayer.HasDied())
+        {
+            Coroutines.Start(MiscUtils.CoFlash(ChaosTokensPlugin.MainColor, 2));
+            Coroutines.Start(CoArrow(Player));
+        }
     }
 
     public override void OnDeactivate()
@@ -36,4 +48,15 @@ public override void OnDeactivate()
                 .Do(x => x.RemoveModifier<VisibleGhost>());
         }
     }
+
+    private static IEnumerator CoArrow(PlayerControl player)
+    {
+        var arrow = MiscUtils.CreateArrow(player.transform, TownOfUsColors.Medium);
+        for (float time = 0; time <= 2; time += Time.deltaTime)
+        {
+            arrow.target = player.GetTruePosition();
+            yield return new WaitForEndOfFrame();
+        }
+        arrow.gameObject.Destroy();
+    }
 }

ChaosTokens/Modifiers/Effects/TokenOneTimeKill.cs

@@ -13,12 +13,19 @@ public class TokenOneTimeKill : TokenEffect
     public override void OnActivate()
     {
         base.OnActivate();
-        CustomButtonSingleton<TokenKillButton>.Instance.SetTimer(10f);
-        CustomButtonSingleton<TokenKillButton>.Instance.Button.gameObject.SetActive(true);
+
+        if (Player.AmOwner)
+        {
+            CustomButtonSingleton<TokenKillButton>.Instance.SetTimer(10f);
+            CustomButtonSingleton<TokenKillButton>.Instance.Button.gameObject.SetActive(true);
+        }
     }
 
     public override void OnDeactivate()
     {
-        CustomButtonSingleton<TokenKillButton>.Instance.Button.gameObject.SetActive(false);
+        if (Player.AmOwner)
+        {
+            CustomButtonSingleton<TokenKillButton>.Instance.Button.gameObject.SetActive(false);
+        }
     }
 }

ChaosTokens/Modifiers/Effects/TokenReveal.cs

@@ -14,6 +14,7 @@ public class TokenReveal(RoleTypes role, byte source) : TokenEffect<RoleReveal>(
     public override bool LinkToAditional => true;
 
     public bool FakeReveal { get; protected set; }
+    private bool _ghostInfoUpdated = false;
 
     public override void OnActivate()
     {
@@ -24,17 +25,17 @@ public override void OnActivate()
         if (Player.AmOwner && FakeReveal)
         {
             Utils.Notification("<b>You have been revealed to everyone as a random role!</b>");
-
-            AdditionalModifier.ExtraRoleText = " <i><color=red>(fake)</color></i>";
+            AdditionalModifier.ExtraRoleText = " <size=50%><i><color=red>(fake)</color></i></size>";
             return;
         }
 
         if (Player.AmOwner)
         {
             Utils.Notification("<b>Your role has been revealed to everyone!</b>");
+            AdditionalModifier.ExtraRoleText = " <size=50%><i><color=red>(revealed)</color></i></size>";
             return;
         }
-
+        
         if (AdditionalModifier?.RevealSource?.AmOwner ?? false)
         {
             Utils.Notification("<b>You revealed the role of a random person!</b>");
@@ -47,5 +48,12 @@ public override void Update()
         {
             MeetingMenu.Instances.Do(x => x.HideSingle(Player.PlayerId));
         }
+
+        if (!_ghostInfoUpdated && FakeReveal && PlayerControl.LocalPlayer.HasDied())
+        {
+            _ghostInfoUpdated = true;
+            AdditionalModifier.ExtraRoleText = $" <size=50%><i><color=red>(revealed as {AdditionalModifier.ShownRole?.NiceName})</color></i></size>";
+            AdditionalModifier.ShownRole = Player.GetRoleWhenAlive();
+        }
     }
 }

ChaosTokens/Modifiers/VisibleGhost.cs

@@ -6,7 +6,7 @@ public sealed class VisibleGhost : BaseModifier
 {
     public override string ModifierName => "Visible Ghost";
     public override bool HideOnUi => true;
-
+    
     public override void FixedUpdate()
     {
         if (!Player.Data.IsDead)
@@ -17,4 +17,9 @@ public override void FixedUpdate()
 
         Player.Visible = true;
     }
+
+    public override void OnDeactivate()
+    {
+        Player.Visible = false;
+    }
 }