Merge branch 'dev' into options-changes

MiraAPI.Example/ExampleAssets.cs

@@ -5,6 +5,7 @@ namespace MiraAPI.Example;
 public static class ExampleAssets
 {
     public static LoadableResourceAsset ExampleButton { get; } = new("MiraAPI.Example.Resources.ExampleButton.png");
+    public static LoadableResourceAsset CallMeetingButton { get; } = new("MiraAPI.Example.Resources.CallMeeting.png");
 
     // Credit to EpicHorrors for the teleport button asset.
     public static LoadableResourceAsset TeleportButton { get; } = new("MiraAPI.Example.Resources.TeleportButton.png");

MiraAPI.Example/ExampleEventHandlers.cs

@@ -9,7 +9,10 @@ using MiraAPI.Events.Vanilla.Player;
 using MiraAPI.Example.Buttons.Freezer;
 using MiraAPI.Example.Roles;
 using MiraAPI.Utilities;
+using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
+using TMPro;
+using UnityEngine;
 
 namespace MiraAPI.Example;
 
@@ -38,12 +41,9 @@ public static class ExampleEventHandlers
     [RegisterEvent]
     public static void StartMeetingEvent(StartMeetingEvent _)
     {
-        foreach (var plr in PlayerControl.AllPlayerControls)
+        foreach (var plr in PlayerControl.AllPlayerControls.ToArray().Where(player => player.Data.Role is MayorRole))
         {
-            if (plr.Data.Role is MayorRole)
-            {
-                plr.GetVoteData().IncreaseRemainingVotes(1);
-            }
+            plr.GetVoteData().IncreaseRemainingVotes(1);
         }
     }
 

MiraAPI.Example/MiraAPI.Example.csproj

@@ -9,11 +9,9 @@
 		<ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
 	</ItemGroup>
 
-	<ItemGroup>
-		<EmbeddedResource Include="Resources\ExampleButton.png" />
-		<EmbeddedResource Include="Resources\FortniteBanner.jpeg" />
-		<EmbeddedResource Include="Resources\TeleportButton.png" />
-	</ItemGroup>
+	 <ItemGroup>
+		 <EmbeddedResource Include="Resources\**\*.*" />
+	 </ItemGroup>
 
 	<Import Project="..\AmongUs.props" />
 </Project>

MiraAPI.Example/Modifiers/CaptainModifier.cs

@@ -1,12 +1,29 @@
-using MiraAPI.Example.Options.Modifiers;
+using Il2CppSystem.Collections.Generic;
+using MiraAPI.Example.Options.Modifiers;
 using MiraAPI.GameOptions;
+using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities.Assets;
+using Reactor.Utilities.Extensions;
+using UnityEngine;
+using Random = System.Random;
 
 namespace MiraAPI.Example.Modifiers;
 
 public class CaptainModifier : GameModifier
 {
     public override string ModifierName => "Captain";
+    public override LoadableAsset<Sprite>? ModifierIcon => ExampleAssets.CallMeetingButton;
+
+    public override void OnDeath(DeathReason reason)
+    {
+        Player.RemoveModifier(this);
+    }
+
+    public override string GetDescription()
+    {
+        return $"You can call a meeting from anywhere on the map.";
+    }
 
     public override int GetAssignmentChance()
     {

MiraAPI.Example/Modifiers/HighPriorityModifier.cs

@@ -1,4 +1,6 @@
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
 
 namespace MiraAPI.Example.Modifiers;
 
@@ -6,6 +8,11 @@ public class HighPriorityModifier : GameModifier
 {
     public override string ModifierName => "High Priority";
 
+    public override string GetDescription()
+    {
+        return "You are high priority! Idrk what this means either tbh...";
+    }
+
     public override int GetAssignmentChance()
     {
         return 100;

MiraAPI.Example/Roles/ChameleonRole.cs

@@ -1,5 +1,6 @@
 using AmongUs.GameOptions;
 using MiraAPI.Roles;
+using Reactor.Utilities;
 using TMPro;
 using UnityEngine;
 
@@ -19,6 +20,12 @@ public class ChameloenRole : CrewmateRole, ICustomRole
         IntroSound = CustomRoleUtils.GetIntroSound(RoleTypes.Shapeshifter),
     };
 
+    public override void Initialize(PlayerControl player)
+    {
+        Player = player;
+        Logger<ExamplePlugin>.Error("Initializing ChamelonRole for player: " + player.PlayerId);
+    }
+
     public void PlayerControlFixedUpdate(PlayerControl playerControl)
     {
         if (playerControl.MyPhysics.Velocity.magnitude > 0)