Compare commits

..
32 Commits
Author SHA1 Message Date
Atony 7ad003ed1e Merge pull request #75 from All-Of-Us-Mods/dev
- Adds custom game tabs, with their own names and description blurbs.
- All keybinds have been moved to the right for consistency and to prevent hide and seek vent uses being obscured.
- Holding shift will change most options to be split in half, like 2.5s -> 1.25s
- Vanilla roles can be blacklisted from spawning or appearing in menus via other mira mods.
- Roles can check if they can spawn on the current gamemode or under specific conditions, such as the current map.
- Adds options that can have customizable text for -1 and 0 values respectively.
- Adds support for modded roles in Hide and Seek
- Fixes vanilla roles bypassing murder attempts
- Fixes keybinds not being hidden on buttons
- Fixes buttons used via keybinds bypassing ButtonClickEvents
- Fixes crashing for Epic Games users when opening the keybinds menu.
2025-12-14 07:58:01 -06:00
Atony 93eea6ea2f Bump version 2025-12-14 07:50:55 -06:00
Atony 8e09b7fee0 Merge pull request #74 from All-Of-Us-Mods/new-features
- Adds custom game tabs, with their own names and description blurbs.
- All keybinds have been moved to the right for consistency and to prevent hide and seek vent uses being obscured.
- Holding shift will split options in half
- Vanilla roles can be blacklisted from spawning or appearing in menus via other mira mods.
- Roles can check if they can spawn on the current gamemode or under specific conditions, such as the current map.
- Add options that can have customizable text for -1 and 0 values respectively.
- Fix buttons used via keybinds bypassing ButtonClickEvents
2025-12-14 07:47:27 -06:00
Atony 1e4894538c Merge branch 'dev' into new-features 2025-12-14 07:40:15 -06:00
Atony 303aedafc7 Fix keybinds bypassing button click events 2025-12-13 15:29:12 -06:00
Atony 8ed4355504 Clear up I2lCpp warning 2025-12-08 12:28:02 -06:00
Atony 76b02835a7 Update HudManagerPatches.cs 2025-11-30 15:30:17 -06:00
Atony 8d5bc710e7 Move all binds to the top right of buttons 2025-11-30 15:22:37 -06:00
Atony 798ce451d5 Add text for setting descriptions 2025-11-29 14:21:25 -06:00
Atony 136bbde516 Fix MaxUses check 2025-11-29 13:40:21 -06:00
Atony 5252620108 Update CustomActionButton.cs 2025-11-27 23:00:24 -06:00
Atony c9b1c57774 Add toggle for buttons to change uses check 2025-11-27 22:54:03 -06:00
Atony d97df1a891 Add options for negatives as infinity 2025-11-27 22:30:04 -06:00
Atony e93ef6fd1d Add special modded number type 2025-11-27 21:34:20 -06:00
Atony 3afe437101 Fix Hns Task Event not registering properly 2025-11-23 12:50:52 -06:00
Atony 62c01b2f72 Add Hns Manager into the task event 2025-11-23 12:05:31 -06:00
Atony 089d2c1ea5 Add Hide and seek task event 2025-11-23 12:01:41 -06:00
Atony c65511d03e Add checks to hide roles from menus 2025-11-22 15:26:07 -06:00
Atony aee304fb96 Fix nullable roletype errors 2025-11-22 08:19:58 -06:00
Atony 11ba564eed Fix seeker role assignment 2025-11-21 23:18:41 -06:00
Atony 259b9b7097 Add logic for modifiers & roles in hide and seek 2025-11-21 18:23:08 -06:00
Atony 7e3a279b56 Fix imps and crew being shown twice in view pane 2025-11-20 21:51:39 -06:00
Atony 1fd2dd3539 Allow mods to blacklist vanilla roles 2025-11-20 21:39:45 -06:00
XtraCube 3f60bcae2c default constructor not supported for custom role config 2025-11-20 10:18:39 -05:00
Atony fe1580bb7e Fix double round events on Airship & Submerged 2025-11-17 18:45:32 -06:00
Atony 8b23021b2a Fix null error for player without assigned role 2025-11-16 08:41:29 -06:00
Atony fdc715dac2 Expose data for option names 2025-11-07 17:26:06 -06:00
Atony e1ca50be3e Vanilla roles no longer bypass murder cancels 2025-11-01 10:00:42 -05:00
Atony 056a9b6102 Merge pull request #72 from All-Of-Us-Mods/dev
Fix Logger error for v0.3.3
2025-10-14 13:53:21 -05:00
Atony ae917a9c77 Merge pull request #71 from All-Of-Us-Mods/dev
MiraAPI v0.3.3
2025-10-14 13:46:58 -05:00
Atony fc9e9740be Merge pull request #70 from All-Of-Us-Mods/dev
MiraAPI v0.3.2
2025-10-14 09:08:53 -05:00
Atony f9096b6160 Merge pull request #69 from All-Of-Us-Mods/dev
MiraAPI v0.3.1
2025-09-28 13:17:06 -05:00
48 changed files with 733 additions and 900 deletions

No files matched your search

