Merge branch 'dev' into generic-option-list
No files matched your search
@@ -2,7 +2,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Reactor" Version="2.5.0-ci.371" />
|
<PackageReference Include="Reactor" Version="2.5.0-ci.371" />
|
||||||
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
|
<PackageReference Include="BepInEx.Unity.IL2CPP" Version="6.0.0-be.735" Private="false" ExcludeAssets="runtime;native" />
|
||||||
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.8.18" PrivateAssets="all" />
|
<PackageReference Include="AmongUs.GameLibs.Steam" Version="2026.9.29" PrivateAssets="all" />
|
||||||
|
|
||||||
<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
|
<PackageReference Include="BepInEx.AutoPlugin" Version="1.1.0" PrivateAssets="all" />
|
||||||
<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
|
<PackageReference Include="BepInEx.IL2CPP.MSBuild" Version="2.1.0-rc.1" PrivateAssets="all" ExcludeAssets="runtime" />
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using Il2CppSystem;
|
using MiraAPI.Example.Roles;
|
||||||
using MiraAPI.Example.Roles;
|
|
||||||
using MiraAPI.Modifiers.Types;
|
using MiraAPI.Modifiers.Types;
|
||||||
using MiraAPI.Translation;
|
using MiraAPI.Translation;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -28,7 +27,7 @@ public class FreezeModifier : TimedModifier
|
|||||||
|
|
||||||
if (Player.AmOwner || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
|
if (Player.AmOwner || PlayerControl.LocalPlayer.Data.Role is FreezerRole)
|
||||||
{
|
{
|
||||||
Player.cosmetics.SetOutline(true, new Nullable<Color>(Palette.LightBlue));
|
Player.cosmetics.SetOutline(true, new Il2CppSystem.Nullable<Color>(Palette.LightBlue));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,7 +39,7 @@ public static class GameModeOption
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static readonly StringNames GamemodeName = MiraLocaleManager.GetOrCreateLocaleString("Gamemode");
|
internal static readonly StringNames GamemodeName = MiraLocaleManager.GetOrCreateLocaleString("MiraApi.Gamemode");
|
||||||
internal static readonly StringNames CustomName = MiraLocaleManager.GetOrCreateLocaleString("Custom");
|
internal static readonly StringNames CustomName = MiraLocaleManager.GetOrCreateLocaleString("Custom");
|
||||||
internal static readonly Dictionary<uint, StringNames> Values = new()
|
internal static readonly Dictionary<uint, StringNames> Values = new()
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace MiraAPI.GameOptions;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Allows an option group to compress noisy option blocks in the wiki "Options" section.
|
||||||
|
/// Implementers can hide specific option keys and replace them with one or more summary lines.
|
||||||
|
/// </summary>
|
||||||
|
public interface ISummarizedOptions
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the option string keys (StringNames) to omit from the wiki options list (e.g., a large set of related options).
|
||||||
|
/// </summary>
|
||||||
|
IReadOnlySet<StringNames> WikiHiddenOptionKeys { get; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets summary lines to insert when the first hidden option would have appeared.
|
||||||
|
/// Lines should already be formatted as "Title: Value".
|
||||||
|
/// </summary>
|
||||||
|
IEnumerable<string> GetWikiOptionSummaryLines();
|
||||||
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using Il2CppSystem.Collections.Generic;
|
|
||||||
using MiraAPI.Networking;
|
using MiraAPI.Networking;
|
||||||
using MiraAPI.Translation;
|
using MiraAPI.Translation;
|
||||||
using MiraAPI.Utilities;
|
using MiraAPI.Utilities;
|
||||||
@@ -43,7 +43,7 @@ public class ModdedPlayerOption : ModdedOption<int>
|
|||||||
data.Title = StringName;
|
data.Title = StringName;
|
||||||
data.Type = global::OptionTypes.Player;
|
data.Type = global::OptionTypes.Player;
|
||||||
|
|
||||||
Values = new List<NetworkedPlayerInfo>();
|
Values = new();
|
||||||
AllowNone = allowNone;
|
AllowNone = allowNone;
|
||||||
Value = DefaultValue;
|
Value = DefaultValue;
|
||||||
}
|
}
|
||||||
@@ -60,17 +60,16 @@ public class ModdedPlayerOption : ModdedOption<int>
|
|||||||
playerOption.name =
|
playerOption.name =
|
||||||
$"{ParentMod!.OptionsTitleText}.PlayerOption.{TranslationController.Instance.GetString(StringName)}";
|
$"{ParentMod!.OptionsTitleText}.PlayerOption.{TranslationController.Instance.GetString(StringName)}";
|
||||||
|
|
||||||
var filteredList = GetFilteredPlayers();
|
Values = GetFilteredPlayers();
|
||||||
Values = filteredList.ToIl2CppList();
|
|
||||||
|
|
||||||
playerOption.SetUpFromData(Data, 20);
|
playerOption.SetUpFromData(Data, 20);
|
||||||
playerOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
|
playerOption.OnValueChanged = (Il2CppSystem.Action<OptionBehaviour>)ValueChanged;
|
||||||
|
|
||||||
playerOption.Title = StringName;
|
playerOption.Title = StringName;
|
||||||
playerOption.TitleText.text = Title.Translate();
|
playerOption.TitleText.text = Title.Translate();
|
||||||
playerOption.Values = Values;
|
playerOption.Values = Values.ToIl2CppList();
|
||||||
playerOption.Value = Value;
|
playerOption.Value = Value;
|
||||||
playerOption.playerIndex = filteredList.FindIndex(p => p.PlayerId == Value);
|
playerOption.playerIndex = Values.FindIndex(p => p.PlayerId == Value);
|
||||||
|
|
||||||
OptionBehaviour = playerOption;
|
OptionBehaviour = playerOption;
|
||||||
ModdedOptionsManager.CreatedPlayerOptions.TryAdd(playerOption, this);
|
ModdedOptionsManager.CreatedPlayerOptions.TryAdd(playerOption, this);
|
||||||
@@ -85,7 +84,7 @@ public class ModdedPlayerOption : ModdedOption<int>
|
|||||||
/// Returns a player ran through the filter.
|
/// Returns a player ran through the filter.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns>A list of filtered players.</returns>
|
/// <returns>A list of filtered players.</returns>
|
||||||
public System.Collections.Generic.List<NetworkedPlayerInfo> GetFilteredPlayers()
|
public List<NetworkedPlayerInfo> GetFilteredPlayers()
|
||||||
{
|
{
|
||||||
return [.. GameData.Instance.AllPlayers.ToArray().Where(x => PlayerFilter?.Invoke(x) ?? true)];
|
return [.. GameData.Instance.AllPlayers.ToArray().Where(x => PlayerFilter?.Invoke(x) ?? true)];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,16 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Il2CppInterop.Runtime.Attributes;
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.PluginLoading;
|
using MiraAPI.PluginLoading;
|
||||||
|
using MiraAPI.Roles;
|
||||||
|
using MiraAPI.Translation;
|
||||||
|
using MiraAPI.Utilities;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
namespace MiraAPI.Modifiers;
|
namespace MiraAPI.Modifiers;
|
||||||
|
|
||||||
@@ -44,16 +52,134 @@ public abstract class BaseModifier : IOptionable
|
|||||||
x => x.InternalModifiers.Exists(y => y.TypeId == TypeId))
|
x => x.InternalModifiers.Exists(y => y.TypeId == TypeId))
|
||||||
?? throw new InvalidOperationException("Modifier is not registered.");
|
?? throw new InvalidOperationException("Modifier is not registered.");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the id part used to build the modifier's translation keys. It is recommended to simply call it what the modifier is, as other mods may utilize it.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string IdPart => GetType().Name;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the id part used to build the modifier's translation keys. It is recommended to call it ModGuid.Modifier.Type.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string IdPrefix => GetType().Namespace!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the modifier name.
|
/// Gets the modifier name.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract string ModifierName { get; }
|
public virtual string ModifierName => MiraLocaleManager.Get(ModifierNameLocale);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the modifier's name id for localization.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierNameLocale => MiraLocaleManager.BuildTranslationId(IdPrefix, IdPart);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the medium description of the modifier. Used in the modifier guide and options menu.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierMedDescription => MiraLocaleManager.Get(ModifierMedDescriptionLocale, GetDescription());
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the modifier's medium description id for localization.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierMedDescriptionLocale => MiraLocaleManager.BuildTranslationId(IdPrefix, IdPart, "MedDescription");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the wiki description of the modifier. Used in the wiki and normally appends the options text as well.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierWikiDescription => MiraLocaleManager.Get(ModifierWikiDescriptionLocale, GetDescription()) +
|
||||||
|
Helpers.GetOptionsText(GetType());
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the modifier's wiki description id for localization.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierWikiDescriptionLocale => MiraLocaleManager.BuildTranslationId(IdPrefix, IdPart, "WikiDescription");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the category of the modifier. Used in the wiki.
|
||||||
|
/// </summary>
|
||||||
|
public virtual string ModifierCategoryTitle => MiraLocaleManager.Get("Modifier");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets whether the modifier is forcibly shown or disabled in the wiki screen.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns><see langword="true"/> if the modifier is always displayed, otherwise <see langword="false"/> if it is never displayable, or <see langword="null"/> if it is dictated by amount and chance.</returns>
|
||||||
|
public virtual bool? ForceShowModifierOnWiki => false;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the information to display in the wiki.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="guide">The guide object.</param>
|
||||||
|
/// <param name="titleText">The title text object.</param>
|
||||||
|
/// <param name="parent">The scroller parent.</param>
|
||||||
|
/// <returns>The <see cref="GameObject"/> of the wiki.</returns>
|
||||||
|
public virtual GameObject GetAdvancedWiki(MatchInfoGuide guide, TextMeshPro titleText, Scroller parent)
|
||||||
|
{
|
||||||
|
parent.ScrollToTop();
|
||||||
|
var obj = Helpers.CreateAdvancedWikiTab(
|
||||||
|
guide,
|
||||||
|
ModifierNameLocale,
|
||||||
|
ModifierName + $" ({ModifierCategoryTitle})",
|
||||||
|
ModifierWikiDescription,
|
||||||
|
titleText,
|
||||||
|
out var desc);
|
||||||
|
var num = 0;
|
||||||
|
if (WikiAbilities.Count != 0)
|
||||||
|
{
|
||||||
|
var grid = Object.Instantiate(parent.Inner, obj.transform);
|
||||||
|
var layoutGroup = grid.GetComponent<GridLayoutGroup>();
|
||||||
|
layoutGroup.startAxis = GridLayoutGroup.Axis.Vertical;
|
||||||
|
layoutGroup.constraint = GridLayoutGroup.Constraint.FixedColumnCount;
|
||||||
|
layoutGroup.spacing = new Vector2(0.75f, 0.4f);
|
||||||
|
grid.DestroyChildren();
|
||||||
|
foreach (var ability in WikiAbilities)
|
||||||
|
{
|
||||||
|
num++;
|
||||||
|
var panel = Object.Instantiate(
|
||||||
|
guide.MatchInfoRolePanelPrefab,
|
||||||
|
grid);
|
||||||
|
panel.roleCount.text = ability.AbilityType;
|
||||||
|
panel.roleCount.transform.localPosition += new Vector3(-0.04f, 0);
|
||||||
|
panel.roleName.text = ability.Name;
|
||||||
|
panel.roleName.transform.localPosition += new Vector3(-0.04f, 0);
|
||||||
|
panel.roleDescription.text = ability.Description;
|
||||||
|
panel.roleDescription.rectTransform.sizeDelta = new Vector2(2.601f, 0.8f);
|
||||||
|
panel.roleDescription.transform.localPosition += new Vector3(0, -0.1f);
|
||||||
|
panel.roleIcon.sprite = ability.Icon.LoadAsset();
|
||||||
|
panel.roleIcon.SetSizeLimit(0.13f);
|
||||||
|
|
||||||
|
panel.roleIcon.material.SetInt(PlayerMaterial.MaskLayer, 50);
|
||||||
|
panel.roleName.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleDescription.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleCount.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleIcon.transform.localScale = new Vector3(3.5f, 3.5f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
grid.localPosition = new Vector3(-3.9f, 1.1f - desc.textBounds.size.y, 0f);
|
||||||
|
grid.localScale = new Vector3(1.3f, 1.3f, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
obj.transform.SetParent(parent.Inner.transform);
|
||||||
|
obj.transform.localPosition = new Vector3(0f, 0f, 0f);
|
||||||
|
parent.SetYBoundsMax(Mathf.Clamp(desc.textBounds.size.y - 2 + Mathf.Ceil(num / 2f) * 1.45f, 0f, 999f));
|
||||||
|
return obj;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the list of abilities or other similar information to display below the text of a modifier's wiki page.
|
||||||
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
|
public virtual List<AdvancedWikiAbilityDescription> WikiAbilities => [];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the modifier icon. Useless if <see cref="HideOnUi"/> is <see langword="true"/>.
|
/// Gets the modifier icon. Useless if <see cref="HideOnUi"/> is <see langword="true"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual LoadableAsset<Sprite>? ModifierIcon => null;
|
public virtual LoadableAsset<Sprite>? ModifierIcon => null;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the <see cref="TMP_SpriteAsset"/> for the Modifier Icon.
|
||||||
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
|
public virtual TMP_SpriteAsset IconTmp => null!;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether the modifier is hidden on the UI. Will be hidden either way if no description is provided.
|
/// Gets a value indicating whether the modifier is hidden on the UI. Will be hidden either way if no description is provided.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -69,6 +195,11 @@ public abstract class BaseModifier : IOptionable
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public virtual Color FreeplayFileColor => Color.gray;
|
public virtual Color FreeplayFileColor => Color.gray;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the <see cref="Color"/> of the modifier, used in the wiki and other UI outside freeplay.
|
||||||
|
/// </summary>
|
||||||
|
public virtual Color GeneralColor => FreeplayFileColor;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets a value indicating whether the modifier is unique. If <see langword="true"/>, the player can only have one instance of this modifier.
|
/// Gets a value indicating whether the modifier is unique. If <see langword="true"/>, the player can only have one instance of this modifier.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -9,6 +9,9 @@ namespace MiraAPI.Modifiers.Types;
|
|||||||
[MiraIgnore]
|
[MiraIgnore]
|
||||||
public abstract class GameModifier : BaseModifier
|
public abstract class GameModifier : BaseModifier
|
||||||
{
|
{
|
||||||
|
/// <inheritdoc />
|
||||||
|
public override bool? ForceShowModifierOnWiki => null;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public override bool ShowInFreeplay => true;
|
public override bool ShowInFreeplay => true;
|
||||||
|
|
||||||
|
|||||||
@@ -23,10 +23,18 @@ public static class VanillaButtonPatches
|
|||||||
{
|
{
|
||||||
playerTarget = role.Cast<TrackerRole>().currentTarget;
|
playerTarget = role.Cast<TrackerRole>().currentTarget;
|
||||||
}
|
}
|
||||||
|
else if (role.Role is RoleTypes.Detective)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<DetectiveRole>().currentTarget;
|
||||||
|
}
|
||||||
else if (role.Role is RoleTypes.GuardianAngel)
|
else if (role.Role is RoleTypes.GuardianAngel)
|
||||||
{
|
{
|
||||||
playerTarget = role.Cast<GuardianAngelRole>().currentTarget;
|
playerTarget = role.Cast<GuardianAngelRole>().currentTarget;
|
||||||
}
|
}
|
||||||
|
else if (role.Role is RoleTypes.SpiritGuide)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<SpiritGuideRole>().currentTarget;
|
||||||
|
}
|
||||||
else if (role.Role is RoleTypes.Engineer)
|
else if (role.Role is RoleTypes.Engineer)
|
||||||
{
|
{
|
||||||
ventTarget = role.Cast<EngineerRole>().currentTarget;
|
ventTarget = role.Cast<EngineerRole>().currentTarget;
|
||||||
@@ -53,6 +61,10 @@ public static class VanillaButtonPatches
|
|||||||
{
|
{
|
||||||
playerTarget = role.Cast<DetectiveRole>().currentTarget;
|
playerTarget = role.Cast<DetectiveRole>().currentTarget;
|
||||||
}
|
}
|
||||||
|
else if (role.Role is RoleTypes.SpiritGuide)
|
||||||
|
{
|
||||||
|
playerTarget = role.Cast<SpiritGuideRole>().currentTarget;
|
||||||
|
}
|
||||||
|
|
||||||
var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget);
|
var genericEvent = new VanillaButtonClickEvent(__instance, playerTarget);
|
||||||
MiraEventManager.InvokeEvent(genericEvent);
|
MiraEventManager.InvokeEvent(genericEvent);
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppSystem;
|
|
||||||
using MiraAPI.GameModes;
|
using MiraAPI.GameModes;
|
||||||
using MiraAPI.Translation;
|
using MiraAPI.Translation;
|
||||||
using Reactor.Utilities;
|
using Reactor.Utilities;
|
||||||
@@ -16,7 +15,7 @@ internal static class HudPatches
|
|||||||
[HarmonyPostfix, HarmonyPatch(nameof(HudManager.Update))]
|
[HarmonyPostfix, HarmonyPatch(nameof(HudManager.Update))]
|
||||||
public static void HudUpdatePatch(HudManager __instance)
|
public static void HudUpdatePatch(HudManager __instance)
|
||||||
{
|
{
|
||||||
if (GameManager.Instance != null && GameManager.Instance.GameHasStarted &&
|
if (GameManager.Instance && GameManager.Instance.GameHasStarted &&
|
||||||
CustomGameModeManager.ActiveMode != null)
|
CustomGameModeManager.ActiveMode != null)
|
||||||
{
|
{
|
||||||
CustomGameModeManager.ActiveMode.HudUpdate(__instance);
|
CustomGameModeManager.ActiveMode.HudUpdate(__instance);
|
||||||
@@ -32,7 +31,7 @@ internal static class HudPatches
|
|||||||
|
|
||||||
private static IEnumerator CoPostHudStart(HudManager instance)
|
private static IEnumerator CoPostHudStart(HudManager instance)
|
||||||
{
|
{
|
||||||
yield return new WaitUntil((Func<bool>)(() => GameManager.Instance != null));
|
yield return new WaitUntil((Il2CppSystem.Func<bool>)(() => GameManager.Instance != null));
|
||||||
if (GameManager.Instance.IsHideAndSeek())
|
if (GameManager.Instance.IsHideAndSeek())
|
||||||
yield return null;
|
yield return null;
|
||||||
var infoPane = instance.gameObject.transform.FindChild("LobbyInfoPane");
|
var infoPane = instance.gameObject.transform.FindChild("LobbyInfoPane");
|
||||||
@@ -42,7 +41,7 @@ internal static class HudPatches
|
|||||||
var modelText = modeLabel!.Find("Text_TMP").gameObject;
|
var modelText = modeLabel!.Find("Text_TMP").gameObject;
|
||||||
var modelTextClone = Object.Instantiate(modelText, modeLabel);
|
var modelTextClone = Object.Instantiate(modelText, modeLabel);
|
||||||
Object.Destroy(modelTextClone.GetComponent<TextTranslatorTMP>());
|
Object.Destroy(modelTextClone.GetComponent<TextTranslatorTMP>());
|
||||||
modelTextClone.GetComponent<TextMeshPro>().text = "Gamemode";
|
modelTextClone.GetComponent<TextMeshPro>().text = MiraLocaleManager.Get("MiraApi.Gamemode", "Gamemode");
|
||||||
var gmText = modeValue!.Find("GameModeText").gameObject;
|
var gmText = modeValue!.Find("GameModeText").gameObject;
|
||||||
var gmTextClone = Object.Instantiate(gmText, modeValue);
|
var gmTextClone = Object.Instantiate(gmText, modeValue);
|
||||||
gmText.SetActive(false);
|
gmText.SetActive(false);
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using BepInEx.Unity.IL2CPP.Utils.Collections;
|
using BepInEx.Unity.IL2CPP.Utils.Collections;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
||||||
using Il2CppSystem.Collections.Generic;
|
|
||||||
using MiraAPI.GameModes;
|
using MiraAPI.GameModes;
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.Modifiers;
|
using MiraAPI.Modifiers;
|
||||||
@@ -28,9 +28,9 @@ internal static class GameOptionsMenuPatch
|
|||||||
private static readonly List<CategoryHeaderMasked> VanillaHeaders = new();
|
private static readonly List<CategoryHeaderMasked> VanillaHeaders = new();
|
||||||
private static readonly List<OptionBehaviour> VanillaOptions = new();
|
private static readonly List<OptionBehaviour> VanillaOptions = new();
|
||||||
private static readonly List<OptionBehaviour> MainOptions = new();
|
private static readonly List<OptionBehaviour> MainOptions = new();
|
||||||
private static readonly System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<AbstractOptionGroup>> GameModeGroups = [];
|
private static readonly Dictionary<AbstractGameMode, List<AbstractOptionGroup>> GameModeGroups = [];
|
||||||
private static readonly System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<OptionBehaviour>> GameModeOptions = [];
|
private static readonly Dictionary<AbstractGameMode, List<OptionBehaviour>> GameModeOptions = [];
|
||||||
private static readonly System.Collections.Generic.Dictionary<AbstractGameMode, System.Collections.Generic.List<CategoryHeaderMasked>> GameModeHeaders = [];
|
private static readonly Dictionary<AbstractGameMode, List<CategoryHeaderMasked>> GameModeHeaders = [];
|
||||||
private static TextMeshPro _gamemodeDescription = null!;
|
private static TextMeshPro _gamemodeDescription = null!;
|
||||||
private static SpriteRenderer _modIcon = null!;
|
private static SpriteRenderer _modIcon = null!;
|
||||||
|
|
||||||
@@ -38,7 +38,7 @@ internal static class GameOptionsMenuPatch
|
|||||||
[HarmonyPatch(nameof(GameOptionsMenu.Initialize))]
|
[HarmonyPatch(nameof(GameOptionsMenu.Initialize))]
|
||||||
public static bool InitPatch(GameOptionsMenu __instance)
|
public static bool InitPatch(GameOptionsMenu __instance)
|
||||||
{
|
{
|
||||||
__instance.Children ??= new List<OptionBehaviour>();
|
__instance.Children ??= new();
|
||||||
__instance.Children.Clear();
|
__instance.Children.Clear();
|
||||||
|
|
||||||
if (MenuState.Instance.CurrentModIdx == 0)
|
if (MenuState.Instance.CurrentModIdx == 0)
|
||||||
@@ -324,8 +324,8 @@ internal static class GameOptionsMenuPatch
|
|||||||
.ToList();
|
.ToList();
|
||||||
GameModeGroups.Add(mode, [.. filteredGroups]);
|
GameModeGroups.Add(mode, [.. filteredGroups]);
|
||||||
|
|
||||||
var optionBehaviours = new System.Collections.Generic.List<OptionBehaviour>();
|
var optionBehaviours = new List<OptionBehaviour>();
|
||||||
var categoryHeaders = new System.Collections.Generic.List<CategoryHeaderMasked>();
|
var categoryHeaders = new List<CategoryHeaderMasked>();
|
||||||
var newNum = mode.ShowNormalGameSettings ? num : num - additionalVanillaScrollNum;
|
var newNum = mode.ShowNormalGameSettings ? num : num - additionalVanillaScrollNum;
|
||||||
foreach (var group in filteredGroups)
|
foreach (var group in filteredGroups)
|
||||||
{
|
{
|
||||||
@@ -406,7 +406,7 @@ internal static class GameOptionsMenuPatch
|
|||||||
__instance.scrollBar.SetYBoundsMax(-num - 1.65f);
|
__instance.scrollBar.SetYBoundsMax(-num - 1.65f);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group, Transform container, ref float num, ref System.Collections.Generic.List<OptionBehaviour> optionBehaviours, ref System.Collections.Generic.List<CategoryHeaderMasked> categoryHeaders)
|
private static void CreateGroup(GameOptionsMenu menu, AbstractOptionGroup group, Transform container, ref float num, ref List<OptionBehaviour> optionBehaviours, ref List<CategoryHeaderMasked> categoryHeaders)
|
||||||
{
|
{
|
||||||
var categoryHeaderMasked = Object.Instantiate(
|
var categoryHeaderMasked = Object.Instantiate(
|
||||||
menu.categoryHeaderOrigin,
|
menu.categoryHeaderOrigin,
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppSystem;
|
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.Roles;
|
using MiraAPI.Roles;
|
||||||
using MiraAPI.Translation;
|
using MiraAPI.Translation;
|
||||||
@@ -165,7 +164,7 @@ public static class OptionsPatches
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
__instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>()).Translate();
|
__instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -314,8 +313,8 @@ public static class OptionsPatches
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
__instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title, Array.Empty<Object>()).Translate();
|
__instance.TitleText.text = TranslationController.Instance.GetString(__instance.Title).Translate();
|
||||||
__instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value], Array.Empty<Object>());
|
__instance.ValueText.text = TranslationController.Instance.GetString(__instance.Values[__instance.Value]);
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,8 +26,8 @@ public static class PlayerOptionPatches
|
|||||||
{
|
{
|
||||||
filteredPlayers.Sort((a, b) => a.PlayerId.CompareTo(b.PlayerId));
|
filteredPlayers.Sort((a, b) => a.PlayerId.CompareTo(b.PlayerId));
|
||||||
|
|
||||||
|
moddedPlrOpt.Values = filteredPlayers;
|
||||||
__instance.Values = filteredPlayers.ToIl2CppList();
|
__instance.Values = filteredPlayers.ToIl2CppList();
|
||||||
moddedPlrOpt.Values = __instance.Values;
|
|
||||||
__instance.playerIndex = filteredPlayers.FindIndex(p => p.PlayerId == __instance.Value);
|
__instance.playerIndex = filteredPlayers.FindIndex(p => p.PlayerId == __instance.Value);
|
||||||
__instance.SetValueText();
|
__instance.SetValueText();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppSystem;
|
|
||||||
using MiraAPI.Networking;
|
using MiraAPI.Networking;
|
||||||
using MiraAPI.Roles;
|
using MiraAPI.Roles;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
@@ -31,13 +30,13 @@ public static class KillButtonPatches
|
|||||||
|
|
||||||
if (__instance.currentTarget && __instance.currentTarget != target)
|
if (__instance.currentTarget && __instance.currentTarget != target)
|
||||||
{
|
{
|
||||||
__instance.currentTarget.cosmetics.SetOutline(false, new Nullable<Color>(Color.clear));
|
__instance.currentTarget.cosmetics.SetOutline(false, new Il2CppSystem.Nullable<Color>(Color.clear));
|
||||||
}
|
}
|
||||||
|
|
||||||
__instance.currentTarget = target;
|
__instance.currentTarget = target;
|
||||||
if (__instance.currentTarget)
|
if (__instance.currentTarget)
|
||||||
{
|
{
|
||||||
__instance.currentTarget.cosmetics.SetOutline(true, new Nullable<Color>(customRole.Configuration.KillButtonOutlineColor));
|
__instance.currentTarget.cosmetics.SetOutline(true, new Il2CppSystem.Nullable<Color>(customRole.Configuration.KillButtonOutlineColor));
|
||||||
__instance.SetEnabled();
|
__instance.SetEnabled();
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using AmongUs.GameOptions;
|
using AmongUs.GameOptions;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppSystem.Collections.Generic;
|
|
||||||
using MiraAPI.Roles;
|
using MiraAPI.Roles;
|
||||||
|
|
||||||
namespace MiraAPI.Patches.Roles;
|
namespace MiraAPI.Patches.Roles;
|
||||||
@@ -14,7 +14,7 @@ public static class LogicRoleSelectionHnsPatch
|
|||||||
[HarmonyPatch(nameof(LogicRoleSelectionHnS.AssignRolesForTeam))]
|
[HarmonyPatch(nameof(LogicRoleSelectionHnS.AssignRolesForTeam))]
|
||||||
public static bool AssignRolesForTeam(
|
public static bool AssignRolesForTeam(
|
||||||
LogicRoleSelectionHnS __instance,
|
LogicRoleSelectionHnS __instance,
|
||||||
List<NetworkedPlayerInfo> players,
|
Il2CppSystem.Collections.Generic.List<NetworkedPlayerInfo> players,
|
||||||
IGameOptions opts,
|
IGameOptions opts,
|
||||||
RoleTeamTypes team,
|
RoleTeamTypes team,
|
||||||
int teamMax,
|
int teamMax,
|
||||||
@@ -58,7 +58,7 @@ public static class LogicRoleSelectionHnsPatch
|
|||||||
|
|
||||||
case RoleTeamTypes.Impostor:
|
case RoleTeamTypes.Impostor:
|
||||||
Info($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
|
Info($"MiraAPI.Patches.Roles.LogicRoleSelectionHnsPatch - AssignRolesForTeam: Before Guaranteed Assignment");
|
||||||
var newImpostors = new List<NetworkedPlayerInfo>();
|
var newImpostors = new Il2CppSystem.Collections.Generic.List<NetworkedPlayerInfo>();
|
||||||
|
|
||||||
// Specified Seeker
|
// Specified Seeker
|
||||||
if (__instance.hnsManager.LogicOptionsHnS.HasImpostorPlayerID() &&
|
if (__instance.hnsManager.LogicOptionsHnS.HasImpostorPlayerID() &&
|
||||||
@@ -113,7 +113,7 @@ public static class LogicRoleSelectionHnsPatch
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void AssignRolesFromList(List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
|
public static void AssignRolesFromList(Il2CppSystem.Collections.Generic.List<NetworkedPlayerInfo> players, int teamMax, List<RoleTypes> roleList, ref int rolesAssigned)
|
||||||
{
|
{
|
||||||
while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
|
while (roleList.Count > 0 && players.Count > 0 && rolesAssigned < teamMax)
|
||||||
{
|
{
|
||||||
@@ -128,7 +128,7 @@ public static class LogicRoleSelectionHnsPatch
|
|||||||
}
|
}
|
||||||
|
|
||||||
private static void AddGuaranteedRoles(
|
private static void AddGuaranteedRoles(
|
||||||
System.Collections.Generic.IEnumerable<RoleBehaviour> guaranteedRoles,
|
IEnumerable<RoleBehaviour> guaranteedRoles,
|
||||||
IGameOptions opts,
|
IGameOptions opts,
|
||||||
List<RoleTypes> list)
|
List<RoleTypes> list)
|
||||||
{
|
{
|
||||||
@@ -146,7 +146,7 @@ public static class LogicRoleSelectionHnsPatch
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static void AddPotentialRoles(System.Collections.Generic.IEnumerable<RoleBehaviour> source, IGameOptions opts, List<RoleTypes> list)
|
private static void AddPotentialRoles(IEnumerable<RoleBehaviour> source, IGameOptions opts, List<RoleTypes> list)
|
||||||
{
|
{
|
||||||
var roleOptions = opts.RoleOptions;
|
var roleOptions = opts.RoleOptions;
|
||||||
var potentialRoles = source.Where(x => !x.IsDead).Select(role => new RoleManager.RoleAssignmentData(
|
var potentialRoles = source.Where(x => !x.IsDead).Select(role => new RoleManager.RoleAssignmentData(
|
||||||
|
|||||||
@@ -2,7 +2,6 @@
|
|||||||
using System.Runtime.CompilerServices;
|
using System.Runtime.CompilerServices;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Hazel;
|
using Hazel;
|
||||||
using Il2CppSystem.Text;
|
|
||||||
|
|
||||||
namespace MiraAPI.Patches.Stubs;
|
namespace MiraAPI.Patches.Stubs;
|
||||||
|
|
||||||
@@ -45,9 +44,9 @@ public static class RoleBehaviourStubs
|
|||||||
/// <param name="instance">The <see cref="RoleBehaviour"/> object.</param>
|
/// <param name="instance">The <see cref="RoleBehaviour"/> object.</param>
|
||||||
/// <param name="taskStringBuilder">The <see cref="StringBuilder"/> to append the task hint to.</param>
|
/// <param name="taskStringBuilder">The <see cref="StringBuilder"/> to append the task hint to.</param>
|
||||||
[HarmonyReversePatch]
|
[HarmonyReversePatch]
|
||||||
[HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.AppendTaskHint), typeof(StringBuilder))]
|
[HarmonyPatch(typeof(RoleBehaviour), nameof(RoleBehaviour.AppendTaskHint), typeof(Il2CppSystem.Text.StringBuilder))]
|
||||||
[MethodImpl(MethodImplOptions.NoInlining)]
|
[MethodImpl(MethodImplOptions.NoInlining)]
|
||||||
public static void AppendTaskHint(RoleBehaviour instance, StringBuilder taskStringBuilder)
|
public static void AppendTaskHint(RoleBehaviour instance, Il2CppSystem.Text.StringBuilder taskStringBuilder)
|
||||||
{
|
{
|
||||||
// nothing needed
|
// nothing needed
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,10 @@ using UnityEngine;
|
|||||||
using UnityEngine.Events;
|
using UnityEngine.Events;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
|
// TODO: for the love of fucking god please add a namespace on the asset bundle AND here - Atony.
|
||||||
|
/*
|
||||||
namespace MiraAPI.Presets;
|
namespace MiraAPI.Presets;
|
||||||
|
*/
|
||||||
|
|
||||||
[RegisterInIl2Cpp]
|
[RegisterInIl2Cpp]
|
||||||
[SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "Unity convention.")]
|
[SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "Unity convention.")]
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
<string name="MiraApi.CustomCategory2">Custom Category 2</string>
|
<string name="MiraApi.CustomCategory2">Custom Category 2</string>
|
||||||
<string name="MiraApi.ModifierMenuDescription">Configure modifiers and their settings here!</string>
|
<string name="MiraApi.ModifierMenuDescription">Configure modifiers and their settings here!</string>
|
||||||
<string name="MiraApi.CustomOptionMenuDescription">Apply game settings for this mod!</string>
|
<string name="MiraApi.CustomOptionMenuDescription">Apply game settings for this mod!</string>
|
||||||
|
<string name="MiraApi.Gamemode">Gamemode</string>
|
||||||
<string name="MiraApi.Gamemode.Classic">Classic</string>
|
<string name="MiraApi.Gamemode.Classic">Classic</string>
|
||||||
<string name="MiraApi.Gamemode.Classic.Description">The classic Among Us experience!
|
<string name="MiraApi.Gamemode.Classic.Description">The classic Among Us experience!
|
||||||
Find the Impostors or deceive the Crew.</string>
|
Find the Impostors or deceive the Crew.</string>
|
||||||
@@ -43,4 +44,15 @@ Outlive the timer or eliminate the crew.</string>
|
|||||||
<string name="MiraApi.ModifierDisplay.Page">Page</string>
|
<string name="MiraApi.ModifierDisplay.Page">Page</string>
|
||||||
<string name="MiraApi.Page">Page</string>
|
<string name="MiraApi.Page">Page</string>
|
||||||
<string name="MiraApi.Main">Main</string>
|
<string name="MiraApi.Main">Main</string>
|
||||||
|
<string name="MiraApi.AbilityType.Basic">Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.Indirect">Indirect Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.Interaction">Interaction Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.Radius">Radius Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.Menu">Menu Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.Meeting">Meeting Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.SelectiveMeeting">Selective Meeting Ability</string>
|
||||||
|
<string name="MiraApi.AbilityType.MeetingMenu">Meeting Menu Ability</string>
|
||||||
|
<string name="Options">Options</string>
|
||||||
|
<string name="MiraApi.Wiki.PlayersTab">Player List</string>
|
||||||
|
<string name="MiraApi.Wiki.SettingsTab">Game Settings</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
After Width: | Height: | Size: 5.8 KiB |
|
After Width: | Height: | Size: 5.0 KiB |
|
After Width: | Height: | Size: 6.0 KiB |
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 6.1 KiB |
|
After Width: | Height: | Size: 5.2 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 5.5 KiB |
|
After Width: | Height: | Size: 6.1 KiB |
|
After Width: | Height: | Size: 5.1 KiB |
|
After Width: | Height: | Size: 6.5 KiB |
|
After Width: | Height: | Size: 6.1 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 6.4 KiB |
|
After Width: | Height: | Size: 6.8 KiB |
|
After Width: | Height: | Size: 8.2 KiB |
|
After Width: | Height: | Size: 8.2 KiB |
|
After Width: | Height: | Size: 8.3 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 4.7 KiB |
|
After Width: | Height: | Size: 4.1 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
|
After Width: | Height: | Size: 4.6 KiB |
|
After Width: | Height: | Size: 3.9 KiB |
|
After Width: | Height: | Size: 3.8 KiB |
|
After Width: | Height: | Size: 3.2 KiB |
@@ -45,6 +45,11 @@ public static class CustomRoleManager
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static IReadOnlyList<RoleBehaviour> CustomRoleBehaviours { get; private set; } = [];
|
public static IReadOnlyList<RoleBehaviour> CustomRoleBehaviours { get; private set; } = [];
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the <see cref="IReadOnlyList{T}"/> of all roles as <see cref="RoleBehaviour"/> objects.
|
||||||
|
/// </summary>
|
||||||
|
public static IReadOnlyList<RoleBehaviour> AllStoredRoleBehaviours { get; private set; } = [];
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the <see cref="IReadOnlyList{T}"/> of custom roles as <see cref="ICustomRole"/> objects.
|
/// Gets the <see cref="IReadOnlyList{T}"/> of custom roles as <see cref="ICustomRole"/> objects.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -77,6 +82,7 @@ public static class CustomRoleManager
|
|||||||
|
|
||||||
CustomRoleBehaviours = [.. CustomRoles.Values];
|
CustomRoleBehaviours = [.. CustomRoles.Values];
|
||||||
CustomMiraRoles = [.. CustomRoles.Values.OfType<ICustomRole>()];
|
CustomMiraRoles = [.. CustomRoles.Values.OfType<ICustomRole>()];
|
||||||
|
AllStoredRoleBehaviours = [.. RoleManager.Instance.AllRoles];
|
||||||
}
|
}
|
||||||
|
|
||||||
internal static void RegisterRoleTypes(List<Type> roles, MiraPluginInfo pluginInfo)
|
internal static void RegisterRoleTypes(List<Type> roles, MiraPluginInfo pluginInfo)
|
||||||
|
|||||||
@@ -1,14 +1,19 @@
|
|||||||
using System;
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using BepInEx.Configuration;
|
using BepInEx.Configuration;
|
||||||
|
using Il2CppInterop.Runtime.Attributes;
|
||||||
using MiraAPI.GameModes;
|
using MiraAPI.GameModes;
|
||||||
using MiraAPI.GameOptions;
|
using MiraAPI.GameOptions;
|
||||||
using MiraAPI.Modifiers;
|
using MiraAPI.Modifiers;
|
||||||
using MiraAPI.PluginLoading;
|
using MiraAPI.PluginLoading;
|
||||||
using MiraAPI.Translation;
|
using MiraAPI.Translation;
|
||||||
using MiraAPI.Utilities;
|
using MiraAPI.Utilities;
|
||||||
|
using MiraAPI.Utilities.Assets;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
using Object = UnityEngine.Object;
|
||||||
|
|
||||||
namespace MiraAPI.Roles;
|
namespace MiraAPI.Roles;
|
||||||
|
|
||||||
@@ -68,9 +73,10 @@ public interface ICustomRole : IOptionable
|
|||||||
string RoleLongDescriptionLocale => MiraLocaleManager.BuildTranslationId(IdPrefix, IdPart, "TabDescription");
|
string RoleLongDescriptionLocale => MiraLocaleManager.BuildTranslationId(IdPrefix, IdPart, "TabDescription");
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the wiki description of the role. Used in the wiki, but not currently required.
|
/// Gets the wiki description of the role. Used in the wiki and normally appends the options text as well.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
string RoleWikiDescription => MiraLocaleManager.Get(RoleWikiDescriptionLocale, RoleLongDescription);
|
string RoleWikiDescription => MiraLocaleManager.Get(RoleWikiDescriptionLocale, RoleLongDescription) +
|
||||||
|
Helpers.GetOptionsText(GetType());
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the role's wiki description id for localization.
|
/// Gets the role's wiki description id for localization.
|
||||||
@@ -326,9 +332,45 @@ public interface ICustomRole : IOptionable
|
|||||||
RoleWikiDescription,
|
RoleWikiDescription,
|
||||||
titleText,
|
titleText,
|
||||||
out var desc);
|
out var desc);
|
||||||
|
var num = 0;
|
||||||
|
if (WikiAbilities.Count != 0)
|
||||||
|
{
|
||||||
|
var grid = Object.Instantiate(parent.Inner, obj.transform);
|
||||||
|
var layoutGroup = grid.GetComponent<GridLayoutGroup>();
|
||||||
|
layoutGroup.startAxis = GridLayoutGroup.Axis.Vertical;
|
||||||
|
layoutGroup.constraint = GridLayoutGroup.Constraint.FixedColumnCount;
|
||||||
|
layoutGroup.spacing = new Vector2(0.75f, 0.4f);
|
||||||
|
grid.DestroyChildren();
|
||||||
|
foreach (var ability in WikiAbilities)
|
||||||
|
{
|
||||||
|
num++;
|
||||||
|
var panel = Object.Instantiate(
|
||||||
|
guide.MatchInfoRolePanelPrefab,
|
||||||
|
grid);
|
||||||
|
panel.roleCount.text = ability.AbilityType;
|
||||||
|
panel.roleCount.transform.localPosition += new Vector3(-0.04f, 0);
|
||||||
|
panel.roleName.text = ability.Name;
|
||||||
|
panel.roleName.transform.localPosition += new Vector3(-0.04f, 0);
|
||||||
|
panel.roleDescription.text = ability.Description;
|
||||||
|
panel.roleDescription.rectTransform.sizeDelta = new Vector2(2.601f, 0.8f);
|
||||||
|
panel.roleDescription.transform.localPosition += new Vector3(0, -0.1f);
|
||||||
|
panel.roleIcon.sprite = ability.Icon.LoadAsset();
|
||||||
|
panel.roleIcon.SetSizeLimit(0.13f);
|
||||||
|
|
||||||
|
panel.roleIcon.material.SetInt(PlayerMaterial.MaskLayer, 50);
|
||||||
|
panel.roleName.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleDescription.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleCount.fontMaterial.SetFloat(panel.STENCIL_NAME, 50f);
|
||||||
|
panel.roleIcon.transform.localScale = new Vector3(3.5f, 3.5f, 1f);
|
||||||
|
}
|
||||||
|
|
||||||
|
grid.localPosition = new Vector3(-3.9f, 1.1f - desc.textBounds.size.y, 0f);
|
||||||
|
grid.localScale = new Vector3(1.3f, 1.3f, 1);
|
||||||
|
}
|
||||||
|
|
||||||
obj.transform.SetParent(parent.Inner.transform);
|
obj.transform.SetParent(parent.Inner.transform);
|
||||||
obj.transform.localPosition = new Vector3(0f, 0f, 0f);
|
obj.transform.localPosition = new Vector3(0f, 0f, 0f);
|
||||||
parent.SetYBoundsMax(Mathf.Clamp(desc.textBounds.size.y - 2, 0f, 999f));
|
parent.SetYBoundsMax(Mathf.Clamp((desc.textBounds.size.y - 2) + (Mathf.Ceil(num / 2f) * 1.45f), 0f, 999f));
|
||||||
return obj;
|
return obj;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -336,4 +378,12 @@ public interface ICustomRole : IOptionable
|
|||||||
/// Gets the function that determines whether the role should be toggled on or off in the game settings.
|
/// Gets the function that determines whether the role should be toggled on or off in the game settings.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
Func<bool> VisibleInSettings => () => true;
|
Func<bool> VisibleInSettings => () => true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the list of abilities or other similar information to display below the text of a role's wiki page.
|
||||||
|
/// </summary>
|
||||||
|
[HideFromIl2Cpp]
|
||||||
|
public List<AdvancedWikiAbilityDescription> WikiAbilities => [];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public record struct AdvancedWikiAbilityDescription(string Name, string AbilityType, string Description, LoadableAsset<Sprite> Icon);
|
||||||
@@ -160,5 +160,150 @@ public static class MiraAssets
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static LoadableResourceAsset ChatOpenSprite { get; } = new("MiraAPI.Resources.NormalChatOpen.png");
|
public static LoadableResourceAsset ChatOpenSprite { get; } = new("MiraAPI.Resources.NormalChatOpen.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for players button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiPlayersButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the players button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiPlayersButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the players button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiPlayersButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarPlayersButtonOpen.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the settings button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiSettingsButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the settings button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiSettingsButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the settings button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiSettingsButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarSettingsButtonOpen.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiRolesButtonHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiRolesButtonIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset WikiRolesButtonOpenSprite { get; } = new("MiraAPI.Resources.Wiki.SidebarRolesButtonOpen.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupCountHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupCountHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupCountIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupCountIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupFactionHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupFactionHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupFactionIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupFactionIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupNoneHoverSprite { get; } = new("MiraAPI.Resources.Wiki.GroupNoneHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset GroupNoneIdleSprite { get; } = new("MiraAPI.Resources.Wiki.GroupNoneIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SearchClearHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SearchClearHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SearchClearIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SearchClearIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SearchIconHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SearchIconHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SearchIconIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SearchIconIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SortingAzHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SortingAzHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SortingAzIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SortingAzIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SortingZaHoverSprite { get; } = new("MiraAPI.Resources.Wiki.SortingZaHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset SortingZaIdleSprite { get; } = new("MiraAPI.Resources.Wiki.SortingZaIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleAllHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleAllHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleAllIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleAllIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleOffHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOffHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleOffIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOffIdle.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleOnHoverSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOnHover.png");
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Gets the sprite used for the roles button while hovering.
|
||||||
|
/// </summary>
|
||||||
|
public static LoadableResourceAsset VisibleOnIdleSprite { get; } = new("MiraAPI.Resources.Wiki.VisibleOnIdle.png");
|
||||||
|
|
||||||
internal static LoadableResourceAsset BlankSprite { get; } = new("MiraAPI.Resources.BlankSprite.png");
|
internal static LoadableResourceAsset BlankSprite { get; } = new("MiraAPI.Resources.BlankSprite.png");
|
||||||
}
|
}
|
||||||
@@ -1,17 +1,24 @@
|
|||||||
using System.Collections;
|
using System;
|
||||||
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using System.Collections.ObjectModel;
|
||||||
using System.Diagnostics.CodeAnalysis;
|
using System.Diagnostics.CodeAnalysis;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
|
using System.Text;
|
||||||
using HarmonyLib;
|
using HarmonyLib;
|
||||||
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
using Il2CppInterop.Runtime.InteropTypes.Arrays;
|
||||||
|
using MiraAPI.GameOptions;
|
||||||
|
using MiraAPI.GameOptions.OptionTypes;
|
||||||
using MiraAPI.Roles;
|
using MiraAPI.Roles;
|
||||||
|
using MiraAPI.Translation;
|
||||||
using MiraAPI.Utilities.Assets;
|
using MiraAPI.Utilities.Assets;
|
||||||
using Rewired;
|
using Rewired;
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using MethodBase = System.Reflection.MethodBase;
|
using MethodBase = System.Reflection.MethodBase;
|
||||||
using Object = UnityEngine.Object;
|
using Object = UnityEngine.Object;
|
||||||
|
using Random = UnityEngine.Random;
|
||||||
|
|
||||||
namespace MiraAPI.Utilities;
|
namespace MiraAPI.Utilities;
|
||||||
|
|
||||||
@@ -20,6 +27,157 @@ namespace MiraAPI.Utilities;
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public static class Helpers
|
public static class Helpers
|
||||||
{
|
{
|
||||||
|
public static ReadOnlyCollection<IModdedOption>? GetModdedOptionsForType(Type classType)
|
||||||
|
{
|
||||||
|
var optionGroups =
|
||||||
|
AccessTools.Field(typeof(ModdedOptionsManager), "Groups").GetValue(null) as List<AbstractOptionGroup>;
|
||||||
|
|
||||||
|
return optionGroups?.FirstOrDefault(x => x.OptionableType == classType)?.Children;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static string GetOptionsText(Type classType)
|
||||||
|
{
|
||||||
|
var options = GetModdedOptionsForType(classType);
|
||||||
|
if (options == null)
|
||||||
|
{
|
||||||
|
return string.Empty;
|
||||||
|
}
|
||||||
|
|
||||||
|
ISummarizedOptions? summaryProvider;
|
||||||
|
IReadOnlySet<StringNames>? hiddenKeys;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var optionGroups =
|
||||||
|
AccessTools.Field(typeof(ModdedOptionsManager), "Groups").GetValue(null) as List<AbstractOptionGroup>;
|
||||||
|
summaryProvider =
|
||||||
|
optionGroups?.FirstOrDefault(x => x.OptionableType == classType) as ISummarizedOptions;
|
||||||
|
hiddenKeys = summaryProvider?.WikiHiddenOptionKeys;
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
summaryProvider = null;
|
||||||
|
hiddenKeys = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
var builder = new StringBuilder();
|
||||||
|
builder.AppendLine(
|
||||||
|
MiraApiPlugin.Culture,
|
||||||
|
$"\n<size=50%> \n</size><b><color=#29D7B5>{MiraLocaleManager.Get("Options")}</color></b>");
|
||||||
|
|
||||||
|
var insertedSummary = false;
|
||||||
|
foreach (var option in options)
|
||||||
|
{
|
||||||
|
if (!insertedSummary && summaryProvider != null && hiddenKeys != null)
|
||||||
|
{
|
||||||
|
StringNames? key = option switch
|
||||||
|
{
|
||||||
|
ModdedToggleOption t => t.StringName,
|
||||||
|
ModdedEnumOption e => e.StringName,
|
||||||
|
ModdedNumberOption n => n.StringName,
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
if (key.HasValue && hiddenKeys.Contains(key.Value))
|
||||||
|
{
|
||||||
|
foreach (var line in summaryProvider.GetWikiOptionSummaryLines())
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrWhiteSpace(line))
|
||||||
|
{
|
||||||
|
builder.AppendLine(line);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
insertedSummary = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
switch (option)
|
||||||
|
{
|
||||||
|
case ModdedToggleOption toggleOption:
|
||||||
|
if (!toggleOption.Visible())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hiddenKeys != null && hiddenKeys.Contains(toggleOption.StringName))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.AppendLine(
|
||||||
|
TranslationController.Instance.GetString(toggleOption.StringName) + ": " +
|
||||||
|
toggleOption.Value);
|
||||||
|
break;
|
||||||
|
/*case ModdedMultiSelectOption<Enum> enumOption:
|
||||||
|
if (!enumOption.Visible())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.AppendLine(enumOption.Title + ": " + enumOption.Values[enumOption.Value]);
|
||||||
|
break;*/
|
||||||
|
case ModdedEnumOption enumOption:
|
||||||
|
if (!enumOption.Visible())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hiddenKeys != null && hiddenKeys.Contains(enumOption.StringName))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
builder.AppendLine(
|
||||||
|
TranslationController.Instance.GetString(enumOption.StringName) + ": " +
|
||||||
|
MiraLocaleManager.Get(
|
||||||
|
enumOption.Values[enumOption.Value],
|
||||||
|
enumOption.Values[enumOption.Value]));
|
||||||
|
break;
|
||||||
|
case ModdedNumberOption numberOption:
|
||||||
|
if (!numberOption.Visible())
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hiddenKeys != null && hiddenKeys.Contains(numberOption.StringName))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var optionStr = numberOption.Data.GetValueString(numberOption.Value);
|
||||||
|
if (optionStr.Contains(".000"))
|
||||||
|
{
|
||||||
|
optionStr = optionStr.Replace(".000", string.Empty);
|
||||||
|
}
|
||||||
|
else if (optionStr.Contains(".00"))
|
||||||
|
{
|
||||||
|
optionStr = optionStr.Replace(".00", string.Empty);
|
||||||
|
}
|
||||||
|
else if (optionStr.Contains(".0"))
|
||||||
|
{
|
||||||
|
optionStr = optionStr.Replace(".0", string.Empty);
|
||||||
|
}
|
||||||
|
|
||||||
|
var title = TranslationController.Instance.GetString(numberOption.StringName);
|
||||||
|
if (numberOption is { NegativeWordValue: not "#", Value: -1 })
|
||||||
|
{
|
||||||
|
builder.AppendLine(title + $": {numberOption.NegativeWordValue}");
|
||||||
|
}
|
||||||
|
else if (numberOption is { ZeroWordValue: not "#", Value: 0 })
|
||||||
|
{
|
||||||
|
builder.AppendLine(title + $": {numberOption.ZeroWordValue}");
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
builder.AppendLine(title + ": " + optionStr);
|
||||||
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return builder.ToString();
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Get all living players.
|
/// Get all living players.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -228,7 +386,7 @@ public static class Helpers
|
|||||||
var popper = HudManager.Instance.Notifier;
|
var popper = HudManager.Instance.Notifier;
|
||||||
var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform);
|
var newMessage = Object.Instantiate(popper.notificationMessageOrigin, Vector3.zero, Quaternion.identity, popper.transform);
|
||||||
newMessage.transform.localPosition = localPos;
|
newMessage.transform.localPosition = localPos;
|
||||||
newMessage.SetUp(text, spr ?? null, color, new System.Action(() => popper.OnMessageDestroy(newMessage)));
|
newMessage.SetUp(text, spr ?? null, color, new Action(() => popper.OnMessageDestroy(newMessage)));
|
||||||
popper.lastMessageKey = -1;
|
popper.lastMessageKey = -1;
|
||||||
popper.ShiftMessages();
|
popper.ShiftMessages();
|
||||||
popper.AddMessageToQueue(newMessage);
|
popper.AddMessageToQueue(newMessage);
|
||||||
@@ -280,9 +438,12 @@ public static class Helpers
|
|||||||
{
|
{
|
||||||
var results = new CppCollections.List<Collider2D>();
|
var results = new CppCollections.List<Collider2D>();
|
||||||
Physics2D.OverlapCircle(source, radius, filter, results);
|
Physics2D.OverlapCircle(source, radius, filter, results);
|
||||||
return [.. results.ToArray()
|
return
|
||||||
.Where(collider2D => collider2D.CompareTag("DeadBody"))
|
[
|
||||||
.Select(collider2D => collider2D.GetComponent<DeadBody>())];
|
.. results.ToArray()
|
||||||
|
.Where(collider2D => collider2D.CompareTag("DeadBody"))
|
||||||
|
.Select(collider2D => collider2D.GetComponent<DeadBody>())
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -299,9 +460,12 @@ public static class Helpers
|
|||||||
{
|
{
|
||||||
var results = new CppCollections.List<Collider2D>();
|
var results = new CppCollections.List<Collider2D>();
|
||||||
Physics2D.OverlapCircle(source, radius, filter, results);
|
Physics2D.OverlapCircle(source, radius, filter, results);
|
||||||
return [.. results.ToArray()
|
return
|
||||||
.Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
|
[
|
||||||
.Select(collider2D => collider2D.GetComponent<T>())];
|
.. results.ToArray()
|
||||||
|
.Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
|
||||||
|
.Select(collider2D => collider2D.GetComponent<T>())
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -320,15 +484,18 @@ public static class Helpers
|
|||||||
|
|
||||||
return !ignoreColliders
|
return !ignoreColliders
|
||||||
? newList
|
? newList
|
||||||
: [.. from player in newList
|
:
|
||||||
let vector = player.GetTruePosition() - source
|
[
|
||||||
let magnitude = vector.magnitude
|
.. from player in newList
|
||||||
where !PhysicsHelpers.AnyNonTriggersBetween(
|
let vector = player.GetTruePosition() - source
|
||||||
source,
|
let magnitude = vector.magnitude
|
||||||
vector.normalized,
|
where !PhysicsHelpers.AnyNonTriggersBetween(
|
||||||
magnitude,
|
source,
|
||||||
Constants.ShipAndObjectsMask)
|
vector.normalized,
|
||||||
select player];
|
magnitude,
|
||||||
|
Constants.ShipAndObjectsMask)
|
||||||
|
select player
|
||||||
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -389,17 +556,16 @@ public static class Helpers
|
|||||||
Constants.ShipAndObjectsMask))
|
Constants.ShipAndObjectsMask))
|
||||||
select playerControl);
|
select playerControl);
|
||||||
|
|
||||||
outputList.Sort(
|
outputList.Sort((a, b) =>
|
||||||
(a, b) =>
|
{
|
||||||
{
|
var magnitude2 = (a.GetTruePosition() - source).magnitude;
|
||||||
var magnitude2 = (a.GetTruePosition() - source).magnitude;
|
var magnitude3 = (b.GetTruePosition() - source).magnitude;
|
||||||
var magnitude3 = (b.GetTruePosition() - source).magnitude;
|
return magnitude2 > magnitude3
|
||||||
return magnitude2 > magnitude3
|
? 1
|
||||||
? 1
|
: magnitude2 < magnitude3
|
||||||
: magnitude2 < magnitude3
|
? -1
|
||||||
? -1
|
: 0;
|
||||||
: 0;
|
});
|
||||||
});
|
|
||||||
return outputList;
|
return outputList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -300,10 +300,7 @@ public static class VotingUtils
|
|||||||
// If modified, these will visually change.
|
// If modified, these will visually change.
|
||||||
votes = @event.Votes;
|
votes = @event.Votes;
|
||||||
|
|
||||||
MeetingHud.Instance.TitleText.text =
|
MeetingHud.Instance.TitleText.text = TranslationController.Instance.GetString(StringNames.MeetingVotingResults);
|
||||||
TranslationController.Instance.GetString(
|
|
||||||
StringNames.MeetingVotingResults,
|
|
||||||
Il2CppSystem.Array.Empty<Il2CppSystem.Object>());
|
|
||||||
|
|
||||||
var delays = new Dictionary<byte, int>();
|
var delays = new Dictionary<byte, int>();
|
||||||
var num = 0;
|
var num = 0;
|
||||||
|
|||||||