Merge branch 'dev' into rpc-modifier-arguments

# Conflicts:
#	MiraAPI/Patches/PlayerControlPatches.cs
#	MiraAPI/Patches/VentPatches.cs

MiraAPI.Example/Buttons/Freezer/FreezeButton.cs

@@ -10,7 +10,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Freezer;
 
-[RegisterButton]
 public class FreezeButton : CustomActionButton<PlayerControl>
 {
     public override string Name => "Freeze";

MiraAPI.Example/Buttons/MeetingButton.cs

@@ -6,7 +6,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons;
 
-[RegisterButton]
 public class MeetingButton : CustomActionButton
 {
     public override string Name => "Call Meeting";

MiraAPI.Example/Buttons/Teleporter/TeleportButton.cs

@@ -9,7 +9,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Buttons.Teleporter;
 
-[RegisterButton]
 public class TeleportButton : CustomActionButton
 {
     public override string Name => "Teleport";
@@ -17,6 +16,7 @@ public class TeleportButton : CustomActionButton
     public override float Cooldown => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportCooldown.Value;
 
     public override float EffectDuration => OptionGroupSingleton<TeleporterOptions>.Instance.TeleportDuration;
+    public override int MaxUses => 2;
 
     public override LoadableAsset<Sprite> Sprite => ExampleAssets.TeleportButton;
 

MiraAPI.Example/ExampleEventHandlers.cs

@@ -1,6 +1,8 @@
 using MiraAPI.Events;
 using MiraAPI.Events.Mira;
-using MiraAPI.Events.Vanilla;
+using MiraAPI.Events.Vanilla.Gameplay;
+using MiraAPI.Events.Vanilla.Map;
+using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Example.Buttons.Freezer;
 using Reactor.Utilities;
 
@@ -14,6 +16,21 @@ public static class ExampleEventHandlers
         MiraEventManager.RegisterEventHandler<MiraButtonClickEvent<FreezeButton>>(FreezeButtonClickHandler, 1);
         MiraEventManager.RegisterEventHandler<MiraButtonCancelledEvent<FreezeButton>>(FreezeButtonCancelledHandler);
         MiraEventManager.RegisterEventHandler<UpdateSystemEvent>(UpdateSystemEventHandler);
+
+        MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
+        });
+
+        MiraEventManager.RegisterEventHandler<AfterMurderEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} has killed {@event.Target.Data.PlayerName}");
+        });
+
+        MiraEventManager.RegisterEventHandler<CompleteTaskEvent>(@event =>
+        {
+            Logger<ExamplePlugin>.Info($"{@event.Player.Data.PlayerName} completed {@event.Task.TaskType.ToString()}");
+        });
     }
 
     public static void UpdateSystemEventHandler(UpdateSystemEvent @event)

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,9 +1,7 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
+using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Example.Modifiers;
 
-[RegisterModifier]
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";

MiraAPI.Example/Modifiers/Freezer/FreezeModifier.cs

@@ -1,12 +1,10 @@
 using Il2CppSystem;
 using MiraAPI.Example.Roles;
-using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
 using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers.Freezer;
 
-[RegisterModifier]
 public class FreezeModifier : TimedModifier
 {
     public override string ModifierName => "Freezed";

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,9 +1,7 @@
-using MiraAPI.Modifiers;
-using MiraAPI.Modifiers.Types;
+using MiraAPI.Modifiers.Types;
 
 namespace MiraAPI.Example.Modifiers;
 
-[RegisterModifier]
 public class HighPriorityModifier : GameModifier
 {
     public override string ModifierName => "High Priority";

MiraAPI.Example/Options/ExampleOptions.cs

@@ -16,7 +16,7 @@ public class ExampleOptions : AbstractOptionGroup
     [ModdedToggleOption("Toggle Opt 2")]
     public bool ToggleOpt2 { get; set; } = true;
 
-    [ModdedNumberOption("Number Opt", min: 0, max: 10, suffixType: MiraNumberSuffixes.Percent)]
+    [ModdedNumberOption("Number Opt", min: 0, max: 10, increment: .25f, formatString: "0.00", suffixType: MiraNumberSuffixes.Percent)]
     public float NumberOpt { get; set; } = 4f;
 
     [ModdedEnumOption("Best API", typeof(BestApi), ["Mira API", "Mitochondria", "Reactor"])]

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -4,7 +4,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class ChameloenRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Chamelon";

MiraAPI.Example/Roles/FreezerRole.cs

@@ -3,7 +3,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class FreezerRole : ImpostorRole, ICustomRole
 {
     public string RoleName => "Freezer";

MiraAPI.Example/Roles/NeutralKillerRole.cs

@@ -3,22 +3,28 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class NeutralKillerRole : ImpostorRole, ICustomRole
 {
-    public string RoleName => "Neutral Killer";
-    public string RoleDescription => "Neutral who can kill.";
+    public string RoleName => "Outcast Killer";
+    public string RoleDescription => "Outcast who can kill.";
     public string RoleLongDescription => RoleDescription;
     public Color RoleColor => Color.magenta;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Neutral;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Custom;
 
-    public CustomRoleConfiguration Configuration => new CustomRoleConfiguration(this)
+    public CustomRoleConfiguration Configuration => new(this)
     {
         UseVanillaKillButton = true,
         CanGetKilled = true,
         CanUseVent = true,
     };
 
+    public RoleOptionsGroup RoleOptionsGroup { get; } = new("Outcast", Color.gray);
+
+    public TeamIntroConfiguration? IntroConfiguration { get; } = new(
+        Color.gray,
+        "NEUTRAL",
+        "You are an Outcast. You do not have a team.");
+
     public override void SpawnTaskHeader(PlayerControl playerControl)
     {
         // remove existing task header.

MiraAPI.Example/Roles/TeleporterRole.cs

@@ -3,7 +3,6 @@ using UnityEngine;
 
 namespace MiraAPI.Example.Roles;
 
-[RegisterCustomRole]
 public class TeleporterRole : CrewmateRole, ICustomRole
 {
     public string RoleName => "Teleporter";
@@ -19,4 +18,9 @@ public class TeleporterRole : CrewmateRole, ICustomRole
         DefaultChance = 73,
         DefaultRoleCount = 4,
     };
+
+    public bool CanLocalPlayerSeeRole(PlayerControl player)
+    {
+        return true;
+    }
 }