+1 -2
View File
@@ -6,5 +6,4 @@ bin/
.qodo/
*.user
*.lock.json
.qodo
*.lock.json
+1 -1
View File
@@ -8,7 +8,7 @@
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
<VersionPrefix>0.3.3</VersionPrefix>
<VersionPrefix>0.3.4</VersionPrefix>
<VersionSuffix>dev</VersionSuffix>
<Authors>All Of Us, XtraCube, Angxl</Authors>
+3 -6
View File
@@ -19,14 +19,11 @@ public class ExampleOptions : AbstractOptionGroup
[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(AuApis), ["Mira API", "Mitochondria", "Reactor"])]
public AuApis BestApiOpt { get; set; } = AuApis.MiraAPI;
[ModdedEnumOption<AuApis>("Worst API", ["Mira API", "Mitochondria", "Reactor"])]
public AuApis WorstApiOpt { get; set; } = AuApis.Mitochondria;
[ModdedEnumOption("Best API", typeof(BestApi), ["Mira API", "Mitochondria", "Reactor"])]
public BestApi Opt { get; set; } = BestApi.MiraAPI;
}
public enum AuApis
public enum BestApi
{
MiraAPI,
Mitochondria,
@@ -23,12 +23,6 @@ public class ExampleOptions2 : AbstractOptionGroup
{
ChangedEvent = x => Logger<ExamplePlugin>.Info($"changed Enum Opt to {x}"),
};
public ModdedMultiSelectOption<TestingData> MultiSelectOption { get; } = new(
"Emotions",
TestingData.Happy,
TestingData.All,
TestingData.None);
}
public enum TestingData : ulong
@@ -36,6 +30,4 @@ public enum TestingData : ulong
Happy,
Sad,
Neutral,
All,
None,
}
@@ -0,0 +1,35 @@
namespace MiraAPI.Events.Vanilla.Player;
/// <summary>
/// The event that is invoked when a player completes a task within Hide and Seek. Non-cancelable.
/// </summary>
public class CompleteHnsTaskEvent : MiraEvent
{
/// <summary>
/// Gets the instance of the <see cref="PlayerControl"/>.
/// </summary>
public PlayerControl Player { get; }
/// <summary>
/// Gets the instance of the <see cref="PlayerTask"/> that the player completed.
/// </summary>
public PlayerTask Task { get; }
/// <summary>
/// Gets the instance of the <see cref="HnsManager"/> attached to the game.
/// </summary>
public HideAndSeekManager HnsManager { get; }
/// <summary>
/// Initializes a new instance of the <see cref="CompleteHnsTaskEvent"/> class.
/// </summary>
/// <param name="hnsManager">The Hide and Seek Manager currently active.</param>
/// <param name="player">The player who completed the task.</param>
/// <param name="task">The task that the player completed.</param>
public CompleteHnsTaskEvent(HideAndSeekManager hnsManager, PlayerControl player, PlayerTask task)
{
HnsManager = hnsManager;
Player = player;
Task = task;
}
}
@@ -32,33 +32,3 @@ public class ModdedEnumOptionAttribute(string title, Type enumType, string[]? va
: throw new InvalidOperationException($"HolderOption for option \"{Title}\" with EnumType ${enumType.FullName} is not a ModdedEnumOption");
}
}
/// <summary>
/// Generic attribute for creating an enum option.
/// </summary>
/// <typeparam name="T">An enum type.</typeparam>
[AttributeUsage(AttributeTargets.Property)]
public class ModdedEnumOptionAttribute<T>(string title, string[]? values = null)
: ModdedOptionAttribute(title) where T : struct, Enum
{
internal override IModdedOption CreateOption(object? value, PropertyInfo property)
{
var opt = new ModdedEnumOption<T>(Title, (T)(value ?? 0), values);
return opt;
}
/// <inheritdoc />
public override void SetValue(object value)
{
var opt = HolderOption as ModdedEnumOption;
opt?.SetValue((int)value);
}
/// <inheritdoc />
public override object GetValue()
{
return HolderOption is ModdedEnumOption<T> opt
? Enum.ToObject(typeof(T), opt.Value)
: throw new InvalidOperationException($"HolderOption for option \"{Title}\" is not a ModdedEnumOption<{typeof(T).Name}>");
}
}
+2 -7
View File
@@ -17,9 +17,9 @@ public interface IModdedOption
uint Id { get; }
/// <summary>
/// Gets the title of the option.
/// Gets or sets the title of the option.
/// </summary>
string Title { get; }
string Title { get; set; }
/// <summary>
/// Gets the StringName for the option, used for localization.
@@ -92,11 +92,6 @@ public interface IModdedOption
/// <param name="saveDefault">Indicates whether to save the default value instead of the current value.</param>
void SaveToPreset(ConfigFile presetConfig, bool saveDefault = false);
/// <summary>
/// Changes the scales and positions of the option if it's attached to the game options menu.
/// </summary>
void ChangeGameSetting();
/// <summary>
/// Binds the option to a configuration file.
/// </summary>
@@ -1,4 +1,5 @@
using System;
using Il2CppInterop.Runtime.Attributes;
using MiraAPI.GameOptions.OptionTypes;
using Reactor.Utilities.Attributes;
using UnityEngine;
@@ -14,6 +15,7 @@ public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
/// <summary>
/// Gets or sets the modded option associated with the object.
/// </summary>
[HideFromIl2Cpp]
public ModdedNumberOption NumberOption { get; set; }
/// <summary>
@@ -22,7 +24,17 @@ public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
public float DefaultIncrement { get; set; }
/// <summary>
/// Gets or sets the value of whether or not holding shift will split the increment in half.
/// Gets or sets a value indicating whether holding shift will split the increment in half.
/// </summary>
public bool ShiftIncrementToggle { get; set; }
/// <summary>
/// Gets or sets a value indicating what Zero displays.
/// </summary>
public string ZeroValue { get; set; } = "#";
/// <summary>
/// Gets or sets a value indicating what Negative One displays.
/// </summary>
public string NegativeValue { get; set; } = "#";
}
@@ -47,13 +47,11 @@ public static class ModdedOptionsManager
TypeToGroup.Add(type, group);
pluginInfo.InternalOptionGroups.Add(group);
#pragma warning disable S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
typeof(OptionGroupSingleton<>).MakeGenericType(type)
#pragma warning disable S3011
.GetField("_instance", BindingFlags.Static | BindingFlags.NonPublic)!
#pragma warning restore S3011
.SetValue(null, group);
#pragma warning restore S3011 // Reflection should not be used to increase accessibility of classes, methods, or fields
return true;
}
@@ -53,11 +53,7 @@ public class ModdedEnumOption : ModdedOption<int>
stringOption.SetUpFromData(Data, 20);
stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
// Changing the button text to make them more distinct from number options
stringOption.MinusBtn.ChangeButtonText("<");
stringOption.PlusBtn.ChangeButtonText(">");
// SetUpFromData method doesn't work correctly so we must set the values manually
// SetUpFromData method doesnt work correctly so we must set the values manually
stringOption.Title = StringName;
stringOption.Values = (Data as StringGameSetting)?.Values ?? new Il2CppStructArray<StringNames>(0);
stringOption.Value = Value;
@@ -67,32 +63,6 @@ public class ModdedEnumOption : ModdedOption<int>
return stringOption;
}
/// <inheritdoc />
public override void ChangeGameSetting()
{
var stringOption = OptionBehaviour as StringOption;
stringOption!.MinusBtn.transform.localPosition += new Vector3(0.6f, 0f, 0f);
stringOption.PlusBtn.transform.localPosition += new Vector3(1.5f, 0f, 0f);
// The value box itself becomes the button
stringOption.PlusBtn.gameObject.SetActive(false);
stringOption.MinusBtn.gameObject.SetActive(false);
var background = stringOption.transform.GetChild(0);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
var title = stringOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
title.fontSize = 2.9f; // Why is it different for string options??
var valueBox = stringOption.transform.GetChild(5);
valueBox.localPosition += new Vector3(1.05f, 0f, 0f);
valueBox.localScale += new Vector3(0.2f, 0f, 0f);
}
/// <inheritdoc />
public override float GetFloatData()
{
@@ -137,7 +107,7 @@ public class ModdedEnumOption : ModdedOption<int>
/// An option for selecting an enum value.
/// </summary>
/// <typeparam name="T">The enum type.</typeparam>
public class ModdedEnumOption<T> : ModdedOption<T> where T : struct, Enum
public class ModdedEnumOption<T> : ModdedOption<T> where T : Enum
{
/// <summary>
/// Gets the string values of the enum.
@@ -148,12 +118,12 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : struct, Enum
/// Initializes a new instance of the <see cref="ModdedEnumOption{T}"/> class.
/// </summary>
/// <param name="title">The title of the option.</param>
/// <param name="defaultValue">The default value.</param>
/// <param name="defaultValue">The default value as an int.</param>
/// <param name="values">An option list of string values to use in place of the enum name.</param>
/// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
public ModdedEnumOption(string title, T defaultValue, string[]? values = null, bool includeInPreset=true) : base(title, defaultValue, includeInPreset)
{
Values = values ?? Enum.GetNames<T>();
Values = values ?? Enum.GetNames(typeof(T));
Data = ScriptableObject.CreateInstance<StringGameSetting>();
var data = (StringGameSetting)Data;
@@ -174,13 +144,9 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : struct, Enum
$"{ParentMod!.OptionsTitleText}.EnumOption.{TranslationController.Instance.GetString(StringName)}";
stringOption.SetUpFromData(Data, 20);
stringOption.OnValueChanged = (Action<OptionBehaviour>)ValueChanged;
stringOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
// Changing the button text to make them more distinct from number options
stringOption.MinusBtn.ChangeButtonText("<");
stringOption.PlusBtn.ChangeButtonText(">");
// SetUpFromData method doesn't work correctly so we must set the values manually
// SetUpFromData method doesnt work correctly so we must set the values manually
stringOption.Title = StringName;
stringOption.Values = (Data as StringGameSetting)?.Values ?? new Il2CppStructArray<StringNames>(0);
stringOption.Value = Convert.ToInt32(Value, NumberFormatInfo.InvariantInfo);
@@ -190,32 +156,6 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : struct, Enum
return stringOption;
}
/// <inheritdoc />
public override void ChangeGameSetting()
{
var stringOption = OptionBehaviour as StringOption;
stringOption!.MinusBtn.transform.localPosition += new Vector3(0.6f, 0f, 0f);
stringOption.PlusBtn.transform.localPosition += new Vector3(1.5f, 0f, 0f);
// The value box itself becomes the button
stringOption.PlusBtn.gameObject.SetActive(false);
stringOption.MinusBtn.gameObject.SetActive(false);
var background = stringOption.transform.GetChild(0);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
var title = stringOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
title.fontSize = 2.9f; // Why is it different for string options??
var valueBox = stringOption.transform.GetChild(5);
valueBox.localPosition += new Vector3(1.05f, 0f, 0f);
valueBox.localScale += new Vector3(0.2f, 0f, 0f);
}
/// <inheritdoc />
public override float GetFloatData()
{
@@ -231,19 +171,19 @@ public class ModdedEnumOption<T> : ModdedOption<T> where T : struct, Enum
/// <inheritdoc />
public override void HandleNetData(byte[] data)
{
SetValue(Enum.Parse<T>(Encoding.Unicode.GetString(data)));
SetValue((T)Enum.Parse(typeof(T), Encoding.Unicode.GetString(data)));
}
/// <inheritdoc />
public override T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
{
return Enum.Parse<T>(optionBehaviour.GetInt().ToString(NumberFormatInfo.InvariantInfo));
return (T)Enum.Parse(typeof(T), optionBehaviour.GetInt().ToString(NumberFormatInfo.InvariantInfo));
}
/// <inheritdoc />
protected override void OnValueChanged(T newValue)
{
HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data!.GetValueString(Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo)), false);
HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data.GetValueString(Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo)), false);
if (!OptionBehaviour)
{
return;
@@ -1,182 +0,0 @@
using AmongUs.GameOptions;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using MiraAPI.Modules;
using MiraAPI.Networking;
using MiraAPI.Utilities;
using MiraAPI.Utilities.Assets;
using Reactor.Utilities.Extensions;
using UnityEngine;
using Object = UnityEngine.Object;
namespace MiraAPI.GameOptions.OptionTypes;
/// <summary>
/// An option for selecting an enum value.
/// </summary>
/// <typeparam name="T">The enum type.</typeparam>
public class ModdedMultiSelectOption<T> : ModdedOption<T> where T : struct, Enum
{
/// <summary>
/// Gets the string values of the enum.
/// </summary>
public string[]? Values { get; }
/// <summary>
/// Gets a value indicating "all of the above".
/// </summary>
public T All { get; }
/// <summary>
/// Gets a value indicating "none of the above".
/// </summary>
public T None { get; }
/// <summary>
/// Gets the list of buttons that relate to the current instance.
/// </summary>
public List<MonoBehaviour> Buttons { get; }
/// <summary>
/// Initializes a new instance of the <see cref="ModdedMultiSelectOption{T}"/> class.
/// </summary>
/// <param name="title">The title of the option.</param>
/// <param name="defaultValue">The default value as an int.</param>
/// <param name="all">The all value.</param>
/// <param name="none">The none value.</param>
/// <param name="values">An option list of string values to use in place of the enum name.</param>
/// <exception cref="ArgumentException">The enum type doesn't have the flags attribute.</exception>
public ModdedMultiSelectOption(string title, T defaultValue, T all, T none, string[]? values = null) : base(title, defaultValue)
{
var tType = typeof(T);
if (tType.GetCustomAttribute<FlagsAttribute>() == null)
throw new ArgumentException($"{tType.Name} is not a flag enum type");
Values = values ?? Enum.GetNames<T>();
All = all;
None = none;
Data = ScriptableObject.CreateInstance<MultiSelectGameSetting>();
Buttons = [];
var data = (MultiSelectGameSetting)Data;
data.Title = StringName;
data.OptionName = Int32OptionNames.Invalid;
data.Type = global::OptionTypes.MultipleChoice; // How nice of the game to provide an enum value themselves
data.EnumNames = []; // We don't initialise the translation here, we just add one as and when needed
}
/// <inheritdoc />
public override OptionBehaviour CreateOption(
ToggleOption toggleOpt,
NumberOption numberOpt,
StringOption stringOpt,
PlayerOption playerOpt,
Transform container)
{
var stringOption = Object.Instantiate(stringOpt, container);
stringOption.SetUpFromData(Data, 20);
stringOption.OnValueChanged = (Action<OptionBehaviour>)ValueChanged;
var toggle = Object.Instantiate(toggleOpt.GetComponentInChildren<PassiveButton>(), stringOption.transform);
toggle.name = "Button";
toggle.transform.DestroyChildren();
toggle.OverrideOnClickListeners(ToggleButtons);
var box = toggle.GetComponent<BoxCollider2D>();
var prevColliderSize = box.size;
prevColliderSize.x *= 4.97f;
box.size = prevColliderSize;
var rend = stringOption.transform.GetChild(5).GetComponent<SpriteRenderer>();
toggle.OverrideOnMouseOverListeners(() => rend.color = Buttons.Count > 0 ? Color.white : MiraAssets.AcceptedTeal);
toggle.OverrideOnMouseOutListeners(() => rend.color = Buttons.Count > 0 ? MiraAssets.AcceptedTeal : Color.white);
// SetUpFromData method doesn't work correctly so we must set the values manually
stringOption.Title = StringName;
stringOption.Values = (Data as MultiSelectGameSetting)?.EnumNames?.Values?.ToArray() ?? new Il2CppStructArray<StringNames>(0);
stringOption.Value = Convert.ToInt32(Value, NumberFormatInfo.InvariantInfo);
OptionBehaviour = stringOption;
return stringOption;
}
/// <inheritdoc />
public override void ChangeGameSetting()
{
var stringOption = OptionBehaviour as StringOption;
// The value box itself becomes the button
stringOption!.PlusBtn.gameObject.SetActive(false);
stringOption.MinusBtn.gameObject.SetActive(false);
var background = stringOption.transform.GetChild(0);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
var title = stringOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
title.fontSize = 2.9f; // Why is it different for string options??
var valueBox = stringOption.transform.GetChild(5);
valueBox.localPosition += new Vector3(1.05f, 0f, 0f);
valueBox.localScale += new Vector3(0.2f, 0f, 0f);
}
private void ToggleButtons()
{
if (Buttons.Count > 0)
{
Buttons.ForEach(x => x.gameObject.Destroy());
return;
}
// TODO: Implement this
}
/// <inheritdoc />
public override float GetFloatData()
{
return Convert.ToSingle(Value, NumberFormatInfo.InvariantInfo);
}
/// <inheritdoc />
public override NetData GetNetData()
{
return new NetData(Id, EnumSerializer.EnumToBytes(Value));
}
/// <inheritdoc />
public override void HandleNetData(byte[] data)
{
SetValue(EnumSerializer.EnumFromBytes<T>(data, 0));
}
/// <inheritdoc />
public override T GetValueFromOptionBehaviour(OptionBehaviour optionBehaviour)
{
return Enum.Parse<T>(optionBehaviour.GetInt().ToString(NumberFormatInfo.InvariantInfo));
}
/// <inheritdoc />
protected override void OnValueChanged(T newValue)
{
HudManager.Instance.Notifier.AddSettingsChangeMessage(StringName, Data!.GetValueString(Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo)), false);
if (!OptionBehaviour)
{
return;
}
if (OptionBehaviour is StringOption opt)
{
opt.Value = Convert.ToInt32(newValue, NumberFormatInfo.InvariantInfo);
}
}
}
@@ -32,16 +32,83 @@ public class ModdedNumberOption : ModdedOption<float>
/// </summary>
public MiraNumberSuffixes SuffixType { get; }
/// <summary>
/// Gets a value indicating what zero appears as.
/// </summary>
public string ZeroWordValue { get; }
/// <summary>
/// Gets a value indicating what a negative one appears as.
/// </summary>
public string NegativeWordValue { get; }
/// <summary>
/// Gets a value indicating whether zero is infinity.
/// </summary>
public bool ZeroInfinity { get; }
public bool ZeroInfinity => ZeroWordValue == "∞";
/// <summary>
/// Gets a value indicating whether holding shift will divide the increment.
/// </summary>
public bool ShiftIncrement { get; }
/// <summary>
/// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
/// </summary>
/// <param name="title">The title of the option.</param>
/// <param name="defaultValue">The default value as a float.</param>
/// <param name="min">The minimum value.</param>
/// <param name="max">The maximum value.</param>
/// <param name="increment">The increment.</param>
/// <param name="suffixType">The suffix type.</param>
/// <param name="formatString">Optional format string for the option screen.</param>
/// <param name="zeroBehavior">Determines what is shown for zero. Options: ∞, #, or a word value (such as Off).</param>
/// <param name="negativeBehavior">Determines what is shown for negative 1. Options: ∞, #, or a word value (such as Off).</param>
/// <param name="halfIncrements">Whether increments can be split in half.</param>
/// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
public ModdedNumberOption(
string title,
float defaultValue,
float min,
float max,
float increment,
string zeroBehavior,
string negativeBehavior,
MiraNumberSuffixes suffixType,
string? formatString = null,
bool halfIncrements = false,
bool includeInPreset = true) : base(title, defaultValue, includeInPreset)
{
Min = min;
Max = max;
Increment = increment;
SuffixType = suffixType;
ZeroWordValue = zeroBehavior;
NegativeWordValue = negativeBehavior;
ShiftIncrement = halfIncrements;
Value = Mathf.Clamp(defaultValue, min, max);
Data = ScriptableObject.CreateInstance<FloatGameSetting>();
var data = (FloatGameSetting)Data;
data.Type = global::OptionTypes.Float;
data.Title = StringName;
data.Value = Value;
data.Increment = Increment;
data.ValidRange = new FloatRange(Min, Max);
data.FormatString = formatString ??
(defaultValue.IsInteger() &&
Increment.IsInteger() &&
Value.IsInteger() &&
Min.IsInteger() &&
Max.IsInteger() ? "0" : "0.0");
data.ZeroIsInfinity = ZeroInfinity;
data.SuffixType = (NumberSuffixes)SuffixType;
data.OptionName = FloatOptionNames.Invalid;
}
/// <summary>
/// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
/// </summary>
@@ -54,7 +121,6 @@ public class ModdedNumberOption : ModdedOption<float>
/// <param name="formatString">Optional format string for the option screen.</param>
/// <param name="zeroInfinity">Whether zero is infinity or not.</param>
/// <param name="includeInPreset">Whether to include this option in the preset or not.</param>
/// <param name="shiftIncrement">Whether holding shift will divide the increment or not.</param>
public ModdedNumberOption(
string title,
float defaultValue,
@@ -70,7 +136,8 @@ public class ModdedNumberOption : ModdedOption<float>
Max = max;
Increment = increment;
SuffixType = suffixType;
ZeroInfinity = zeroInfinity;
ZeroWordValue = zeroInfinity ? "∞" : "#";
NegativeWordValue = "#";
ShiftIncrement = increment != 1f;
Value = Mathf.Clamp(defaultValue, min, max);
@@ -110,6 +177,8 @@ public class ModdedNumberOption : ModdedOption<float>
optionComponent.NumberOption = this;
optionComponent.DefaultIncrement = Increment;
optionComponent.ShiftIncrementToggle = ShiftIncrement;
optionComponent.NegativeValue = NegativeWordValue;
optionComponent.ZeroValue = ZeroWordValue;
numberOption.SetUpFromData(Data, 20);
numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
@@ -128,27 +197,6 @@ public class ModdedNumberOption : ModdedOption<float>
return numberOption;
}
/// <inheritdoc />
public override void ChangeGameSetting()
{
var numberOption = OptionBehaviour as NumberOption;
numberOption!.PlusBtn.transform.localPosition += new Vector3(0.6f, 0f, 0f);
numberOption.MinusBtn.transform.localPosition += new Vector3(1.5f, 0f, 0f);
var background = numberOption.transform.GetChild(0);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
var title = numberOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
var valueBox = numberOption.transform.GetChild(5);
valueBox.localPosition += new Vector3(1.05f, 0f, 0f);
valueBox.localScale += new Vector3(0.2f, 0f, 0f);
}
/// <inheritdoc />
public override float GetFloatData()
{
@@ -179,7 +227,7 @@ public class ModdedNumberOption : ModdedOption<float>
Value = Mathf.Clamp(newValue, Min, Max);
HudManager.Instance.Notifier.AddSettingsChangeMessage(
StringName,
Data!.GetValueString(Value),
Data.GetValueString(Value),
false);
if (OptionBehaviour is NumberOption opt)
@@ -21,7 +21,7 @@ public abstract class ModdedOption<T> : IModdedOption
public uint Id { get; }
/// <inheritdoc />
public string Title { get; }
public string Title { get; set; }
/// <inheritdoc />
public StringNames StringName { get; }
@@ -181,23 +181,6 @@ public abstract class ModdedOption<T> : IModdedOption
PlayerOption playerOpt,
Transform container);
/// <summary>
/// Visually adjust the game option as needed.
/// </summary>
public abstract void ChangeGameSetting();
/// <summary>
/// Binds the option to the configuration file of the parent mod, if available.
/// </summary>
public virtual void BindConfig()
{
var entry = ParentMod?.GetConfigFile().Bind(ConfigDefinition, DefaultValue);
if (entry != null)
{
Value = entry.Value;
}
}
/// <summary>
/// Implicitly converts the option to type of <typeparamref name="T"/>.
/// </summary>
@@ -28,27 +28,6 @@ public class ModdedPlayerOption : ModdedOption<int>
/// </summary>
public bool AllowNone { get; set; }
/// <inheritdoc />
public override void ChangeGameSetting()
{
var numberOption = OptionBehaviour as PlayerOption;
numberOption!.PlusBtn.transform.localPosition += new Vector3(0.6f, 0f, 0f);
numberOption.MinusBtn.transform.localPosition += new Vector3(1.5f, 0f, 0f);
var background = numberOption.transform.GetChild(0);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
var title = numberOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
var valueBox = numberOption.transform.GetChild(5);
valueBox.localPosition += new Vector3(1.05f, 0f, 0f);
valueBox.localScale += new Vector3(0.2f, 0f, 0f);
}
/// <summary>
/// Initializes a new instance of the <see cref="ModdedPlayerOption"/> class.
/// </summary>
@@ -44,21 +44,6 @@ public class ModdedToggleOption : ModdedOption<bool>
return toggleOption;
}
/// <inheritdoc />
public override void ChangeGameSetting()
{
var toggleOption = OptionBehaviour as ToggleOption;
toggleOption!.transform.GetChild(1).localPosition += new Vector3(2.2f, 0f, 0f); // Checkbox
var title = toggleOption.TitleText;
title.transform.localPosition = new(-2.0466f, 0f, -2.9968f);
title.GetComponent<RectTransform>().sizeDelta = new(5.8f, 0.458f);
var background = toggleOption.transform.GetChild(2);
background.localPosition += new Vector3(-0.8f, 0f, 0f);
background.localScale += new Vector3(1f, 0f, 0f);
}
/// <inheritdoc />
public override float GetFloatData()
{
+44 -7
View File
@@ -64,9 +64,14 @@ public abstract class CustomActionButton
public virtual float EffectDuration => 0;
/// <summary>
/// Gets the maximum amount of uses the button has. If the button has infinite uses, set to 0.
/// Gets a value indicating whether the button has limited uses.
/// </summary>
public virtual int MaxUses => 0;
public bool LimitedUses => ZeroIsInfinite ? MaxUses > 0 : MaxUses >= 0;
/// <summary>
/// Gets the maximum number of uses the button has. If the button has infinite uses, set to 0 or -1 based on what value that ZeroIsInfinite is set to.
/// </summary>
public virtual int MaxUses => ZeroIsInfinite ? 0 : -1;
/// <summary>
/// Gets the value indicating uses mode.
@@ -89,9 +94,9 @@ public abstract class CustomActionButton
public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
/// <summary>
/// Gets a value indicating whether the button has limited uses.
/// Gets or sets a value indicating whether limited uses are determined via zero or a negative number of uses.
/// </summary>
public bool LimitedUses => MaxUses > 0;
public virtual bool ZeroIsInfinite { get; set; } = true;
/// <summary>
/// Gets or sets a value indicating whether the effect is currently active, if there is one.
@@ -206,7 +211,39 @@ public abstract class CustomActionButton
{
if (Enabled(PlayerControl.LocalPlayer.Data.Role))
{
ClickHandler();
// Invoke the generic button click event.
var genericEvent = new MiraButtonClickEvent(this);
MiraEventManager.InvokeEvent(genericEvent);
if (genericEvent.IsCancelled)
{
MiraEventManager.InvokeEvent(new MiraButtonCancelledEvent(this));
}
// Invoke the button click event for specific button.
var eventType = CustomButtonManager.ButtonEventTypes[GetType()];
var @event = (MiraCancelableEvent)Activator.CreateInstance(eventType, this, genericEvent)!;
var specificInvoked = MiraEventManager.InvokeEvent(@event, eventType);
if (@event.IsCancelled)
{
var cancelEventType = CustomButtonManager.ButtonCancelledEventTypes[GetType()];
var cancelEvent = (MiraEvent)Activator.CreateInstance(cancelEventType, this)!;
MiraEventManager.InvokeEvent(cancelEvent, cancelEventType);
}
if (specificInvoked)
{
if (!@event.IsCancelled)
{
ClickHandler();
}
}
else
{
if (!genericEvent.IsCancelled)
{
ClickHandler();
}
}
}
});
@@ -214,10 +251,10 @@ public abstract class CustomActionButton
Helpers.CreateKeybindIcon(
Button.gameObject,
Keybind.CurrentKey,
new Vector3(MaxUses <= 0 ? -0.4f : 0.4f, 0.45f, -9f)
new Vector3(0.4f, 0.45f, -9f)
);
KeybindText = KeybindIcon.transform.GetChild(0).GetComponent<TextMeshPro>();
HudManagerPatches.moddedKeybindIcons.Add(KeybindText);
HudManagerPatches.ModdedKeybindIcons.Add(KeybindText);
Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
}
}
+1 -1
View File
@@ -19,6 +19,6 @@ public class VanillaKeybind : BaseKeybind
public VanillaKeybind(int id)
{
RewiredInputAction = KeybindUtils.GetInputActionById(id);
Id = RewiredInputAction?.name;
Id = RewiredInputAction != null ? RewiredInputAction.name : id.ToString();
}
}
-4
View File
@@ -1,6 +1,5 @@
global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
using BepInEx;
using BepInEx.Configuration;
using BepInEx.Unity.IL2CPP;
using HarmonyLib;
using MiraAPI.PluginLoading;
@@ -32,7 +31,6 @@ public partial class MiraApiPlugin : BasePlugin
/// </summary>
public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
internal static ConfigEntry<string>? DistanceSuffix { get; private set; }
private static MiraPluginManager? PluginManager { get; set; }
internal Harmony Harmony { get; } = new(Id);
@@ -43,8 +41,6 @@ public partial class MiraApiPlugin : BasePlugin
ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
DistanceSuffix = Config.Bind("Display", "Distance", "unit(s)", "Dictates how a distance is shown in numeric option displays");
PluginManager = new MiraPluginManager();
PluginManager.Initialize();
}
+2 -1
View File
@@ -179,6 +179,7 @@ public static class ModifierManager
private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
{
return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId);
modifier.IsModifierValidOn(player.Data.Role) && !player.HasModifier(modifierId) &&
modifier.CanSpawnOnCurrentMode();
}
}
+6
View File
@@ -39,4 +39,10 @@ public abstract class GameModifier : BaseModifier
/// <param name="reason">The reason why the game ended.</param>
/// <returns>True if the player won, false if they lost. Return null to use the player's default win condition.</returns>
public virtual bool? DidWin(GameOverReason reason) => null;
/// <summary>
/// Determines whether the modifier can spawn in general, accounting for gamemodes and everything else.
/// </summary>
/// <returns>True if the modifier is able to spawn, otherwise false.</returns>
public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
}
@@ -1,9 +0,0 @@
using System;
namespace MiraAPI.Modules;
/// <summary>
/// Denotes a failure in conversion of values.
/// </summary>
/// <param name="message">The message to log.</param>
public class ConversionFailException(string message) : Exception(message);
-19
View File
@@ -1,19 +0,0 @@
// TODO: Remove later before completing the pr
#pragma warning disable
using System;
using System.Collections.Generic;
using AmongUs.GameOptions;
using Il2CppInterop.Runtime.Attributes;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using Reactor.Utilities.Attributes;
namespace MiraAPI.Modules;
[RegisterInIl2Cpp, Serializable]
public class MultiSelectGameSetting : BaseGameSetting
{
public Int32OptionNames OptionName;
public Dictionary<int, StringNames> EnumNames;
public override string GetValueString(float value) => TranslationController.Instance.GetString(EnumNames[(int)value]);
}
-202
View File
@@ -1,202 +0,0 @@
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using MiraAPI.Utilities;
namespace MiraAPI.Modules;
/// <summary>
/// Represents a collection of enum values that can be stored and manipulated as a comma-separated string.
/// </summary>
/// <typeparam name="T">The enum type that this collection will store.</typeparam>
/// <param name="values">One or more enum values to initialize the collection with.</param>
[Serializable]
public struct MultiSelectValue<T>(params T[] values) : IEnumerable<T>, IEquatable<MultiSelectValue<T>>, IDisposable where T : struct, Enum
{
/// <summary>
/// Gets or sets the underlying comma-separated string representation of enum values.
/// </summary>
public string Values
{
readonly get => Helpers.Join(',', _values);
set => _values = [.. value.TrueSplit(',').Select(Enum.Parse<T>)];
}
private HashSet<T> _values = [.. values];
/// <summary>
/// Gets the number of values contained within.
/// </summary>
public readonly int Count => _values.Count;
/// <summary>
/// Adds a single enum value to the end of the collection.
/// </summary>
/// <param name="item">The enum value to add.</param>
/// <returns><c>true</c> if successfully added; otherwise, <c>false</c>.</returns>
public readonly bool Add(T item) => _values.Add(item);
/// <summary>
/// Removes the first occurrence of the specified enum value.<br/>
/// Returns <c>true</c> if the value was found and removed, <c>false</c> otherwise.
/// </summary>
/// <param name="item">The enum value to remove.</param>
/// <returns><c>true</c> if successfully removed; otherwise, <c>false</c>.</returns>
public readonly bool Remove(T item) => _values.Remove(item);
/// <summary>
/// Adds multiple enum values to the end of the collection.
/// </summary>
/// <param name="items">The collection of enum values to add.</param>
public readonly void AddRange(IEnumerable<T> items)
{
foreach (var item in items)
_values.Add(item);
}
/// <summary>
/// Removes multiple enum values from the collection.
/// </summary>
/// <param name="items">The enum values to remove.</param>
/// <returns>The number of items successfully removed.</returns>
public readonly int RemoveRange(params T[] items) => RemoveRange((IEnumerable<T>)items);
/// <summary>
/// Removes multiple enum values from the collection.
/// </summary>
/// <param name="items">The collection of enum values to remove.</param>
/// <returns>The number of items successfully removed.</returns>
public readonly int RemoveRange(IEnumerable<T> items) => items.Count(Remove);
/// <summary>
/// Determines whether the collection contains the specified enum value.
/// </summary>
/// <param name="item">The enum value to locate.</param>
/// <returns>true if the item is found in the collection; otherwise, false.</returns>
public readonly bool Contains(T item) => _values.Contains(item);
/// <summary>
/// Removes all enum values that match the specified predicate condition.<br/>
/// Iterates through the collection and removes each matching value.
/// </summary>
/// <param name="predicate">A function that defines the condition for removing items.</param>
/// <returns>The number of items removed from the collection.</returns>
public readonly int RemoveAll(Func<T, bool> predicate)
{
var count = 0;
foreach (var item in this)
{
if (predicate(item) && Remove(item))
count++;
}
return count;
}
/// <summary>
/// Removes all enum values from the collection.
/// </summary>
public readonly void Clear() => _values.Clear();
/// <summary>
/// Gets the first value in the collection.
/// </summary>
/// <returns>Returns the first value.</returns>
public readonly T First() => _values.First();
/// <summary>
/// Serializes the current instance to an array of bytes.
/// </summary>
/// <returns>An array of bytes representing the current instance.</returns>
public readonly byte[] ToBytes() => EnumSerializer.EnumsToBytes(this);
/// <summary>
/// Converts the collection to its string representation.
/// </summary>
/// <returns>A comma-separated string of enum values.</returns>
public readonly override string ToString() => Values;
/// <inheritdoc/>
public readonly override bool Equals(object? obj) => obj is MultiSelectValue<T> other && Equals(other);
/// <inheritdoc/>
public readonly bool Equals(MultiSelectValue<T> other) => _values.SetEquals(other._values);
/// <inheritdoc/>
public readonly override int GetHashCode() => Values.GetHashCode();
/// <inheritdoc/>
public readonly IEnumerator<T> GetEnumerator() => ((IEnumerable<T>)_values).GetEnumerator();
/// <inheritdoc/>
readonly IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
/// <inheritdoc/>
public readonly void Dispose() => _values.Clear();
/// <summary>
/// Creates an instance of <see cref="MultiSelectValue{T}"/> from the provided byte array.
/// </summary>
/// <param name="bytes">The bytes to deserialize from.</param>
/// <returns>An instance of <see cref="MultiSelectValue{T}"/>.</returns>
#pragma warning disable CA1000 // Do not declare static members on generic types
public static MultiSelectValue<T> FromBytes(byte[] bytes) => new([.. EnumSerializer.EnumsFromBytes<T>(bytes)]);
#pragma warning restore CA1000 // Do not declare static members on generic types
/// <summary>
/// Converts the current instance to its string representation.
/// </summary>
/// <param name="value">The value to convert.</param>
public static implicit operator string(MultiSelectValue<T> value) => value.Values;
/// <summary>
/// Converts the current instance to its array representation of values.
/// </summary>
/// <param name="value">The value to convert.</param>
public static implicit operator T[](MultiSelectValue<T> value) => [.. value._values];
/// <summary>
/// Converts the current instance to one singular value.
/// </summary>
/// <param name="value">The value to convert.</param>
/// <exception cref="ConversionFailException">There were either no values, or more than one value.</exception>
#pragma warning disable S3877 // Exceptions should not be thrown from unexpected methods
public static implicit operator T(MultiSelectValue<T> value) =>
value.Count == 1
? value._values.First()
: throw new ConversionFailException($"Tried to convert multiple or no values ({value.Values}) to a singular one");
#pragma warning restore S3877 // Exceptions should not be thrown from unexpected methods
/// <summary>
/// Converts the value to an instance of MultiSelectValue.
/// </summary>
/// <param name="value">The value to convert.</param>
public static implicit operator MultiSelectValue<T>(T value) => new(value);
/// <summary>
/// Converts the array of values to an instance of MultiSelectValue.
/// </summary>
/// <param name="values">The values to convert.</param>
public static implicit operator MultiSelectValue<T>(T[] values) => new(values);
/// <summary>
/// Converts the value string to an instance of MultiSelectValue.
/// </summary>
/// <param name="values">The values to convert.</param>
public static implicit operator MultiSelectValue<T>(string values) => new([.. values.TrueSplit(',').Select(Enum.Parse<T>)]);
/// <summary>
/// Equality comparison.
/// </summary>
/// <param name="left">Left.</param>
/// <param name="right">Right.</param>
public static bool operator ==(MultiSelectValue<T> left, MultiSelectValue<T> right) => left.Equals(right);
/// <summary>
/// Inequality comparison.
/// </summary>
/// <param name="left">Left.</param>
/// <param name="right">Right.</param>
public static bool operator !=(MultiSelectValue<T> left, MultiSelectValue<T> right) => !left.Equals(right);
}
+1 -1
View File
@@ -87,11 +87,11 @@ public static class CustomMurderRpc
bool playKillSound = true)
{
source.isKilling = false;
var data = target.Data;
if (resultFlags.HasFlag(MurderResultFlags.FailedError))
{
return;
}
var data = target.Data;
if (resultFlags.HasFlag(MurderResultFlags.FailedProtected) ||
(resultFlags.HasFlag(MurderResultFlags.DecisionByHost) && target.protectedByGuardianId > -1))
@@ -0,0 +1,17 @@
using HarmonyLib;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Player;
namespace MiraAPI.Patches.Events;
[HarmonyPatch(typeof(HideAndSeekManager))]
public static class HnsFinishTaskPatch
{
[HarmonyPostfix]
[HarmonyPatch(nameof(HideAndSeekManager.FinishTask))]
public static void FinishTaskPostfix(HideAndSeekManager __instance, PlayerTask task)
{
var completeTaskEvent = new CompleteHnsTaskEvent(__instance, task.Owner, task);
MiraEventManager.InvokeEvent(completeTaskEvent);
}
}
@@ -1,4 +1,5 @@
using HarmonyLib;
/*
using HarmonyLib;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
@@ -18,3 +19,4 @@ internal static class SpawnInMinigamePatch
MiraEventManager.InvokeEvent(@event2);
}
}
*/
@@ -1,4 +1,5 @@
using System.Collections.Generic;
/*
using System.Collections.Generic;
using System.Reflection;
using HarmonyLib;
using MiraAPI.Events;
@@ -34,3 +35,4 @@ internal static class SubmergedSpawnGamePatch
MiraEventManager.InvokeEvent(@event2);
}
}
*/
+12 -11
View File
@@ -21,10 +21,14 @@ using Object = UnityEngine.Object;
namespace MiraAPI.Patches.Freeplay;
[HarmonyPatch(typeof(TaskAdderGame))]
internal static class TaskAdderPatches
public static class TaskAdderPatches
{
private static Scroller _scroller = null!;
private static Dictionary<string, TaskFolder> folders = new();
public static string CrewmateName => TranslationController.Instance.GetString(StringNames.Crewmate);
public static string ImpostorName => TranslationController.Instance.GetString(StringNames.Impostor);
public static string NeutralName => "Neutral";
public static string ModifiersName => "Modifiers";
[HarmonyPostfix]
[HarmonyPatch(nameof(TaskAdderGame.Begin))]
@@ -66,19 +70,16 @@ internal static class TaskAdderPatches
__instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
__instance.RootFolderPrefab.gameObject.SetActive(false);
__instance.TaskParent = inner.transform;
var crewLocale = TranslationController.Instance.GetString(StringNames.Crewmate);
var impLocale = TranslationController.Instance.GetString(StringNames.Impostor);
var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == crewLocale)!;
var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == impLocale)!;
var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == CrewmateName)!;
var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == ImpostorName)!;
//var neutralFolder = __instance.CreateFolder("Neutral", __instance.Root, 2, Color.gray);
var modifiersFolder = __instance.CreateFolder("Modifiers", __instance.Root, 0, Color.blue);
var modifiersFolder = __instance.CreateFolder(ModifiersName, __instance.Root, 0, Color.blue);
folders.Clear();
folders.Add(crewmateFolder.FolderName, crewmateFolder);
folders.Add(impostorFolder.FolderName, impostorFolder);
//folders.Add("Neutrals", neutralFolder);
folders.Add("Modifiers", modifiersFolder);
folders.Add(ModifiersName, modifiersFolder);
int folderIdx = 2;
foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
@@ -137,8 +138,8 @@ internal static class TaskAdderPatches
Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
impFolder.gameObject.SetActive(false);
impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
crewFolder.FolderName = TranslationController.Instance.GetString(StringNames.Crewmate);
impFolder.FolderName = TranslationController.Instance.GetString(StringNames.Impostor);
crewFolder.FolderName = CrewmateName;
impFolder.FolderName = ImpostorName;
rootFolder.SubFolders.Insert(0, crewFolder);
rootFolder.SubFolders.Insert(0, impFolder);
Il2CppSystem.Collections.Generic.List<RoleBehaviour> impRoles = new();
@@ -440,7 +441,7 @@ internal static class TaskAdderPatches
}
}
if (folders.TryGetValue("Modifiers", out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
if (folders.TryGetValue(ModifiersName, out var modifiersFolder) && taskFolder.IsChildOf(modifiersFolder))
{
var plugin = MiraPluginManager.GetPluginByGuid(taskFolder.name.Replace("(Clone)", string.Empty));
if (plugin != null)
+4 -4
View File
@@ -27,7 +27,7 @@ public static class HudManagerPatches
private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = new();
internal static List<TextMeshPro> moddedKeybindIcons = new();
internal static List<TextMeshPro> ModdedKeybindIcons = new();
/*
/// <summary>
@@ -90,7 +90,7 @@ public static class HudManagerPatches
fakeButton.ToggleVisible(true);
fakeButton.Destroy();
}
moddedKeybindIcons = [];
ModdedKeybindIcons = [];
foreach (var button in CustomButtonManager.CustomButtons)
{
@@ -123,7 +123,7 @@ public static class HudManagerPatches
aspectPosition.AdjustPosition();
vanillaKeybindIcons = [];
var keybindIconPos = new Vector3(-0.4f, 0.4f, -9.5f);
var keybindIconPos = new Vector3(0.4f, 0.4f, -9.5f);
var vanillaButtons = new Dictionary<GameObject, int>
{
{ __instance.KillButton.gameObject, 8 },
@@ -192,7 +192,7 @@ public static class HudManagerPatches
btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
btnIcon.Key.transform.parent.gameObject.SetActive(canSeeBinds);
}
foreach (var btnIcon in moddedKeybindIcons)
foreach (var btnIcon in ModdedKeybindIcons)
{
btnIcon.transform.parent.gameObject.SetActive(canSeeBinds);
}
@@ -284,9 +284,6 @@ internal static class GameOptionsMenuPatch
menu.playerOptionOrigin,
menu.settingsContainer));
// TODO: Reimplement this without breaking the menu.
// group.Options.ForEach(x => x.ChangeGameSetting());
foreach (var newOpt in options)
{
newOpt.SetClickMask(menu.ButtonClickMask);
@@ -110,12 +110,15 @@ internal static class GameSettingMenuPatches
{
case 3:
_modifiersButton?.SelectButton(true);
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.ModifierMenuDescription : "Configure modifiers and their settings here!";
break;
case 4:
_customOneButton?.SelectButton(true);
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuOneDescription : "Apply game settings for this mod!";
break;
case 5:
_customTwoButton?.SelectButton(true);
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuTwoDescription : "Apply game settings for this mod!";
break;
}
}
@@ -185,7 +185,9 @@ public static class LobbyViewPanePatches
__instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
num -= 0.696f;
var roles = RoleManager.Instance.AllRoles.ToArray().Where(x =>
x is not ICustomRole && x.Role != RoleTypes.Crewmate && x.Role != RoleTypes.Impostor &&
x is not ICustomRole && !x.IsRoleBlacklisted() && x.Role != RoleTypes.Crewmate &&
x.Role != RoleTypes.Impostor && ((i == 0 && x.TeamType is RoleTeamTypes.Crewmate) ||
(i == 1 && x.TeamType is RoleTeamTypes.Impostor)) &&
x.Role != RoleTypes.CrewmateGhost && x.Role != RoleTypes.ImpostorGhost).ToList();
for (int j = 0; j < roles.Count; j++)
{
@@ -380,7 +382,7 @@ public static class LobbyViewPanePatches
foreach (var grouping in sortedRoleGroups)
{
if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings))
if (!grouping.Any() || grouping.All(x => x.Configuration.HideSettings || !x.VisibleInSettings()))
{
continue;
}
@@ -411,7 +413,7 @@ public static class LobbyViewPanePatches
foreach (var customRole in grouping)
{
if (customRole.Configuration.HideSettings)
if (customRole.Configuration.HideSettings || !customRole.VisibleInSettings())
{
continue;
}
@@ -74,10 +74,10 @@ public static class RoleSettingMenuPatches
var num = 0.662f;
var list = CustomRoleManager.AllRoles.Where(
r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Crewmate && r.Role != RoleTypes.Crewmate &&
r.Role != RoleTypes.CrewmateGhost).ToList();
var list2 = CustomRoleManager.AllRoles.Where(
r => !r.IsCustomRole() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
r => !r.IsCustomRole() && !r.IsRoleBlacklisted() && r.TeamType == RoleTeamTypes.Impostor && r.Role != RoleTypes.Impostor &&
r.Role != RoleTypes.ImpostorGhost).ToList();
if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
@@ -160,7 +160,7 @@ public static class RoleSettingMenuPatches
foreach (var grouping in sortedRoleGroups)
{
if (!grouping.Any() || grouping.All(x=>x.Configuration.HideSettings))
if (!grouping.Any() || grouping.All(x=> x.Configuration.HideSettings || !x.VisibleInSettings()))
{
continue;
}
+30 -2
View File
@@ -1,5 +1,8 @@
using System.Globalization;
using System.Linq;
using HarmonyLib;
using MiraAPI.GameOptions;
using MiraAPI.GameOptions.OptionTypes;
using MiraAPI.Utilities;
using UnityEngine;
@@ -28,7 +31,33 @@ public static class SettingPatches
string result;
var suffix = (MiraNumberSuffixes)__instance.SuffixType;
if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
var custom =
ModdedOptionsManager.ModdedOptions.Values.FirstOrDefault(opt =>
opt.OptionBehaviour != null && opt.OptionBehaviour.Data == __instance);
if (custom is ModdedNumberOption moddedNumberOption)
{
if (moddedNumberOption.NegativeWordValue != "#" && (int)value == -1)
{
result = $"<b>{moddedNumberOption.NegativeWordValue}</b>";
}
else if (moddedNumberOption.ZeroWordValue != "#" && Mathf.Abs(value) < 0.0001f)
{
result = $"<b>{moddedNumberOption.ZeroWordValue}</b>";
}
else
{
result = suffix switch
{
MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
_ => TranslationController.Instance.GetString(
StringNames.GameSecondsAbbrev,
(Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
};
}
}
else if (__instance.ZeroIsInfinity && Mathf.Abs(value) < 0.0001f)
{
result = "<b>∞</b>";
}
@@ -39,7 +68,6 @@ public static class SettingPatches
MiraNumberSuffixes.None => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo),
MiraNumberSuffixes.Multiplier => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "x",
MiraNumberSuffixes.Percent => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + "%",
MiraNumberSuffixes.Distance => value.ToString(__instance.FormatString, NumberFormatInfo.InvariantInfo) + MiraApiPlugin.DistanceSuffix.Value,
_ => TranslationController.Instance.GetString(
StringNames.GameSecondsAbbrev,
(Il2CppSystem.Object[])[value.ToString(__instance.FormatString, CultureInfo.InvariantCulture)]),
+1 -6
View File
@@ -46,7 +46,7 @@ public static class KillButtonPatches
}
/// <summary>
/// Use Custom Murder if player is custom role.
/// Use Custom Murder instead of Murder Player from vanilla.
/// </summary>
[HarmonyPrefix]
[HarmonyPatch(nameof(KillButton.DoClick))]
@@ -58,11 +58,6 @@ public static class KillButtonPatches
return false;
}
if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole)
{
return true;
}
PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget);
__instance.SetTarget(null);
@@ -0,0 +1,183 @@
using AmongUs.GameOptions;
using HarmonyLib;
using Il2CppSystem.Collections.Generic;
using System.Linq;
using MiraAPI.Roles;
namespace MiraAPI.Patches.Roles;
[HarmonyPatch(typeof(LogicRoleSelectionHnS))]
public static class LogicRoleSelectionHnsPatch
{
[HarmonyPrefix]
[HarmonyPatch(nameof(LogicRoleSelectionHnS.AssignRolesForTeam))]
public static bool AssignRolesForTeam(
LogicRoleSelectionHnS __instance,
List<NetworkedPlayerInfo> players,
IGameOptions opts,
RoleTeamTypes team,
int teamMax,
Il2CppSystem.Nullable<RoleTypes> defaultRole)
{
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Team: {team}, Max: {teamMax}, Players: {players.Count}, DefaultRole: {defaultRole}");
int num = 0;
IRoleOptionsCollection roleOptions = opts.RoleOptions;
var source = RoleManager.Instance.AllRoles.ToArray()
.Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
CustomRoleUtils.CanSpawnOnCurrentMode(role));
var assignmentData = source.Where(x => !x.IsDead).Select(role =>
new RoleManager.RoleAssignmentData(
role,
roleOptions.GetNumPerGame(role.Role),
roleOptions.GetChancePerGame(role.Role))).ToList();
var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
List<RoleTypes> list = new List<RoleTypes>();
if (team == RoleTeamTypes.Crewmate)
{
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
{
for (;;)
{
RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
int count = roleAssignmentData2.Count;
roleAssignmentData2.Count = count - 1;
if (count <= 0)
{
break;
}
list.Add(roleAssignmentData.Role.Role);
}
}
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
AssignRolesFromList(players, teamMax, list, ref num);
var list2 = source.Where(x => !x.IsDead).Select(role =>
new RoleManager.RoleAssignmentData(
role,
roleOptions.GetNumPerGame(role.Role),
roleOptions.GetChancePerGame(role.Role))).ToList();
list.Clear();
foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
{
for (int i = 0; i < roleAssignmentData3.Count; i++)
{
if (HashRandom.Next(101) < roleAssignmentData3.Chance)
{
list.Add(roleAssignmentData3.Role.Role);
}
}
}
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Potential Assignment");
AssignRolesFromList(players, teamMax, list, ref num);
var basicRole = RoleTypes.Engineer;
while (list.Count < players.Count && list.Count + num < teamMax)
{
list.Add(basicRole);
}
AssignRolesFromList(players, teamMax, list, ref num);
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Fallback Assignment");
}
else if (team == RoleTeamTypes.Impostor)
{
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
var newImpostors = new List<NetworkedPlayerInfo>();
// Specified Seeker
if (__instance.hnsManager.LogicOptionsHnS.HasImpostorPlayerID() &&
__instance.hnsManager.LogicOptionsHnS.ValidateImpostorPlayerID(players) &&
!AmongUsClient.Instance.IsGamePublic)
{
NetworkedPlayerInfo networkedPlayerInfo = players.ToArray()
.First(p => p.PlayerId == __instance.hnsManager.LogicOptionsHnS.ImpostorPlayerID());
players.Remove(networkedPlayerInfo);
newImpostors.Add(networkedPlayerInfo);
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
}
// Random Seeker
else
{
int num2 = 0;
while (num2 < teamMax && players.Count > 0)
{
PseudoRandomList<NetworkedPlayerInfo> pseudoRandomList = new PseudoRandomList<NetworkedPlayerInfo>(AmongUsClient.Instance.GameId);
players._items.Do(x => pseudoRandomList.Add(x));
for (int i = 0; i < GameData.RoundsPlayedInSession; i++)
{
pseudoRandomList.PickRandom();
}
NetworkedPlayerInfo networkedPlayerInfo = pseudoRandomList.PickRandom();
players.Remove(networkedPlayerInfo);
newImpostors.Add(networkedPlayerInfo);
num2++;
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Seeker is {networkedPlayerInfo.PlayerName}, ID: {networkedPlayerInfo.PlayerId}");
}
}
Error($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: After Guaranteed Assignment");
foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
{
for (;;)
{
RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
int count = roleAssignmentData2.Count;
roleAssignmentData2.Count = count - 1;
if (count <= 0)
{
break;
}
list.Add(roleAssignmentData.Role.Role);
}
}
AssignRolesFromList(newImpostors, teamMax, list, ref num);
var list2 = source.Where(x => !x.IsDead).Select(role =>
new RoleManager.RoleAssignmentData(
role,
roleOptions.GetNumPerGame(role.Role),
roleOptions.GetChancePerGame(role.Role))).ToList();
list.Clear();
foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
{
for (int i = 0; i < roleAssignmentData3.Count; i++)
{
if (HashRandom.Next(101) < roleAssignmentData3.Chance)
{
list.Add(roleAssignmentData3.Role.Role);
}
}
}
AssignRolesFromList(newImpostors, teamMax, list, ref num);
var basicRole = RoleTypes.Impostor;
while (list.Count < newImpostors.Count && list.Count + num < teamMax)
{
list.Add(basicRole);
}
AssignRolesFromList(newImpostors, teamMax, list, ref num);
}
return false;
}
public static void AssignRolesFromList(List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
{
while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
{
int index = HashRandom.FastNext(roleList.Count);
RoleTypes roleType = roleList[index];
roleList.RemoveAt(index);
int index2 = HashRandom.FastNext(players.Count);
players[index2].Object.RpcSetRole(roleType, false);
players.RemoveAt(index2);
rolesAssigned++;
}
}
}
@@ -0,0 +1,93 @@
using AmongUs.GameOptions;
using HarmonyLib;
using Il2CppSystem.Collections.Generic;
using System.Linq;
using MiraAPI.Roles;
namespace MiraAPI.Patches.Roles;
[HarmonyPatch(typeof(LogicRoleSelectionNormal))]
public static class LogicRoleSelectionNormalPatch
{
[HarmonyPrefix]
[HarmonyPatch(nameof(LogicRoleSelectionNormal.AssignRolesForTeam))]
public static bool AssignRolesForTeam(
LogicRoleSelectionNormal __instance,
List<NetworkedPlayerInfo> players,
IGameOptions opts,
RoleTeamTypes team,
int teamMax,
Il2CppSystem.Nullable<RoleTypes> defaultRole)
{
int num = 0;
var source = RoleManager.Instance.AllRoles.ToArray()
.Where(role => role.TeamType == team && !RoleManager.IsGhostRole(role.Role) &&
CustomRoleUtils.CanSpawnOnCurrentMode(role));
List<RoleTypes> list = new List<RoleTypes>();
IRoleOptionsCollection roleOptions = opts.RoleOptions;
var assignmentData = source.Where(x => !x.IsDead).Select(role =>
new RoleManager.RoleAssignmentData(
role,
roleOptions.GetNumPerGame(role.Role),
roleOptions.GetChancePerGame(role.Role))).ToList();
var source2 = CustomRoleUtils.GetPossibleRoles(assignmentData, x => x.Chance == 100);
var guaranteedRoles = source.Where(x => source2.Contains(((ushort)x.Role, 100)));
foreach (RoleManager.RoleAssignmentData roleAssignmentData in guaranteedRoles.Select((x) =>
new RoleManager.RoleAssignmentData(x, roleOptions.GetNumPerGame(x.Role), 100)))
{
for (;;)
{
RoleManager.RoleAssignmentData roleAssignmentData2 = roleAssignmentData;
int count = roleAssignmentData2.Count;
roleAssignmentData2.Count = count - 1;
if (count <= 0)
{
break;
}
list.Add(roleAssignmentData.Role.Role);
}
}
__instance.AssignRolesFromList(players, teamMax, list, ref num);
var list2 = source.Where(x => !x.IsDead).Select(role =>
new RoleManager.RoleAssignmentData(
role,
roleOptions.GetNumPerGame(role.Role),
roleOptions.GetChancePerGame(role.Role))).ToList();
list.Clear();
foreach (RoleManager.RoleAssignmentData roleAssignmentData3 in list2)
{
for (int i = 0; i < roleAssignmentData3.Count; i++)
{
if (HashRandom.Next(101) < roleAssignmentData3.Chance)
{
list.Add(roleAssignmentData3.Role.Role);
}
}
}
__instance.AssignRolesFromList(players, teamMax, list, ref num);
var defaultRole2 = team is RoleTeamTypes.Crewmate ? RoleTypes.Crewmate : RoleTypes.Impostor;
try
{
defaultRole2 = defaultRole.Value;
}
catch
{
// Ignored
}
while (list.Count < players.Count && list.Count + num < teamMax)
{
list.Add(defaultRole2);
}
__instance.AssignRolesFromList(players, teamMax, list, ref num);
return false;
}
}
+2 -2
View File
@@ -20,7 +20,7 @@ public static class NameTagPatch
return false;
}
if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
if (PlayerControl.LocalPlayer.Data?.Role?.IsImpostor == true && otherPlayerRole.IsImpostor)
{
return true;
}
@@ -30,7 +30,7 @@ public static class NameTagPatch
return true;
}
if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data.Role || !otherPlayerRole)
if (!PlayerControl.LocalPlayer || !PlayerControl.LocalPlayer.Data || !PlayerControl.LocalPlayer.Data?.Role || !otherPlayerRole)
{
__result = Color.white;
}
@@ -1,6 +1,7 @@
using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib;
using InnerNet;
using MiraAPI.Events;
using MiraAPI.Events.Vanilla.Gameplay;
using MiraAPI.Modifiers;
+15
View File
@@ -22,6 +22,21 @@ public interface IMiraPlugin
/// </summary>
public virtual string CustomOptionMenuNameTwo => "Custom Category 2";
/// <summary>
/// Gets the description for the second custom category in the game options menu, if any.
/// </summary>
public virtual string ModifierMenuDescription => "Configure modifiers and their settings here!";
/// <summary>
/// Gets the description for the first custom category in the game options menu, if any.
/// </summary>
public virtual string CustomOptionMenuOneDescription => "Apply game settings for this mod!";
/// <summary>
/// Gets the description for the second custom category in the game options menu, if any.
/// </summary>
public virtual string CustomOptionMenuTwoDescription => "Apply game settings for this mod!";
/// <summary>
/// Gets the BepInEx configuration file for the plugin.
/// </summary>
+1 -1
View File
@@ -51,7 +51,7 @@ public class MiraPluginInfo
public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
/// <summary>
/// Gets a read only dictionary of this plugin's custom game modes.
/// Gets a read only dictionary of this plugin's custom presets.
/// </summary>
public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
+63 -1
View File
@@ -1,4 +1,5 @@
using System.IO;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using BepInEx.Configuration;
using MiraAPI.PluginLoading;
@@ -18,6 +19,13 @@ public static class PresetManager
/// </summary>
public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
internal static List<OptionPreset> InternalMasterPresets { get; } = [];
/// <summary>
/// Gets a read only dictionary of this plugin's custom presets.
/// </summary>
public static IReadOnlyCollection<OptionPreset> MasterPresets { get; internal set; } = null!;
internal static void CreateDefaultPreset(MiraPluginInfo plugin)
{
var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
@@ -93,4 +101,58 @@ public static class PresetManager
}
plugin.Presets = [..plugin.InternalPresets];
}
/// <summary>
/// Loads the master presets by reading the configuration files from the preset directory.
/// </summary>
public static void LoadMasterPreset()
{
/*foreach (var btn in plugin.InternalPresets.Select(x=>x.PresetButton))
{
if (btn != null)
{
Object.DestroyImmediate(btn);
}
}
plugin.InternalPresets.Clear();*/
if (!Directory.Exists(PresetDirectory))
{
Directory.CreateDirectory(PresetDirectory);
}
var pluginPresetPath = Path.Combine(PresetDirectory, "MasterPresets");
if (!Directory.Exists(pluginPresetPath))
{
Directory.CreateDirectory(pluginPresetPath);
}
foreach (var file in Directory.GetFiles(pluginPresetPath, "*.cfg"))
{
var fileName = Path.GetFileName(file);
Info($"Loading preset file {fileName}");
var presetName = Path.GetFileNameWithoutExtension(file);
var presetConfig = new ConfigFile(file, false)
{
SaveOnConfigSet = false,
};
foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
{
foreach (var option in plugin.InternalOptions.Where(x=>x.IncludeInPreset))
{
option.Bind(presetConfig);
}
foreach (var role in plugin.InternalRoles.Values.OfType<ICustomRole>().Where(x=>!x.Configuration.HideSettings))
{
role.BindConfig(presetConfig);
}
}
presetConfig.Save();
// InternalMasterPresets.Add(new OptionPreset(presetName, plugin, presetConfig));
}
MasterPresets = [..InternalMasterPresets];
}
}
+14 -3
View File
@@ -1,7 +1,8 @@
using AmongUs.GameOptions;
using AmongUs.GameOptions;
using System;
using MiraAPI.Patches.Freeplay;
using MiraAPI.Utilities.Assets;
using UnityEngine;
namespace MiraAPI.Roles;
/// <summary>
@@ -9,6 +10,16 @@ namespace MiraAPI.Roles;
/// </summary>
public record struct CustomRoleConfiguration
{
#pragma warning disable S1133
[Obsolete("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.")]
#pragma warning restore S1133
#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
public CustomRoleConfiguration()
#pragma warning restore CS1591 // Missing XML comment for publicly visible type or member
{
throw new NotImplementedException("Default constructor is not supported. Please use the constructor that takes an ICustomRole parameter.");
}
/// <summary>
/// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
/// </summary>
@@ -36,7 +47,7 @@ public record struct CustomRoleConfiguration
{
ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
_ => "Neutral",
_ => TaskAdderPatches.NeutralName,
};
IntroSound = role.Team is ModdedRoleTeams.Crewmate
? CustomRoleManager.CrewmateIntroSound
+58 -1
View File
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Text;
@@ -13,6 +14,62 @@ namespace MiraAPI.Roles;
/// </summary>
public static class CustomRoleUtils
{
/// <summary>
/// Determines whether the specified role can spawn in general, accounting for gamemodes and everything else.
/// </summary>
/// <param name="role">The role you would like to check for.</param>
/// <returns>True if the role is able to spawn, otherwise false.</returns>
public static bool CanSpawnOnCurrentMode(RoleBehaviour role)
{
if (role is ICustomRole custom)
{
return custom.CanSpawnOnCurrentMode();
}
if (GameManager.Instance.IsHideAndSeek())
{
return role.Role is RoleTypes.Engineer || role.Role is RoleTypes.Impostor;
}
return true;
}
public static List<(ushort RoleType, int Chance)> GetPossibleRoles(
List<RoleManager.RoleAssignmentData> assignmentData,
Func<RoleManager.RoleAssignmentData, bool>? predicate = null)
{
var roles = new List<(ushort, int)>();
assignmentData.Where(x => predicate == null || predicate(x)).ToList().ForEach(x =>
{
for (var i = 0; i < x.Count; i++)
{
roles.Add(((ushort)x.Role.Role, x.Chance));
}
});
return roles;
}
public static RoleManager.RoleAssignmentData GetAssignData(RoleTypes roleType)
{
var currentGameOptions = GameOptionsManager.Instance.CurrentGameOptions;
var roleOptions = currentGameOptions.RoleOptions;
var role = GetRegisteredRole(roleType);
var assignmentData = new RoleManager.RoleAssignmentData(role, roleOptions.GetNumPerGame(role!.Role),
roleOptions.GetChancePerGame(role.Role));
return assignmentData;
}
public static RoleBehaviour? GetRegisteredRole(RoleTypes roleType)
{
// we want to prioritize the custom roles because the role has the right RoleColour/TeamColor
var role = CustomRoleManager.AllRoles.FirstOrDefault(x => x.Role == roleType);
return role;
}
/// <summary>
/// Gets all active in-game roles.
/// </summary>
+13 -1
View File
@@ -1,4 +1,5 @@
using System.Text;
using System;
using System.Text;
using BepInEx.Configuration;
using MiraAPI.GameOptions;
using MiraAPI.Modifiers;
@@ -239,4 +240,15 @@ public interface ICustomRole : IOptionable
{
return true;
}
/// <summary>
/// Determines whether the role can spawn in general, accounting for gamemodes and everything else.
/// </summary>
/// <returns>True if the role is able to spawn, otherwise false.</returns>
public virtual bool CanSpawnOnCurrentMode() => !GameManager.Instance.IsHideAndSeek();
/// <summary>
/// Gets the function that determines whether the role should be toggled on or off in the game settings.
/// </summary>
public virtual Func<bool> VisibleInSettings => () => true;
}
-145
View File
@@ -1,145 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
namespace MiraAPI.Utilities;
/// <summary>
/// Enum serializer for converting enums to and from byte arrays.
/// </summary>
public static class EnumSerializer
{
/// <summary>
/// Serializes an enum to an array of bytes.
/// </summary>
/// <param name="value">The enum value to serialize.</param>
/// <typeparam name="T">The enum type.</typeparam>
/// <returns>A byte array representing the enum value.</returns>
/// <exception cref="ArgumentException">Thrown when the underlying type is not recognized.</exception>
public static byte[] EnumToBytes<T>(T value) where T : struct, Enum
{
var underlyingType = typeof(T).GetEnumUnderlyingType();
return underlyingType switch
{
not null when underlyingType == typeof(byte) => [(byte)(object)value],
not null when underlyingType == typeof(sbyte) => [(byte)(sbyte)(object)value],
not null when underlyingType == typeof(short) => BitConverter.GetBytes((short)(object)value),
not null when underlyingType == typeof(ushort) => BitConverter.GetBytes((ushort)(object)value),
not null when underlyingType == typeof(int) => BitConverter.GetBytes((int)(object)value),
not null when underlyingType == typeof(uint) => BitConverter.GetBytes((uint)(object)value),
not null when underlyingType == typeof(long) => BitConverter.GetBytes((long)(object)value),
not null when underlyingType == typeof(ulong) => BitConverter.GetBytes((ulong)(object)value),
_ => throw new ArgumentException("Unknown underlying type for " + typeof(T).Name),
};
}
/// <summary>
/// Converts bytes to an enum using the underlying type.
/// </summary>
/// <param name="bytes">The byte array to convert.</param>
/// <param name="offset">The offset in the byte array to start reading from.</param>
/// <param name="underlyingType">The underlying type of the enum.</param>
/// <typeparam name="T">The enum type.</typeparam>
/// <returns>The enum value represented by the bytes.</returns>
/// <exception cref="ArgumentException">Thrown when the underlying type is not recognized.</exception>
public static T EnumFromBytes<T>(byte[] bytes, int offset, Type underlyingType) where T : struct, Enum
{
return underlyingType switch
{
{ } t when t == typeof(byte) || t == typeof(sbyte) => (T)(object)bytes[offset],
{ } t when t == typeof(short) => (T)(object)BitConverter.ToInt16(bytes, offset),
{ } t when t == typeof(ushort) => (T)(object)BitConverter.ToUInt16(bytes, offset),
{ } t when t == typeof(int) => (T)(object)BitConverter.ToInt32(bytes, offset),
{ } t when t == typeof(uint) => (T)(object)BitConverter.ToUInt32(bytes, offset),
{ } t when t == typeof(long) => (T)(object)BitConverter.ToInt64(bytes, offset),
{ } t when t == typeof(ulong) => (T)(object)BitConverter.ToUInt64(bytes, offset),
_ => throw new ArgumentException("Unknown underlying type for " + typeof(T).Name),
};
}
/// <inheritdoc cref="EnumFromBytes{T}(byte[], int, Type)"/>
public static T EnumFromBytes<T>(byte[] bytes, int offset) where T : struct, Enum => EnumFromBytes<T>(bytes, offset, typeof(T).GetEnumUnderlyingType());
/// <summary>
/// Converts a byte array into a collection of enum values.
/// </summary>
/// <param name="bytes">The byte array to convert.</param>
/// <typeparam name="T">The enum type.</typeparam>
/// <returns>An enumerable collection of enum values.</returns>
/// <exception cref="ArgumentException">Thrown when the byte array length is not a multiple of the enum's underlying type size.</exception>
public static IEnumerable<T> EnumsFromBytes<T>(byte[] bytes) where T : struct, Enum
{
var underlyingType = typeof(T).GetEnumUnderlyingType();
var size = GetManagedSize(underlyingType);
if (bytes.Length % size != 0)
{
throw new ArgumentException("Byte array length must be a multiple of " + size + ".");
}
return EnumsFromBytesIterator<T>(bytes, underlyingType, size);
}
private static IEnumerable<T> EnumsFromBytesIterator<T>(byte[] bytes, Type underlyingType, int size) where T : struct, Enum
{
var count = bytes.Length / size;
var underlyingArray = Array.CreateInstance(underlyingType, count);
Buffer.BlockCopy(bytes, 0, underlyingArray, 0, bytes.Length);
foreach (var value in underlyingArray)
yield return (T)value;
}
/// <summary>
/// Converts a collection of enum values to a byte array.
/// </summary>
/// <param name="values"> The collection of enum values to convert.</param>
/// <typeparam name="T">The enum type.</typeparam>
/// <returns>A byte array representing the collection of enum values.</returns>
public static byte[] EnumsToBytes<T>(IEnumerable<T> values) where T : struct, Enum
{
var underlyingType = typeof(T).GetEnumUnderlyingType();
var size = GetManagedSize(underlyingType);
var valuesArray = values.ToArray();
var count = valuesArray.Length;
var underlyingArray = Array.CreateInstance(underlyingType, count);
for (var i = 0; i < count; i++)
{
underlyingArray.SetValue(ConvertToUnderlyingType(valuesArray[i], underlyingType), i);
}
var bytes = new byte[count * size];
Buffer.BlockCopy(underlyingArray, 0, bytes, 0, bytes.Length);
return bytes;
}
private static object ConvertToUnderlyingType<T>(T value, Type underlyingType) where T : struct, Enum
{
return underlyingType switch
{
not null when underlyingType == typeof(byte) => (byte)(object)value,
not null when underlyingType == typeof(sbyte) => (sbyte)(object)value,
not null when underlyingType == typeof(short) => (short)(object)value,
not null when underlyingType == typeof(ushort) => (ushort)(object)value,
not null when underlyingType == typeof(int) => (int)(object)value,
not null when underlyingType == typeof(uint) => (uint)(object)value,
not null when underlyingType == typeof(long) => (long)(object)value,
not null when underlyingType == typeof(ulong) => (ulong)(object)value,
_ => throw new InvalidOperationException("Unsupported underlying type."),
};
}
private static int GetManagedSize(Type type)
{
return Type.GetTypeCode(type) switch
{
TypeCode.Byte or TypeCode.SByte => 1,
TypeCode.Int16 or TypeCode.UInt16 => 2,
TypeCode.Int32 or TypeCode.UInt32 => 4,
TypeCode.Int64 or TypeCode.UInt64 => 8,
_ => throw new ArgumentException("Unsupported underlying type: " + type.Name),
};
}
}
+17 -76
View File
@@ -1,8 +1,8 @@
using System;
using System.Collections;
using System.Collections;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using AmongUs.GameOptions;
using HarmonyLib;
using Il2CppInterop.Runtime.InteropTypes.Arrays;
using MiraAPI.Roles;
@@ -13,7 +13,6 @@ using TMPro;
using UnityEngine;
using MethodBase = System.Reflection.MethodBase;
using Object = UnityEngine.Object;
using Random = UnityEngine.Random;
namespace MiraAPI.Utilities;
@@ -524,79 +523,6 @@ public static class Helpers
(Il2CppSystem.Object[])[value.ToString(formatString, CultureInfo.InvariantCulture)]),
};
}
/// <summary>
/// Shorthand for <see cref="string.Split(char, StringSplitOptions)"/> that removes empty entries and trims leading and ending spaces.
/// </summary>
/// <param name="value">The string to split.</param>
/// <param name="separator">The separator.</param>
/// <returns>An array of substrings.</returns>
public static string[] TrueSplit(this string value, char separator) => value.Split(separator, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries);
/// <summary>
/// Joins a collection of items that are separated by a character.
/// </summary>
/// <param name="separator">The separator.</param>
/// <param name="items">The collection of items to string together.</param>
/// <typeparam name="T">The type of the items.</typeparam>
/// <returns>A string formed by concatenating the ToString results of each item, each separated by a separator.</returns>
public static string Join<T>(char separator, IEnumerable<T> items) => Join(separator.ToString(), items);
/// <inheritdoc cref="Join{T}(char, IEnumerable{T})"/>
public static string Join<T>(string separator, IEnumerable<T> items)
{
if (!items.Any())
return string.Empty;
var result = string.Empty;
items.Do(x => result += $"{separator}{x}");
return result[separator.Length..];
}
/// <summary>
/// Shorthand helper for overriding the on click listeners for PassiveButton.
/// </summary>
/// <param name="passive">The PassiveButton being modified.</param>
/// <param name="action">The action that's replacing the original listeners.</param>
public static void OverrideOnClickListeners(this PassiveButton passive, Action action)
{
if (!passive)
return;
passive.OnClick?.RemoveAllListeners();
passive.OnClick = new();
passive.OnClick.AddListener(action);
passive.enabled = true;
}
/// <summary>
/// Shorthand helper for overriding the on mouse over listeners for PassiveButton.
/// </summary>
/// <inheritdoc cref="OverrideOnClickListeners"/>
public static void OverrideOnMouseOverListeners(this PassiveButton passive, Action action)
{
if (!passive)
return;
passive.OnMouseOver?.RemoveAllListeners();
passive.OnMouseOver = new();
passive.OnMouseOver.AddListener(action);
passive.enabled = true;
}
/// <summary>
/// Shorthand helper for overriding the on mouse out listeners for PassiveButton.
/// </summary>
/// <inheritdoc cref="OverrideOnClickListeners"/>
public static void OverrideOnMouseOutListeners(this PassiveButton passive, Action action)
{
if (!passive)
return;
passive.OnMouseOut?.RemoveAllListeners();
passive.OnMouseOut = new();
passive.OnMouseOut.AddListener(action);
passive.enabled = true;
}
/// <summary>
/// Returns the string of a role.
@@ -611,4 +537,19 @@ public static class Helpers
}
return role.NiceName;
}
/// <summary>
/// Returns whether the role is blacklisted from appearing and spawning. (Only applicable to vanilla roles)
/// </summary>
/// <param name="role">The role to check.</param>
/// <returns>The role's blacklist status.</returns>
public static bool IsRoleBlacklisted(this RoleBehaviour role)
{
// This should be patchable by mods when a vanilla role is meant to be replaced by a custom role.
if (role.Role is RoleTypes.Engineer)
{
return true;
}
return false;
}
}
-5
View File
@@ -24,9 +24,4 @@ public enum MiraNumberSuffixes
/// Percentage suffix (%).
/// </summary>
Percent,
/// <summary>
/// Display in units.
/// </summary>
Distance,
}