mirror of
https://github.com/All-Of-Us-Mods/MiraAPI.git
synced 2026-10-20 11:39:45 +00:00
Compare commits
62
Commits
options-changes
...
0.3.8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9dfad78df6 | ||
|
|
7f506000a4 | ||
|
|
795b6a81d7 | ||
|
|
bd8d7a3208 | ||
|
|
e8536e5d4b | ||
|
|
090db766b2 | ||
|
|
1f0027108e | ||
|
|
665724010d | ||
|
|
2d58c91289 | ||
|
|
b3ed6d67f9 | ||
|
|
64ef78e3a2 | ||
|
|
5e9e4012ef | ||
|
|
fe04a7033a | ||
|
|
ba0ee49255 | ||
|
|
97528b4380 | ||
|
|
50030c113b | ||
|
|
20e51cc993 | ||
|
|
64b5e01ba1 | ||
|
|
d4469153ab | ||
|
|
ab67c233d8 | ||
|
|
c72eacc7a2 | ||
|
|
13072d6834 | ||
|
|
c6342750ef | ||
|
|
5c2e95376d | ||
|
|
067859b9fd | ||
|
|
fe3bfcdbc4 | ||
|
|
5d01462a32 | ||
|
|
a9b6f40ed0 | ||
|
|
eae0024ec3 | ||
|
|
2907564d6a | ||
|
|
7ad003ed1e | ||
|
|
93eea6ea2f | ||
|
|
8e09b7fee0 | ||
|
|
1e4894538c | ||
|
|
303aedafc7 | ||
|
|
8ed4355504 | ||
|
|
76b02835a7 | ||
|
|
8d5bc710e7 | ||
|
|
798ce451d5 | ||
|
|
136bbde516 | ||
|
|
5252620108 | ||
|
|
c9b1c57774 | ||
|
|
d97df1a891 | ||
|
|
e93ef6fd1d | ||
|
|
3afe437101 | ||
|
|
62c01b2f72 | ||
|
|
089d2c1ea5 | ||
|
|
c65511d03e | ||
|
|
aee304fb96 | ||
|
|
11ba564eed | ||
|
|
259b9b7097 | ||
|
|
7e3a279b56 | ||
|
|
1fd2dd3539 | ||
|
|
3f60bcae2c | ||
|
|
fe1580bb7e | ||
|
|
8b23021b2a | ||
|
|
fdc715dac2 | ||
|
|
e1ca50be3e | ||
|
|
056a9b6102 | ||
|
|
ae917a9c77 | ||
|
|
fc9e9740be | ||
|
|
f9096b6160 |
No files matched your search
@@ -8,7 +8,7 @@
|
|||||||
|
|
||||||
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
|
||||||
|
|
||||||
<VersionPrefix>0.3.3</VersionPrefix>
|
<VersionPrefix>0.3.8</VersionPrefix>
|
||||||
<VersionSuffix>dev</VersionSuffix>
|
<VersionSuffix>dev</VersionSuffix>
|
||||||
|
|
||||||
<Authors>All Of Us, XtraCube, Angxl</Authors>
|
<Authors>All Of Us, XtraCube, Angxl</Authors>
|
||||||
@@ -42,4 +42,4 @@
|
|||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\stylecop.ruleset</CodeAnalysisRuleSet>
|
<CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)\stylecop.ruleset</CodeAnalysisRuleSet>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
</Project>
|
</Project>
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Linq;
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
using MiraAPI.Events;
|
using MiraAPI.Events;
|
||||||
using MiraAPI.Events.Mira;
|
using MiraAPI.Events.Mira;
|
||||||
using MiraAPI.Events.Vanilla.Gameplay;
|
using MiraAPI.Events.Vanilla.Gameplay;
|
||||||
@@ -17,7 +18,7 @@ public static class ExampleEventHandlers
|
|||||||
{
|
{
|
||||||
public static void Initialize()
|
public static void Initialize()
|
||||||
{
|
{
|
||||||
// You can register event handlers with the MiraEventManager class.
|
// You can register event handlers with the MiraEventManager class
|
||||||
var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
|
var handle = MiraEventManager.RegisterEventHandler<BeforeMurderEvent>(@event =>
|
||||||
{
|
{
|
||||||
Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
|
Logger<ExamplePlugin>.Info($"{@event.Source.Data.PlayerName} is about to kill {@event.Target.Data.PlayerName}");
|
||||||
@@ -37,6 +38,21 @@ public static class ExampleEventHandlers
|
|||||||
MiraEventManager.UnregisterEventHandler(handle);
|
MiraEventManager.UnregisterEventHandler(handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If you want to check vanilla buttons, use something like this!
|
||||||
|
[RegisterEvent]
|
||||||
|
public static void VanillaButtonClickHandler(VanillaButtonClickEvent @event)
|
||||||
|
{
|
||||||
|
Logger<ExamplePlugin>.Info($"{@event.Button.buttonLabelText.text} is being used!");
|
||||||
|
if (@event.PlayerTarget != null)
|
||||||
|
{
|
||||||
|
Logger<ExamplePlugin>.Info($"{@event.PlayerTarget.Data.PlayerName} is being targeted!");
|
||||||
|
}
|
||||||
|
else if (@event.VentTarget != null)
|
||||||
|
{
|
||||||
|
Logger<ExamplePlugin>.Info($"Vent with id {@event.VentTarget.Id.ToString(CultureInfo.InvariantCulture)} is being targeted!");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// If you want to add extra votes to a player, do something like this.
|
// If you want to add extra votes to a player, do something like this.
|
||||||
[RegisterEvent]
|
[RegisterEvent]
|
||||||
public static void StartMeetingEvent(StartMeetingEvent _)
|
public static void StartMeetingEvent(StartMeetingEvent _)
|
||||||
|
|||||||
@@ -1,4 +1,6 @@
|
|||||||
namespace MiraAPI.Events.Vanilla.Gameplay;
|
using MiraAPI.Networking;
|
||||||
|
|
||||||
|
namespace MiraAPI.Events.Vanilla.Gameplay;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Event that is invoked before a player is murdered. This event is cancelable.
|
/// Event that is invoked before a player is murdered. This event is cancelable.
|
||||||
@@ -15,6 +17,24 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public PlayerControl Target { get; }
|
public PlayerControl Target { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether the murder was meant to be done in a meeting via an enum.
|
||||||
|
/// </summary>
|
||||||
|
public MeetingCheck InMeeting { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="source">The player that is killing the target.</param>
|
||||||
|
/// <param name="target">The player that is being killed.</param>
|
||||||
|
/// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
|
||||||
|
public BeforeMurderEvent(PlayerControl source, PlayerControl target, MeetingCheck inMeeting)
|
||||||
|
{
|
||||||
|
Source = source;
|
||||||
|
Target = target;
|
||||||
|
InMeeting = inMeeting;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
|
/// Initializes a new instance of the <see cref="BeforeMurderEvent"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -24,5 +44,6 @@ public sealed class BeforeMurderEvent : MiraCancelableEvent
|
|||||||
{
|
{
|
||||||
Source = source;
|
Source = source;
|
||||||
Target = target;
|
Target = target;
|
||||||
|
InMeeting = MeetingCheck.Ignore;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
using MiraAPI.Hud;
|
||||||
|
|
||||||
|
namespace MiraAPI.Events.Vanilla.Gameplay;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Invoked when a Vanilla Button click is cancelled. Do not use for custom buttons.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The Vanilla Button type.</typeparam>
|
||||||
|
public sealed class VanillaButtonCancelledEvent<T> : MiraEvent where T : AbilityButton
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets Vanilla Button whose click was cancelled.
|
||||||
|
/// </summary>
|
||||||
|
public T Button { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="VanillaButtonCancelledEvent{T}"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="button">The Mira Button whose click was cancelled.</param>
|
||||||
|
public VanillaButtonCancelledEvent(T button)
|
||||||
|
{
|
||||||
|
Button = button;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Invoked when a Vanilla Button click is cancelled. Do not use for custom buttons.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class VanillaButtonCancelledEvent : MiraEvent
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets Vanilla Button whose click was cancelled.
|
||||||
|
/// </summary>
|
||||||
|
public AbilityButton Button { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="VanillaButtonCancelledEvent"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="button">The Vanilla Button whose click was cancelled.</param>
|
||||||
|
public VanillaButtonCancelledEvent(AbilityButton button)
|
||||||
|
{
|
||||||
|
Button = button;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
using MiraAPI.Hud;
|
||||||
|
|
||||||
|
namespace MiraAPI.Events.Vanilla.Gameplay;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
|
||||||
|
/// </summary>
|
||||||
|
/// <typeparam name="T">The Vanilla Button type.</typeparam>
|
||||||
|
public sealed class VanillaButtonClickEvent<T> : MiraCancelableEvent where T : AbilityButton
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets Vanilla Button that was clicked.
|
||||||
|
/// </summary>
|
||||||
|
public T Button { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the generic click event that is invoked before this button-specific event.
|
||||||
|
/// </summary>
|
||||||
|
public VanillaButtonClickEvent GenericClickEvent { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="VanillaButtonClickEvent{T}"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="button">The Mira Button that was clicked.</param>
|
||||||
|
/// <param name="genericClickEvent">The generic click event invoked before button-specific events.</param>
|
||||||
|
public VanillaButtonClickEvent(T button, VanillaButtonClickEvent genericClickEvent)
|
||||||
|
{
|
||||||
|
GenericClickEvent = genericClickEvent;
|
||||||
|
Button = button;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Button click event for Vanilla Buttons only. Do not use for custom buttons.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class VanillaButtonClickEvent : MiraCancelableEvent
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets Vanilla Button that was clicked.
|
||||||
|
/// </summary>
|
||||||
|
public AbilityButton Button { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the target player, if any, of the Vanilla Button that was clicked.
|
||||||
|
/// </summary>
|
||||||
|
public PlayerControl? PlayerTarget { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the target vent, if any, of the Vanilla Button that was clicked.
|
||||||
|
/// </summary>
|
||||||
|
public Vent? VentTarget { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="VanillaButtonClickEvent"/> class.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="button">The Vanilla Button that was clicked.</param>
|
||||||
|
/// <param name="playerTarget">The Player target, if any.</param>
|
||||||
|
/// <param name="ventTarget">The Vent target, if any.</param>
|
||||||
|
public VanillaButtonClickEvent(AbilityButton button, PlayerControl? playerTarget = null, Vent? ventTarget = null)
|
||||||
|
{
|
||||||
|
Button = button;
|
||||||
|
PlayerTarget = playerTarget;
|
||||||
|
VentTarget = ventTarget;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,9 +17,9 @@ public interface IModdedOption
|
|||||||
uint Id { get; }
|
uint Id { get; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the title of the option.
|
/// Gets or sets the title of the option.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
string Title { get; }
|
string Title { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the StringName for the option, used for localization.
|
/// Gets the StringName for the option, used for localization.
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using Il2CppInterop.Runtime.Attributes;
|
||||||
using MiraAPI.GameOptions.OptionTypes;
|
using MiraAPI.GameOptions.OptionTypes;
|
||||||
using Reactor.Utilities.Attributes;
|
using Reactor.Utilities.Attributes;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -14,6 +15,7 @@ public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the modded option associated with the object.
|
/// Gets or sets the modded option associated with the object.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
public ModdedNumberOption NumberOption { get; set; }
|
public ModdedNumberOption NumberOption { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -22,7 +24,17 @@ public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
|
|||||||
public float DefaultIncrement { get; set; }
|
public float DefaultIncrement { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
public bool ShiftIncrementToggle { get; set; }
|
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; } = "#";
|
||||||
}
|
}
|
||||||
@@ -32,16 +32,83 @@ public class ModdedNumberOption : ModdedOption<float>
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public MiraNumberSuffixes SuffixType { get; }
|
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>
|
/// <summary>
|
||||||
/// Gets a value indicating whether zero is infinity.
|
/// Gets a value indicating whether zero is infinity.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool ZeroInfinity { get; }
|
public bool ZeroInfinity => ZeroWordValue == "∞";
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether holding shift will divide the increment.
|
/// Gets a value indicating whether holding shift will divide the increment.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool ShiftIncrement { get; }
|
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>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
|
/// Initializes a new instance of the <see cref="ModdedNumberOption"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -54,7 +121,6 @@ public class ModdedNumberOption : ModdedOption<float>
|
|||||||
/// <param name="formatString">Optional format string for the option screen.</param>
|
/// <param name="formatString">Optional format string for the option screen.</param>
|
||||||
/// <param name="zeroInfinity">Whether zero is infinity or not.</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="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(
|
public ModdedNumberOption(
|
||||||
string title,
|
string title,
|
||||||
float defaultValue,
|
float defaultValue,
|
||||||
@@ -70,7 +136,8 @@ public class ModdedNumberOption : ModdedOption<float>
|
|||||||
Max = max;
|
Max = max;
|
||||||
Increment = increment;
|
Increment = increment;
|
||||||
SuffixType = suffixType;
|
SuffixType = suffixType;
|
||||||
ZeroInfinity = zeroInfinity;
|
ZeroWordValue = zeroInfinity ? "∞" : "#";
|
||||||
|
NegativeWordValue = "#";
|
||||||
ShiftIncrement = increment != 1f;
|
ShiftIncrement = increment != 1f;
|
||||||
|
|
||||||
Value = Mathf.Clamp(defaultValue, min, max);
|
Value = Mathf.Clamp(defaultValue, min, max);
|
||||||
@@ -110,6 +177,8 @@ public class ModdedNumberOption : ModdedOption<float>
|
|||||||
optionComponent.NumberOption = this;
|
optionComponent.NumberOption = this;
|
||||||
optionComponent.DefaultIncrement = Increment;
|
optionComponent.DefaultIncrement = Increment;
|
||||||
optionComponent.ShiftIncrementToggle = ShiftIncrement;
|
optionComponent.ShiftIncrementToggle = ShiftIncrement;
|
||||||
|
optionComponent.NegativeValue = NegativeWordValue;
|
||||||
|
optionComponent.ZeroValue = ZeroWordValue;
|
||||||
|
|
||||||
numberOption.SetUpFromData(Data, 20);
|
numberOption.SetUpFromData(Data, 20);
|
||||||
numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
|
numberOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ public abstract class ModdedOption<T> : IModdedOption
|
|||||||
public uint Id { get; }
|
public uint Id { get; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public string Title { get; }
|
public string Title { get; set; }
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public StringNames StringName { get; }
|
public StringNames StringName { get; }
|
||||||
|
|||||||
@@ -64,9 +64,14 @@ public abstract class CustomActionButton
|
|||||||
public virtual float EffectDuration => 0;
|
public virtual float EffectDuration => 0;
|
||||||
|
|
||||||
/// <summary>
|
/// <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>
|
/// </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>
|
/// <summary>
|
||||||
/// Gets the value indicating uses mode.
|
/// Gets the value indicating uses mode.
|
||||||
@@ -89,9 +94,9 @@ public abstract class CustomActionButton
|
|||||||
public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
|
public virtual ButtonLocation Location { get; set; } = ButtonLocation.BottomLeft;
|
||||||
|
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
public bool LimitedUses => MaxUses > 0;
|
public virtual bool ZeroIsInfinite { get; set; } = true;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether the effect is currently active, if there is one.
|
/// 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))
|
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(
|
Helpers.CreateKeybindIcon(
|
||||||
Button.gameObject,
|
Button.gameObject,
|
||||||
Keybind.CurrentKey,
|
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>();
|
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);
|
Button.usesRemainingSprite.transform.localPosition = new(-0.341f, 0.45f, -0.1f);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -69,4 +69,4 @@ public class BaseKeybind
|
|||||||
{
|
{
|
||||||
Handler -= action;
|
Handler -= action;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -9,7 +9,7 @@ namespace MiraAPI.Keybinds;
|
|||||||
public class MiraKeybind : BaseKeybind
|
public class MiraKeybind : BaseKeybind
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets name of the keybind
|
/// Gets name of the keybind.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public string Name { get; }
|
public string Name { get; }
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,6 @@ public class VanillaKeybind : BaseKeybind
|
|||||||
public VanillaKeybind(int id)
|
public VanillaKeybind(int id)
|
||||||
{
|
{
|
||||||
RewiredInputAction = KeybindUtils.GetInputActionById(id);
|
RewiredInputAction = KeybindUtils.GetInputActionById(id);
|
||||||
Id = RewiredInputAction?.name;
|
Id = RewiredInputAction != null ? RewiredInputAction.name : id.ToString();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
|
global using static Reactor.Utilities.Logger<MiraAPI.MiraApiPlugin>;
|
||||||
|
using System;
|
||||||
using BepInEx;
|
using BepInEx;
|
||||||
using BepInEx.Unity.IL2CPP;
|
using BepInEx.Unity.IL2CPP;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
@@ -21,6 +22,11 @@ namespace MiraAPI;
|
|||||||
[ReactorModFlags(ModFlags.RequireOnAllClients)]
|
[ReactorModFlags(ModFlags.RequireOnAllClients)]
|
||||||
public partial class MiraApiPlugin : BasePlugin
|
public partial class MiraApiPlugin : BasePlugin
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets a value indicating whether the current device is running Starlight (on mobile).
|
||||||
|
/// </summary>
|
||||||
|
public static bool IsMobile => Constants.GetPlatformType() is Platforms.Android or Platforms.IPhone;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the branding Mira API color.
|
/// Gets the branding Mira API color.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -31,6 +37,11 @@ public partial class MiraApiPlugin : BasePlugin
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
|
public static Color DefaultHeaderColor { get; } = new Color32(77, 77, 77, 255);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets a value indicating whether the current build is a development build or not. This mostly avoids confusion for users asking why the mod appears red.
|
||||||
|
/// </summary>
|
||||||
|
public static bool IsDevBuild => Version.Contains("ci", StringComparison.OrdinalIgnoreCase) || Version.Contains("dev", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
private static MiraPluginManager? PluginManager { get; set; }
|
private static MiraPluginManager? PluginManager { get; set; }
|
||||||
internal Harmony Harmony { get; } = new(Id);
|
internal Harmony Harmony { get; } = new(Id);
|
||||||
|
|
||||||
@@ -39,7 +50,7 @@ public partial class MiraApiPlugin : BasePlugin
|
|||||||
{
|
{
|
||||||
Harmony.PatchAll();
|
Harmony.PatchAll();
|
||||||
|
|
||||||
ReactorCredits.Register("Mira API", Version, true, ReactorCredits.AlwaysShow);
|
ReactorCredits.Register("Mira API", Version, IsDevBuild, ReactorCredits.AlwaysShow);
|
||||||
|
|
||||||
PluginManager = new MiraPluginManager();
|
PluginManager = new MiraPluginManager();
|
||||||
PluginManager.Initialize();
|
PluginManager.Initialize();
|
||||||
|
|||||||
@@ -1,12 +1,15 @@
|
|||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
using MiraAPI.LocalSettings;
|
using MiraAPI.LocalSettings;
|
||||||
using MiraAPI.LocalSettings.Attributes;
|
using MiraAPI.LocalSettings.Attributes;
|
||||||
|
using MiraAPI.Patches;
|
||||||
|
using MiraAPI.Utilities;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
namespace MiraAPI;
|
namespace MiraAPI;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Mira API Config File Handler
|
/// Mira API Config File Handler.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
|
public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
|
||||||
{
|
{
|
||||||
@@ -21,22 +24,78 @@ public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
|
|||||||
HideIconOnHover = false,
|
HideIconOnHover = false,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the value stored for scaling buttons properly.
|
||||||
|
/// </summary>
|
||||||
|
public static float OldButtonScaleFactor { get; set; }
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void Open()
|
||||||
|
{
|
||||||
|
base.Open();
|
||||||
|
OldButtonScaleFactor = ButtonUIFactorSlider.Value;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override void OnOptionChanged(ConfigEntryBase configEntry)
|
||||||
|
{
|
||||||
|
base.OnOptionChanged(configEntry);
|
||||||
|
if (configEntry == ButtonUIFactorSlider)
|
||||||
|
{
|
||||||
|
if (HudManager.InstanceExists)
|
||||||
|
{
|
||||||
|
HudManagerPatches.ResizeUI(1f / OldButtonScaleFactor);
|
||||||
|
HudManagerPatches.ResizeUI(ButtonUIFactorSlider.Value);
|
||||||
|
}
|
||||||
|
OldButtonScaleFactor = ButtonUIFactorSlider.Value;
|
||||||
|
}
|
||||||
|
else if (configEntry == SetFpsSlider)
|
||||||
|
{
|
||||||
|
Application.targetFrameRate = (int)SetFpsSlider.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
|
/// Gets whether the modifiers hud should be on the left side of the screen (under roles/task tab). Recommended for streamers.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[LocalToggleSetting]
|
[LocalToggleSetting]
|
||||||
public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Displays", "Show Modifiers HUD on Left Side", false);
|
public ConfigEntry<bool> ModifiersHudLeftSide { get; private set; } = config.Bind("Visuals/UI", "Show Modifiers HUD on Left Side", false);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets whether to show keybinds on buttons.
|
/// Gets whether to show keybinds on buttons.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[LocalToggleSetting]
|
[LocalToggleSetting]
|
||||||
public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Keybinds", "Show Keybinds on Buttons", true);
|
public ConfigEntry<bool> ShowKeybinds { get; private set; } = config.Bind("Visuals/UI", "Show Keybinds on Buttons", true);
|
||||||
// This would be placed in the keybinds menu, but it crashes for Epic Games users. - Atony
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the scale of the buttons.
|
||||||
|
/// </summary>
|
||||||
|
[LocalSliderSetting(min: 0.5f, max: 1.5f, suffixType: MiraNumberSuffixes.Multiplier, formatString: "0.00", displayValue: true)]
|
||||||
|
public ConfigEntry<float> ButtonUIFactorSlider { get; private set; } =
|
||||||
|
config.Bind("Visuals/UI", "Button Scale Factor", 0.75f);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the fps specified by the player.
|
||||||
|
/// </summary>
|
||||||
|
[LocalSliderSetting(min: 60f, max: 240f, suffixType: MiraNumberSuffixes.None, formatString: "0", displayValue: true, roundValue: true)]
|
||||||
|
public ConfigEntry<float> SetFpsSlider { get; private set; } =
|
||||||
|
config.Bind("Visuals/UI", "Max FPS", 120f);
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets whether to apply cosmetic changes to the TaskAdder.
|
/// Gets whether to apply cosmetic changes to the TaskAdder.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[LocalToggleSetting]
|
[LocalToggleSetting]
|
||||||
public ConfigEntry<bool> PrettyTaskAdder { get; private set; } = config.Bind("Freeplay", "Pretty Task Laptop", true);
|
public ConfigEntry<bool> PrettyTaskAdder { get; private set; } = config.Bind("Freeplay", "Pretty Task Laptop", true);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether to show the red flash from sabotages.
|
||||||
|
/// </summary>
|
||||||
|
[LocalToggleSetting]
|
||||||
|
public ConfigEntry<bool> EnableSabotageFlashes { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Flashes", true);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether to enable the sabotage sound effects or not.
|
||||||
|
/// </summary>
|
||||||
|
[LocalToggleSetting]
|
||||||
|
public ConfigEntry<bool> EnableSabotageBlares { get; private set; } = config.Bind("Accessibility", "Enable Sabotage Blare", true);
|
||||||
}
|
}
|
||||||
@@ -179,6 +179,7 @@ public static class ModifierManager
|
|||||||
private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
|
private static bool IsGameModifierValid(PlayerControl player, GameModifier modifier, uint modifierId)
|
||||||
{
|
{
|
||||||
return (player.Data.Role is not ICustomRole role || role.IsModifierApplicable(modifier)) &&
|
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();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -39,4 +39,10 @@ public abstract class GameModifier : BaseModifier
|
|||||||
/// <param name="reason">The reason why the game ended.</param>
|
/// <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>
|
/// <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;
|
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();
|
||||||
}
|
}
|
||||||
@@ -32,7 +32,6 @@ public static class CustomMurderRpc
|
|||||||
/// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
|
/// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
|
||||||
/// <param name="showKillAnim">Should the kill animation be shown.</param>
|
/// <param name="showKillAnim">Should the kill animation be shown.</param>
|
||||||
/// <param name="playKillSound">Should the kill sound be played.</param>
|
/// <param name="playKillSound">Should the kill sound be played.</param>
|
||||||
[MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before)]
|
|
||||||
public static void RpcCustomMurder(
|
public static void RpcCustomMurder(
|
||||||
this PlayerControl source,
|
this PlayerControl source,
|
||||||
PlayerControl target,
|
PlayerControl target,
|
||||||
@@ -43,10 +42,54 @@ public static class CustomMurderRpc
|
|||||||
bool showKillAnim = true,
|
bool showKillAnim = true,
|
||||||
bool playKillSound = true)
|
bool playKillSound = true)
|
||||||
{
|
{
|
||||||
|
source.RpcCustomMurder(
|
||||||
|
target,
|
||||||
|
MeetingCheck.Ignore,
|
||||||
|
didSucceed,
|
||||||
|
resetKillTimer,
|
||||||
|
createDeadBody,
|
||||||
|
teleportMurderer,
|
||||||
|
showKillAnim,
|
||||||
|
playKillSound);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Networked Custom Murder method, which checks for meetings as well.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="source">The killer.</param>
|
||||||
|
/// <param name="target">The player to murder.</param>
|
||||||
|
/// <param name="inMeeting">Whether the murder is intended to be triggered in a meeting.</param>
|
||||||
|
/// <param name="didSucceed">Whether the murder was successful or not.</param>
|
||||||
|
/// <param name="resetKillTimer">Should the kill timer be reset.</param>
|
||||||
|
/// <param name="createDeadBody">Should a dead body be created.</param>
|
||||||
|
/// <param name="teleportMurderer">Should the killer be snapped to the dead player.</param>
|
||||||
|
/// <param name="showKillAnim">Should the kill animation be shown.</param>
|
||||||
|
/// <param name="playKillSound">Should the kill sound be played.</param>
|
||||||
|
[MethodRpc((uint)MiraRpc.CustomMurder, LocalHandling = RpcLocalHandling.Before)]
|
||||||
|
public static void RpcCustomMurder(
|
||||||
|
this PlayerControl source,
|
||||||
|
PlayerControl target,
|
||||||
|
MeetingCheck inMeeting,
|
||||||
|
bool didSucceed = true,
|
||||||
|
bool resetKillTimer = true,
|
||||||
|
bool createDeadBody = true,
|
||||||
|
bool teleportMurderer = true,
|
||||||
|
bool showKillAnim = true,
|
||||||
|
bool playKillSound = true)
|
||||||
|
{
|
||||||
|
if (LobbyBehaviour.Instance)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
|
var murderResultFlags = didSucceed ? MurderResultFlags.Succeeded : MurderResultFlags.FailedError;
|
||||||
|
|
||||||
var beforeMurderEvent = new BeforeMurderEvent(source, target);
|
var beforeMurderEvent = new BeforeMurderEvent(source, target, inMeeting);
|
||||||
MiraEventManager.InvokeEvent(beforeMurderEvent);
|
MiraEventManager.InvokeEvent(beforeMurderEvent);
|
||||||
|
var isMeetingActive = MeetingHud.Instance != null || ExileController.Instance != null;
|
||||||
|
if ((inMeeting is MeetingCheck.ForMeeting && !isMeetingActive) || (inMeeting is MeetingCheck.OutsideMeeting && isMeetingActive))
|
||||||
|
{
|
||||||
|
beforeMurderEvent.Cancel();
|
||||||
|
}
|
||||||
|
|
||||||
if (beforeMurderEvent.IsCancelled)
|
if (beforeMurderEvent.IsCancelled)
|
||||||
{
|
{
|
||||||
@@ -87,8 +130,7 @@ public static class CustomMurderRpc
|
|||||||
bool playKillSound = true)
|
bool playKillSound = true)
|
||||||
{
|
{
|
||||||
source.isKilling = false;
|
source.isKilling = false;
|
||||||
var data = target.Data;
|
if (resultFlags.HasFlag(MurderResultFlags.FailedError) || LobbyBehaviour.Instance)
|
||||||
if (resultFlags.HasFlag(MurderResultFlags.FailedError))
|
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -174,7 +216,7 @@ public static class CustomMurderRpc
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, data);
|
HudManager.Instance.KillOverlay.ShowKillAnimation(source.Data, target.Data);
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
@@ -211,6 +253,10 @@ public static class CustomMurderRpc
|
|||||||
bool createDeadBody = true,
|
bool createDeadBody = true,
|
||||||
bool teleportMurderer = true)
|
bool teleportMurderer = true)
|
||||||
{
|
{
|
||||||
|
if (LobbyBehaviour.Instance)
|
||||||
|
{
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
var cam = Camera.main?.GetComponent<FollowerCamera>();
|
var cam = Camera.main?.GetComponent<FollowerCamera>();
|
||||||
var isParticipant = source.AmOwner || target.AmOwner;
|
var isParticipant = source.AmOwner || target.AmOwner;
|
||||||
var sourcePhys = source.MyPhysics;
|
var sourcePhys = source.MyPhysics;
|
||||||
@@ -298,3 +344,24 @@ public static class CustomMurderRpc
|
|||||||
source.isKilling = false;
|
source.isKilling = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks for custom murders.
|
||||||
|
/// </summary>
|
||||||
|
public enum MeetingCheck
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Checks for meetings.
|
||||||
|
/// </summary>
|
||||||
|
ForMeeting,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Checks for a meeting to not be active.
|
||||||
|
/// </summary>
|
||||||
|
OutsideMeeting,
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Doesn't check for a meeting at all.
|
||||||
|
/// </summary>
|
||||||
|
Ignore,
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
using System.Collections;
|
||||||
|
using BepInEx.Unity.IL2CPP.Utils.Collections;
|
||||||
|
using HarmonyLib;
|
||||||
|
using MiraAPI.LocalSettings;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
namespace MiraAPI.Patches.Accessibility;
|
||||||
|
[HarmonyPatch]
|
||||||
|
public static class HudManagerFlashPatches
|
||||||
|
{
|
||||||
|
[HarmonyPatch(typeof(HudManager), nameof(HudManager.StartReactorFlash))]
|
||||||
|
[HarmonyPrefix]
|
||||||
|
public static bool ReactorFlashPrefix(HudManager __instance)
|
||||||
|
{
|
||||||
|
if (__instance.ReactorFlash == null)
|
||||||
|
{
|
||||||
|
__instance.ReactorFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
[HarmonyPatch(typeof(HudManager), nameof(HudManager.StartOxyFlash))]
|
||||||
|
[HarmonyPrefix]
|
||||||
|
public static bool OxygenFlashPrefix(HudManager __instance)
|
||||||
|
{
|
||||||
|
if (__instance.OxyFlash == null)
|
||||||
|
{
|
||||||
|
__instance.OxyFlash = __instance.StartCoroutine(CoReactorFlash().WrapToIl2Cpp());
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
public static IEnumerator CoReactorFlash()
|
||||||
|
{
|
||||||
|
if (!HudManager.InstanceExists)
|
||||||
|
{
|
||||||
|
yield break;
|
||||||
|
}
|
||||||
|
var hudManager = HudManager.Instance;
|
||||||
|
WaitForSeconds wait = new WaitForSeconds(1f);
|
||||||
|
bool light = false;
|
||||||
|
|
||||||
|
hudManager.FullScreen.color = new Color(1f, 0f, 0f, 0.37254903f);
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
var settins = LocalSettingsTabSingleton<MiraApiSettings>.Instance;
|
||||||
|
hudManager.FullScreen.gameObject.SetActive(settins.EnableSabotageFlashes.Value && !hudManager.FullScreen.gameObject.activeSelf);
|
||||||
|
if (settins.EnableSabotageBlares.Value)
|
||||||
|
{
|
||||||
|
SoundManager.Instance.PlaySound(ShipStatus.Instance.SabotageSound, false, 1f, null);
|
||||||
|
}
|
||||||
|
light = !light;
|
||||||
|
|
||||||
|
/*if (!MiraApiPlugin.IsMobile)
|
||||||
|
{
|
||||||
|
if (hudManager.lightFlashHandle == null)
|
||||||
|
{
|
||||||
|
hudManager.lightFlashHandle = DualshockLightManager.Instance.AllocateLight();
|
||||||
|
hudManager.lightFlashHandle.color = new Color(1f, 0f, 0f, 1f);
|
||||||
|
hudManager.lightFlashHandle.intensity = 1f;
|
||||||
|
}
|
||||||
|
hudManager.lightFlashHandle.color.SetAlpha(light ? 1f : 0f);
|
||||||
|
}*/
|
||||||
|
yield return wait;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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;
|
||||||
using MiraAPI.Events.Vanilla.Gameplay;
|
using MiraAPI.Events.Vanilla.Gameplay;
|
||||||
|
|
||||||
@@ -18,3 +19,4 @@ internal static class SpawnInMinigamePatch
|
|||||||
MiraEventManager.InvokeEvent(@event2);
|
MiraEventManager.InvokeEvent(@event2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
/*
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using MiraAPI.Events;
|
using MiraAPI.Events;
|
||||||
@@ -34,3 +35,4 @@ internal static class SubmergedSpawnGamePatch
|
|||||||
MiraEventManager.InvokeEvent(@event2);
|
MiraEventManager.InvokeEvent(@event2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
using System.Linq;
|
||||||
|
using AmongUs.GameOptions;
|
||||||
|
using HarmonyLib;
|
||||||
|
using MiraAPI.Events;
|
||||||
|
using MiraAPI.Events.Vanilla.Gameplay;
|
||||||
|
using MiraAPI.Events.Vanilla.Usables;
|
||||||
|
|
||||||
|
namespace MiraAPI.Patches.Events;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Patches to invoke vent related MiraEvents.
|
||||||
|
/// </summary>
|
||||||
|
[HarmonyPatch]
|
||||||
|
public static class VanillaButtonPatches
|
||||||
|
{
|
||||||
|
[HarmonyPrefix]
|
||||||
|
[HarmonyPatch(typeof(AbilityButton), nameof(AbilityButton.DoClick))]
|
||||||
|
public static bool DoClickPrefix(AbilityButton __instance)
|
||||||
|
{
|
||||||
|
// Invoke the generic button click event.
|
||||||
|
PlayerControl? playerTarget = null;
|
||||||
|
Vent? ventTarget = null;
|
||||||
|
var role = PlayerControl.LocalPlayer.Data.Role;
|
||||||
|
if (role.Role is RoleTypes.Tracker)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<TrackerRole>().currentTarget;
|
||||||
|
}
|
||||||
|
else if (role.Role is RoleTypes.GuardianAngel)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<GuardianAngelRole>().currentTarget;
|
||||||
|
}
|
||||||
|
else if (role.Role is RoleTypes.Engineer)
|
||||||
|
{
|
||||||
|
ventTarget = role.Cast<EngineerRole>().currentTarget;
|
||||||
|
}
|
||||||
|
var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget, ventTarget);
|
||||||
|
MiraEventManager.InvokeEvent(genericEvent);
|
||||||
|
if (genericEvent.IsCancelled)
|
||||||
|
{
|
||||||
|
MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!genericEvent.IsCancelled)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
[HarmonyPrefix]
|
||||||
|
[HarmonyPatch(typeof(SecondaryAbilityButton), nameof(SecondaryAbilityButton.DoClick))]
|
||||||
|
public static bool SecondaryDoClickPrefix(AbilityButton __instance)
|
||||||
|
{
|
||||||
|
// Invoke the generic button click event.
|
||||||
|
PlayerControl? playerTarget = null;
|
||||||
|
var role = PlayerControl.LocalPlayer.Data.Role;
|
||||||
|
if (role.Role is RoleTypes.Detective)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<DetectiveRole>().currentTarget;
|
||||||
|
}
|
||||||
|
var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget);
|
||||||
|
MiraEventManager.InvokeEvent(genericEvent);
|
||||||
|
if (genericEvent.IsCancelled)
|
||||||
|
{
|
||||||
|
MiraEventManager.InvokeEvent(new VanillaButtonCancelledEvent(__instance));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!genericEvent.IsCancelled)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,10 +21,14 @@ using Object = UnityEngine.Object;
|
|||||||
namespace MiraAPI.Patches.Freeplay;
|
namespace MiraAPI.Patches.Freeplay;
|
||||||
|
|
||||||
[HarmonyPatch(typeof(TaskAdderGame))]
|
[HarmonyPatch(typeof(TaskAdderGame))]
|
||||||
internal static class TaskAdderPatches
|
public static class TaskAdderPatches
|
||||||
{
|
{
|
||||||
private static Scroller _scroller = null!;
|
private static Scroller _scroller = null!;
|
||||||
private static Dictionary<string, TaskFolder> folders = new();
|
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]
|
[HarmonyPostfix]
|
||||||
[HarmonyPatch(nameof(TaskAdderGame.Begin))]
|
[HarmonyPatch(nameof(TaskAdderGame.Begin))]
|
||||||
@@ -66,19 +70,16 @@ internal static class TaskAdderPatches
|
|||||||
__instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
|
__instance.RootFolderPrefab.GetComponent<PassiveButton>().ClickMask = collider;
|
||||||
__instance.RootFolderPrefab.gameObject.SetActive(false);
|
__instance.RootFolderPrefab.gameObject.SetActive(false);
|
||||||
__instance.TaskParent = inner.transform;
|
__instance.TaskParent = inner.transform;
|
||||||
var crewLocale = TranslationController.Instance.GetString(StringNames.Crewmate);
|
var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == CrewmateName)!;
|
||||||
var impLocale = TranslationController.Instance.GetString(StringNames.Impostor);
|
var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == ImpostorName)!;
|
||||||
|
|
||||||
var crewmateFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == crewLocale)!;
|
|
||||||
var impostorFolder = __instance.Root.SubFolders.ToArray().FirstOrDefault(x => x.FolderName == impLocale)!;
|
|
||||||
//var neutralFolder = __instance.CreateFolder("Neutral", __instance.Root, 2, Color.gray);
|
//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.Clear();
|
||||||
folders.Add(crewmateFolder.FolderName, crewmateFolder);
|
folders.Add(crewmateFolder.FolderName, crewmateFolder);
|
||||||
folders.Add(impostorFolder.FolderName, impostorFolder);
|
folders.Add(impostorFolder.FolderName, impostorFolder);
|
||||||
//folders.Add("Neutrals", neutralFolder);
|
//folders.Add("Neutrals", neutralFolder);
|
||||||
folders.Add("Modifiers", modifiersFolder);
|
folders.Add(ModifiersName, modifiersFolder);
|
||||||
|
|
||||||
int folderIdx = 2;
|
int folderIdx = 2;
|
||||||
foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
|
foreach (var plugin in MiraPluginManager.Instance.RegisteredPlugins)
|
||||||
@@ -137,8 +138,8 @@ internal static class TaskAdderPatches
|
|||||||
Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
|
Object.Instantiate(__instance.RootFolderPrefab, __instance.transform);
|
||||||
impFolder.gameObject.SetActive(false);
|
impFolder.gameObject.SetActive(false);
|
||||||
impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
|
impFolder.SetFolderColor(TaskFolder.FolderColor.Red);
|
||||||
crewFolder.FolderName = TranslationController.Instance.GetString(StringNames.Crewmate);
|
crewFolder.FolderName = CrewmateName;
|
||||||
impFolder.FolderName = TranslationController.Instance.GetString(StringNames.Impostor);
|
impFolder.FolderName = ImpostorName;
|
||||||
rootFolder.SubFolders.Insert(0, crewFolder);
|
rootFolder.SubFolders.Insert(0, crewFolder);
|
||||||
rootFolder.SubFolders.Insert(0, impFolder);
|
rootFolder.SubFolders.Insert(0, impFolder);
|
||||||
Il2CppSystem.Collections.Generic.List<RoleBehaviour> impRoles = new();
|
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));
|
var plugin = MiraPluginManager.GetPluginByGuid(taskFolder.name.Replace("(Clone)", string.Empty));
|
||||||
if (plugin != null)
|
if (plugin != null)
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections;
|
||||||
using System.Linq;
|
using System.Collections.Generic;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using MiraAPI.Hud;
|
using MiraAPI.Hud;
|
||||||
using MiraAPI.Keybinds;
|
using MiraAPI.Keybinds;
|
||||||
@@ -25,9 +25,87 @@ public static class HudManagerPatches
|
|||||||
public static Transform? BottomRight { get; private set; }
|
public static Transform? BottomRight { get; private set; }
|
||||||
public static Transform? Buttons { get; private set; }
|
public static Transform? Buttons { get; private set; }
|
||||||
|
|
||||||
private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = new();
|
private static Dictionary<TextMeshPro, int> vanillaKeybindIcons = [];
|
||||||
|
|
||||||
internal static List<TextMeshPro> moddedKeybindIcons = new();
|
internal static List<TextMeshPro> ModdedKeybindIcons = [];
|
||||||
|
|
||||||
|
public static IEnumerator CoResizeUI()
|
||||||
|
{
|
||||||
|
while (!HudManager.Instance)
|
||||||
|
{
|
||||||
|
yield return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
yield return new WaitForSeconds(0.01f);
|
||||||
|
ResizeUI(LocalSettingsTabSingleton<MiraApiSettings>.Instance.ButtonUIFactorSlider.Value);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ResizeUI(float scaleFactor)
|
||||||
|
{
|
||||||
|
var baseButtons = HudManager.Instance.transform.FindChild("Buttons");
|
||||||
|
if (baseButtons != null)
|
||||||
|
{
|
||||||
|
foreach (var aspect in baseButtons.GetComponentsInChildren<AspectPosition>(true))
|
||||||
|
{
|
||||||
|
if (aspect.gameObject == null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (aspect.gameObject.transform.parent.name == "TopRight")
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (aspect.gameObject.transform.parent.transform.parent.name == "TopRight")
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
|
||||||
|
aspect.DistanceFromEdge *= new Vector2(scaleFactor, scaleFactor);
|
||||||
|
aspect.gameObject.SetActive(!aspect.isActiveAndEnabled);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var button in HudManager.Instance.GetComponentsInChildren<ActionButton>(true))
|
||||||
|
{
|
||||||
|
if (button.gameObject == null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
button.gameObject.SetActive(!button.isActiveAndEnabled);
|
||||||
|
button.gameObject.transform.localScale *= scaleFactor;
|
||||||
|
button.gameObject.SetActive(!button.isActiveAndEnabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (baseButtons != null)
|
||||||
|
{
|
||||||
|
foreach (var arrange in baseButtons.GetComponentsInChildren<GridArrange>(true))
|
||||||
|
{
|
||||||
|
if (!arrange.gameObject || !arrange.transform)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
|
||||||
|
arrange.CellSize = new Vector2(scaleFactor, scaleFactor);
|
||||||
|
arrange.gameObject.SetActive(!arrange.isActiveAndEnabled);
|
||||||
|
if (arrange.isActiveAndEnabled && arrange.gameObject.transform.childCount != 0)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
arrange.ArrangeChilds();
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
// Error($"Error arranging child objects in GridArrange: {e}");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -90,7 +168,7 @@ public static class HudManagerPatches
|
|||||||
fakeButton.ToggleVisible(true);
|
fakeButton.ToggleVisible(true);
|
||||||
fakeButton.Destroy();
|
fakeButton.Destroy();
|
||||||
}
|
}
|
||||||
moddedKeybindIcons = [];
|
ModdedKeybindIcons = [];
|
||||||
|
|
||||||
foreach (var button in CustomButtonManager.CustomButtons)
|
foreach (var button in CustomButtonManager.CustomButtons)
|
||||||
{
|
{
|
||||||
@@ -123,7 +201,7 @@ public static class HudManagerPatches
|
|||||||
aspectPosition.AdjustPosition();
|
aspectPosition.AdjustPosition();
|
||||||
|
|
||||||
vanillaKeybindIcons = [];
|
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>
|
var vanillaButtons = new Dictionary<GameObject, int>
|
||||||
{
|
{
|
||||||
{ __instance.KillButton.gameObject, 8 },
|
{ __instance.KillButton.gameObject, 8 },
|
||||||
@@ -146,9 +224,15 @@ public static class HudManagerPatches
|
|||||||
}
|
}
|
||||||
var icon = Helpers.CreateKeybindIcon(buttonObj, key, keybindIconPos);
|
var icon = Helpers.CreateKeybindIcon(buttonObj, key, keybindIconPos);
|
||||||
vanillaKeybindIcons.Add(icon.transform.GetChild(0).GetComponent<TextMeshPro>(), actionId);
|
vanillaKeybindIcons.Add(icon.transform.GetChild(0).GetComponent<TextMeshPro>(), actionId);
|
||||||
var comp = buttonObj.GetComponent<ActionButton>();
|
if (!MiraApiPlugin.IsMobile)
|
||||||
KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
|
{
|
||||||
|
var comp = buttonObj.GetComponent<ActionButton>();
|
||||||
|
KeybindManager.VanillaKeybinds[comp.GetType()].Button = comp;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
MiraApiSettings.OldButtonScaleFactor =
|
||||||
|
LocalSettingsTabSingleton<MiraApiSettings>.Instance.ButtonUIFactorSlider.Value;
|
||||||
|
Coroutines.Start(CoResizeUI());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -187,31 +271,54 @@ public static class HudManagerPatches
|
|||||||
{
|
{
|
||||||
var canSeeBinds = ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
|
var canSeeBinds = ActiveInputManager.currentControlType == ActiveInputManager.InputType.Keyboard &&
|
||||||
LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value;
|
LocalSettingsTabSingleton<MiraApiSettings>.Instance.ShowKeybinds.Value;
|
||||||
|
|
||||||
foreach (var btnIcon in vanillaKeybindIcons)
|
foreach (var btnIcon in vanillaKeybindIcons)
|
||||||
{
|
{
|
||||||
btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
|
btnIcon.Key.text = KeybindUtils.GetKeycodeByActionId(btnIcon.Value).ToString();
|
||||||
btnIcon.Key.transform.parent.gameObject.SetActive(canSeeBinds);
|
btnIcon.Key.transform.parent.gameObject.SetActive(canSeeBinds);
|
||||||
}
|
}
|
||||||
foreach (var btnIcon in moddedKeybindIcons)
|
|
||||||
|
foreach (var btnIcon in ModdedKeybindIcons)
|
||||||
{
|
{
|
||||||
btnIcon.transform.parent.gameObject.SetActive(canSeeBinds);
|
btnIcon.transform.parent.gameObject.SetActive(canSeeBinds);
|
||||||
}
|
}
|
||||||
|
|
||||||
var player = ReInput.players.GetPlayer(0);
|
var player = ReInput.players.GetPlayer(0);
|
||||||
|
var keyboard = player.controllers.Keyboard;
|
||||||
foreach (var entry in KeybindManager.Keybinds)
|
foreach (var entry in KeybindManager.Keybinds)
|
||||||
{
|
{
|
||||||
var keyboard = player.controllers.Keyboard;
|
var modKeys = entry.ModifierKeys;
|
||||||
bool modifierKeysPressed = entry.ModifierKeys.All(k => keyboard.GetModifierKey(k)) ||
|
bool modifierKeysPressed;
|
||||||
entry.ModifierKeys.Length <= 0;
|
if (modKeys.Length == 0)
|
||||||
|
{
|
||||||
|
modifierKeysPressed = true;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
modifierKeysPressed = true;
|
||||||
|
foreach (var key in modKeys)
|
||||||
|
{
|
||||||
|
if (keyboard.GetModifierKey(key)) continue;
|
||||||
|
modifierKeysPressed = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (player.GetButtonDown(entry.Id) && modifierKeysPressed)
|
if (player.GetButtonDown(entry.Id) && modifierKeysPressed)
|
||||||
{
|
{
|
||||||
entry.Invoke();
|
entry.Invoke();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var entry in KeybindManager.VanillaKeybinds.Values.Where(x => player.GetButtonDown(x.Id)))
|
// suppressed warning because we want minimum allocations here
|
||||||
|
#pragma warning disable S3267
|
||||||
|
foreach (var entry in KeybindManager.VanillaKeybinds.Values)
|
||||||
|
#pragma warning restore S3267
|
||||||
{
|
{
|
||||||
entry.Invoke();
|
if (player.GetButtonDown(entry.Id))
|
||||||
|
{
|
||||||
|
entry.Invoke();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using MiraAPI.LocalSettings;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
namespace MiraAPI.Patches.Menu;
|
namespace MiraAPI.Patches.Menu;
|
||||||
|
|
||||||
@@ -17,5 +19,6 @@ public static class MainMenuManagerPatches
|
|||||||
public static void AwakePostfix()
|
public static void AwakePostfix()
|
||||||
{
|
{
|
||||||
AddressablesLoader.LoadAll();
|
AddressablesLoader.LoadAll();
|
||||||
|
Application.targetFrameRate = (int)LocalSettingsTabSingleton<MiraApiSettings>.Instance.SetFpsSlider.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,8 +1,11 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using AmongUs.GameOptions;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using Il2CppInterop.Runtime.Attributes;
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.Modifiers;
|
using MiraAPI.Modifiers;
|
||||||
|
using MiraAPI.Presets;
|
||||||
using MiraAPI.Utilities;
|
using MiraAPI.Utilities;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
using Reactor.Localization.Utilities;
|
using Reactor.Localization.Utilities;
|
||||||
@@ -10,6 +13,7 @@ using Reactor.Utilities.Extensions;
|
|||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.Events;
|
using UnityEngine.Events;
|
||||||
|
using UnityEngine.UI;
|
||||||
using Object = UnityEngine.Object;
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
namespace MiraAPI.Patches.Options;
|
namespace MiraAPI.Patches.Options;
|
||||||
@@ -17,6 +21,20 @@ namespace MiraAPI.Patches.Options;
|
|||||||
[HarmonyPatch(typeof(GameOptionsMenu))]
|
[HarmonyPatch(typeof(GameOptionsMenu))]
|
||||||
internal static class GameOptionsMenuPatch
|
internal static class GameOptionsMenuPatch
|
||||||
{
|
{
|
||||||
|
[HarmonyPostfix]
|
||||||
|
[HarmonyPatch(nameof(GameOptionsMenu.OnEnable))]
|
||||||
|
public static void OpenPatch(GameOptionsMenu __instance)
|
||||||
|
{
|
||||||
|
HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
[HarmonyPostfix]
|
||||||
|
[HarmonyPatch(nameof(GameOptionsMenu.OnDisable))]
|
||||||
|
public static void ClosePatch(GameOptionsMenu __instance)
|
||||||
|
{
|
||||||
|
HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPostfix]
|
[HarmonyPostfix]
|
||||||
[HarmonyPatch(nameof(GameOptionsMenu.Update))]
|
[HarmonyPatch(nameof(GameOptionsMenu.Update))]
|
||||||
// ReSharper disable once InconsistentNaming
|
// ReSharper disable once InconsistentNaming
|
||||||
@@ -153,7 +171,7 @@ internal static class GameOptionsMenuPatch
|
|||||||
private static void ModifiersUpdate(ref float num)
|
private static void ModifiersUpdate(ref float num)
|
||||||
{
|
{
|
||||||
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
|
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
|
||||||
.Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
|
.Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
|
||||||
|
|
||||||
foreach (var modGroup in groups)
|
foreach (var modGroup in groups)
|
||||||
{
|
{
|
||||||
@@ -164,7 +182,7 @@ internal static class GameOptionsMenuPatch
|
|||||||
private static void ModifiersCreate(GameOptionsMenu menu)
|
private static void ModifiersCreate(GameOptionsMenu menu)
|
||||||
{
|
{
|
||||||
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
|
var groups = GameSettingMenuPatches.SelectedMod?.InternalOptionGroups
|
||||||
.Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true) ?? [];
|
.Where(x => x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier)) == true) ?? [];
|
||||||
foreach (var group in groups)
|
foreach (var group in groups)
|
||||||
{
|
{
|
||||||
CreateGroup(menu, group);
|
CreateGroup(menu, group);
|
||||||
@@ -257,7 +275,9 @@ internal static class GameOptionsMenuPatch
|
|||||||
categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
|
categoryHeaderMasked.SetHeader(CustomStringName.CreateAndRegister(group.GroupName), 20);
|
||||||
categoryHeaderMasked.Background.color = group.GroupColor;
|
categoryHeaderMasked.Background.color = group.GroupColor;
|
||||||
categoryHeaderMasked.Divider.color = group.GroupColor;
|
categoryHeaderMasked.Divider.color = group.GroupColor;
|
||||||
categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor) ? Color.white : group.GroupColor.FindAlternateColor();
|
categoryHeaderMasked.Title.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
|
||||||
|
? Color.white
|
||||||
|
: group.GroupColor.FindAlternateColor();
|
||||||
|
|
||||||
categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
|
categoryHeaderMasked.Background.sprite = MiraAssets.CategoryHeader.LoadAsset();
|
||||||
categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
|
categoryHeaderMasked.Background.sprite.texture.filterMode = FilterMode.Bilinear;
|
||||||
@@ -276,13 +296,20 @@ internal static class GameOptionsMenuPatch
|
|||||||
newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
|
newText.transform.localPosition = new Vector3(2.6249f, -0.165f, 0f);
|
||||||
newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
|
newText.gameObject.GetComponent<TextTranslatorTMP>().Destroy();
|
||||||
|
|
||||||
var options = group.Options.Select(
|
var options = group.Options.Select(opt => opt.CreateOption(
|
||||||
opt => opt.CreateOption(
|
menu.checkboxOrigin,
|
||||||
menu.checkboxOrigin,
|
menu.numberOptionOrigin,
|
||||||
menu.numberOptionOrigin,
|
menu.stringOptionOrigin,
|
||||||
menu.stringOptionOrigin,
|
menu.playerOptionOrigin,
|
||||||
menu.playerOptionOrigin,
|
menu.settingsContainer));
|
||||||
menu.settingsContainer));
|
|
||||||
|
OptionPreset? defaultPreset = null;
|
||||||
|
if (GameSettingMenuPatches.SelectedMod != null && PresetManager.DefaultPresets.TryGetValue(
|
||||||
|
GameSettingMenuPatches.SelectedMod,
|
||||||
|
out var preset))
|
||||||
|
{
|
||||||
|
defaultPreset = preset;
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var newOpt in options)
|
foreach (var newOpt in options)
|
||||||
{
|
{
|
||||||
@@ -318,14 +345,79 @@ internal static class GameOptionsMenuPatch
|
|||||||
if (newOpt is ToggleOption toggle)
|
if (newOpt is ToggleOption toggle)
|
||||||
{
|
{
|
||||||
toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
|
toggle.CheckMark.sprite = MiraAssets.Checkmark.LoadAsset();
|
||||||
toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
|
toggle.CheckMark.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
|
||||||
|
? group.GroupColor
|
||||||
|
: MiraAssets.AcceptedTeal;
|
||||||
var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
|
var rend = toggle.CheckMark.transform.parent.FindChild("ActiveSprite")
|
||||||
.GetComponent<SpriteRenderer>();
|
.GetComponent<SpriteRenderer>();
|
||||||
rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
|
rend.sprite = MiraAssets.CheckmarkBox.LoadAsset();
|
||||||
rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor ? group.GroupColor : MiraAssets.AcceptedTeal;
|
rend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
|
||||||
|
? group.GroupColor
|
||||||
|
: MiraAssets.AcceptedTeal;
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.Children.Add(newOpt);
|
menu.Children.Add(newOpt);
|
||||||
|
var resetBtn = new GameObject("ResetOption");
|
||||||
|
resetBtn.transform.parent = newOpt.transform;
|
||||||
|
resetBtn.transform.localScale = new(.5f, .5f, 1);
|
||||||
|
resetBtn.layer = LayerMask.NameToLayer("UI");
|
||||||
|
resetBtn.transform.localPosition = new Vector3(-3.1f, 0f, -2f);
|
||||||
|
var resetRend = resetBtn.AddComponent<SpriteRenderer>();
|
||||||
|
resetRend.sprite = MiraAssets.ResetButton.LoadAsset();
|
||||||
|
resetRend.maskInteraction = SpriteMaskInteraction.VisibleInsideMask;
|
||||||
|
resetRend.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
|
||||||
|
? Color.white
|
||||||
|
: group.GroupColor.FindAlternateColor();
|
||||||
|
var resetBoxCol = resetBtn.gameObject.AddComponent<BoxCollider2D>();
|
||||||
|
resetBoxCol.size = new Vector2(1f, 1f);
|
||||||
|
resetBoxCol.offset = new Vector2(0, 0);
|
||||||
|
var passiveButton = resetBtn.AddComponent<PassiveButton>();
|
||||||
|
passiveButton.OnClick = new Button.ButtonClickedEvent();
|
||||||
|
passiveButton.ClickSound = menu.BackButton.GetComponent<PassiveButton>().ClickSound;
|
||||||
|
passiveButton.OnMouseOver = new UnityEvent();
|
||||||
|
passiveButton.OnMouseOver.AddListener(
|
||||||
|
(UnityAction)(() =>
|
||||||
|
{
|
||||||
|
resetRend.color = group.GroupColor != MiraApiPlugin.DefaultHeaderColor
|
||||||
|
? group.GroupColor
|
||||||
|
: MiraAssets.AcceptedTeal;
|
||||||
|
}));
|
||||||
|
passiveButton.OnMouseOut = new UnityEvent();
|
||||||
|
passiveButton.OnMouseOut.AddListener(
|
||||||
|
(UnityAction)(() =>
|
||||||
|
{
|
||||||
|
resetRend.color = group.GroupColor.Equals(MiraApiPlugin.DefaultHeaderColor)
|
||||||
|
? Color.white
|
||||||
|
: group.GroupColor.FindAlternateColor();
|
||||||
|
}));
|
||||||
|
if (newOpt is ToggleOption toggleOpt)
|
||||||
|
{
|
||||||
|
passiveButton.OnClick.AddListener(
|
||||||
|
(UnityAction)(() =>
|
||||||
|
{
|
||||||
|
defaultPreset!.ResetOption(toggleOpt);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
else if (newOpt is NumberOption numOpt)
|
||||||
|
{
|
||||||
|
passiveButton.OnClick.AddListener(
|
||||||
|
(UnityAction)(() =>
|
||||||
|
{
|
||||||
|
defaultPreset!.ResetOption(numOpt);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
else if (newOpt is StringOption strOpt)
|
||||||
|
{
|
||||||
|
passiveButton.OnClick.AddListener(
|
||||||
|
(UnityAction)(() =>
|
||||||
|
{
|
||||||
|
defaultPreset!.ResetOption(strOpt);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
if (!defaultPreset!.IsOptionInPreset(newOpt))
|
||||||
|
{
|
||||||
|
resetBtn.Destroy();
|
||||||
|
}
|
||||||
|
|
||||||
newOpt.Initialize();
|
newOpt.Initialize();
|
||||||
newOpt.gameObject.SetActive(false);
|
newOpt.gameObject.SetActive(false);
|
||||||
|
|||||||
@@ -110,12 +110,15 @@ internal static class GameSettingMenuPatches
|
|||||||
{
|
{
|
||||||
case 3:
|
case 3:
|
||||||
_modifiersButton?.SelectButton(true);
|
_modifiersButton?.SelectButton(true);
|
||||||
|
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.ModifierMenuDescription : "Configure modifiers and their settings here!";
|
||||||
break;
|
break;
|
||||||
case 4:
|
case 4:
|
||||||
_customOneButton?.SelectButton(true);
|
_customOneButton?.SelectButton(true);
|
||||||
|
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuOneDescription : "Apply game settings for this mod!";
|
||||||
break;
|
break;
|
||||||
case 5:
|
case 5:
|
||||||
_customTwoButton?.SelectButton(true);
|
_customTwoButton?.SelectButton(true);
|
||||||
|
__instance.MenuDescriptionText.text = SelectedMod != null ? SelectedMod.MiraPlugin.CustomOptionMenuTwoDescription : "Apply game settings for this mod!";
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -185,7 +185,9 @@ public static class LobbyViewPanePatches
|
|||||||
__instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
|
__instance.settingsInfo.Add(categoryHeaderRoleVariant.gameObject);
|
||||||
num -= 0.696f;
|
num -= 0.696f;
|
||||||
var roles = RoleManager.Instance.AllRoles.ToArray().Where(x =>
|
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();
|
x.Role != RoleTypes.CrewmateGhost && x.Role != RoleTypes.ImpostorGhost).ToList();
|
||||||
for (int j = 0; j < roles.Count; j++)
|
for (int j = 0; j < roles.Count; j++)
|
||||||
{
|
{
|
||||||
@@ -380,7 +382,7 @@ public static class LobbyViewPanePatches
|
|||||||
|
|
||||||
foreach (var grouping in sortedRoleGroups)
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -411,7 +413,7 @@ public static class LobbyViewPanePatches
|
|||||||
|
|
||||||
foreach (var customRole in grouping)
|
foreach (var customRole in grouping)
|
||||||
{
|
{
|
||||||
if (customRole.Configuration.HideSettings)
|
if (customRole.Configuration.HideSettings || !customRole.VisibleInSettings())
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -35,6 +35,19 @@ public static class RoleSettingMenuPatches
|
|||||||
private static RoleBehaviour? CurrentRole { get; set; }
|
private static RoleBehaviour? CurrentRole { get; set; }
|
||||||
private static List<IModdedOption>? CurrentRoleOptions { get; set; }
|
private static List<IModdedOption>? CurrentRoleOptions { get; set; }
|
||||||
|
|
||||||
|
[HarmonyPostfix]
|
||||||
|
[HarmonyPatch(nameof(RolesSettingsMenu.OnEnable))]
|
||||||
|
public static void OpenPatch(RolesSettingsMenu __instance)
|
||||||
|
{
|
||||||
|
HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = false;
|
||||||
|
}
|
||||||
|
[HarmonyPostfix]
|
||||||
|
[HarmonyPatch(nameof(RolesSettingsMenu.OnDisable))]
|
||||||
|
public static void ClosePatch(RolesSettingsMenu __instance)
|
||||||
|
{
|
||||||
|
HudManager.Instance.PlayerCam.OverrideScreenShakeEnabled = true;
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPostfix]
|
[HarmonyPostfix]
|
||||||
[HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
|
[HarmonyPatch(nameof(RolesSettingsMenu.SetQuotaTab))]
|
||||||
public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
|
public static void SetQuotaTabPostfix(RolesSettingsMenu __instance)
|
||||||
@@ -74,10 +87,10 @@ public static class RoleSettingMenuPatches
|
|||||||
var num = 0.662f;
|
var num = 0.662f;
|
||||||
|
|
||||||
var list = CustomRoleManager.AllRoles.Where(
|
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();
|
r.Role != RoleTypes.CrewmateGhost).ToList();
|
||||||
var list2 = CustomRoleManager.AllRoles.Where(
|
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();
|
r.Role != RoleTypes.ImpostorGhost).ToList();
|
||||||
|
|
||||||
if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
|
if (__instance.roleTabs == null || __instance.roleTabs.Count == 0)
|
||||||
@@ -160,7 +173,7 @@ public static class RoleSettingMenuPatches
|
|||||||
|
|
||||||
foreach (var grouping in sortedRoleGroups)
|
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;
|
continue;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
using System.Linq;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using MiraAPI.GameOptions;
|
||||||
|
using MiraAPI.GameOptions.OptionTypes;
|
||||||
using MiraAPI.Utilities;
|
using MiraAPI.Utilities;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
@@ -28,7 +31,33 @@ public static class SettingPatches
|
|||||||
string result;
|
string result;
|
||||||
var suffix = (MiraNumberSuffixes)__instance.SuffixType;
|
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>";
|
result = "<b>∞</b>";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,6 +117,20 @@ internal static class PlayerControlPatches
|
|||||||
__instance.RpcMurderPlayer(target, true);
|
__instance.RpcMurderPlayer(target, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HarmonyPrefix]
|
||||||
|
[HarmonyPatch(nameof(PlayerControl.RpcMurderPlayer))]
|
||||||
|
[HarmonyPatch(nameof(PlayerControl.MurderPlayer))]
|
||||||
|
// ReSharper disable once InconsistentNaming
|
||||||
|
public static bool MurderPlayerPrefix(PlayerControl __instance)
|
||||||
|
{
|
||||||
|
if (LobbyBehaviour.Instance)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
[HarmonyPostfix]
|
[HarmonyPostfix]
|
||||||
[HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
|
[HarmonyPatch(nameof(PlayerControl.FixedUpdate))]
|
||||||
// ReSharper disable once InconsistentNaming
|
// ReSharper disable once InconsistentNaming
|
||||||
|
|||||||
@@ -13,6 +13,10 @@ internal static class HowToPlayPatch
|
|||||||
// yes i patched the entire method
|
// yes i patched the entire method
|
||||||
private static void Prefix(HowToPlayScene __instance)
|
private static void Prefix(HowToPlayScene __instance)
|
||||||
{
|
{
|
||||||
|
if (RoleManager.Instance.AllRoles.ToArray().All(x => !x.IsCustomRole()))
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
__instance.sceneIndex = 0;
|
__instance.sceneIndex = 0;
|
||||||
__instance.category = HowToPlayScene.HowToPlayCategory.RolesSelection;
|
__instance.category = HowToPlayScene.HowToPlayCategory.RolesSelection;
|
||||||
__instance.startPage.SetActive(false);
|
__instance.startPage.SetActive(false);
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public static class KillButtonPatches
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Use Custom Murder if player is custom role.
|
/// Use Custom Murder instead of Murder Player from vanilla.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
[HarmonyPrefix]
|
[HarmonyPrefix]
|
||||||
[HarmonyPatch(nameof(KillButton.DoClick))]
|
[HarmonyPatch(nameof(KillButton.DoClick))]
|
||||||
@@ -58,12 +58,7 @@ public static class KillButtonPatches
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PlayerControl.LocalPlayer.Data.Role is not ICustomRole)
|
PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget, MeetingCheck.OutsideMeeting);
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
PlayerControl.LocalPlayer.RpcCustomMurder(__instance.currentTarget);
|
|
||||||
__instance.SetTarget(null);
|
__instance.SetTarget(null);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -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)))
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
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)))
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
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)))
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -20,7 +20,7 @@ public static class NameTagPatch
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (PlayerControl.LocalPlayer.Data.Role.IsImpostor && otherPlayerRole.IsImpostor)
|
if (PlayerControl.LocalPlayer.Data?.Role?.IsImpostor == true && otherPlayerRole.IsImpostor)
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -30,7 +30,7 @@ public static class NameTagPatch
|
|||||||
return true;
|
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;
|
__result = Color.white;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
using System.Linq;
|
using System.Linq;
|
||||||
using AmongUs.GameOptions;
|
using AmongUs.GameOptions;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
|
using InnerNet;
|
||||||
using MiraAPI.Events;
|
using MiraAPI.Events;
|
||||||
using MiraAPI.Events.Vanilla.Gameplay;
|
using MiraAPI.Events.Vanilla.Gameplay;
|
||||||
using MiraAPI.Modifiers;
|
using MiraAPI.Modifiers;
|
||||||
|
|||||||
@@ -22,6 +22,21 @@ public interface IMiraPlugin
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual string CustomOptionMenuNameTwo => "Custom Category 2";
|
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>
|
/// <summary>
|
||||||
/// Gets the BepInEx configuration file for the plugin.
|
/// Gets the BepInEx configuration file for the plugin.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ public class MiraPluginInfo
|
|||||||
public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
|
public IReadOnlyCollection<CustomActionButton> Buttons { get; private set; } = null!;
|
||||||
|
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
|
public IReadOnlyCollection<OptionPreset> Presets { get; internal set; } = null!;
|
||||||
|
|
||||||
|
|||||||
@@ -71,4 +71,26 @@ public class OptionPreset
|
|||||||
|
|
||||||
CustomRoleManager.SyncAllRoleSettings();
|
CustomRoleManager.SyncAllRoleSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Resets the specified option with the preset provided.
|
||||||
|
/// </summary>
|
||||||
|
public void ResetOption(OptionBehaviour baseOption)
|
||||||
|
{
|
||||||
|
var selectedOpt = Plugin.InternalOptions.First(x => x.OptionBehaviour == baseOption);
|
||||||
|
selectedOpt.LoadFromPreset(PresetConfig);
|
||||||
|
/*ModdedOptionsManager.SyncAllOptions();
|
||||||
|
|
||||||
|
CustomRoleManager.SyncAllRoleSettings();*/
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether the specified option is included in the preset.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>>The value of whether the option is in the preset.</returns>
|
||||||
|
public bool IsOptionInPreset(OptionBehaviour baseOption)
|
||||||
|
{
|
||||||
|
var selectedOpt = Plugin.InternalOptions.First(x => x.OptionBehaviour == baseOption);
|
||||||
|
return selectedOpt.ConfigDefinition != null && PresetConfig.ContainsKey(selectedOpt.ConfigDefinition);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.IO;
|
using System.Collections.Generic;
|
||||||
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
using MiraAPI.PluginLoading;
|
using MiraAPI.PluginLoading;
|
||||||
@@ -18,6 +19,14 @@ public static class PresetManager
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
|
public static string PresetDirectory { get; } = Path.GetFullPath("mira_presets", Application.persistentDataPath);
|
||||||
|
|
||||||
|
internal static Dictionary<MiraPluginInfo, OptionPreset> DefaultPresets { get; } = [];
|
||||||
|
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)
|
internal static void CreateDefaultPreset(MiraPluginInfo plugin)
|
||||||
{
|
{
|
||||||
var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
|
var presetPath = Path.Combine(PresetDirectory, plugin.PluginId);
|
||||||
@@ -39,6 +48,7 @@ public static class PresetManager
|
|||||||
}
|
}
|
||||||
|
|
||||||
presetConfig.Save();
|
presetConfig.Save();
|
||||||
|
DefaultPresets.Add(plugin, new OptionPreset("Default", plugin, presetConfig));
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -93,4 +103,58 @@ public static class PresetManager
|
|||||||
}
|
}
|
||||||
plugin.Presets = [..plugin.InternalPresets];
|
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];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
@@ -1,7 +1,9 @@
|
|||||||
using AmongUs.GameOptions;
|
using AmongUs.GameOptions;
|
||||||
|
using System;
|
||||||
|
using Il2CppInterop.Runtime.Attributes;
|
||||||
|
using MiraAPI.Patches.Freeplay;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
namespace MiraAPI.Roles;
|
namespace MiraAPI.Roles;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -9,6 +11,16 @@ namespace MiraAPI.Roles;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public record struct CustomRoleConfiguration
|
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>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
|
/// Initializes a new instance of the <see cref="CustomRoleConfiguration"/> struct.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -36,7 +48,7 @@ public record struct CustomRoleConfiguration
|
|||||||
{
|
{
|
||||||
ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
|
ModdedRoleTeams.Crewmate => TranslationController.Instance.GetString(StringNames.Crewmate),
|
||||||
ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
|
ModdedRoleTeams.Impostor => TranslationController.Instance.GetString(StringNames.Impostor),
|
||||||
_ => "Neutral",
|
_ => TaskAdderPatches.NeutralName,
|
||||||
};
|
};
|
||||||
IntroSound = role.Team is ModdedRoleTeams.Crewmate
|
IntroSound = role.Team is ModdedRoleTeams.Crewmate
|
||||||
? CustomRoleManager.CrewmateIntroSound
|
? CustomRoleManager.CrewmateIntroSound
|
||||||
@@ -66,16 +78,19 @@ public record struct CustomRoleConfiguration
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Sprite used for the Role Options menu screenshot.
|
/// Gets or sets the Sprite used for the Role Options menu screenshot.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
public LoadableAsset<Sprite>? OptionsScreenshot { get; set; } = null;
|
public LoadableAsset<Sprite>? OptionsScreenshot { get; set; } = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Sprite used for the Role Icon.
|
/// Gets or sets the Sprite used for the Role Icon.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
public LoadableAsset<Sprite>? Icon { get; set; } = null;
|
public LoadableAsset<Sprite>? Icon { get; set; } = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the Intro sound for the Role.
|
/// Gets or sets the Intro sound for the Role.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
public LoadableAsset<AudioClip>? IntroSound { get; set; } = null;
|
public LoadableAsset<AudioClip>? IntroSound { get; set; } = null;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
@@ -89,15 +89,22 @@ public static class CustomRoleManager
|
|||||||
|
|
||||||
foreach (var roleType in roles)
|
foreach (var roleType in roles)
|
||||||
{
|
{
|
||||||
ClassInjector.RegisterTypeInIl2Cpp(roleType);
|
try
|
||||||
|
|
||||||
var role = RegisterRole(roleType, pluginInfo);
|
|
||||||
if (role is null)
|
|
||||||
{
|
{
|
||||||
continue;
|
ClassInjector.RegisterTypeInIl2Cpp(roleType);
|
||||||
}
|
|
||||||
|
|
||||||
pluginInfo.InternalRoles.Add((ushort)role.Role, role);
|
var role = RegisterRole(roleType, pluginInfo);
|
||||||
|
if (role is null)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
pluginInfo.InternalRoles.Add((ushort)role.Role, role);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Error($"Failed to register role type {roleType.Name}: {ex}");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pluginInfo.PluginConfig.Save();
|
pluginInfo.PluginConfig.Save();
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
@@ -13,6 +14,62 @@ namespace MiraAPI.Roles;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static class CustomRoleUtils
|
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>
|
/// <summary>
|
||||||
/// Gets all active in-game roles.
|
/// Gets all active in-game roles.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text;
|
using System;
|
||||||
|
using System.Text;
|
||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.Modifiers;
|
using MiraAPI.Modifiers;
|
||||||
@@ -239,4 +240,15 @@ public interface ICustomRole : IOptionable
|
|||||||
{
|
{
|
||||||
return true;
|
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;
|
||||||
}
|
}
|
||||||
@@ -90,6 +90,11 @@ public static class MiraAssets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static LoadableResourceAsset CheckmarkBox { get; } = new("MiraAPI.Resources.CheckMarkBox.png");
|
public static LoadableResourceAsset CheckmarkBox { get; } = new("MiraAPI.Resources.CheckMarkBox.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the Reset Box used in the Settings Menu.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset ResetButton { get; } = new("MiraAPI.Resources.ResetButton.png");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the Checkmark used in the Settings Menu.
|
/// Gets the Checkmark used in the Settings Menu.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using AmongUs.GameOptions;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
||||||
using MiraAPI.Roles;
|
using MiraAPI.Roles;
|
||||||
@@ -536,4 +537,15 @@ public static class Helpers
|
|||||||
}
|
}
|
||||||
return role.NiceName;
|
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.
|
||||||
|
return false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user