Merge branch 'dev' into color-ids

This commit is contained in:
Az committed 2026-11-03 09:14:25 -05:00
commit 6543bcfb97
35 files changed
+154 -51

No files matched your search

+6
View File
@@ -107,3 +107,9 @@ dotnet_diagnostic.S2325.severity = none
# IDE0005: Using directive is unnecessary.
dotnet_diagnostic.IDE0005.severity = warning
# SA1114: Parameter list should follow declaration
dotnet_diagnostic.SA1114.severity = none
# SA1143: Conditional expressions must be formatted consistently
dotnet_diagnostic.SA1143.severity = none
+7 -5
View File
@@ -5,6 +5,8 @@
<DebugType>embedded</DebugType>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<GenerateFullPaths>false</GenerateFullPaths>
<PathMap>$(MSBuildProjectDirectory)=.</PathMap>
<RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
@@ -32,11 +34,11 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.32.0.713" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" PrivateAssets="all" />
<PackageReference Include="Roslynator.Analyzers" Version="*-*" PrivateAssets="all" />
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="*-*" PrivateAssets="all" />
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="*-*" PrivateAssets="all" />
<PackageReference Include="SonarAnalyzer.CSharp" Version="*-*" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="*-*" PrivateAssets="all" />
<AdditionalFiles Include="$(MSBuildThisFileDirectory)/stylecop.json" Link="stylecop.json" Visible="false" />
</ItemGroup>
</Project>
@@ -3,6 +3,7 @@
/// <summary>
/// The event that is invoked when the meeting has ended.
/// </summary>
/// <param name="meetingHud">The meeting hud of the meeting that invoked the event.</param>
public class EndMeetingEvent(MeetingHud meetingHud) : MiraEvent
{
/// <summary>
+1 -1
View File
@@ -94,7 +94,7 @@ public class HideAndSeekMode : AbstractGameMode
AmongUsClient.Instance.GetAllClients(list);
List<NetworkedPlayerInfo> list2 = [.. list.ToArray()
.Where(c => c.Character != null && c.Character.Data != null && !c.Character.Data.Disconnected &&
!c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data)];
!c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data),];
foreach (var networkedPlayerInfo in GameData.Instance.AllPlayers)
{
@@ -17,5 +17,6 @@ public interface ISummarizedOptions
/// Gets summary lines to insert when the first hidden option would have appeared.
/// Lines should already be formatted as "Title: Value".
/// </summary>
/// <returns>The summarisation of the hidden options.</returns>
IEnumerable<string> GetWikiOptionSummaryLines();
}
@@ -9,6 +9,7 @@ namespace MiraAPI.GameOptions;
/// <summary>
/// Component added onto options generated via MiraAPI. This allows developers to hook patches onto options in general, without using a list.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
public class MiraNumberOptionComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
{
@@ -47,7 +47,10 @@ public abstract class ModdedOption<T> : IModdedOption
/// </summary>
public T Value
{
get => Getter != null ? Getter(_value) : _value;
get
{
return Getter != null ? Getter(_value) : _value;
}
protected set
{
if (Setter != null)
+1 -1
View File
@@ -113,7 +113,7 @@ public abstract class CustomPaginableMenu : CustomPhoneMenu<CustomPaginableMenu.
.OrderByDescending(e => e.SortKey.Equals(query, StringComparison.OrdinalIgnoreCase))
.ThenByDescending(e => e.SortKey.StartsWith(query, StringComparison.OrdinalIgnoreCase))
.ThenByDescending(e => e.SortKey.Contains(query, StringComparison.OrdinalIgnoreCase))
.ThenBy(e => e.SortKey, StringComparer.OrdinalIgnoreCase)];
.ThenBy(e => e.SortKey, StringComparer.OrdinalIgnoreCase),];
}
private static int GetTotalPages(int itemCount)
+1
View File
@@ -15,6 +15,7 @@ namespace MiraAPI.Hud;
/// <summary>
/// Component registered in Il2Cpp domain to handle Unity events for custom menus.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
public class CustomPhoneMenuComponent(IntPtr cppPtr) : Minigame(cppPtr)
{
+1 -1
View File
@@ -57,7 +57,7 @@ public abstract class MultiTargetButton<T> : CustomActionButton
Targets = [.. newTargets
.Where(IsTargetValid)
.Take(MaxTargets)];
.Take(MaxTargets),];
Targets.Do(t => SetOutline(t, true));
return base.CanUse() && Targets.Length > 0;
@@ -12,6 +12,8 @@ namespace MiraAPI.LocalSettings;
/// <summary>
/// Represents a <see cref="LocalSettingsTab"/> button.
/// </summary>
/// <param name="text">The text on the button.</param>
/// <param name="onClick">The event that is invoked when the button is clicked.</param>
public class LocalSettingsButton(string text, Action onClick)
{
/// <summary>
@@ -16,6 +16,7 @@ namespace MiraAPI.LocalSettings;
/// <summary>
/// Represents a local settings tab. Gets a button by default.
/// </summary>
/// <param name="config">The config file that this settings tab wraps around.</param>
public abstract class LocalSettingsTab(ConfigFile config)
{
/// <summary>
@@ -39,7 +39,7 @@ public class LocalEnumSetting(
public string[] Values { get; } = values ?? [.. Enum
.GetValues(configEntry.SettingType)
.Cast<Enum>()
.Select(x => x.ToDisplayString())];
.Select(x => x.ToDisplayString()),];
private SpriteRenderer _highlight;
private TextMeshPro _btnText;
@@ -15,9 +15,9 @@ namespace MiraAPI.LocalSettings.SettingTypes;
/// </summary>
/// <param name="tab">The tab to create the setting in.</param>
/// <param name="configEntry">The config entry.</param>
/// <param name="numberRange">The value range.</param>
/// <param name="name">The name of the setting.</param>
/// <param name="description">The description of the setting.</param>
/// <param name="numberRange">The value range.</param>
/// <param name="increment">The increment per click.</param>
/// <param name="suffixType">The suffix used for formatting.</param>
/// <param name="formatString">The format string used for formatting.</param>
@@ -18,10 +18,10 @@ namespace MiraAPI.LocalSettings.SettingTypes;
/// <param name="name">The name of the setting.</param>
/// <param name="description">The description of the setting.</param>
/// <param name="sliderRange">The value range.</param>
/// <param name="displayValue">Should display the value next to the name.</param>
/// <param name="suffixType">The suffix used for formatting.</param>
/// <param name="formatString">The format string used for formatting.</param>
/// <param name="roundValue">Should the value be rounded.</param>
/// <param name="displayValue">Should display the value next to the name.</param>
public class LocalSliderSetting(
Type tab,
ConfigEntryBase configEntry,
+1
View File
@@ -15,6 +15,7 @@ namespace MiraAPI;
/// <summary>
/// Mira API <see cref="ConfigFile"/> Handler.
/// </summary>
/// <param name="config">The config file that the tab wraps around.</param>
public class MiraApiSettings(ConfigFile config) : LocalSettingsTab(config)
{
/// <inheritdoc />
+1
View File
@@ -16,6 +16,7 @@ namespace MiraAPI.Modifiers;
/// <summary>
/// The component for handling <see cref="BaseModifier"/>s.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
[SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "Unity Convention.")]
public class ModifierComponent(IntPtr cppPtr) : MonoBehaviour(cppPtr)
@@ -19,6 +19,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
/// <summary>
/// The code used to display <see cref="BaseModifier"/>s.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
[SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "Unity Convention.")]
public class ModifierDisplayComponent(nint cppPtr) : MonoBehaviour(cppPtr)
@@ -9,6 +9,7 @@ namespace MiraAPI.Modifiers.ModifierDisplay;
/// <summary>
/// The code placed on every <see cref="BaseModifier"/> HUD object. Used to handle updating.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
[SuppressMessage("Style", "IDE0051:Remove unused private members", Justification = "Unity Convention.")]
public class ModifierUiComponent(nint cppPtr) : MonoBehaviour(cppPtr)
@@ -57,7 +57,7 @@ public class AddModifierRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<Mir
}
/// <inheritdoc />
public override void Handle(PlayerControl player, ModifierData data)
public override void Handle(PlayerControl innerNetObject, ModifierData data)
{
var type = ModifierManager.GetModifierType(data.TypeId) ?? throw new InvalidOperationException($"Modifier type not found for ID {data.TypeId}.");
var modifier = data.Args.Length > 0
@@ -65,6 +65,6 @@ public class AddModifierRpc(MiraApiPlugin plugin, uint id) : PlayerCustomRpc<Mir
: Activator.CreateInstance(type) as BaseModifier
?? throw new InvalidOperationException($"Cannot add modifier {type.Name} because it is not a valid modifier.");
modifier.UniqueId = data.UniqueId;
player.AddModifier(modifier);
innerNetObject.AddModifier(modifier);
}
}
+2 -2
View File
@@ -47,9 +47,9 @@ internal sealed class SyncOptionsRpc(MiraApiPlugin plugin, uint id) : PlayerCust
return new MiraOptionNetData(shouldShowNotif, data);
}
public override void Handle(PlayerControl playerControl, MiraOptionNetData data)
public override void Handle(PlayerControl innerNetObject, MiraOptionNetData data)
{
if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
if (AmongUsClient.Instance.HostId != innerNetObject.OwnerId)
{
return;
}
+2 -2
View File
@@ -52,9 +52,9 @@ internal sealed class SyncRoleOptionsRpc(MiraApiPlugin plugin, uint id) : Player
return new MiraOptionNetData(shouldShowNotif, data);
}
public override void Handle(PlayerControl playerControl, MiraOptionNetData data)
public override void Handle(PlayerControl innerNetObject, MiraOptionNetData data)
{
if (AmongUsClient.Instance.HostId != playerControl.OwnerId)
if (AmongUsClient.Instance.HostId != innerNetObject.OwnerId)
{
return;
}
+1 -1
View File
@@ -1238,7 +1238,7 @@ public static class RoleGuidePatches
[
.. _sortMethod is SortingMethod.Alphabetical
? sorted.ThenBy(p => p.GetSortKey(_sortGrouping))
: sorted.ThenByDescending(p => p.GetSortKey(_sortGrouping))
: sorted.ThenByDescending(p => p.GetSortKey(_sortGrouping)),
];
}
+1 -1
View File
@@ -47,7 +47,7 @@ public static class SelectRolesPatch
AmongUsClient.Instance.GetAllClients(list);
List<NetworkedPlayerInfo> list2 = [.. list.ToArray()
.Where(c => c.Character != null && c.Character.Data != null && !c.Character.Data.Disconnected &&
!c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data)];
!c.Character.Data.IsDead).OrderBy(c => c.Id).Select(c => c.Character.Data),];
foreach (var networkedPlayerInfo in GameData.Instance.AllPlayers)
{
+1 -1
View File
@@ -260,7 +260,7 @@ internal static class MeetingHudPatches
{
VoterId = v.Voter,
VotedForId = v.Suspect,
})
}),
]);
__instance.RpcVotingComplete(voterStates, exiled, isTie, @event.OverruledVote, @event.OverruledNonce);
+40 -1
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="MiraApi.TopRightButtonScaleFactor">Factor de Escala de la IU superior derecha</string>
<string name="MiraApi.WikiOnBottomRow">Botón de Wiki debajo de la IU principal</string>
<string name="MiraApi.WikiOnBottomRow">Botón debajo de la IU principal</string>
<string name="Roles">Roles</string>
<string name="Modifier">Modificador</string>
<string name="Modifiers">Modificadores</string>
@@ -40,4 +40,43 @@ Sobrevive al temporizador o elimina a la Tripulación.</string>
<string name="MiraApi.RoleTeam.Impostor.Group">Roles de Impostor</string>
<string name="MiraApi.RoleTeam.Neutral.Group">Roles Neutrales</string>
<string name="MiraApi.RoleTeam.Other">Otros</string>
<string name="MiraApi.MatchInfoGuide">Guía de Partida</string>
<string name="MiraApi.MatchInfoGuideScaleFactor">Factor de Escala de la Guía de Partida</string>
<string name="MiraApi.WikiTabPosition">Posición de la Pestaña de Botones</string>
<string name="MiraApi.WikiTabPosition.LeftSide">Izquierda</string>
<string name="MiraApi.WikiTabPosition.RightSide">Derecha</string>
<string name="MiraApi.WikiTabPosition.Below">Debajo de la IU</string>
<string name="MiraApi.EnableVariableColors">Activar Colores Variables</string>
<string name="MiraApi.Gamemode">Modo de Juego</string>
<string name="MiraApi.ModifierDisplay.Page">Página</string>
<string name="MiraApi.Page">Página</string>
<string name="MiraApi.Main">Principal</string>
<string name="MiraApi.AbilityType.Basic">Habilidad</string>
<string name="MiraApi.AbilityType.Indirect">Habilidad Indirecta</string>
<string name="MiraApi.Wiki.VanillaSettings">Vanilla</string>
<string name="MiraApi.Wiki.SearchResults">Resultados de búsqueda</string>
<string name="MiraApi.Wiki.PreviousPage">Anterior</string>
<string name="MiraApi.Wiki.NextPage">Siguiente</string>
<string name="MiraApi.Wiki.NoResultsFound">Sin resultados</string>
<string name="On">Sí</string>
<string name="Off">No</string>
<string name="Enabled">Activado</string>
<string name="Disabled">Desactivado</string>
<string name="Active">Activo</string>
<string name="Inactive">Inactivo</string>
<string name="Activated">Activado</string>
<string name="Deactivated">Desactivado</string>
<string name="MiraApi.AbilityType.Interaction">Habilidad de Interacción</string>
<string name="MiraApi.AbilityType.Radius">Habilidad de Radio</string>
<string name="MiraApi.AbilityType.Menu">Habilidad de Menú</string>
<string name="MiraApi.AbilityType.Meeting">Habilidad de Reunión</string>
<string name="MiraApi.AbilityType.SelectiveMeeting">Habilidad Selectiva de Reunión</string>
<string name="MiraApi.AbilityType.MeetingMenu">Habilidad de Menú de Reunión</string>
<string name="Options">Opciones</string>
<string name="MiraApi.Wiki.PlayersTab">Lista de Jugadores</string>
<string name="MiraApi.Wiki.SettingsTab">Opciones de Partida</string>
<string name="MiraApi.Wiki.SearchPlaceholder">Buscar...</string>
<string name="MiraApi.Wiki.FilterLabel">Filtrar</string>
<string name="MiraApi.Wiki.GroupingLabel">Agrupar</string>
<string name="MiraApi.Wiki.OrderLabel">Ordenar</string>
</resources>
+11 -11
View File
@@ -1,14 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="MiraApi.TopRightButtonScaleFactor">Échelle de tailles de boutons</string>
<string name="MiraApi.WikiOnBottomRow">Bouton pour le Wiki sous l'interface principale</string>
<string name="Roles">Rôles</string>
<string name="Modifier">Modificateur</string>
<string name="Modifiers">Modificateurs</string>
<string name="MiraApi.RoleTeam.Crewmate">Coéquipier</string>
<string name="MiraApi.RoleTeam.Crewmate.Short">Équipage</string>
<string name="MiraApi.RoleTeam.Impostor">Imposteur</string>
<string name="MiraApi.RoleTeam.Impostor.Short">Impo</string>
<string name="MiraApi.RoleTeam.Neutral">Neutre</string>
<string name="MiraApi.RoleTeam.Neutral.Short">Neutre</string>
<string name="MiraApi.TopRightButtonScaleFactor">Échelle de tailles de boutons</string>
<string name="MiraApi.WikiOnBottomRow">Bouton pour le Wiki sous l'interface principale</string>
<string name="Roles">Rôles</string>
<string name="Modifier">Modificateur</string>
<string name="Modifiers">Modificateurs</string>
<string name="MiraApi.RoleTeam.Crewmate">Coéquipier</string>
<string name="MiraApi.RoleTeam.Crewmate.Short">Équipage</string>
<string name="MiraApi.RoleTeam.Impostor">Imposteur</string>
<string name="MiraApi.RoleTeam.Impostor.Short">Impo</string>
<string name="MiraApi.RoleTeam.Neutral">Neutre</string>
<string name="MiraApi.RoleTeam.Neutral.Short">Neutre</string>
</resources>
+40 -1
View File
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="MiraApi.TopRightButtonScaleFactor">Skala Przycisków w Prawym Górnym</string>
<string name="MiraApi.WikiOnBottomRow">Pokaż Wiki w Dolnym Rzędzie</string>
<string name="MiraApi.WikiOnBottomRow">Pokaż Przycisk w Dolnym Rzędzie</string>
<string name="Roles">Role</string>
<string name="Modifier">Modyfikator</string>
<string name="Modifiers">Modyfikatory</string>
@@ -40,4 +40,43 @@ Przeżyj przez wymagany czas, albo zabij chowających.</string>
<string name="MiraApi.RoleTeam.Impostor.Group">Role Intruzów</string>
<string name="MiraApi.RoleTeam.Neutral.Group">Role Neutralne</string>
<string name="MiraApi.RoleTeam.Other">Inne</string>
<string name="MiraApi.MatchInfoGuide">Informacje O Meczu</string>
<string name="MiraApi.WikiTabPosition.LeftSide">Po Lewo</string>
<string name="MiraApi.WikiTabPosition.RightSide">Po Prawo</string>
<string name="MiraApi.WikiTabPosition.Below">Poniżej UI</string>
<string name="MiraApi.Gamemode">Tryb Gry</string>
<string name="MiraApi.MatchInfoGuideScaleFactor">Skala Menu Z Informacjami O Meczu</string>
<string name="MiraApi.WikiTabPosition">Położenie Przycisków Informacji O Meczu</string>
<string name="MiraApi.ModifierDisplay.Page">Strona</string>
<string name="MiraApi.Page">Strona</string>
<string name="MiraApi.Main">Główne</string>
<string name="MiraApi.AbilityType.Basic">Umiejętność</string>
<string name="MiraApi.AbilityType.Indirect">Umiejętność Pośrednia</string>
<string name="MiraApi.AbilityType.Interaction">Umiejętność Interakcyjna</string>
<string name="MiraApi.AbilityType.Radius">Umiejętność z Zasięgiem</string>
<string name="MiraApi.AbilityType.Menu">Umiejętność z Menu</string>
<string name="MiraApi.AbilityType.Meeting">Umiejętność na Spotkaniu</string>
<string name="MiraApi.AbilityType.SelectiveMeeting">Umiejętność na Spotkaniu z Wyborem</string>
<string name="MiraApi.AbilityType.MeetingMenu">Umiejętność z Menu na Spotkaniu</string>
<string name="Options">Opcję</string>
<string name="MiraApi.Wiki.PlayersTab">Lista Graczy</string>
<string name="MiraApi.Wiki.SettingsTab">Ustawienia Gry</string>
<string name="MiraApi.Wiki.SearchPlaceholder">Wyszukaj...</string>
<string name="MiraApi.Wiki.FilterLabel">Filtruj</string>
<string name="MiraApi.Wiki.OrderLabel">Kolejność</string>
<string name="MiraApi.Wiki.GroupingLabel">Grupuj</string>
<string name="MiraApi.Wiki.VanillaSettings">Vanilla</string>
<string name="MiraApi.Wiki.SearchResults">Wyniki Wyszukiwania</string>
<string name="MiraApi.Wiki.PreviousPage">Poprzednia</string>
<string name="MiraApi.Wiki.NextPage">Następna</string>
<string name="MiraApi.Wiki.NoResultsFound">Brak Wyników</string>
<string name="On">Wł</string>
<string name="Off">Wył</string>
<string name="Enabled">Włączone</string>
<string name="Disabled">Wyłączone</string>
<string name="Active">Aktywne</string>
<string name="Inactive">Nieaktywne</string>
<string name="Activated">Aktywowane</string>
<string name="Deactivated">Dezaktywowane</string>
<string name="MiraApi.EnableVariableColors">Włącz Kolory Zmienne</string>
</resources>
+11 -11
View File
@@ -1,14 +1,14 @@
<?xml version='1.0' encoding='UTF-8'?>
<resources>
<string name="MiraApi.TopRightButtonScaleFactor">Множитель разрешения верх.-правого интерфейса</string>
<string name="MiraApi.WikiOnBottomRow">Кнопка вики под основным интерфейсом</string>
<string name="Roles">Роли</string>
<string name="Modifier">Атрибут</string>
<string name="Modifiers">Атрибуты</string>
<string name="MiraApi.RoleTeam.Crewmate">Член Экипажа</string>
<string name="MiraApi.RoleTeam.Crewmate.Short">Экипаж</string>
<string name="MiraApi.RoleTeam.Impostor">Предатель</string>
<string name="MiraApi.RoleTeam.Impostor.Short">Пред</string>
<string name="MiraApi.RoleTeam.Neutral">Нейтрал</string>
<string name="MiraApi.RoleTeam.Neutral.Short">Нейт</string>
<string name="MiraApi.TopRightButtonScaleFactor">Множитель разрешения верх.-правого интерфейса</string>
<string name="MiraApi.WikiOnBottomRow">Кнопка вики под основным интерфейсом</string>
<string name="Roles">Роли</string>
<string name="Modifier">Атрибут</string>
<string name="Modifiers">Атрибуты</string>
<string name="MiraApi.RoleTeam.Crewmate">Член Экипажа</string>
<string name="MiraApi.RoleTeam.Crewmate.Short">Экипаж</string>
<string name="MiraApi.RoleTeam.Impostor">Предатель</string>
<string name="MiraApi.RoleTeam.Impostor.Short">Пред</string>
<string name="MiraApi.RoleTeam.Neutral">Нейтрал</string>
<string name="MiraApi.RoleTeam.Neutral.Short">Нейт</string>
</resources>
@@ -10,6 +10,7 @@ namespace MiraAPI.Utilities.Assets;
/// A utility class for loading groups of assets from ALL addressable locations.
/// </summary>
/// <typeparam name="T">The type of the asset to be loaded.</typeparam>
/// <param name="key">The asset key.</param>
public class LoadableAddressableAssets<T>(string key)
where T : UnityEngine.Object
{
@@ -7,6 +7,7 @@ namespace MiraAPI.Utilities.Components;
/// <summary>
/// A spinning ring used to indicate that content is loading.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
public class LoadingRing(IntPtr cppPtr) : MonoBehaviour(cppPtr)
{
+2 -2
View File
@@ -147,7 +147,7 @@ internal static class GuideOptionPages
.ThenBy(page => page.GroupPriority)
.ThenBy(page => page.Order)
.ThenBy(page => page.Group.GroupName, StringComparer.OrdinalIgnoreCase)
.ThenBy(page => page.ModAbbreviation, StringComparer.OrdinalIgnoreCase)];
.ThenBy(page => page.ModAbbreviation, StringComparer.OrdinalIgnoreCase),];
}
private static int GetMenuOrder(MenuCategory menu)
@@ -189,7 +189,7 @@ internal static class GuideOptionPages
.Select(entry => (Entry: entry, Rank: Rank(entry, query, cmp)))
.Where(result => result.Rank < int.MaxValue)
.OrderBy(result => result.Rank)
.Select(result => result.Entry))];
.Select(result => result.Entry)),];
}
private static string[] GetModSearchTerms(MiraPluginInfo plugin, AbstractOptionGroup group)
+3 -3
View File
@@ -428,7 +428,7 @@ public static class Helpers
[
.. results.ToArray()
.Where(collider2D => collider2D.CompareTag("DeadBody"))
.Select(collider2D => collider2D.GetComponent<DeadBody>())
.Select(collider2D => collider2D.GetComponent<DeadBody>()),
];
}
@@ -450,7 +450,7 @@ public static class Helpers
[
.. results.ToArray()
.Where(collider2D => colliderTag == null || collider2D.CompareTag(colliderTag))
.Select(collider2D => collider2D.GetComponent<T>())
.Select(collider2D => collider2D.GetComponent<T>()),
];
}
@@ -480,7 +480,7 @@ public static class Helpers
vector.normalized,
magnitude,
Constants.ShipAndObjectsMask)
select player
select player,
];
}
+1
View File
@@ -10,6 +10,7 @@ namespace MiraAPI.Voting;
/// <summary>
/// Handles player votes, and removing/adding additional votes.
/// </summary>
/// <param name="cppPtr">The pointer to the C++ object.</param>
[RegisterInIl2Cpp]
public class PlayerVoteData(nint cppPtr) : MonoBehaviour(cppPtr)
{
+1 -1
View File
@@ -279,7 +279,7 @@ public static class VotingUtils
return
[
.. Helpers.GetAlivePlayers()
.SelectMany(player => player.GetVoteData().Votes)
.SelectMany(player => player.GetVoteData().Votes),
];
}