diff --git a/MiraAPI.Example/ExampleEventHandlers.cs b/MiraAPI.Example/ExampleEventHandlers.cs index ed7748c..2f3c3ce 100644 --- a/MiraAPI.Example/ExampleEventHandlers.cs +++ b/MiraAPI.Example/ExampleEventHandlers.cs @@ -1,9 +1,12 @@ -using MiraAPI.Events; +using System.Linq; +using MiraAPI.Events; using MiraAPI.Events.Mira; using MiraAPI.Events.Vanilla.Gameplay; using MiraAPI.Events.Vanilla.Map; +using MiraAPI.Events.Vanilla.Meeting; using MiraAPI.Events.Vanilla.Player; using MiraAPI.Example.Buttons.Freezer; +using MiraAPI.Example.Roles; using MiraAPI.Utilities.Assets; using Reactor.Utilities; using TMPro; @@ -34,6 +37,38 @@ public static class ExampleEventHandlers }); } + // If you want to add extra votes to a player, do something like this. + [RegisterEvent] + public static void StartMeetingEvent(StartMeetingEvent _) + { + foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player.Data.Role is MayorRole)) + { + plr.GetVoteData().IncreaseRemainingVotes(1); + } + } + + // Example of using the Voting API to make a role similar to the Prosecutor from Town of Us. + [RegisterEvent(15)] + public static void HandleVoteEvent(HandleVoteEvent @event) + { + if (@event.VoteData.Owner.Data.Role is not NeutralKillerRole) return; + + @event.VoteData.SetRemainingVotes(0); + + for (var i = 0; i < 5; i++) + { + @event.VoteData.VoteForPlayer(@event.TargetId); + } + + foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player != @event.VoteData.Owner)) + { + plr.GetVoteData().Votes.Clear(); + plr.GetVoteData().VotesRemaining = 0; + } + + @event.Cancel(); + } + // Events can be registered using an attribute as well. [RegisterEvent] public static void UpdateSystemEventHandler(UpdateSystemEvent @event) @@ -47,11 +82,10 @@ public static class ExampleEventHandlers { Logger.Warning("Freeze button clicked!"); - if (PlayerControl.LocalPlayer.Data.PlayerName == "stupid") - { - @event.Cancel(); - @event.Button.SetTimer(15f); - } + if (PlayerControl.LocalPlayer.Data.PlayerName != "stupid") return; + + @event.Cancel(); + @event.Button.SetTimer(15f); } // Example event handler diff --git a/MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs b/MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs index 12a9587..8eee41e 100644 --- a/MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs +++ b/MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs @@ -15,7 +15,7 @@ public class FreezeModifier : TimedModifier public override void OnActivate() { - if (Player?.AmOwner == true) + if (Player.AmOwner) { Player.moveable = false; } @@ -25,15 +25,15 @@ public class FreezeModifier : TimedModifier { base.FixedUpdate(); - if (Player?.AmOwner == true || PlayerControl.LocalPlayer.Data.Role is FreezerRole) + if (Player.AmOwner || PlayerControl.LocalPlayer.Data.Role is FreezerRole) { - Player?.cosmetics.SetOutline(true, new Nullable(Palette.LightBlue)); + Player.cosmetics.SetOutline(true, new Nullable(Palette.LightBlue)); } } public override void OnTimerComplete() { - if (Player?.AmOwner == true) + if (Player.AmOwner) { Player.moveable = true; } diff --git a/MiraAPI.Example/Roles/ChameleonRole.cs b/MiraAPI.Example/Roles/ChameleonRole.cs index 1f2f61f..52550a3 100644 --- a/MiraAPI.Example/Roles/ChameleonRole.cs +++ b/MiraAPI.Example/Roles/ChameleonRole.cs @@ -1,4 +1,5 @@ -using MiraAPI.Roles; +using AmongUs.GameOptions; +using MiraAPI.Roles; using TMPro; using UnityEngine; @@ -12,9 +13,10 @@ public class ChameloenRole : CrewmateRole, ICustomRole public Color RoleColor => Palette.AcceptedGreen; public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate; - public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this) + public CustomRoleConfiguration Configuration => new(this) { OptionsScreenshot = ExampleAssets.Banner, + IntroSound = CustomRoleUtils.GetIntroSound(RoleTypes.Shapeshifter), }; public void PlayerControlFixedUpdate(PlayerControl playerControl) diff --git a/MiraAPI.Example/Roles/MayorRole.cs b/MiraAPI.Example/Roles/MayorRole.cs new file mode 100644 index 0000000..42c264f --- /dev/null +++ b/MiraAPI.Example/Roles/MayorRole.cs @@ -0,0 +1,14 @@ +using MiraAPI.Roles; +using UnityEngine; + +namespace MiraAPI.Example.Roles; + +public class MayorRole : CrewmateRole, ICustomRole +{ + public string RoleName => "Mayor"; + public string RoleLongDescription => "You get extra votes!"; + public string RoleDescription => RoleLongDescription; + public Color RoleColor => new Color32(221, 176, 152, 255); + public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate; + public CustomRoleConfiguration Configuration => new(this); +} diff --git a/MiraAPI/Events/Vanilla/Meeting/Voting/CheckForEndVotingEvent.cs b/MiraAPI/Events/Vanilla/Meeting/Voting/CheckForEndVotingEvent.cs new file mode 100644 index 0000000..b0bdae5 --- /dev/null +++ b/MiraAPI/Events/Vanilla/Meeting/Voting/CheckForEndVotingEvent.cs @@ -0,0 +1,26 @@ +namespace MiraAPI.Events.Vanilla.Meeting.Voting; + +/// +/// Checks if voting is complete. If canceled, the default end voting logic will be skipped. +/// +public class CheckForEndVotingEvent : MiraCancelableEvent +{ + /// + /// Gets a value indicating whether default voting logic determines that voting is complete. + /// + public bool IsVotingComplete { get; } + + /// + /// Gets or sets a value indicating whether the voting should be forced to end, regardless of the default logic. + /// + public bool ForceEndVoting { get; set; } + + /// + /// Initializes a new instance of the class. + /// + /// >True if voting is complete, false otherwise. + public CheckForEndVotingEvent(bool isVotingComplete) + { + IsVotingComplete = isVotingComplete; + } +} diff --git a/MiraAPI/Events/Vanilla/Meeting/Voting/HandleVoteEvent.cs b/MiraAPI/Events/Vanilla/Meeting/Voting/HandleVoteEvent.cs new file mode 100644 index 0000000..93005de --- /dev/null +++ b/MiraAPI/Events/Vanilla/Meeting/Voting/HandleVoteEvent.cs @@ -0,0 +1,44 @@ +using MiraAPI.Voting; + +namespace MiraAPI.Events.Vanilla.Meeting.Voting; + +/// +/// The event that is invoked when Mira handles a vote. This is invoked before Mira's behaviour, so be cautious. +/// If you intend on adding custom vote behaviour, cancel the event and do so. +/// If you are NOT canceling the event, keep in mind that Mira automatically removes a vote and adds the suspect to the VotedPlayers list after this event is invoked. +/// +public class HandleVoteEvent : MiraCancelableEvent +{ + /// + /// Gets the instance of the voter's vote data. + /// + public PlayerVoteData VoteData { get; } + + /// + /// Gets the player who voted. + /// + public PlayerControl Player { get; } + + /// + /// Gets the player id of the target. + /// + public byte TargetId { get; } + + /// + /// Gets the player info of the target. + /// + public NetworkedPlayerInfo TargetPlayerInfo { get; } + + /// + /// Initializes a new instance of the class. + /// + /// The voter's data. + /// The target's playerId. + public HandleVoteEvent(PlayerVoteData playerVoteData, byte targetId) + { + VoteData = playerVoteData; + Player = playerVoteData.Owner; + TargetId = targetId; + TargetPlayerInfo = GameData.Instance.GetPlayerById(targetId); + } +} diff --git a/MiraAPI/Events/Vanilla/Meeting/Voting/MeetingSelectEvent.cs b/MiraAPI/Events/Vanilla/Meeting/Voting/MeetingSelectEvent.cs new file mode 100644 index 0000000..6ea8eff --- /dev/null +++ b/MiraAPI/Events/Vanilla/Meeting/Voting/MeetingSelectEvent.cs @@ -0,0 +1,43 @@ +using MiraAPI.Voting; + +namespace MiraAPI.Events.Vanilla.Meeting.Voting; + +/// +/// The event that is invoked when the player tries to select another player to vote. +/// +public class MeetingSelectEvent : MiraEvent +{ + /// + /// Gets the instance of the voter's vote data. + /// + public PlayerVoteData VoteData { get; } + + /// + /// Gets the player id of the target. + /// + public int TargetId { get; } + + /// + /// Gets the player info of the target. + /// + public NetworkedPlayerInfo TargetPlayerInfo { get; } + + /// + /// Gets or sets a value indicating whether the player is allowed to select the target. + /// + public bool AllowSelect { get; set; } + + /// + /// Initializes a new instance of the class. + /// + /// The voter's data. + /// The target's playerId. + /// >Whether the player is allowed to select the target. + public MeetingSelectEvent(PlayerVoteData playerVoteData, int targetId, bool allowSelect) + { + VoteData = playerVoteData; + TargetId = targetId; + TargetPlayerInfo = GameData.Instance.GetPlayerById((byte)targetId); + AllowSelect = allowSelect; + } +} diff --git a/MiraAPI/Events/Vanilla/Meeting/Voting/PopulateResultsEvent.cs b/MiraAPI/Events/Vanilla/Meeting/Voting/PopulateResultsEvent.cs new file mode 100644 index 0000000..131b6d5 --- /dev/null +++ b/MiraAPI/Events/Vanilla/Meeting/Voting/PopulateResultsEvent.cs @@ -0,0 +1,25 @@ +using System.Collections.Generic; +using MiraAPI.Voting; + +namespace MiraAPI.Events.Vanilla.Meeting.Voting; + +/// +/// Called in VotingUtils.HandlePopulateResults. +/// Cancelling is NOT advised but if you do plan on cancelling, please ensure you account for displaying ALL player's votes. +/// +public class PopulateResultsEvent : MiraCancelableEvent +{ + /// + /// Gets a list of networked votes. + /// + public List Votes { get; } + + /// + /// Initializes a new instance of the class. + /// + /// The list of votes. + public PopulateResultsEvent(List votes) + { + Votes = votes; + } +} diff --git a/MiraAPI/Events/Vanilla/Meeting/Voting/ProcessVotesEvent.cs b/MiraAPI/Events/Vanilla/Meeting/Voting/ProcessVotesEvent.cs new file mode 100644 index 0000000..9ecaab0 --- /dev/null +++ b/MiraAPI/Events/Vanilla/Meeting/Voting/ProcessVotesEvent.cs @@ -0,0 +1,48 @@ +using System.Collections.Generic; +using System.Linq; +using MiraAPI.Voting; + +namespace MiraAPI.Events.Vanilla.Meeting.Voting; + +/// +/// Ran after calculating votes and before displaying the results. Only ran on the host. +/// +/// +/// Initializes a new instance of the class. +/// +/// >The list of votes that are being processed. +/// The player to be exiled. Will be null if no player is to be exiled. +public class ProcessVotesEvent(List votes, NetworkedPlayerInfo? exiledPlayer = null) : MiraEvent +{ + private readonly List _originalVotes = [.. votes]; + + private NetworkedPlayerInfo? _exiledPlayer = exiledPlayer; + + /// + /// Gets a value indicating whether the exiled player has been modified by the event. + /// + public bool ExiledPlayerModified { get; private set; } + + /// + /// Gets a value indicating whether the votes have been modified by the event. + /// + public bool VotesModified => !Votes.SequenceEqual(_originalVotes); + + /// + /// Gets the list of votes that are being processed. + /// + public List Votes { get; } = votes; + + /// + /// Gets or sets the player to be exiled. Will be null if no player is to be exiled. + /// + public NetworkedPlayerInfo? ExiledPlayer + { + get => _exiledPlayer; + set + { + _exiledPlayer = value; + ExiledPlayerModified = true; + } + } +} diff --git a/MiraAPI/GameOptions/AbstractOptionGroup.cs b/MiraAPI/GameOptions/AbstractOptionGroup.cs index 45f9bd4..db2b93c 100644 --- a/MiraAPI/GameOptions/AbstractOptionGroup.cs +++ b/MiraAPI/GameOptions/AbstractOptionGroup.cs @@ -35,7 +35,7 @@ public abstract class AbstractOptionGroup /// /// Gets the group color. This is used to color the group in the options menu. /// - public virtual Color GroupColor => Color.clear; + public virtual Color GroupColor => MiraApiPlugin.DefaultHeaderColor; /// /// Gets the group priority. This is used to determine the order in which groups are displayed in the options menu. diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs index 670fb3c..83048f7 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedOption.cs @@ -79,17 +79,7 @@ public abstract class ModdedOption : IModdedOption /// /// Gets or sets the config definition of the option. /// - public ConfigDefinition? ConfigDefinition - { - get => _configDefinition; - set - { - if (_configDefinition is not null) return; - _configDefinition = value; - } - } - - private ConfigDefinition? _configDefinition; + public ConfigDefinition? ConfigDefinition { get; set; } /// /// Initializes a new instance of the class. diff --git a/MiraAPI/Hud/CustomActionButton.cs b/MiraAPI/Hud/CustomActionButton.cs index 4136e99..6a721da 100644 --- a/MiraAPI/Hud/CustomActionButton.cs +++ b/MiraAPI/Hud/CustomActionButton.cs @@ -52,9 +52,9 @@ public abstract class CustomActionButton public virtual Color TextOutlineColor => Color.clear; /// - /// Gets the location of the button on the screen. + /// Gets or sets the location of the button on the screen. /// - public virtual ButtonLocation Location { get; private set; } = ButtonLocation.BottomLeft; + public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft; /// /// Gets a value indicating whether the button has an effect ability. @@ -69,27 +69,27 @@ public abstract class CustomActionButton /// /// Gets or sets a value indicating whether the effect is currently active, if there is one. /// - public bool EffectActive { get; protected set; } + public bool EffectActive { get; set; } /// /// Gets or sets a value indicating whether the timer is currently active. /// - public bool TimerPaused { get; protected set; } + public bool TimerPaused { get; set; } /// /// Gets or sets the amount of uses left. /// - public int UsesLeft { get; protected set; } + public int UsesLeft { get; set; } /// /// Gets or sets the timer variable to measure cooldowns and effects. /// - public float Timer { get; protected set; } + public float Timer { get; set; } /// - /// Gets the button object in game. This is created by Mira API automatically. + /// Gets or sets the button object in game. This is created by Mira API automatically. /// - protected ActionButton? Button { get; private set; } + public ActionButton? Button { get; set; } /// /// The method used to create the button. @@ -168,7 +168,7 @@ public abstract class CustomActionButton /// Allows you to change the button's location. /// /// The new location. - /// Whether the button's position should change ingame. + /// Whether the button's position should change in-game. public virtual void SetButtonLocation(ButtonLocation location, bool moveButton = true) { if (!HudManager.InstanceExists || Button == null) @@ -221,7 +221,6 @@ public abstract class CustomActionButton /// A utility function to change the outline color of the button's text. /// /// The new color. - /// The thickness of the outline. Set to 0 if you want to remove it. public virtual void SetTextOutline(Color color) { Button?.buttonLabelText.SetOutlineColor(color); @@ -364,7 +363,7 @@ public abstract class CustomActionButton /// A value that represents whether the button should light up or not. public virtual bool CanUse() { - return !LimitedUses || UsesLeft > 0; + return PlayerControl.LocalPlayer.moveable && (!LimitedUses || UsesLeft > 0); } /// @@ -463,7 +462,7 @@ public abstract class CustomActionButton : CustomActionButton where T : MonoB /// /// Gets or sets the target object of the button. /// - public T? Target { get; protected set; } + public T? Target { get; set; } /// /// Gets the distance the player must be from the target object to use the button. diff --git a/MiraAPI/Hud/CustomPlayerMenu.cs b/MiraAPI/Hud/CustomPlayerMenu.cs index 27f52ac..56d9f0e 100644 --- a/MiraAPI/Hud/CustomPlayerMenu.cs +++ b/MiraAPI/Hud/CustomPlayerMenu.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Diagnostics.CodeAnalysis; using System.Linq; using AmongUs.GameOptions; using Il2CppInterop.Runtime.Attributes; @@ -8,6 +9,8 @@ using Reactor.Utilities.Attributes; using Reactor.Utilities.Extensions; using UnityEngine; using UnityEngine.Events; +#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member +#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable. namespace MiraAPI.Hud; @@ -16,22 +19,18 @@ namespace MiraAPI.Hud; /// /// Used by Il2Cpp. Do not use constructor, this is a MonoBehaviour. [RegisterInIl2Cpp] +[SuppressMessage("Design", "CA1051:Do not declare visible instance fields", Justification = "Unity Convention")] +[SuppressMessage("StyleCop.CSharp.NamingRules", "SA1307:Accessible fields should begin with upper-case letter", Justification = "Unity Convention")] +[SuppressMessage("StyleCop.CSharp.MaintainabilityRules", "SA1401:Fields should be private", Justification = "Unity Convention")] public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) { - public ShapeshifterPanel PanelPrefab; - - public float XStart = -0.8f; - - public float YStart = 2.15f; - - public float XOffset = 1.95f; - - public float YOffset = -0.65f; - - public UiElement BackButton; - - public UiElement DefaultButtonSelected; - + public ShapeshifterPanel panelPrefab; + public float xStart = -0.8f; + public float yStart = 2.15f; + public float xOffset = 1.95f; + public float yOffset = -0.65f; + public UiElement backButton; + public UiElement defaultButtonSelected; public List potentialVictims; /// @@ -42,17 +41,17 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) { var shapeShifterRole = RoleManager.Instance.GetRole(RoleTypes.Shapeshifter); - var ogMenu = shapeShifterRole.TryCast().ShapeshifterMenu; + var ogMenu = shapeShifterRole.TryCast()!.ShapeshifterMenu; var newMenu = Instantiate(ogMenu); var customMenu = newMenu.gameObject.AddComponent(); - customMenu.PanelPrefab = newMenu.PanelPrefab; - customMenu.XStart = newMenu.XStart; - customMenu.YStart = newMenu.YStart; - customMenu.XOffset = newMenu.XOffset; - customMenu.YOffset = newMenu.YOffset; - customMenu.BackButton = newMenu.BackButton; - var back = customMenu.BackButton.GetComponent(); + customMenu.panelPrefab = newMenu.PanelPrefab; + customMenu.xStart = newMenu.XStart; + customMenu.yStart = newMenu.YStart; + customMenu.xOffset = newMenu.XOffset; + customMenu.yOffset = newMenu.YOffset; + customMenu.backButton = newMenu.BackButton; + var back = customMenu.backButton.GetComponent(); back.OnClick.RemoveAllListeners(); back.OnClick.AddListener((UnityAction)(() => { @@ -65,7 +64,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) newMenu.DestroyImmediate(); - customMenu.transform.SetParent(Camera.main.transform, false); + customMenu.transform.SetParent(Camera.main!.transform, false); customMenu.transform.localPosition = new Vector3(0f, 0f, -50f); return customMenu; } @@ -75,6 +74,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) ControllerManager.Instance.CloseOverlayMenu(name); } + /// public override void Begin(PlayerTask task) { throw new NotImplementedException("Use the other Begin method."); @@ -90,7 +90,7 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) { MinigameStubs.Begin(this, null); - var back = BackButton.GetComponent(); + var back = backButton.GetComponent(); back.OnClick.AddListener((UnityAction)(() => { onClick(null); @@ -107,13 +107,13 @@ public class CustomPlayerMenu(IntPtr il2CppPtr) : Minigame(il2CppPtr) var num = i % 3; var num2 = i / 3; var flag = PlayerControl.LocalPlayer.Data.Role.NameColor == player.Data.Role.NameColor; - var shapeshifterPanel = Instantiate(PanelPrefab, transform); - shapeshifterPanel.transform.localPosition = new Vector3(XStart + num * XOffset, YStart + num2 * YOffset, -1f); + var shapeshifterPanel = Instantiate(panelPrefab, transform); + shapeshifterPanel.transform.localPosition = new Vector3(xStart + num * xOffset, yStart + num2 * yOffset, -1f); shapeshifterPanel.SetPlayer(i, player.Data, (Il2CppSystem.Action)(() => { onClick(player); })); shapeshifterPanel.NameText.color = flag ? player.Data.Role.NameColor : Color.white; potentialVictims.Add(shapeshifterPanel); list2.Add(shapeshifterPanel.Button); } - ControllerManager.Instance.OpenOverlayMenu(name, BackButton, DefaultButtonSelected, list2); + ControllerManager.Instance.OpenOverlayMenu(name, backButton, defaultButtonSelected, list2); } } diff --git a/MiraAPI/MiraApiPlugin.cs b/MiraAPI/MiraApiPlugin.cs index 3380820..72424af 100644 --- a/MiraAPI/MiraApiPlugin.cs +++ b/MiraAPI/MiraApiPlugin.cs @@ -19,7 +19,16 @@ namespace MiraAPI; [ReactorModFlags(ModFlags.RequireOnAllClients)] public partial class MiraApiPlugin : BasePlugin { + /// + /// Gets the branding Mira API color. + /// public static Color MiraColor { get; } = new Color32(238, 154, 112, 255); + + /// + /// Gets the default color for headers in the options menu. + /// + public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255); + private static MiraPluginManager? PluginManager { get; set; } internal Harmony Harmony { get; } = new(Id); diff --git a/MiraAPI/Modifiers/BaseModifier.cs b/MiraAPI/Modifiers/BaseModifier.cs index 0dd2149..7b3dc3f 100644 --- a/MiraAPI/Modifiers/BaseModifier.cs +++ b/MiraAPI/Modifiers/BaseModifier.cs @@ -12,7 +12,7 @@ public abstract class BaseModifier : IOptionable /// /// Gets the player that the modifier is attached to. /// - public PlayerControl? Player { get; internal set; } + public PlayerControl Player { get; internal set; } = null!; /// /// Gets the modifier component that the modifier is attached to. diff --git a/MiraAPI/Modifiers/ModifierComponent.cs b/MiraAPI/Modifiers/ModifierComponent.cs index 8c7f6f2..f8859e3 100644 --- a/MiraAPI/Modifiers/ModifierComponent.cs +++ b/MiraAPI/Modifiers/ModifierComponent.cs @@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Collections.Immutable; using System.Diagnostics.CodeAnalysis; -using System.Globalization; using System.Linq; using System.Text; using Il2CppInterop.Runtime.Attributes; @@ -25,14 +24,14 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) /// Gets the active modifiers on the player. /// [HideFromIl2Cpp] - public ImmutableList ActiveModifiers => Modifiers.ToImmutableList(); + public ImmutableList ActiveModifiers { get; private set; } = ImmutableList.Empty; [HideFromIl2Cpp] private List Modifiers { get; set; } = []; - private PlayerControl? _player; + private PlayerControl _player = null!; - private TextMeshPro? _modifierText; + private TextMeshPro _modifierText = null!; private readonly List _toRemove = []; @@ -43,9 +42,18 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) _toRemove.AddRange(Modifiers); } - private void Start() + private void Awake() { _player = GetComponent(); + if (_player == null) + { + Logger.Error("ModifierComponent could not find PlayerControl on the same GameObject."); + Destroy(this); + return; + } + + ModifierExtensions.ModifierComponents.Add(_player, this); + Modifiers = []; if (!_player.AmOwner) @@ -59,13 +67,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) private void FixedUpdate() { - foreach (var modifier in _toRemove) + foreach (var modifier in _toRemove.ToArray()) { modifier.OnDeactivate(); Modifiers.Remove(modifier); } - foreach (var modifier in _toAdd) + foreach (var modifier in _toAdd.ToArray()) { Modifiers.Add(modifier); modifier.Initialized = true; @@ -79,15 +87,17 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) if (_toAdd.Count > 0 || _toRemove.Count > 0) { - if (_player?.AmOwner == true) + if (_player.AmOwner && HudManager.InstanceExists) { - HudManager.Instance?.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled); + HudManager.Instance.SetHudActive(_player, _player.Data.Role, HudManager.Instance.TaskPanel.isActiveAndEnabled); } _toAdd.Clear(); _toRemove.Clear(); + + ActiveModifiers = Modifiers.ToImmutableList(); } - foreach (var modifier in Modifiers) + foreach (var modifier in ActiveModifiers) { modifier.FixedUpdate(); } @@ -95,31 +105,42 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) private void Update() { - foreach (var modifier in Modifiers) + foreach (var modifier in ActiveModifiers) { modifier.Update(); } - if (!_modifierText || _player?.AmOwner == false) + if (!_modifierText || !_player.AmOwner) { return; } - var filteredModifiers = Modifiers.Where(mod => !mod.HideOnUi).ToArray(); + if (MeetingHud.Instance) + { + return; + } - if (filteredModifiers.Length != 0 && !MeetingHud.Instance) + var showText = false; + var builder = new StringBuilder("Modifiers:\n"); + + foreach (var modifier in ActiveModifiers) { - var stringBuild = new StringBuilder(); - foreach (var mod in filteredModifiers) + if (modifier.HideOnUi) { - stringBuild.Append(CultureInfo.InvariantCulture, $"\n{mod.GetHudString()}"); + continue; } - _modifierText!.text = $"Modifiers:{stringBuild}"; - } - else if (_modifierText!.text != string.Empty) - { - _modifierText.text = string.Empty; + + showText = true; + builder.AppendLine(modifier.GetHudString()); } + + _modifierText.text = showText ? builder.ToString() : string.Empty; + } + + private void OnDestroy() + { + // Remove this component from the global list when destroyed + ModifierExtensions.ModifierComponents.Remove(_player); } /// @@ -131,7 +152,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public IEnumerable GetModifiers(Func? predicate=null) where T : BaseModifier { - return Modifiers.OfType().Where(x => predicate == null || predicate(x)); + return ActiveModifiers.OfType().Where(x => predicate == null || predicate(x)); } /// @@ -143,7 +164,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public IEnumerable GetModifiers(Type type, Func? predicate=null) { - return Modifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))); + return ActiveModifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))); } /// @@ -263,7 +284,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public BaseModifier? GetModifier(Guid modifierGuid) { - return Modifiers.Find(x => x.UniqueId == modifierGuid); + return ActiveModifiers.Find(x => x.UniqueId == modifierGuid); } /// @@ -285,7 +306,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public void RemoveModifier(Type type, Func? predicate = null) { - var modifiers = Modifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))).ToList(); + var modifiers = ActiveModifiers.Where(x => x.GetType() == type && (predicate == null || predicate(x))).ToList(); if (modifiers.Count > 1) { throw new InvalidOperationException($"Cannot remove modifier {type.Name} because there are multiple instances of that modifier."); @@ -308,7 +329,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public void RemoveModifier(BaseModifier modifier) { - if (!Modifiers.Contains(modifier)) + if (!ActiveModifiers.Contains(modifier)) { Logger.Error($"Cannot remove modifier {modifier.ModifierName} because it is not active on this player."); return; @@ -374,13 +395,13 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) } var id = modifier.TypeId; - if (modifier.Unique && Modifiers.Find(x => x.TypeId == id) != null) + if (modifier.Unique && ActiveModifiers.Find(x => x.TypeId == id) != null) { Logger.Error($"Player already has modifier with id {id}!"); return null; } - if (Modifiers.Contains(modifier)) + if (ActiveModifiers.Contains(modifier)) { Logger.Error($"Player already has this modifier!"); return null; @@ -446,7 +467,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public bool HasModifier(Func? predicate=null) where T : BaseModifier { - return Modifiers.Exists(x => x is T modifier && (predicate == null || predicate(modifier))); + return ActiveModifiers.Exists(x => x is T modifier && (predicate == null || predicate(modifier))); } /// @@ -458,7 +479,7 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public bool HasModifier(Type type, Func? predicate=null) { - return Modifiers.Exists(x => x.GetType() == type && (predicate == null || predicate(x))); + return ActiveModifiers.Exists(x => x.GetType() == type && (predicate == null || predicate(x))); } /// @@ -484,6 +505,6 @@ public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr) [HideFromIl2Cpp] public bool HasModifier(Guid id) { - return Modifiers.Exists(x => x.UniqueId == id); + return ActiveModifiers.Exists(x => x.UniqueId == id); } } diff --git a/MiraAPI/Modifiers/ModifierExtensions.cs b/MiraAPI/Modifiers/ModifierExtensions.cs index 06d9f06..ca49808 100644 --- a/MiraAPI/Modifiers/ModifierExtensions.cs +++ b/MiraAPI/Modifiers/ModifierExtensions.cs @@ -180,6 +180,30 @@ public static class ModifierExtensions return player.GetModifierComponent().HasModifier(typeId, predicate); } + /// + /// Clears all modifiers from a player. + /// + /// The player you want to clear modifiers for. + public static void ClearModifiers(this PlayerControl plr) + { + foreach (var mod in plr.GetModifierComponent().ActiveModifiers) + { + plr.RemoveModifier(mod); + } + } + + /// + /// Clears all modifiers from a player. + /// + /// The player you want to clear modifiers for. + public static void RpcClearModifiers(this PlayerControl plr) + { + foreach (var mod in plr.GetModifierComponent().ActiveModifiers) + { + plr.RpcRemoveModifier(mod.UniqueId); + } + } + /// /// Checks if the player has a specific modifier by its GUID. /// diff --git a/MiraAPI/Modifiers/ModifierUtils.cs b/MiraAPI/Modifiers/ModifierUtils.cs new file mode 100644 index 0000000..b69e7bc --- /dev/null +++ b/MiraAPI/Modifiers/ModifierUtils.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; + +namespace MiraAPI.Modifiers; + +/// +/// Utilities to make handling modifiers in-game easier. +/// +public static class ModifierUtils +{ + /// + /// Gets a list of all active in-game modifiers. + /// + /// Select if modifier is valid to be added to list. + /// The modifier type. + /// A list of modifiers. + public static IEnumerable GetActiveModifiers(Func? predicate = null) where T : BaseModifier + { + return PlayerControl.AllPlayerControls.ToArray().SelectMany(x => x.GetModifiers(predicate)).OfType(); + } + + /// + /// Gets all players with a certain modifier. + /// + /// Select if modifier is valid. + /// The modifier type. + /// A list of players with that modifier. + public static IEnumerable GetPlayersWithModifier(Func? predicate = null) where T : BaseModifier + { + return PlayerControl.AllPlayerControls.ToArray().Where(x => x.HasModifier(predicate)); + } +} diff --git a/MiraAPI/Networking/MiraRpc.cs b/MiraAPI/Networking/MiraRpc.cs index 280fa7e..9ee1088 100644 --- a/MiraAPI/Networking/MiraRpc.cs +++ b/MiraAPI/Networking/MiraRpc.cs @@ -39,4 +39,9 @@ public enum MiraRpc : uint /// Custom Game Over RPC. /// CustomGameOver, + + /// + /// Custom RPC to undo a player's vote. + /// + RemoveVote, } diff --git a/MiraAPI/Patches/Events/ReportBodyEventPatch.cs b/MiraAPI/Patches/Events/ReportBodyEventPatch.cs index 1598436..feba1c9 100644 --- a/MiraAPI/Patches/Events/ReportBodyEventPatch.cs +++ b/MiraAPI/Patches/Events/ReportBodyEventPatch.cs @@ -5,10 +5,12 @@ using MiraAPI.Utilities; namespace MiraAPI.Patches.Events; -[HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))] +[HarmonyPatch] public static class ReportBodyEventPatch { - public static bool Prefix(PlayerControl __instance, NetworkedPlayerInfo? target) + [HarmonyPrefix] + [HarmonyPatch(typeof(PlayerControl), nameof(PlayerControl.CmdReportDeadBody))] + public static bool PlayerControlCmdReportDeadBodyPrefix(PlayerControl __instance, NetworkedPlayerInfo? target) { var body = target != null ? Helpers.GetBodyById(target.PlayerId) : null; diff --git a/MiraAPI/Patches/Events/StartMeetingEventPatch.cs b/MiraAPI/Patches/Events/StartMeetingEventPatch.cs deleted file mode 100644 index 04eea6f..0000000 --- a/MiraAPI/Patches/Events/StartMeetingEventPatch.cs +++ /dev/null @@ -1,15 +0,0 @@ -using HarmonyLib; -using MiraAPI.Events; -using MiraAPI.Events.Vanilla.Meeting; - -namespace MiraAPI.Patches.Events; - -[HarmonyPatch(typeof(MeetingHud), nameof(MeetingHud.Start))] -public static class StartMeetingEventPatch -{ - public static void Postfix(MeetingHud __instance) - { - var @event = new StartMeetingEvent(__instance); - MiraEventManager.InvokeEvent(@event); - } -} diff --git a/MiraAPI/Patches/Options/GameOptionsMenuPatch.cs b/MiraAPI/Patches/Options/GameOptionsMenuPatch.cs index aca0f2e..8034eff 100644 --- a/MiraAPI/Patches/Options/GameOptionsMenuPatch.cs +++ b/MiraAPI/Patches/Options/GameOptionsMenuPatch.cs @@ -42,7 +42,7 @@ public static class GameOptionsMenuPatch { var filteredGroups = GameSettingMenuPatches.SelectedMod?.OptionGroups - .Where(x => x.OptionableType == null) ?? []; + .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? []; foreach (var group in filteredGroups) { @@ -144,7 +144,7 @@ public static class GameOptionsMenuPatch } var filteredGroups = GameSettingMenuPatches.SelectedMod?.OptionGroups - .Where(x => x.OptionableType == null) ?? []; + .Where(x => x.OptionableType == null && !x.ShowInModifiersMenu) ?? []; foreach (var group in filteredGroups) { @@ -198,16 +198,19 @@ public static class GameOptionsMenuPatch menu.settingsContainer); categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20); - if (group.GroupColor != Color.clear) - { - categoryHeaderMasked.Background.color = group.GroupColor; - categoryHeaderMasked.Divider.color = group.GroupColor; - categoryHeaderMasked.Title.color = group.GroupColor.GetAlternateColor(); - } + categoryHeaderMasked.Background.color = group.GroupColor; + categoryHeaderMasked.Divider.color = group.GroupColor; + categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.GroupColor.FindAlternateColor(); + categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset(); + categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear; + categoryHeaderMasked.Background.sprite.texture.wrapMode = TextureWrapMode.Clamp; + + categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.5f, -0.1833f, 0); categoryHeaderMasked.Background.size = new Vector2( categoryHeaderMasked.Background.size.x + 1.5f, categoryHeaderMasked.Background.size.y); + categoryHeaderMasked.gameObject.SetActive(false); group.Header = categoryHeaderMasked; @@ -230,12 +233,12 @@ public static class GameOptionsMenuPatch SpriteRenderer[] componentsInChildren = newOpt.GetComponentsInChildren(true); foreach (var renderer in componentsInChildren) { - if (group.GroupColor != Color.clear) + if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor) { - renderer.color = group.GroupColor.GetAlternateColor(); + renderer.color = group.GroupColor.FindAlternateColor(); if (renderer.transform.parent.TryGetComponent(out var btn)) { - btn.interactableColor = group.GroupColor.GetAlternateColor(); + btn.interactableColor = group.GroupColor.FindAlternateColor(); btn.interactableHoveredColor = Color.white; } } @@ -245,7 +248,7 @@ public static class GameOptionsMenuPatch foreach (var textMeshPro in newOpt.GetComponentsInChildren(true)) { - if (group.GroupColor != Color.clear) + if (group.GroupColor != MiraApiPlugin.DefaultHeaderColor) { textMeshPro.color = group.GroupColor; } @@ -257,12 +260,11 @@ public static class GameOptionsMenuPatch if (newOpt is ToggleOption toggle) { toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset(); - toggle.CheckMark.color = - group.GroupColor != Color.clear ? group.GroupColor : MiraAssets.AcceptedTeal; + toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal; var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite") .GetComponent(); rend.sprite = MiraAssets.CheckmarkBox.LoadAsset(); - rend.color = group.GroupColor != Color.clear ? group.GroupColor : MiraAssets.AcceptedTeal; + rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal; } menu.Children.Add(newOpt); diff --git a/MiraAPI/Patches/Options/GameSettingMenuPatches.cs b/MiraAPI/Patches/Options/GameSettingMenuPatches.cs index 7781bf8..fcc3722 100644 --- a/MiraAPI/Patches/Options/GameSettingMenuPatches.cs +++ b/MiraAPI/Patches/Options/GameSettingMenuPatches.cs @@ -1,4 +1,5 @@ using System; +using System.Linq; using HarmonyLib; using MiraAPI.Modifiers; using MiraAPI.PluginLoading; @@ -22,6 +23,8 @@ internal static class GameSettingMenuPatches private static TextMeshPro? _text; private static Vector3 _roleBtnOgPos; + private static Vector3 _smallRoleBtnOgPos; + private static Vector3 _modifierBtnOgPos; private static GameOptionsMenu? _modifiersTab; private static PassiveButton? _modifiersButton; @@ -33,9 +36,20 @@ internal static class GameSettingMenuPatches { if ((previewOnly && Controller.currentTouchType == Controller.TouchType.Joystick) || !previewOnly) { - if (_modifiersTab) _modifiersTab?.gameObject.SetActive(tabNum == 3); + if (_modifiersTab) _modifiersTab!.gameObject.SetActive(tabNum == 3); _modifiersButton?.SelectButton(tabNum == 3); _smallRolesButton?.SelectButton(tabNum == 2); + if (tabNum == 3) + { + if (__instance.RoleSettingsButton.gameObject.active) + { + __instance.RoleSettingsButton.SelectButton(true); + } + else + { + _modifiersButton?.SelectButton(true); + } + } } if (previewOnly) @@ -45,6 +59,17 @@ internal static class GameSettingMenuPatches _modifiersButton?.SelectButton(tabNum == 3); _smallRolesButton?.SelectButton(tabNum == 2); + + if (tabNum != 3) return; + + if (__instance.RoleSettingsButton.gameObject.active) + { + __instance.RoleSettingsButton.SelectButton(true); + } + else + { + _modifiersButton?.SelectButton(true); + } } /// @@ -117,6 +142,7 @@ internal static class GameSettingMenuPatches _modifiersTab.name = "MODIFIERS TAB"; // create button for modifiers + __instance.RoleSettingsButton.buttonText.gameObject.GetComponent().Destroy(); __instance.RoleSettingsButton.gameObject.SetActive(false); _smallRolesButton = Object.Instantiate( __instance.RoleSettingsButton, @@ -137,6 +163,8 @@ internal static class GameSettingMenuPatches __instance.ChangeTab(2, true); })); + _smallRoleBtnOgPos = _smallRolesButton.transform.localPosition; + var roleText = _smallRolesButton.buttonText; roleText.text = "Roles"; roleText.GetComponent().Destroy(); @@ -178,9 +206,45 @@ internal static class GameSettingMenuPatches _modifiersButton.transform.localPosition = pos; _modifiersButton.name = "ModifiersButton"; + _modifierBtnOgPos = _modifiersButton.transform.localPosition; + UpdateText(__instance, __instance.GameSettingsTab, __instance.RoleSettingsTab); } + private static void ChangeRoleSettingButton(bool replace, GameSettingMenu __instance) + { + __instance.RoleSettingsButton.OnClick = new ButtonClickedEvent(); + __instance.RoleSettingsButton.OnMouseOver = new UnityEvent(); + + if (replace) + { + __instance.RoleSettingsButton.buttonText.text = "Modifiers Settings"; + __instance.RoleSettingsButton.OnClick.AddListener( + (UnityAction)(() => + { + __instance.ChangeTab(3, false); + })); + __instance.RoleSettingsButton.OnMouseOver.AddListener( + (UnityAction)(() => + { + __instance.ChangeTab(3, true); + })); + } + else + { + __instance.RoleSettingsButton.buttonText.text = "Roles Settings"; + __instance.RoleSettingsButton.OnClick.AddListener( + (UnityAction)(() => + { + __instance.ChangeTab(2, false); + })); + __instance.RoleSettingsButton.OnMouseOver.AddListener( + (UnityAction)(() => + { + __instance.ChangeTab(2, true); + })); + } + } private static void UpdateText(GameSettingMenu menu, GameOptionsMenu settings, RolesSettingsMenu roles) { if (_text is not null && SelectedModIdx == 0) @@ -197,106 +261,182 @@ internal static class GameSettingMenuPatches _text.text = name[..Math.Min(name.Length, 25)]; } - _modifiersButton.gameObject.SetActive(false); - _smallRolesButton.gameObject.SetActive(false); - menu.RoleSettingsButton.gameObject.SetActive(false); - if (SelectedModIdx != 0 && - SelectedMod?.OptionGroups.Exists(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) == true) + bool replaceWithModifiers = true; + _smallRolesButton!.transform.localPosition = _smallRoleBtnOgPos; + _modifiersButton!.transform.localPosition = _modifierBtnOgPos; + menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos; + + if (SelectedModIdx != 0) { + var modHasRoles = SelectedMod!.CustomRoles.Count != 0; + var modHasModifiers = SelectedMod.OptionGroups.Exists(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true); + var modHasOptions = SelectedMod.OptionGroups.Exists(x => x.OptionableType == null && !x.ShowInModifiersMenu); + _modifiersButton.gameObject.SetActive(true); _smallRolesButton.gameObject.SetActive(true); + menu.GameSettingsButton.gameObject.SetActive(true); + menu.RoleSettingsButton.gameObject.SetActive(false); + + // If there are no registered custom roles in the selected mod, hide the button. + if (!modHasRoles) + { + _smallRolesButton.gameObject.SetActive(false); + + if (roles.gameObject.active) + { + menu.ChangeTab(0, false); + } + + // If the mod has modifiers, we can disable the smaller modifier button and enable the bigger one. + if (modHasModifiers) + { + _modifiersButton.gameObject.SetActive(false); + menu.RoleSettingsButton.gameObject.SetActive(true); + + if (_modifiersTab!.gameObject.active) + { + menu.RoleSettingsButton.SelectButton(true); + } + } + } + + // If there are no modifiers in the selected mod, hide the modifiers button. + if (!modHasModifiers) + { + replaceWithModifiers = false; + _modifiersButton.gameObject.SetActive(false); + + if (_modifiersTab!.gameObject.active) + { + menu.ChangeTab(0, false); + } + // If the mod has roles, we can enable the bigger role button and disable the small one. + if (modHasRoles) + { + menu.RoleSettingsButton.gameObject.SetActive(true); + _smallRolesButton.gameObject.SetActive(false); + } + } + + // If there are no custom game options registered (that aren't modifier options), hide game settings button. + if (!modHasOptions) + { + menu.GameSettingsButton.gameObject.SetActive(false); + + if (settings.gameObject.active) + { + menu.ChangeTab(0, false); + } + + // If the mod has roles and modifiers, we can move their buttons to the game settings button position, since nothing is there. + if (menu.RoleSettingsButton.gameObject.active) + { + menu.RoleSettingsButton.transform.localPosition = menu.GameSettingsButton.transform.localPosition; + } + else if (_modifiersButton.gameObject.active && _smallRolesButton.gameObject.active) + { + _modifiersButton.transform.localPosition = new Vector3( + _modifiersButton.transform.localPosition.x, + menu.GameSettingsButton.transform.localPosition.y, + _modifiersButton.transform.localPosition.z); + + _smallRolesButton.transform.localPosition = new Vector3( + _smallRolesButton.transform.localPosition.x, + menu.GameSettingsButton.transform.localPosition.y, + _smallRolesButton.transform.localPosition.z); + } + } } else { + _modifiersButton.gameObject.SetActive(false); + _smallRolesButton.gameObject.SetActive(false); menu.RoleSettingsButton.gameObject.SetActive(true); - if (SelectedModIdx == 0 && _modifiersTab.gameObject.active) + menu.GameSettingsButton.gameObject.SetActive(true); + replaceWithModifiers = false; + + if (_modifiersTab!.gameObject.active) { menu.ChangeTab(0, false); } } - //menu.RoleSettingsButton.transform.localPosition = _roleBtnOgPos; - //menu.GameSettingsButton.gameObject.SetActive(true); - //menu.RoleSettingsButton.gameObject.SetActive(true); - - // TODO: reimplement this - /* - if (SelectedModIdx != 0) + if (menu.RoleSettingsButton.gameObject.active) { - if (SelectedMod?.Options.Where(x=>x.AdvancedRole==null).ToList().Count == 0) - { - menu.GameSettingsButton.gameObject.SetActive(false); - } - - if (SelectedMod?.CustomRoles.Count == 0) - { - menu.RoleSettingsButton.gameObject.SetActive(false); - } - - if (!menu.GameSettingsButton.gameObject.active && menu.RoleSettingsButton.gameObject.active) - { - menu.RoleSettingsButton.transform.localPosition = menu.GameSettingsButton.transform.localPosition; - } - }*/ - - if (roles.roleChances != null && SelectedMod != null && SelectedMod.CustomRoles.Count != 0) - { - if (roles.advancedSettingChildren is not null) - { - foreach (var child in roles.advancedSettingChildren) - { - child.gameObject.DestroyImmediate(); - } - - roles.advancedSettingChildren.Clear(); - roles.advancedSettingChildren = null; - } - - foreach (var header in roles.RoleChancesSettings.transform - .GetComponentsInChildren()) - { - header.gameObject.DestroyImmediate(); - } - - foreach (var roleChance in roles.roleChances) - { - roleChance.gameObject.DestroyImmediate(); - } - - roles.roleChances.Clear(); - roles.AdvancedRolesSettings.gameObject.SetActive(false); - roles.RoleChancesSettings.gameObject.SetActive(true); - roles.SetQuotaTab(); - roles.scrollBar.ScrollToTop(); + ChangeRoleSettingButton(replaceWithModifiers, menu); } - if (settings.Children != null && SelectedMod?.OptionGroups.Count != 0) + CleanupTab(settings, roles); + } + + private static void ClearOptions(Il2CppSystem.Collections.Generic.List options) + { + foreach (var child in options) { - foreach (var child in settings.Children) + if (child.TryCast() || !child.gameObject) { - if (child.TryCast()) - { - continue; - } + continue; + } + child.gameObject.DestroyImmediate(); + } + options.Clear(); + } - if (!child.gameObject) - { - continue; - } - - child.gameObject.DestroyImmediate(); + private static void CleanupTab(GameOptionsMenu settings, RolesSettingsMenu roles) + { + void CleanupRoleSettings(RolesSettingsMenu rolesMenu) + { + if (rolesMenu.advancedSettingChildren != null) + { + ClearOptions(rolesMenu.advancedSettingChildren); + rolesMenu.advancedSettingChildren = null; } - foreach (var header in settings.settingsContainer.GetComponentsInChildren()) + rolesMenu.RoleChancesSettings + .transform + .GetComponentsInChildren() + .ToList() + .ForEach(header => header.gameObject.DestroyImmediate()); + + foreach (var role in rolesMenu.roleChances) { - header.gameObject.DestroyImmediate(); + role.gameObject.DestroyImmediate(); } + rolesMenu.roleChances?.Clear(); - settings.Children.Clear(); - settings.Children = null; + rolesMenu.AdvancedRolesSettings.gameObject.SetActive(false); + rolesMenu.RoleChancesSettings.gameObject.SetActive(true); + rolesMenu.SetQuotaTab(); + rolesMenu.scrollBar.ScrollToTop(); + } - settings.Initialize(); - settings.scrollBar.ScrollToTop(); + void CleanupSettings(GameOptionsMenu gameOptMenu) + { + ClearOptions(gameOptMenu.Children); + gameOptMenu.Children = null; + + gameOptMenu.settingsContainer + .GetComponentsInChildren() + .ToList() + .ForEach(header => header.gameObject.DestroyImmediate()); + + gameOptMenu.Initialize(); + gameOptMenu.scrollBar.ScrollToTop(); + } + + if (roles.roleChances != null && SelectedMod?.CustomRoles.Count > 0) + { + CleanupRoleSettings(roles); + } + + if (settings.Children != null && SelectedMod?.OptionGroups.Count > 0) + { + CleanupSettings(settings); + } + + if (_modifiersTab?.Children?.Count > 0) + { + CleanupSettings(_modifiersTab); } } } diff --git a/MiraAPI/Patches/Options/LobbyViewPanePatches.cs b/MiraAPI/Patches/Options/LobbyViewPanePatches.cs index 9b2a934..8182aa7 100644 --- a/MiraAPI/Patches/Options/LobbyViewPanePatches.cs +++ b/MiraAPI/Patches/Options/LobbyViewPanePatches.cs @@ -250,14 +250,9 @@ public static class LobbyViewPanePatches var list = new List(); - var roleGroups = GameSettingMenuPatches.SelectedMod?.CustomRoles.Values.OfType() + var roleGroups = SelectedMod.CustomRoles.Values.OfType() .ToLookup(x => x.RoleOptionsGroup); - if (roleGroups is null) - { - return; - } - // sort the groups by priority var sortedRoleGroups = roleGroups .OrderBy(x => x.Key.Priority) @@ -265,7 +260,7 @@ public static class LobbyViewPanePatches foreach (var grouping in sortedRoleGroups) { - if (!grouping.Any()) + if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings)) { continue; } @@ -331,7 +326,7 @@ public static class LobbyViewPanePatches chancePerGame, 61, customRole.RoleColor, - customRole.Configuration.Icon.LoadAsset(), + customRole.Configuration.Icon?.LoadAsset() ?? MiraAssets.Empty.LoadAsset(), true); viewSettingsInfoPanelRoleVariant.iconSprite.transform.localScale = new Vector3(0.365f, 0.365f, 1f); viewSettingsInfoPanelRoleVariant.iconSprite.transform.localPosition = new Vector3(0.7144f, -0.028f, -2); @@ -340,7 +335,7 @@ public static class LobbyViewPanePatches viewSettingsInfoPanelRoleVariant.chanceTitle.color = viewSettingsInfoPanelRoleVariant.chanceBackground.color = viewSettingsInfoPanelRoleVariant.background.color = - customRole.RoleColor.GetAlternateColor(); + customRole.RoleColor.FindAlternateColor(); instance.settingsInfo.Add(viewSettingsInfoPanelRoleVariant.gameObject); num -= 0.664f; } @@ -418,7 +413,7 @@ public static class LobbyViewPanePatches role.StringName, maskLayer, role.TeamType == RoleTeamTypes.Crewmate, - customRole.Configuration.Icon.LoadAsset()); + customRole.Configuration.Icon != null ? customRole.Configuration.Icon.LoadAsset() : MiraAssets.Empty.LoadAsset()); viewPanel.header.icon.transform.localScale = new Vector3(0.465f, 0.465f, 1f); viewPanel.divider.material.SetInt(PlayerMaterial.MaskLayer, maskLayer); diff --git a/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs b/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs index 126f0b5..8d171a1 100644 --- a/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs +++ b/MiraAPI/Patches/Options/RoleSettingMenuPatches.cs @@ -83,10 +83,9 @@ public static class RoleSettingMenuPatches var quotaThing = __instance.categoryHeaderEditRoleOrigin.transform.FindChild("QuotaHeader"); var template = __instance.transform.parent.parent.GetComponent().GameSettingsTab.categoryHeaderOrigin; - foreach (var grouping in sortedRoleGroups) { - if (!grouping.Any()) + if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings)) { continue; } @@ -127,32 +126,37 @@ public static class RoleSettingMenuPatches chanceLabel.Destroy(); countLabel.Destroy(); - if (name is StringNames.CrewmateRolesHeader) - { - categoryHeaderMasked.Title.color = Palette.CrewmateRoleHeaderTextBlue; - categoryHeaderMasked.Background.color = Palette.CrewmateRoleHeaderBlue; - } - else if (name is StringNames.ImpostorRolesHeader) - { - categoryHeaderMasked.Title.color = Palette.ImpostorRoleHeaderTextRed; - categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed; - } - else - { - categoryHeaderMasked.Title.color = group.Color; - categoryHeaderMasked.Divider.color = group.Color; - categoryHeaderMasked.Background.color = group.Color; - } + categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset(); + categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear; + categoryHeaderMasked.Background.sprite.texture.wrapMode = TextureWrapMode.Clamp; - categoryHeaderMasked.Title.color = categoryHeaderMasked.Title.color.IsColorDark() ? - categoryHeaderMasked.Title.color.LightenColor(0.3f) : categoryHeaderMasked.Title.color.LightenColor(0.1f); + categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.5f, -0.1833f, 0); + + switch (name) + { + case StringNames.CrewmateRolesHeader: + categoryHeaderMasked.Title.color = Palette.CrewmateRoleHeaderTextBlue; + categoryHeaderMasked.Background.color = Palette.CrewmateRoleHeaderBlue; + break; + case StringNames.ImpostorRolesHeader: + categoryHeaderMasked.Title.color = Palette.ImpostorRoleHeaderTextRed; + categoryHeaderMasked.Background.color = Palette.ImpostorRoleHeaderRed; + break; + default: + categoryHeaderMasked.Title.color = group.Color.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.Color.FindAlternateColor(); + categoryHeaderMasked.Divider.color = group.Color; + categoryHeaderMasked.Background.color = group.Color; + break; + } categoryHeaderMasked.Title.fontStyle = __instance.categoryHeaderEditRoleOrigin.Title.fontStyle; categoryHeaderMasked.Title.font = __instance.categoryHeaderEditRoleOrigin.Title.font; categoryHeaderMasked.Title.fontMaterial = __instance.categoryHeaderEditRoleOrigin.Title.fontMaterial; categoryHeaderMasked.Divider.color = categoryHeaderMasked.Background.color; + categoryHeaderMasked.Background.transform.localPosition = new Vector3(0.55f, -0.1833f, 0); categoryHeaderMasked.Background.size = new Vector2(categoryHeaderMasked.Background.size.x + 1.5f, categoryHeaderMasked.Background.size.y); + categoryHeaderMasked.transform.localScale = Vector3.one * 0.63f; categoryHeaderMasked.transform.localPosition = new Vector3(-0.44f, ScrollerNum, -2f); categoryHeaderMasked.gameObject.SetActive(true); @@ -241,7 +245,7 @@ public static class RoleSettingMenuPatches [HarmonyPatch(nameof(RolesSettingsMenu.OpenChancesTab))] public static void OpenChancesTabPostfix(RolesSettingsMenu __instance) { - if (GameSettingMenuPatches.SelectedModIdx == 0) + if (GameSettingMenuPatches.SelectedModIdx == 0 || !__instance.scrollBar) { return; } @@ -383,8 +387,8 @@ public static class RoleSettingMenuPatches __instance.roleScreenshot.drawMode = SpriteDrawMode.Sliced; } - __instance.roleHeaderSprite.color = customRole.RoleColor; - __instance.roleHeaderText.color = customRole.RoleColor.GetAlternateColor(); + __instance.roleHeaderSprite.color = customRole.OptionsMenuColor; + __instance.roleHeaderText.color = customRole.OptionsMenuColor.FindAlternateColor(); var categoryHeaderMasked = __instance.AdvancedRolesSettings.transform.Find("CategoryHeaderMasked").GetComponent(); @@ -459,13 +463,13 @@ public static class RoleSettingMenuPatches roleOptionSetting.transform.localPosition = new Vector3(-0.1f, ScrollerNum, -2f); roleOptionSetting.SetRole(GameOptionsManager.Instance.CurrentGameOptions.RoleOptions, role, 20); - roleOptionSetting.labelSprite.color = customRole.RoleColor; + roleOptionSetting.labelSprite.color = customRole.OptionsMenuColor; roleOptionSetting.OnValueChanged = new Action(ValueChanged); roleOptionSetting.SetClickMask(__instance.ButtonClickMask); __instance.roleChances.Add(roleOptionSetting); roleOptionSetting.titleText.transform.localPosition = new Vector3(-0.5376f, -0.2923f, 0f); - roleOptionSetting.titleText.color = customRole.RoleColor.GetAlternateColor(); + roleOptionSetting.titleText.color = customRole.OptionsMenuColor.FindAlternateColor(); roleOptionSetting.titleText.horizontalAlignment = HorizontalAlignmentOptions.Left; if (GameSettingMenuPatches.SelectedMod is null || @@ -483,7 +487,7 @@ public static class RoleSettingMenuPatches var passiveButton = newButton.GetComponent(); passiveButton.OnClick = new ButtonClickedEvent(); - passiveButton.interactableColor = btnRend.color = customRole.RoleColor.GetAlternateColor(); + passiveButton.interactableColor = btnRend.color = customRole.OptionsMenuColor.FindAlternateColor(); passiveButton.interactableHoveredColor = Color.white; passiveButton.OnClick.AddListener((UnityAction)(() => { ChangeTab(role, __instance); })); diff --git a/MiraAPI/Patches/PlayerControlPatches.cs b/MiraAPI/Patches/PlayerControlPatches.cs index b6fd6b8..0f53f9f 100644 --- a/MiraAPI/Patches/PlayerControlPatches.cs +++ b/MiraAPI/Patches/PlayerControlPatches.cs @@ -6,6 +6,7 @@ using MiraAPI.Events.Vanilla.Player; using MiraAPI.Hud; using MiraAPI.Modifiers; using MiraAPI.Roles; +using MiraAPI.Voting; using Reactor.Utilities.Extensions; namespace MiraAPI.Patches; @@ -14,30 +15,30 @@ namespace MiraAPI.Patches; /// General patches for the PlayerControl class. /// [HarmonyPatch(typeof(PlayerControl))] -public static class PlayerControlPatches +internal static class PlayerControlPatches { - /// - /// Adds the modifier component to the player on start. - /// - /// PlayerControl instance. [HarmonyPostfix] [HarmonyPatch(nameof(PlayerControl.Start))] + // ReSharper disable once InconsistentNaming public static void PlayerControlStartPostfix(PlayerControl __instance) { - if (__instance.gameObject.TryGetComponent(out var comp)) + if (__instance.gameObject.TryGetComponent(out var modifierComp)) { - comp.DestroyImmediate(); + modifierComp.DestroyImmediate(); + } + + if (__instance.gameObject.TryGetComponent(out var voteComp)) + { + voteComp.DestroyImmediate(); } __instance.gameObject.AddComponent(); + __instance.gameObject.AddComponent(); } - /// - /// Calls the OnDeath method for all active modifiers. - /// - /// PlayerControl instance. [HarmonyPostfix] [HarmonyPatch(nameof(PlayerControl.Die))] + // ReSharper disable once InconsistentNaming public static void PlayerControlDiePostfix(PlayerControl __instance, DeathReason reason) { var deathEvent = new PlayerDeathEvent(__instance, reason); @@ -51,13 +52,9 @@ public static class PlayerControlPatches } } - /// - /// Used to trigger the . - /// - /// PlayerControl instance. - /// The task id. [HarmonyPostfix] [HarmonyPatch(nameof(PlayerControl.CompleteTask))] + // ReSharper disable once InconsistentNaming public static void PlayerCompleteTaskPostfix(PlayerControl __instance, uint idx) { var playerTask = __instance.myTasks.ToArray().First(playerTask => playerTask.Id == idx); @@ -68,14 +65,9 @@ public static class PlayerControlPatches } } - /// - /// Used to trigger the . - /// - /// The source player. - /// The target. - /// Whether the kill succeeded. [HarmonyPrefix] [HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))] + // ReSharper disable once InconsistentNaming public static void PlayerControlMurderPrefix(PlayerControl __instance, PlayerControl target, ref bool didSucceed) { var beforeMurderEvent = new BeforeMurderEvent(__instance, target); @@ -84,12 +76,9 @@ public static class PlayerControlPatches didSucceed = beforeMurderEvent.IsCancelled; } - /// - /// FixedUpdate handler for custom roles and custom buttons. - /// - /// PlayerControl instance. [HarmonyPostfix] [HarmonyPatch(nameof(PlayerControl.FixedUpdate))] + // ReSharper disable once InconsistentNaming public static void PlayerControlFixedUpdatePostfix(PlayerControl __instance) { if (__instance.Data?.Role is ICustomRole customRole) @@ -117,15 +106,4 @@ public static class PlayerControlPatches button.FixedUpdateHandler(__instance); } } - - /// - /// Clear from modifier component cache. - /// - /// PlayerControl instance. - [HarmonyPrefix] - [HarmonyPatch(nameof(PlayerControl.OnDestroy))] - public static void PlayerControlOnDestroyPrefix(PlayerControl __instance) - { - ModifierExtensions.ModifierComponents.Remove(__instance); - } } diff --git a/MiraAPI/Patches/Roles/GameStartupPatch.cs b/MiraAPI/Patches/Roles/GameStartupPatch.cs index b452791..9bb2a54 100644 --- a/MiraAPI/Patches/Roles/GameStartupPatch.cs +++ b/MiraAPI/Patches/Roles/GameStartupPatch.cs @@ -1,4 +1,5 @@ using HarmonyLib; +using MiraAPI.PluginLoading; using MiraAPI.Roles; namespace MiraAPI.Patches.Roles; @@ -21,6 +22,14 @@ public static class GameStartupPatch } _runOnce = true; + + if (MiraPluginManager.Instance.QueuedRoleRegistrations.Count <= 0) return; + foreach (var queue in MiraPluginManager.Instance.QueuedRoleRegistrations) + { + CustomRoleManager.RegisterRoleTypes(queue.Value, queue.Key); + } + + MiraPluginManager.Instance.QueuedRoleRegistrations.Clear(); CustomRoleManager.RegisterInRoleManager(); } } diff --git a/MiraAPI/Patches/Roles/RoleBehaviourPatch.cs b/MiraAPI/Patches/Roles/RoleBehaviourPatch.cs index 55cc5a5..1caba49 100644 --- a/MiraAPI/Patches/Roles/RoleBehaviourPatch.cs +++ b/MiraAPI/Patches/Roles/RoleBehaviourPatch.cs @@ -22,4 +22,4 @@ public static class RoleBehaviourPatch __result = behaviour.RoleColor; return false; } -} \ No newline at end of file +} diff --git a/MiraAPI/Patches/Roles/RoleManagerPatches.cs b/MiraAPI/Patches/Roles/RoleManagerPatches.cs index f326239..63ed61a 100644 --- a/MiraAPI/Patches/Roles/RoleManagerPatches.cs +++ b/MiraAPI/Patches/Roles/RoleManagerPatches.cs @@ -5,6 +5,7 @@ using MiraAPI.Events; using MiraAPI.Events.Vanilla.Gameplay; using MiraAPI.Modifiers; using MiraAPI.Roles; +using UnityEngine; namespace MiraAPI.Patches.Roles; @@ -15,6 +16,43 @@ public static class RoleManagerPatches [HarmonyPatch(nameof(RoleManager.SetRole))] public static void SetRolePatch(RoleManager __instance, PlayerControl targetPlayer, RoleTypes roleType) { + if (!targetPlayer) + { + return; + } + var data = targetPlayer.Data; + if (data == null) + { + Debug.LogError("It shouldn't be possible, but " + targetPlayer.name + " still doesn't have PlayerData during role selection."); + return; + } + if (data.Role) + { + data.Role.Deinitialize(targetPlayer); + Object.Destroy(data.Role.gameObject); + } + var roleBehaviour = Object.Instantiate(__instance.AllRoles.First(r => r.Role == roleType), data.gameObject.transform); + roleBehaviour.Initialize(targetPlayer); + targetPlayer.Data.Role = roleBehaviour; + targetPlayer.Data.RoleType = roleType; + + // basically everything is the same except this one if statement + // innersloth decided to check the roleType manually instead of the role behaviour. + if (!roleBehaviour.IsDead) + { + targetPlayer.Data.RoleWhenAlive = new Il2CppSystem.Nullable(roleType); + } + roleBehaviour.AdjustTasks(targetPlayer); + switch (roleBehaviour.IsDead) + { + case true when !targetPlayer.Data.IsDead: + targetPlayer.Die(DeathReason.Kill, false); + return; + case false when targetPlayer.Data.IsDead: + targetPlayer.Revive(); + break; + } + var @event = new SetRoleEvent(targetPlayer, roleType); MiraEventManager.InvokeEvent(@event); } diff --git a/MiraAPI/Patches/Stubs/MinigameStubs.cs b/MiraAPI/Patches/Stubs/MinigameStubs.cs index 3818d09..11e085e 100644 --- a/MiraAPI/Patches/Stubs/MinigameStubs.cs +++ b/MiraAPI/Patches/Stubs/MinigameStubs.cs @@ -33,4 +33,15 @@ public static class MinigameStubs { // nothing needed } + + /// + /// Fixes the error when creating custom minigames. Credit to Submerged for discovering this fix. + /// + /// The Minigame instance. + [HarmonyPrefix] + [HarmonyPatch(typeof(Minigame), nameof(Minigame.Begin))] + public static void MinigameErrorFixPatch(Minigame __instance) + { + __instance.logger ??= new Logger("Minigame", Logger.Level.Info, Logger.Category.Gameplay); + } } diff --git a/MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs b/MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs index 0248aaa..fe04962 100644 --- a/MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs +++ b/MiraAPI/Patches/Stubs/RoleBehaviourStubs.cs @@ -4,6 +4,9 @@ using Il2CppSystem.Text; namespace MiraAPI.Patches.Stubs; +/// +/// Stub methods for the RoleBehaviour class. Needed because of Il2Cpp limitations on injected classes. +/// [HarmonyPatch] public static class RoleBehaviourStubs { @@ -57,7 +60,7 @@ public static class RoleBehaviourStubs [MethodImpl(MethodImplOptions.NoInlining)] public static bool CanUse(RoleBehaviour instance, IUsable console) { - return default; + return false; } /// @@ -84,7 +87,7 @@ public static class RoleBehaviourStubs [MethodImpl(MethodImplOptions.NoInlining)] public static bool DidWin(RoleBehaviour instance, GameOverReason gameOverReason) { - return default; + return false; } /// @@ -97,7 +100,7 @@ public static class RoleBehaviourStubs [MethodImpl(MethodImplOptions.NoInlining)] public static PlayerControl FindClosestTarget(RoleBehaviour instance) { - return null; + return null!; } /// @@ -110,7 +113,7 @@ public static class RoleBehaviourStubs [MethodImpl(MethodImplOptions.NoInlining)] public static float GetAbilityDistance(RoleBehaviour instance) { - return default; + return 0; } /// @@ -124,7 +127,7 @@ public static class RoleBehaviourStubs [MethodImpl(MethodImplOptions.NoInlining)] public static bool IsValidTarget(RoleBehaviour instance, NetworkedPlayerInfo target) { - return default; + return false; } /// diff --git a/MiraAPI/Patches/VentPatches.cs b/MiraAPI/Patches/VentCanUsePatch.cs similarity index 78% rename from MiraAPI/Patches/VentPatches.cs rename to MiraAPI/Patches/VentCanUsePatch.cs index 2f8991d..b285411 100644 --- a/MiraAPI/Patches/VentPatches.cs +++ b/MiraAPI/Patches/VentCanUsePatch.cs @@ -8,17 +8,13 @@ using UnityEngine; namespace MiraAPI.Patches; /// -/// Vent patches to make sure the player is able to use the vent. +/// Used to change vent behaviour for the event system, custom roles, and modifiers. /// -[HarmonyPatch(typeof(Vent))] -public static class VentPatches +[HarmonyPatch(typeof(Vent), nameof(Vent.CanUse))] +internal static class VentCanUsePatch { - /// - /// CanUse patch. - /// - [HarmonyPostfix] - [HarmonyPatch(nameof(Vent.CanUse))] - public static void VentCanUsePostfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse) + // ReSharper disable InconsistentNaming + public static void Postfix(Vent __instance, ref float __result, [HarmonyArgument(0)] NetworkedPlayerInfo pc, [HarmonyArgument(1)] ref bool canUse, [HarmonyArgument(2)] ref bool couldUse) { var @event = new PlayerCanUseEvent(__instance.Cast()); MiraEventManager.InvokeEvent(@event); diff --git a/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs b/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs new file mode 100644 index 0000000..a276946 --- /dev/null +++ b/MiraAPI/Patches/Voting/DummyBehaviourPatch.cs @@ -0,0 +1,16 @@ +using HarmonyLib; +using MiraAPI.Utilities; + +namespace MiraAPI.Patches.Voting; + +[HarmonyPatch(typeof(DummyBehaviour), nameof(DummyBehaviour.Update))] +internal static class DummyBehaviourPatch +{ + public static void Postfix(DummyBehaviour __instance) + { + if (MeetingHud.Instance && __instance.myPlayer.GetVoteData()) + { + __instance.voted = __instance.myPlayer.GetVoteData().VotesRemaining == 0; + } + } +} diff --git a/MiraAPI/Patches/Voting/MeetingHudPatches.cs b/MiraAPI/Patches/Voting/MeetingHudPatches.cs new file mode 100644 index 0000000..6070b1e --- /dev/null +++ b/MiraAPI/Patches/Voting/MeetingHudPatches.cs @@ -0,0 +1,237 @@ +using System.Linq; +using HarmonyLib; +using Il2CppInterop.Runtime.InteropTypes.Arrays; +using MiraAPI.Events; +using MiraAPI.Events.Vanilla.Meeting; +using MiraAPI.Events.Vanilla.Meeting.Voting; +using MiraAPI.Utilities; +using MiraAPI.Voting; + +namespace MiraAPI.Patches.Voting; + +[HarmonyPatch(typeof(MeetingHud))] +internal static class MeetingHudPatches +{ + [HarmonyPostfix] + [HarmonyPatch(nameof(MeetingHud.Start))] + public static void MeetingHudStartPatch(MeetingHud __instance) + { + foreach (var plr in PlayerControl.AllPlayerControls) + { + var voteData = plr.GetVoteData(); + voteData.Votes.Clear(); + voteData.SetRemainingVotes(1); + + if (plr.Data.IsDead || plr.Data.Disconnected) + { + voteData.SetRemainingVotes(0); + } + } + var @event = new StartMeetingEvent(__instance); + MiraEventManager.InvokeEvent(@event); + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.Select))] + public static bool SelectPatch(MeetingHud __instance, int suspectStateIdx) + { + var voteData = PlayerControl.LocalPlayer.GetVoteData(); + + var hasVotes = voteData.VotesRemaining > 0; + var hasVotedFor = voteData.VotedFor((byte)suspectStateIdx); + + var @event = new MeetingSelectEvent(voteData, suspectStateIdx, hasVotes && !hasVotedFor); + MiraEventManager.InvokeEvent(@event); + + return @event.AllowSelect; + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.HandleDisconnect), typeof(PlayerControl), typeof(DisconnectReasons))] + public static bool HandleDisconnect(MeetingHud __instance, PlayerControl pc) + { + if (!AmongUsClient.Instance.AmHost || __instance.playerStates is null || !pc || !GameData.Instance) + { + return false; + } + + var playerVoteArea = __instance.playerStates.First(pv => pv.TargetPlayerId == pc.PlayerId); + playerVoteArea.AmDead = true; + playerVoteArea.Overlay.gameObject.SetActive(true); + + foreach (var player in Helpers.GetAlivePlayers()) + { + var pva = __instance.playerStates.First(pv => pv.TargetPlayerId == player.PlayerId); + var voteData = player.GetVoteData(); + + if (pva.AmDead || !voteData.VotedFor(pc.PlayerId)) + { + continue; + } + + voteData.Votes.RemoveAll(x=>x.Suspect==pc.PlayerId); + voteData.VotesRemaining += 1; + + VotingUtils.RpcRemoveVote(PlayerControl.LocalPlayer, player.PlayerId, pc.PlayerId); + } + + __instance.SetDirtyBit(1U); + __instance.CheckForEndVoting(); + + if (__instance.state == MeetingHud.VoteStates.Results) + { + __instance.SetupProceedButton(); + } + + return false; + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.CastVote))] + public static bool CastVotePatch(MeetingHud __instance, byte srcPlayerId, byte suspectPlayerId) + { + var plr = GameData.Instance.GetPlayerById(srcPlayerId); + + if (plr == null) + { + return false; + } + + var voteData = plr.Object.GetVoteData(); + if (voteData == null || voteData.VotesRemaining == 0 || + voteData.VotedFor(suspectPlayerId)) + { + return false; + } + + VotingUtils.HandleVote(voteData, suspectPlayerId); + + __instance.SetDirtyBit(1U); + __instance.CheckForEndVoting(); + + if (voteData.VotesRemaining != 0) + { + return false; + } + + __instance.playerStates.First(x => x.TargetPlayerId == srcPlayerId).SetVote(suspectPlayerId); + PlayerControl.LocalPlayer.RpcSendChatNote(srcPlayerId, ChatNoteTypes.DidVote); + + return false; + } + + [HarmonyPostfix] + [HarmonyPatch(nameof(MeetingHud.CmdCastVote))] + public static void CmdCastVotePatch(MeetingHud __instance, byte playerId, byte suspectIdx) + { + var plr = GameData.Instance.GetPlayerById(playerId); + var voteData = plr.Object.GetVoteData(); + + if (!AmongUsClient.Instance.AmHost) + { + if (voteData == null || voteData.VotesRemaining == 0 || + voteData.VotedFor(suspectIdx)) + { + return; + } + + VotingUtils.HandleVote(voteData, suspectIdx); + + if (voteData.VotesRemaining == 0) + { + __instance.playerStates.First(x => x.TargetPlayerId == playerId).SetVote(suspectIdx); + } + } + + if (PlayerControl.LocalPlayer.PlayerId != playerId) + { + return; + } + + SoundManager.Instance.PlaySound(__instance.VoteLockinSound, false); + + foreach (var playerVoteArea in __instance.playerStates) + { + playerVoteArea.ClearButtons(); + } + + __instance.SkipVoteButton.ClearButtons(); + + var localVoteData = PlayerControl.LocalPlayer.GetVoteData(); + if (localVoteData == null || localVoteData.VotesRemaining != 0) return; + + __instance.SkipVoteButton.voteComplete = true; + __instance.SkipVoteButton.gameObject.SetActive(false); + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.CheckForEndVoting))] + public static bool EndCheck(MeetingHud __instance) + { + var shouldEnd = !Helpers.GetAlivePlayers().Exists(plr => plr.GetVoteData().VotesRemaining > 0); + + var checkEndEvent = new CheckForEndVotingEvent(shouldEnd); + MiraEventManager.InvokeEvent(checkEndEvent); + shouldEnd = checkEndEvent.ForceEndVoting || checkEndEvent is { IsCancelled: false, IsVotingComplete: true }; + + if (!shouldEnd) + { + return false; + } + + var votes = VotingUtils.CalculateVotes(); + var exiled = VotingUtils.GetExiled(votes, out var isTie); + + var @event = new ProcessVotesEvent(votes, exiled); + MiraEventManager.InvokeEvent(@event); + + if (@event.VotesModified) + { + votes = @event.Votes; + exiled = VotingUtils.GetExiled(votes, out isTie); + } + + if (@event.ExiledPlayerModified) + { + exiled = @event.ExiledPlayer; + } + + var voterStates = new Il2CppStructArray([ + .. votes.Select( + v=> new MeetingHud.VoterState + { + VoterId = v.Voter, + VotedForId = v.Suspect, + }) + ]); + + __instance.RpcVotingComplete(voterStates, exiled, isTie); + return false; + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.PopulateResults))] + public static bool PopulateResultsPatch(MeetingHud __instance, ref Il2CppStructArray states) + { + var votes = states.Select(x=> new CustomVote(x.VoterId, x.VotedForId)).ToList(); + var @event = new PopulateResultsEvent(votes); + MiraEventManager.InvokeEvent(@event); + + if (@event.IsCancelled) + { + return false; + } + + VotingUtils.HandlePopulateResults(votes); + return false; + } + + [HarmonyPrefix] + [HarmonyPatch(nameof(MeetingHud.Confirm))] + public static bool ConfirmPatch(MeetingHud __instance, [HarmonyArgument(0)] byte suspect) + { + __instance.CmdCastVote(PlayerControl.LocalPlayer.PlayerId, suspect); + + return false; + } +} diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index 15fe686..885414d 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -27,7 +27,7 @@ public sealed class MiraPluginManager private readonly Dictionary _registeredPlugins = []; internal MiraPluginInfo[] RegisteredPlugins() => [.. _registeredPlugins.Values]; - + internal Dictionary> QueuedRoleRegistrations { get; } = new(); internal static MiraPluginManager Instance { get; private set; } = new(); internal void Initialize() @@ -97,7 +97,7 @@ public sealed class MiraPluginManager } info.OptionGroups.Sort((x, y) => x.GroupPriority.CompareTo(y.GroupPriority)); - CustomRoleManager.RegisterRoleTypes(roles, info); + QueuedRoleRegistrations.Add(info, roles); _registeredPlugins.Add(assembly, info); Logger.Info($"Registering mod {pluginInfo.Metadata.GUID} with Mira API."); diff --git a/MiraAPI/Resources/CategoryHeader.png b/MiraAPI/Resources/CategoryHeader.png new file mode 100644 index 0000000..0fb58e8 Binary files /dev/null and b/MiraAPI/Resources/CategoryHeader.png differ diff --git a/MiraAPI/Roles/CustomRoleConfiguration.cs b/MiraAPI/Roles/CustomRoleConfiguration.cs index efaf444..5b0158d 100644 --- a/MiraAPI/Roles/CustomRoleConfiguration.cs +++ b/MiraAPI/Roles/CustomRoleConfiguration.cs @@ -32,7 +32,9 @@ public record struct CustomRoleConfiguration TasksCountForProgress = role.Team is ModdedRoleTeams.Crewmate; HideSettings = roleBehaviour?.IsDead == true; ShowInFreeplay = roleBehaviour?.IsDead == false; - OptionsScreenshot = null; + IntroSound = role.Team is ModdedRoleTeams.Crewmate + ? CustomRoleManager.CrewmateIntroSound + : CustomRoleManager.ImpostorIntroSound; } /// @@ -58,12 +60,17 @@ public record struct CustomRoleConfiguration /// /// Gets or sets the Sprite used for the Role Options menu screenshot. /// - public LoadableAsset? OptionsScreenshot { get; set; } + public LoadableAsset? OptionsScreenshot { get; set; } = null; /// /// Gets or sets the Sprite used for the Role Icon. /// - public LoadableAsset Icon { get; set; } = MiraAssets.Empty; + public LoadableAsset? Icon { get; set; } = null; + + /// + /// Gets or sets the Intro sound for the Role. + /// + public LoadableAsset? IntroSound { get; set; } = null; /// /// Gets or sets a value indicating whether the role is affected by light affectors on Airship. diff --git a/MiraAPI/Roles/CustomRoleManager.cs b/MiraAPI/Roles/CustomRoleManager.cs index a778a09..ab890fb 100644 --- a/MiraAPI/Roles/CustomRoleManager.cs +++ b/MiraAPI/Roles/CustomRoleManager.cs @@ -7,6 +7,7 @@ using Il2CppInterop.Runtime.Injection; using MiraAPI.Networking; using MiraAPI.PluginLoading; using MiraAPI.Utilities; +using MiraAPI.Utilities.Assets; using Reactor.Localization.Utilities; using Reactor.Networking.Rpc; using Reactor.Utilities; @@ -22,6 +23,18 @@ namespace MiraAPI.Roles; /// public static class CustomRoleManager { + /// + /// The default Among Us Crewmate Intro Sound. + /// + public static readonly LoadableAsset CrewmateIntroSound = + CustomRoleUtils.GetIntroSound(RoleTypes.Crewmate)!; + + /// + /// The default Among Us Impostor Intro Sound. + /// + public static readonly LoadableAsset ImpostorIntroSound = + CustomRoleUtils.GetIntroSound(RoleTypes.Impostor)!; + internal static readonly Dictionary CustomRoles = []; internal static readonly Dictionary RoleIds = []; @@ -93,6 +106,21 @@ public static class CustomRoleManager roleBehaviour.MaxCount = customRole.Configuration.MaxRoleCount; roleBehaviour.RoleScreenshot = customRole.Configuration.OptionsScreenshot?.LoadAsset(); + if (customRole.Configuration.Icon != null) + { + var asset = customRole.Configuration.Icon.LoadAsset(); + if (asset != null) + { + roleBehaviour.RoleIconSolid = asset; + roleBehaviour.RoleIconWhite = asset; + } + } + + if (customRole.Configuration.IntroSound != null) + { + roleBehaviour.IntroSound = customRole.Configuration.IntroSound.LoadAsset(); + } + if (roleBehaviour.IsDead) { RoleManager.GhostRoles.Add(roleBehaviour.Role); diff --git a/MiraAPI/Roles/CustomRoleUtils.cs b/MiraAPI/Roles/CustomRoleUtils.cs new file mode 100644 index 0000000..acaaeb3 --- /dev/null +++ b/MiraAPI/Roles/CustomRoleUtils.cs @@ -0,0 +1,62 @@ +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using AmongUs.GameOptions; +using MiraAPI.Utilities.Assets; +using UnityEngine; + +namespace MiraAPI.Roles; + +/// +/// Utilities to make handling roles in-game easier. +/// +public static class CustomRoleUtils +{ + /// + /// Gets all active in-game roles. + /// + /// A list of roles. + // ReSharper disable once MemberCanBePrivate.Global + public static IEnumerable GetActiveRoles() => PlayerControl.AllPlayerControls.ToArray().Select(x => x.Data.Role); + + /// + /// Gets all active in-game roles in a certain team. + /// + /// The team you would like to check for. + /// A list of roles with the team. + public static IEnumerable GetActiveRolesOfTeam(ModdedRoleTeams team) => GetActiveRoles().Where(x => x is ICustomRole customRole && customRole.Team == team); + + /// + /// Gets all active in-game roles of a certain type. + /// + /// The role Type you would like to check for. Must be a RoleBehaviour. + /// A list of roles with that specific type. + public static IEnumerable GetActiveRolesOfType() where T : RoleBehaviour => GetActiveRoles().OfType(); + + /// + /// Creates a string builder for the Role Tab. + /// + /// The ICustomRole object. + /// A StringBuilder. + public static StringBuilder CreateForRole(ICustomRole role) + { + var taskStringBuilder = new StringBuilder(); + taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleColor.ToTextColor()}You are a {role.RoleName}."); + taskStringBuilder.Append(""); + taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleLongDescription}"); + return taskStringBuilder; + } + + /// + /// Returns an intro sound from a role. + /// + /// The role type. + /// The intro sound. + public static LoadableAsset? GetIntroSound(RoleTypes roleType) + { + var role = RoleManager.Instance.AllRoles.FirstOrDefault(role => role.Role == roleType); + if (role is ICustomRole customRole) return customRole.Configuration.IntroSound; + return new PreloadedAsset(role!.IntroSound); + } +} diff --git a/MiraAPI/Roles/ICustomRole.cs b/MiraAPI/Roles/ICustomRole.cs index 27df3cd..abc0656 100644 --- a/MiraAPI/Roles/ICustomRole.cs +++ b/MiraAPI/Roles/ICustomRole.cs @@ -3,7 +3,6 @@ using BepInEx.Configuration; using MiraAPI.GameOptions; using MiraAPI.Modifiers; using MiraAPI.PluginLoading; -using MiraAPI.Utilities; using Reactor.Utilities; using UnityEngine; @@ -34,6 +33,11 @@ public interface ICustomRole : IOptionable /// Color RoleColor { get; } + /// + /// Gets the color that should be used in the options menu. + /// + Color OptionsMenuColor => RoleColor; + /// /// Gets the team of the role. /// @@ -201,7 +205,7 @@ public interface ICustomRole : IOptionable /// Get the custom Role Tab text for this role. /// /// A StringBuilder with the role tab text. - StringBuilder SetTabText() => Helpers.CreateForRole(this); + StringBuilder SetTabText() => CustomRoleUtils.CreateForRole(this); /// /// Determine whether a given modifier can be applied to this role. diff --git a/MiraAPI/Utilities/Assets/MiraAssets.cs b/MiraAPI/Utilities/Assets/MiraAssets.cs index 514bd25..d2e855f 100644 --- a/MiraAPI/Utilities/Assets/MiraAssets.cs +++ b/MiraAPI/Utilities/Assets/MiraAssets.cs @@ -10,6 +10,7 @@ public static class MiraAssets public static readonly LoadableResourceAsset NextButtonActive = new("MiraAPI.Resources.NextButtonActive.png"); public static readonly LoadableResourceAsset Cog = new("MiraAPI.Resources.Cog.png"); public static readonly LoadableResourceAsset Checkmark = new("MiraAPI.Resources.Checkmark.png"); + public static readonly LoadableResourceAsset CategoryHeader = new("MiraAPI.Resources.CategoryHeader.png"); public static readonly LoadableResourceAsset CheckmarkBox = new("MiraAPI.Resources.CheckMarkBox.png"); public static readonly Color32 AcceptedTeal = new(43, 233, 198, 255); } diff --git a/MiraAPI/Utilities/Assets/PreloadedAsset.cs b/MiraAPI/Utilities/Assets/PreloadedAsset.cs new file mode 100644 index 0000000..ed28ebf --- /dev/null +++ b/MiraAPI/Utilities/Assets/PreloadedAsset.cs @@ -0,0 +1,19 @@ +using System; + +namespace MiraAPI.Utilities.Assets; + +/// +/// An implementation for creating loadable assets from preloaded assets. +/// +/// +/// +public class PreloadedAsset(T asset) : LoadableAsset where T : UnityEngine.Object +{ + private readonly T loadedAsset = asset ?? throw new ArgumentNullException(nameof(asset)); + + /// + public override T LoadAsset() + { + return loadedAsset; + } +} diff --git a/MiraAPI/Utilities/Assets/SpriteTools.cs b/MiraAPI/Utilities/Assets/SpriteTools.cs index fa49f12..5d438de 100644 --- a/MiraAPI/Utilities/Assets/SpriteTools.cs +++ b/MiraAPI/Utilities/Assets/SpriteTools.cs @@ -30,6 +30,9 @@ public static class SpriteTools throw new ArgumentException($"Resource not found: {resourcePath}"); } - return Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f), pixelsPerUnit); + tex.name = resourcePath; + var sprite = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0.5f, 0.5f), pixelsPerUnit); + sprite.name = resourcePath; + return sprite; } } diff --git a/MiraAPI/Utilities/ColorExtensions.cs b/MiraAPI/Utilities/ColorExtensions.cs new file mode 100644 index 0000000..d773b47 --- /dev/null +++ b/MiraAPI/Utilities/ColorExtensions.cs @@ -0,0 +1,89 @@ +using UnityEngine; + +namespace MiraAPI.Utilities; + +/// +/// Extension methods for the Color struct. +/// +public static class ColorExtensions +{ + /// + /// Gets the relative luminance of a color (WCAG 2.1 specification). 0 is black, 1 is white. + /// + /// Color to calculate luminance for. + /// Luminance value between 0 and 1. + public static float GetRelativeLuminance(this Color color) + { + var r = color.r <= 0.03928f ? color.r / 12.92f : Mathf.Pow((color.r + 0.055f) / 1.055f, 2.4f); + var g = color.g <= 0.03928f ? color.g / 12.92f : Mathf.Pow((color.g + 0.055f) / 1.055f, 2.4f); + var b = color.b <= 0.03928f ? color.b / 12.92f : Mathf.Pow((color.b + 0.055f) / 1.055f, 2.4f); + return 0.2126f * r + 0.7152f * g + 0.0722f * b; + } + + /// + /// Calculates the contrast ratio between two colors (WCAG 2.1 specification). + /// + /// First color. + /// Second color. + /// Contrast ratio between the two colors. + public static float GetContrastRatio(this Color colorA, Color colorB) + { + var luminanceA = colorA.GetRelativeLuminance(); + var luminanceB = colorB.GetRelativeLuminance(); + return (Mathf.Max(luminanceA, luminanceB) + 0.05f) / (Mathf.Min(luminanceA, luminanceB) + 0.05f); + } + + /// + /// Generates an accessible alternate color with sufficient contrast. + /// + /// Base color. + /// Target contrast ratio (default 4.5f for AA). + /// Alternate color with sufficient contrast. + public static Color FindAlternateColor(this Color color, float desiredRatio = 4.5f) + { + var lightColor = FindMinimumContrastColor(color, Color.white, desiredRatio); + var darkColor = FindMinimumContrastColor(color, Color.black, desiredRatio); + + return lightColor.GetContrastRatio(color) >= darkColor.GetContrastRatio(color) ? lightColor : darkColor; + } + + /// + /// Finds the color with the minimum contrast ratio to the target color. + /// + /// The base color to start from. + /// The target color to compare against. + /// The desired contrast ratio. + /// The color with the minimum contrast ratio to the target color. + public static Color FindMinimumContrastColor(Color baseColor, Color targetColor, float desiredRatio) + { + var baseLuminance = baseColor.GetRelativeLuminance(); + var isLightening = targetColor == Color.white; + + var targetLuminance = isLightening + ? desiredRatio * (baseLuminance + 0.05f) - 0.05f + : (baseLuminance + 0.05f) / desiredRatio - 0.05f; + + if (isLightening && targetLuminance > 1f) return Color.white; + if (!isLightening && targetLuminance < 0f) return Color.black; + + float low = 0f, high = 1f; + var bestColor = targetColor; + for (var i = 0; i < 10; i++) + { + var t = (low + high) / 2f; + var testColor = Color.Lerp(baseColor, targetColor, t); + var testLuminance = testColor.GetRelativeLuminance(); + + if ((isLightening && testLuminance >= targetLuminance) || (!isLightening && testLuminance <= targetLuminance)) + { + high = t; + bestColor = testColor; + } + else + { + low = t; + } + } + return bestColor; + } +} diff --git a/MiraAPI/Utilities/Extensions.cs b/MiraAPI/Utilities/Extensions.cs index a85da1d..7a0d9a7 100644 --- a/MiraAPI/Utilities/Extensions.cs +++ b/MiraAPI/Utilities/Extensions.cs @@ -2,10 +2,12 @@ using System; using System.Collections.Generic; using System.Linq; using System.Reflection; +using System.Text.RegularExpressions; using HarmonyLib; using MiraAPI.GameOptions; using MiraAPI.Networking; using MiraAPI.Roles; +using MiraAPI.Voting; using Reactor.Utilities; using TMPro; using UnityEngine; @@ -39,6 +41,30 @@ public static class Extensions BitConverter.GetBytes(count.Value).AddRangeToArray(BitConverter.GetBytes(chance.Value))); } + /// + /// Gets a PlayerControl from their PlayerVoteArea in a meeting. + /// + /// The vote area. + /// The player's PlayerControl. + public static PlayerControl? GetPlayer(this PlayerVoteArea state) => GameData.Instance.GetPlayerById(state.TargetPlayerId)?.Object; + + /// + /// Gets an int representing the amount of tasks a player has left. + /// + /// The player. + /// A count of how many tasks the player has left. + public static int GetTasksLeft(this PlayerControl player) => player.Data.Tasks.ToArray().Count(x => !x.Complete); + + /// + /// Checks if a PlayerControl is the game's host. + /// + /// The player you're checking for. + /// If the player is the host, true, else false. + public static bool IsHost(this PlayerControl playerControl) + { + return TutorialManager.InstanceExists || AmongUsClient.Instance.HostId == playerControl.OwnerId; + } + /// /// Determines if a float is an integer. /// @@ -49,6 +75,71 @@ public static class Extensions return Mathf.Approximately(number, Mathf.Round(number)); } + /// + /// Gets a cache of player's vote data components to improve performance. + /// + public static Dictionary VoteDataComponents { get; } = []; + + /// + /// Gets the PlayerVoteData of a player. + /// + /// The PlayerControl object. + /// A PlayerVoteData if there is one, null otherwise. + public static PlayerVoteData GetVoteData(this PlayerControl player) + { + if (VoteDataComponents.TryGetValue(player, out var component)) + { + return component; + } + + component = player.GetComponent(); + if (!component) + { + throw new InvalidOperationException("PlayerVoteData is not attached to the player."); + } + + VoteDataComponents[player] = component; + return component; + } + + public static KeyValuePair MaxPair(this Dictionary self, out bool tie) + { + tie = true; + var result = new KeyValuePair(byte.MaxValue, int.MinValue); + foreach (var keyValuePair in self) + { + if (keyValuePair.Value > result.Value) + { + result = keyValuePair; + tie = false; + } + else if (keyValuePair.Value == result.Value) + { + tie = true; + } + } + return result; + } + + public static KeyValuePair MaxPair(this Dictionary self, out bool tie) + { + tie = true; + var result = new KeyValuePair(byte.MaxValue, int.MinValue); + foreach (var keyValuePair in self) + { + if (keyValuePair.Value > result.Value) + { + result = keyValuePair; + tie = false; + } + else if (Math.Abs(keyValuePair.Value - result.Value) < .05) + { + tie = true; + } + } + return result; + } + /// /// Gets the best constructor for a type based on the specified arguments. /// @@ -65,6 +156,17 @@ public static class Extensions .FirstOrDefault(); } + /// + /// Gets a proper string for an enum. (with spaces). + /// + /// The enum you would like to change. + /// A proper string for the enum. + public static string ToDisplayString(this Enum @enum) + { + var regex = new Regex(@"([^\^])([A-Z][a-z$])"); + return regex.Replace(@enum.ToString(), m => $"{m.Groups[1].Value} {m.Groups[2].Value}"); + } + /// /// Gets the constructors of a type that match the specified arguments. /// @@ -181,12 +283,13 @@ public static class Extensions if (count + length > chunkSize) { - chunks.Enqueue(current.ToArray()); + chunks.Enqueue([.. current]); current.Clear(); count = 0; } current.Add(netData); + count += length; } if (current.Count > 0) @@ -245,6 +348,7 @@ public static class Extensions /// The original color. /// The amount to darken or lighten the original color by between 0.0 and 1.0. /// An alternate color that has been darkened or lightened. + [Obsolete("Use FindAlternateColor for WACG compliance.")] public static Color GetAlternateColor(this Color color, float amount = 0.45f) { return color.IsColorDark() ? LightenColor(color, amount) : DarkenColor(color, amount); diff --git a/MiraAPI/Utilities/Helpers.cs b/MiraAPI/Utilities/Helpers.cs index 6b3b79f..513789e 100644 --- a/MiraAPI/Utilities/Helpers.cs +++ b/MiraAPI/Utilities/Helpers.cs @@ -2,8 +2,6 @@ using System.Collections.Generic; using System.Globalization; using System.Linq; -using System.Text; -using MiraAPI.Roles; using TMPro; using UnityEngine; using Object = UnityEngine.Object; @@ -24,6 +22,123 @@ public static class Helpers return PlayerControl.AllPlayerControls.ToArray().Where(x => !x.Data.IsDead).ToList(); } + /// + /// Determines whether a given probability check succeeds. + /// + /// An integer value representing the success probability (0-100). + /// True if the number falls in the range, false if not. + public static bool CheckChance(int probability) + { + switch (probability) + { + case 0: + return false; + case 100: + return true; + default: + { + var num = Random.RandomRangeInt(1, 101); + return num <= probability; + } + } + } + + /// + /// Retrieves a vent from the ID. + /// + /// The vent ID. + /// The vent. + public static Vent? GetVentById(int id) + { + return ShipStatus.Instance.AllVents.FirstOrDefault(vent => vent.Id == id); + } + + /// + /// Creates an arrow. + /// + /// The arrow gameObject's parent. + /// The color of the arrow. + /// The created ArrowBehaviour. + public static ArrowBehaviour CreateArrow(Transform parent, Color color) + { + var prefab = Object.FindObjectOfType(true); + var arrow = Object.Instantiate(prefab, parent); + arrow.image = arrow.gameObject.GetComponent(); + arrow.image.color = color; + arrow.gameObject.layer = 5; + arrow.gameObject.SetActive(true); + return arrow; + } + + /// + /// Get the closest object of a specific type. + /// + /// A list of all the objects you'd like to check the distance for. + /// The position of where you want to check from. For example: PlayerControl.LocalPlayer.transform.position. + /// The object type. + /// The closest object. + public static T? FindClosestObjectOfType(List objectList, Vector3 position) where T : MonoBehaviour + { + T? closest = null; + var closestDistanceSqr = Mathf.Infinity; + + foreach (var obj in objectList) + { + if (obj == null) + { + continue; + } + + var sqrDistance = (obj.transform.position - position).sqrMagnitude; + if (sqrDistance < closestDistanceSqr) + { + closestDistanceSqr = sqrDistance; + closest = obj; + } + } + + return closest; + } + + /// + /// Creates and shows a notification. + /// + /// The text you want to display. + /// The color of the text and image. + /// The sound you want to play with the notification. + /// The sprite beside the notification. + /// The created notification. + public static LobbyNotificationMessage CreateAndShowNotification(string text, Color color, AudioClip? clip = null, Sprite? spr = null) + { + return CreateAndShowNotification(text, color, new Vector3(0f, 0f, -2f), clip, spr); + } + + /// + /// Creates and shows a notification. + /// + /// The text you want to display. + /// The color of the text and image. + /// The position of the notification. + /// The sound you want to play with the notification. + /// The sprite beside the notification. + /// The created notification. + public static LobbyNotificationMessage CreateAndShowNotification(string text, Color color, Vector3 localPos, AudioClip? clip = null, Sprite? spr = null) + { + var popper = HudManager.Instance.Notifier; + var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform); + newMessage.transform.localPosition = localPos; + newMessage.SetUp(text, spr ?? null, color, new System.Action(() => popper.OnMessageDestroy(newMessage))); + popper.lastMessageKey = -1; + popper.ShiftMessages(); + popper.AddMessageToQueue(newMessage); + + if (clip == null) return newMessage; + SoundManager.Instance.StopSound(clip); + SoundManager.Instance.PlaySound(clip, false, 2f); + + return newMessage; + } + /// /// Returns an empty coroutine. /// @@ -265,16 +380,24 @@ public static class Helpers } /// - /// Creates a string builder for the Role Tab. + /// Converts the first letter of a string to uppercase. /// - /// The ICustomRole object. - /// A StringBuilder. - public static StringBuilder CreateForRole(ICustomRole role) + /// The string. + /// The fixed string. + public static string FirstLetterToUpper(string str) { - var taskStringBuilder = new StringBuilder(); - taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleColor.ToTextColor()}You are a {role.RoleName}."); - taskStringBuilder.Append(""); - taskStringBuilder.AppendLine(CultureInfo.InvariantCulture, $"{role.RoleLongDescription}"); - return taskStringBuilder; + return CultureInfo.CurrentCulture.TextInfo.ToTitleCase(str.ToLower(CultureInfo.InvariantCulture)); + } + + /// + /// Gets a random string based on characters. + /// + /// The length of the string. + /// The characters in the random string. + /// The random string. + public static string RandomString(int length, string chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789") + { + return new string(Enumerable.Repeat(chars, length) + .Select(s => s[Random.RandomRangeInt(0, s.Length)]).ToArray()); } } diff --git a/MiraAPI/Voting/CustomVote.cs b/MiraAPI/Voting/CustomVote.cs new file mode 100644 index 0000000..b36796a --- /dev/null +++ b/MiraAPI/Voting/CustomVote.cs @@ -0,0 +1,8 @@ +namespace MiraAPI.Voting; + +/// +/// Represents a custom vote. +/// +/// The player that voted. +/// The suspect being voted for. +public record struct CustomVote(byte Voter, byte Suspect); diff --git a/MiraAPI/Voting/PlayerVoteData.cs b/MiraAPI/Voting/PlayerVoteData.cs new file mode 100644 index 0000000..b7a1b84 --- /dev/null +++ b/MiraAPI/Voting/PlayerVoteData.cs @@ -0,0 +1,108 @@ +using System; +using System.Collections.Generic; +using Reactor.Utilities.Attributes; +using UnityEngine; + +namespace MiraAPI.Voting; + +/// +/// Handles player votes, and removing/adding additional votes. +/// +[RegisterInIl2Cpp] +public class PlayerVoteData(nint cppPtr) : MonoBehaviour(cppPtr) +{ + /// + /// Gets the owner of this component. + /// + public PlayerControl Owner { get; private set; } = null!; + + /// + /// Gets the list of votes the owner has. + /// + public List Votes { get; private set; } = []; + + /// + /// Gets or sets the amount of votes the owner has left. + /// + public int VotesRemaining + { + get => _votesRemaining; + set => _votesRemaining = Math.Max(0, value); + } + + private int _votesRemaining = 1; + + private void Awake() + { + Owner = GetComponent(); + + if (Owner == null) + { + Destroy(this); + } + } + + /// + /// Returns whether the owner has voted for the specified player. + /// + /// The target's playerId. + /// True if the owner voted for the specified player, false otherwise. + public bool VotedFor(byte playerId) + { + return Votes.Exists(x => x.Suspect == playerId); + } + + /// + /// Adds the voted player to the list. + /// + /// The target's playerId. + public void VoteForPlayer(byte playerId) + { + Votes.Add(new CustomVote(Owner.PlayerId, playerId)); + } + + /// + /// Removes the specified vote. + /// + /// The vote you would like to remove. + public void RemovePlayerVote(CustomVote vote) + { + Votes.Remove(vote); + } + + /// + /// Removes a single vote from the owner. + /// + /// The target's playerId. + public void RemovePlayerVote(byte playerId) + { + Votes.Remove(Votes.Find(x=>x.Suspect==playerId)); + } + + /// + /// Sets the player's votes remaining. + /// + /// The amount of votes you would like to set it to. + public void SetRemainingVotes(int votesRemaining) + { + VotesRemaining = votesRemaining; + } + + /// + /// Adds votes to the owner. + /// + /// The amount of votes you would like to add. + public void IncreaseRemainingVotes(int amount) + { + SetRemainingVotes(VotesRemaining + amount); + } + + /// + /// Removes votes from the owner. + /// + /// The amount of votes you would like to remove. + public void DecreaseRemainingVotes(int amount) + { + SetRemainingVotes(VotesRemaining - amount); + } +} diff --git a/MiraAPI/Voting/VotingUtils.cs b/MiraAPI/Voting/VotingUtils.cs new file mode 100644 index 0000000..56833a6 --- /dev/null +++ b/MiraAPI/Voting/VotingUtils.cs @@ -0,0 +1,180 @@ +using System.Collections.Generic; +using System.Linq; +using MiraAPI.Events; +using MiraAPI.Events.Vanilla.Meeting.Voting; +using MiraAPI.Networking; +using MiraAPI.Utilities; +using Reactor.Networking.Attributes; +using Reactor.Utilities; + +namespace MiraAPI.Voting; + +/// +/// Utilities used for the Mira voting system. +/// +public static class VotingUtils +{ + private const byte SkipVoteId = 253; + + /// + /// Gets the exiled player from the list of votes. Returns null if no player is to be exiled. + /// + /// >The list of votes to check. + /// Whether the vote is a tie. + /// The player to be exiled. Will be null if no player is to be exiled. + public static NetworkedPlayerInfo? GetExiled(List votes, out bool isTie) + { + var max = CalculateNumVotes(votes).MaxPair(out var tie); + isTie = tie; + var exiled = GameData.Instance.AllPlayers.ToArray().FirstOrDefault(v => !tie && v.PlayerId == max.Key); + + if (exiled is null || exiled.IsDead || exiled.Disconnected) + { + exiled = null; + } + + return exiled; + } + + /// + /// Handles when a vote is added and allows for other mods to override/modify. + /// + /// The player's vote data. + /// Who the player voted for. + public static void HandleVote(PlayerVoteData voteData, byte suspectIdx) + { + var @event = new HandleVoteEvent(voteData, suspectIdx); + MiraEventManager.InvokeEvent(@event); + + if (@event.IsCancelled) + { + return; + } + + voteData.DecreaseRemainingVotes(1); + voteData.VoteForPlayer(suspectIdx); + } + + /// + /// Networks the removal of votes. Used to remove votes when a player disconnects. + /// + /// The player who is sending the RPC. Should be the host. + /// The player who voted. + /// The player who the voter voted for. + [MethodRpc((uint)MiraRpc.RemoveVote)] + public static void RpcRemoveVote(PlayerControl source, byte voterId, byte votedFor) + { + if (source.OwnerId != AmongUsClient.Instance.HostId) + { + return; + } + + MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == voterId).UnsetVote(); + + if (PlayerControl.LocalPlayer.PlayerId != voterId) + { + return; + } + + MeetingHud.Instance.playerStates.First(state => state.TargetPlayerId == votedFor).ThumbsDown.enabled = false; + + if (!AmongUsClient.Instance.AmHost) + { + var voteData = PlayerControl.LocalPlayer.GetVoteData(); + voteData.DecreaseRemainingVotes(1); + voteData.RemovePlayerVote(votedFor); + } + + foreach (var t in MeetingHud.Instance.playerStates) + { + t.voteComplete = false; + } + + MeetingHud.Instance.SkipVoteButton.voteComplete = false; + MeetingHud.Instance.SkipVoteButton.gameObject.SetActive(true); + } + + /// + /// Calculates the total number of votes. + /// + /// A list of calculated votes. + /// The total votes. + public static Dictionary CalculateNumVotes(IEnumerable votes) + { + var dictionary = new Dictionary(); + + foreach (var vote in votes.Select(v=>v.Suspect)) + { + if (!dictionary.TryAdd(vote, 1)) + { + dictionary[vote] += 1; + } + } + + return dictionary; + } + + /// + /// Calculates votes to check if all players have voted. + /// + /// The list of votes. + public static List CalculateVotes() + { + return + [ + .. Helpers.GetAlivePlayers() + .SelectMany(player => player.GetVoteData().Votes) + ]; + } + + /// + /// Handles the populating of results locally. Called by the PopulateResultsRpc. + /// + /// The list of networked votes. + public static void HandlePopulateResults(List votes) + { + PopulateResultsEvent @event = new PopulateResultsEvent(votes); + MiraEventManager.InvokeEvent(@event); + + if (@event.IsCancelled) + { + return; + } + + MeetingHud.Instance.TitleText.text = + DestroyableSingleton.Instance.GetString( + StringNames.MeetingVotingResults, + Il2CppSystem.Array.Empty()); + + var delays = new Dictionary(); + var num = 0; + + for (var i = 0; i < MeetingHud.Instance.playerStates.Length; i++) + { + var playerVoteArea = MeetingHud.Instance.playerStates[i]; + playerVoteArea.ClearForResults(); + foreach (var vote in votes) + { + var playerById = GameData.Instance.GetPlayerById(vote.Voter); + if (playerById == null) + { + Logger.Error($"Couldn't find player info for voter: {vote.Voter}"); + } + else if (i == 0 && vote.Suspect == SkipVoteId) + { + MeetingHud.Instance.BloopAVoteIcon(playerById, num, MeetingHud.Instance.SkippedVoting.transform); + num++; + } + else if (vote.Suspect == playerVoteArea.TargetPlayerId) + { + if (!delays.TryAdd(vote.Suspect, 0)) + { + delays[vote.Suspect]++; + } + + MeetingHud.Instance.BloopAVoteIcon(playerById, delays[vote.Suspect], playerVoteArea.transform); + } + } + } + } +}