Merge branch 'refs/heads/master' into modifiers

# Conflicts:
#	MiraAPI.Example/Buttons/ExampleButton.cs
#	MiraAPI.Example/ExampleRole.cs
#	MiraAPI/GameOptions/OptionTypes/ModdedOption.cs
#	MiraAPI/Hud/CustomActionButton.cs
#	MiraAPI/MiraApiPlugin.cs
#	MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
#	MiraAPI/Patches/PlayerControlPatches.cs
#	MiraAPI/PluginLoading/MiraPluginManager.cs
#	MiraAPI/Roles/ICustomRole.cs
#	MiraAPI/Utilities/Extensions.cs

MiraAPI.Example/Buttons/ExampleButton.cs

@@ -4,7 +4,7 @@ using MiraAPI.Utilities.Assets;
 using Reactor.Utilities;
 using UnityEngine;
 
-namespace MiraAPI.Example;
+namespace MiraAPI.Example.Buttons;
 
 [RegisterButton]
 public class ExampleButton : CustomActionButton
@@ -13,7 +13,8 @@ public class ExampleButton : CustomActionButton
     public override float Cooldown => 5f;
     public override float EffectDuration => 0f;
     public override int MaxUses => 5;
-    public override LoadableAsset<Sprite> Sprite { get; } = new LoadableResourceAsset("MiraAPI.Resources.ExampleButton.png");
+    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
+    public override ButtonLocation Location => ButtonLocation.BottomRight;
 
     protected override void OnClick()
     {

MiraAPI.Example/Buttons/ExampleTargetButton.cs

@@ -0,0 +1,40 @@
+using MiraAPI.Hud;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Buttons;
+
+public class ExampleTargetButton : CustomActionButton<PlayerControl>
+{
+    public override string Name => "Shoot";
+    public override float Cooldown => 0f;
+    public override float EffectDuration => 0f;
+    public override int MaxUses => 0;
+    public override LoadableAsset<Sprite> Sprite => ExampleAssets.ExampleButton;
+
+    protected override void OnClick()
+    {
+        PlayerControl.LocalPlayer.CmdCheckMurder(Target);
+    }
+
+    public override PlayerControl GetTarget()
+    {
+        return PlayerControl.LocalPlayer.Data.Role.FindClosestTarget();
+    }
+
+    public override void SetOutline(bool active)
+    {
+        Target?.cosmetics.SetOutline(active, new Il2CppSystem.Nullable<Color>(Color.red));
+    }
+
+    public override bool IsTargetValid(PlayerControl target)
+    {
+        return PlayerControl.LocalPlayer.Data.Role.IsValidTarget(target.Data);
+    }
+
+    public override bool Enabled(RoleBehaviour role)
+    {
+        return role.IsImpostor;
+    }
+
+}

MiraAPI.Example/ExampleAssets.cs

@@ -0,0 +1,9 @@
+using MiraAPI.Utilities.Assets;
+
+namespace MiraAPI.Example;
+
+public static class ExampleAssets
+{
+    public static LoadableResourceAsset ExampleButton { get; } = new("MiraAPI.Example.Resources.ExampleButton.png");
+    public static LoadableResourceAsset Banner { get; } = new("MiraAPI.Example.Resources.FortniteBanner.jpeg");
+}

MiraAPI.Example/ExamplePlugin.cs

@@ -9,7 +9,7 @@ using Reactor.Networking.Attributes;
 
 namespace MiraAPI.Example;
 
-[BepInAutoPlugin("mira.example", "MiraAPIExample")]
+[BepInAutoPlugin("mira.example", "MiraExampleMod")]
 [BepInProcess("Among Us.exe")]
 [BepInDependency(ReactorPlugin.Id)]
 [BepInDependency(MiraApiPlugin.Id)]
@@ -17,6 +17,7 @@ namespace MiraAPI.Example;
 public partial class ExamplePlugin : BasePlugin, IMiraPlugin
 {
     public Harmony Harmony { get; } = new(Id);
+    public string OptionsTitleText => "Mira API\nExample Mod";
     public ConfigFile GetConfigFile() => Config;
     public override void Load()
     {

MiraAPI.Example/ExampleRole.cs

@@ -1,16 +0,0 @@
-using MiraAPI.Roles;
-using MiraAPI.Utilities.Assets;
-using UnityEngine;
-
-namespace MiraAPI.Example;
-
-[RegisterCustomRole]
-public class ExampleRole : ImpostorRole, ICustomRole
-{
-    public string RoleName => "fortnite killer";
-    public string RoleLongDescription => "ok so your objective is to eliminate everyone \nwith your fortnite tactical shotgun";
-    public string RoleDescription => RoleLongDescription;
-    public Color RoleColor => Palette.Orange;
-    public ModdedRoleTeams Team => ModdedRoleTeams.Impostor;
-    public LoadableAsset<Sprite> OptionsScreenshot => MiraAssets.Empty;
-}

MiraAPI.Example/MiraAPI.Example.csproj

@@ -6,20 +6,14 @@
 
 		<VersionPrefix>1.0.0</VersionPrefix>
 		<VersionSuffix>dev</VersionSuffix>
-		<Description>Simple and easy to use Among Us modding API.</Description>
+		<Description>Example mod for Mira API</Description>
 		<Authors>Angxl, XtraCube</Authors>
 	</PropertyGroup>
-
-	<PropertyGroup>
-		<GamePlatform Condition="'$(GamePlatform)' == ''">Steam</GamePlatform>
-		<GameVersion Condition="'$(GamePlatform)' == 'Steam'">2024.6.18</GameVersion>
-	</PropertyGroup>
-
+	
 	<ItemGroup>
-		<PackageReference Include="Reactor" Version="2.3.0" />
+		<PackageReference Include="Reactor" Version="2.3.1" />
 		<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.697" Private="false" ExcludeAssets="runtime;native" />
-		<PackageReference Include="Iced" Version="1.21.0" />
-		<PackageReference Include="AmongUs.GameLibs.Steam" Version="$(GameVersion)" PrivateAssets="all" />
+		<PackageReference Include="AmongUs.GameLibs.Steam" Version="2024.8.13" PrivateAssets="all" />
 
 		<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
 		<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime">
@@ -28,10 +22,15 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
+		<ProjectReference Include="..\MiraAPI\MiraAPI.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<EmbeddedResource Include="Resources\ExampleButton.png" />
+		<EmbeddedResource Include="Resources\FortniteBanner.jpeg" />
 	</ItemGroup>
 
 	<Target Name="Copy" AfterTargets="Build" Condition="'$(AmongUs)' != ''">
-		<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" />
+		<Copy SourceFiles="$(TargetPath)" DestinationFolder="$(AmongUs)/BepInEx/plugins/" UseSymboliclinksIfPossible="true" />
 	</Target>
 </Project>

MiraAPI.Example/Options/ExampleOptions.cs

@@ -0,0 +1,33 @@
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+using UnityEngine;
+
+namespace MiraAPI.Example.Options;
+
+public class ExampleOptions : AbstractOptionGroup
+{
+    public override string GroupName => "Example Options 1";
+    public override Color GroupColor => Color.green;
+
+    [ModdedToggleOption("Toggle Opt 1")]
+    public bool ToggleOpt { get; set; } = false;
+
+    [ModdedToggleOption("Toggle Opt 2")]
+    public bool ToggleOpt2 { get; set; } = true;
+
+    [ModdedNumberOption("Number Opt", min: 0, max: 10)]
+    public float NumberOpt { get; set; } = 4f;
+
+    [ModdedStringOption("String Opt", ["Hello", "Hey", "Bye"])]
+    public int StringOpt { get; set; } = 2;
+
+    [ModdedEnumOption("Enum Opt", typeof(TestEnum))]
+    public TestEnum EnumOpt { get; set; } = TestEnum.Mira;
+}
+
+public enum TestEnum
+{
+    Welcome,
+    To,
+    Mira
+}

MiraAPI.Example/Options/ExampleOptions2.cs

@@ -0,0 +1,27 @@
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.OptionTypes;
+
+namespace MiraAPI.Example.Options;
+
+public class ExampleOptions2 : AbstractOptionGroup
+{
+    public override string GroupName => "Example Options 2";
+
+    public ModdedToggleOption ToggleOpt1 { get; } = new("Toggle Option 1", false);
+
+    public ModdedToggleOption ToggleOpt2 { get; } = new("Toggle Option 2", false)
+    {
+        Visible = () => OptionGroupSingleton<ExampleOptions2>.Instance.ToggleOpt1.Value
+    };
+
+    public ModdedStringOption StringOpt { get; } = new("String Opt", 0, ["Choice 1", "Choice 2", "Choice 3"]);
+
+    public ModdedEnumOption EnumOpt { get; } = new("Enum Opt", 0, typeof(TestingEnum));
+}
+
+public enum TestingEnum
+{
+    Happy,
+    Sad,
+    Neutral
+}

MiraAPI.Example/Options/Roles/CustomRole2Settings.cs

@@ -0,0 +1,16 @@
+using MiraAPI.Example.Roles;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+using System;
+
+namespace MiraAPI.Example.Options.Roles;
+
+public class CustomRole2Settings : AbstractOptionGroup
+{
+    public override string GroupName => "Custom Role";
+
+    public override Type AdvancedRole => typeof(CustomRole2);
+
+    [ModdedToggleOption("Teleportation ability")] public bool Teleport { get; set; } = true;
+
+}

MiraAPI.Example/Options/Roles/CustomRoleSettings.cs

@@ -0,0 +1,16 @@
+using MiraAPI.Example.Roles;
+using MiraAPI.GameOptions;
+using MiraAPI.GameOptions.Attributes;
+using System;
+
+namespace MiraAPI.Example.Options.Roles;
+
+public class CustomRoleSettings : AbstractOptionGroup
+{
+    public override string GroupName => "Custom Role";
+
+    public override Type AdvancedRole => typeof(CustomRole);
+
+    [ModdedNumberOption("Number Opt", min: 3, max: 9)] public float NumberOpt { get; set; } = 4;
+
+}

MiraAPI.Example/Roles/CustomRole.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+[RegisterCustomRole]
+public class CustomRole : ImpostorRole, ICustomRole
+{
+    public string RoleName => "Custom Role";
+    public string RoleLongDescription => "Eliminate everyone with your special ability!";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => Palette.Black;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Impostor;
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+
+}

MiraAPI.Example/Roles/CustomRole2.cs

@@ -0,0 +1,17 @@
+using MiraAPI.Roles;
+using MiraAPI.Utilities.Assets;
+using UnityEngine;
+
+namespace MiraAPI.Example.Roles;
+
+[RegisterCustomRole]
+public class CustomRole2 : CrewmateRole, ICustomRole
+{
+    public string RoleName => "Custom Role 2";
+    public string RoleLongDescription => "Save everyone from dying!";
+    public string RoleDescription => RoleLongDescription;
+    public Color RoleColor => Palette.AcceptedGreen;
+    public ModdedRoleTeams Team => ModdedRoleTeams.Crewmate;
+    public LoadableAsset<Sprite> OptionsScreenshot => ExampleAssets.Banner;
+
+}