From 0e02a0215667ebe1953079d741eea3ece4d22980 Mon Sep 17 00:00:00 2001 From: David Higueros <111460331+TheDavSmasher@users.noreply.github.com> Date: Thu, 22 Oct 2026 15:40:20 -0600 Subject: [PATCH 1/2] Changed IModdedOptionList structure to actually allow typed iteration --- .editorconfig | 6 ++++ .../ModdedEnumOptionListAttribute.cs | 12 +++---- .../ModdedNumberOptionListAttribute.cs | 6 ++-- .../OptionList/ModdedOptionListAttribute.cs | 4 +-- .../ModdedPlayerOptionListAttribute.cs | 6 ++-- .../ModdedStringOptionListAttribute.cs | 6 ++-- .../ModdedToggleOptionListAttribute.cs | 6 ++-- MiraAPI/GameOptions/IModdedOption.cs | 35 ++++++++++++++----- MiraAPI/GameOptions/ModdedOptionsManager.cs | 6 ++-- .../OptionTypes/ModdedOptionList.cs | 9 ----- MiraAPI/PluginLoading/MiraPluginManager.cs | 4 +-- 11 files changed, 58 insertions(+), 42 deletions(-) diff --git a/.editorconfig b/.editorconfig index 6daa6a75..20f92823 100644 --- a/.editorconfig +++ b/.editorconfig @@ -104,3 +104,9 @@ dotnet_diagnostic.S1244.severity = none # S2325: Methods and properties that don't access instance data should be static dotnet_diagnostic.S2325.severity = none + +# CA1710: Identifiers should have correct suffix +dotnet_diagnostic.CA1710.severity = silent + +# CA1010: Generic interface should also be implemented +dotnet_diagnostic.CA1010.severity = silent diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedEnumOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedEnumOptionListAttribute.cs index bf2fdf07..55e78a74 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedEnumOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedEnumOptionListAttribute.cs @@ -15,7 +15,7 @@ namespace MiraAPI.GameOptions.Attributes; public class ModdedEnumOptionListAttribute(string title, Type enumType, string[]? values = null) : ModdedOptionListAttribute(title) { - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { var optList = new ModdedOptionList( value.Count, idx => new(GetFormattedTitle(idx), (int)(value[idx] ?? 0), enumType, values)); @@ -25,14 +25,14 @@ public class ModdedEnumOptionListAttribute(string title, Type enumType, string[] /// public override void SetValue(int idx, object value) { - var opt = HolderOptionList?[idx] as ModdedEnumOption; + var opt = HolderOptionList?.ElementAt(idx) as ModdedEnumOption; opt?.SetValue((int)value); } /// public override object GetValue(int idx) { - return HolderOptionList?[idx] is ModdedEnumOption opt + return HolderOptionList?.ElementAt(idx) is ModdedEnumOption opt ? Enum.ToObject(enumType, opt.Value) : throw new InvalidOperationException($"HolderOption for option \"{GetFormattedTitle(idx)}\" with EnumType {enumType.FullName} is not a ModdedEnumOption"); } @@ -49,7 +49,7 @@ public class ModdedEnumOptionListAttribute(string title, string[]? values = n : ModdedOptionListAttribute(title) where T : struct, Enum { - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { var optList = new ModdedOptionList>( value.Count, idx => new(GetFormattedTitle(idx), (T)(value[idx] ?? 0), values)); @@ -59,14 +59,14 @@ public class ModdedEnumOptionListAttribute(string title, string[]? values = n /// public override void SetValue(int idx, object value) { - var opt = HolderOptionList?[idx] as ModdedEnumOption; + var opt = HolderOptionList?.ElementAt(idx) as ModdedEnumOption; opt?.SetValue((T)value); } /// public override object GetValue(int idx) { - return HolderOptionList?[idx] is ModdedEnumOption opt + return HolderOptionList?.ElementAt(idx) is ModdedEnumOption opt ? opt.Value : throw new InvalidOperationException($"HolderOption for option \"{GetFormattedTitle(idx)}\" with EnumType {typeof(T).FullName} is not a ModdedEnumOption<{typeof(T).FullName}>"); } diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs index c393db3e..0ee13d5b 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedNumberOptionListAttribute.cs @@ -53,7 +53,7 @@ public class ModdedNumberOptionListAttribute( { } - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { return new ModdedOptionList(value.Count, idx => { @@ -81,7 +81,7 @@ public class ModdedNumberOptionListAttribute( /// public override void SetValue(int idx, object value) { - if (HolderOptionList?[idx] is not ModdedNumberOption opt) + if (HolderOptionList?.ElementAt(idx) is not ModdedNumberOption opt) return; var final = value switch @@ -95,7 +95,7 @@ public class ModdedNumberOptionListAttribute( /// public override object GetValue(int idx) { - if (HolderOptionList?[idx] is not ModdedNumberOption opt) + if (HolderOptionList?.ElementAt(idx) is not ModdedNumberOption opt) throw new InvalidOperationException($"HolderOption for option \"{GetFormattedTitle(idx)}\" is not a ModdedNumberOption"); var value = opt.Value; diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedOptionListAttribute.cs index d7ef6e6a..2a31b4d5 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedOptionListAttribute.cs @@ -14,7 +14,7 @@ namespace MiraAPI.GameOptions.Attributes; [AttributeUsage(AttributeTargets.Property)] public abstract class ModdedOptionListAttribute(string title) : PropertyOptionAttribute { - internal IModdedOptionList? HolderOptionList { get; set; } + internal IBaseModdedOptionList? HolderOptionList { get; set; } internal IList? Value { get; set; } internal Type ValueType { get; set; } @@ -68,7 +68,7 @@ public abstract class ModdedOptionListAttribute(string title) : PropertyOptionAt /// The value of the option as an object. public abstract object GetValue(int idx); - internal abstract IModdedOptionList? CreateOptionList(IList value, PropertyInfo property); + internal abstract IBaseModdedOptionList? CreateOptionList(IList value, PropertyInfo property); /// /// Gets the formatted with the option's index. diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedPlayerOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedPlayerOptionListAttribute.cs index 533492bb..036b64a0 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedPlayerOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedPlayerOptionListAttribute.cs @@ -16,7 +16,7 @@ public class ModdedPlayerOptionListAttribute( bool allowNone = true) : ModdedOptionListAttribute(title) { - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { return new ModdedOptionList(value.Count, idx => { @@ -27,7 +27,7 @@ public class ModdedPlayerOptionListAttribute( /// public override void SetValue(int idx, object value) { - if (HolderOptionList?[idx] is not ModdedPlayerOption opt) + if (HolderOptionList?.ElementAt(idx) is not ModdedPlayerOption opt) return; var final = value switch @@ -41,7 +41,7 @@ public class ModdedPlayerOptionListAttribute( /// public override object GetValue(int idx) { - if (HolderOptionList?[idx] is not ModdedPlayerOption opt) + if (HolderOptionList?.ElementAt(idx) is not ModdedPlayerOption opt) throw new InvalidOperationException($"HolderOption for option \"{GetFormattedTitle(idx)}\" is not a ModdedPlayerOption"); if (ValueType == typeof(int)) diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedStringOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedStringOptionListAttribute.cs index 78c4b66d..53b9b5ad 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedStringOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedStringOptionListAttribute.cs @@ -17,7 +17,7 @@ public class ModdedStringOptionListAttribute( string[] values) : ModdedOptionListAttribute(title) { - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { return new ModdedOptionList(value.Count, idx => { @@ -28,14 +28,14 @@ public class ModdedStringOptionListAttribute( /// public override void SetValue(int idx, object value) { - var opt = HolderOptionList?[idx] as ModdedStringOption; + var opt = HolderOptionList?.ElementAt(idx) as ModdedStringOption; opt?.SetValue((string)value); } /// public override object GetValue(int idx) { - return HolderOptionList?[idx] is ModdedStringOption opt + return HolderOptionList?.ElementAt(idx) is ModdedStringOption opt ? opt.Value : throw new InvalidOperationException($"HolderOption for option \"{GetFormattedTitle(idx)}\" is not a ModdedStringOption"); } diff --git a/MiraAPI/GameOptions/Attributes/OptionList/ModdedToggleOptionListAttribute.cs b/MiraAPI/GameOptions/Attributes/OptionList/ModdedToggleOptionListAttribute.cs index 9dab9a43..eff26c28 100644 --- a/MiraAPI/GameOptions/Attributes/OptionList/ModdedToggleOptionListAttribute.cs +++ b/MiraAPI/GameOptions/Attributes/OptionList/ModdedToggleOptionListAttribute.cs @@ -27,7 +27,7 @@ public class ModdedToggleOptionListAttribute( { } - internal override IModdedOptionList CreateOptionList(IList value, PropertyInfo property) + internal override IBaseModdedOptionList CreateOptionList(IList value, PropertyInfo property) { var optList = new ModdedOptionList( value.Count, idx => new(GetFormattedTitle(idx), (bool)(value[idx] ?? false), on, off)); @@ -37,14 +37,14 @@ public class ModdedToggleOptionListAttribute( /// public override void SetValue(int idx, object value) { - var opt = HolderOptionList?[idx] as ModdedToggleOption; + var opt = HolderOptionList?.ElementAt(idx) as ModdedToggleOption; opt?.SetValue((bool)value); } /// public override object GetValue(int idx) { - return HolderOptionList?[idx] is ModdedToggleOption opt + return HolderOptionList?.ElementAt(idx) is ModdedToggleOption opt ? opt.Value : throw new InvalidOperationException($"Holder option for {GetFormattedTitle(idx)} is not a ModdedToggleOption."); } diff --git a/MiraAPI/GameOptions/IModdedOption.cs b/MiraAPI/GameOptions/IModdedOption.cs index a40c9460..344e2b38 100644 --- a/MiraAPI/GameOptions/IModdedOption.cs +++ b/MiraAPI/GameOptions/IModdedOption.cs @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Collections.Generic; using BepInEx.Configuration; using MiraAPI.Networking; @@ -143,9 +144,11 @@ public interface IModdedOption } /// -/// Interface for list of modded options. +/// Base interface for list of modded options. +/// +/// Do not implement directly, implement or instead. /// -public interface IModdedOptionList : IReadOnlyList +public interface IBaseModdedOptionList : IEnumerable { /// /// Gets the function to name the keys of the individual options in the configuration file. @@ -153,18 +156,34 @@ public interface IModdedOptionList : IReadOnlyList /// Return to use the default of the property's name with its index appended. /// Func? ConfigName { get; init; } + + /// + int Count { get; } + + /// + IModdedOption ElementAt(int index); +} + +/// +/// Interface for list of modded options. +/// +public interface IModdedOptionList : IBaseModdedOptionList, IReadOnlyList +{ + IModdedOption IBaseModdedOptionList.ElementAt(int index) + { + return this[index]; + } } /// /// Interface for list of options. /// /// The type of . -public interface IModdedOptionList : IModdedOptionList +public interface IModdedOptionList : IBaseModdedOptionList, IReadOnlyList where T : IModdedOption { - /// - new T this[int index] { get; } - - /// - new IEnumerator GetEnumerator(); + IModdedOption IBaseModdedOptionList.ElementAt(int index) + { + return this[index]; + } } diff --git a/MiraAPI/GameOptions/ModdedOptionsManager.cs b/MiraAPI/GameOptions/ModdedOptionsManager.cs index 0fb10bb3..2641f706 100644 --- a/MiraAPI/GameOptions/ModdedOptionsManager.cs +++ b/MiraAPI/GameOptions/ModdedOptionsManager.cs @@ -217,7 +217,7 @@ public static class ModdedOptionsManager return; } - if (property.GetValue(group) is not IModdedOptionList optionList) + if (property.GetValue(group) is not IBaseModdedOptionList optionList) { Error($"Failed to get option list for {property.Name}"); return; @@ -227,7 +227,7 @@ public static class ModdedOptionsManager for (var i = 0; i < optionList.Count; i++) { - RegisterOption(optionList[i], group, configName(i), pluginInfo); + RegisterOption(optionList.ElementAt(i), group, configName(i), pluginInfo); } } @@ -324,7 +324,7 @@ public static class ModdedOptionsManager for (var i = 0; i < optionList.Count; i++) { - var option = optionList[i]; + var option = optionList.ElementAt(i); if (visibilityFactory != null) option.Visible = (Func)(visibilityFactory(i) ?? DelegateUtilities.AlwaysTrue); diff --git a/MiraAPI/GameOptions/OptionTypes/ModdedOptionList.cs b/MiraAPI/GameOptions/OptionTypes/ModdedOptionList.cs index 6e9e9ad3..4928e580 100644 --- a/MiraAPI/GameOptions/OptionTypes/ModdedOptionList.cs +++ b/MiraAPI/GameOptions/OptionTypes/ModdedOptionList.cs @@ -62,13 +62,4 @@ public class ModdedOptionList : IModdedOptionList { return Options.GetEnumerator(); } - - /// - IEnumerator IEnumerable.GetEnumerator() - { - return ((IEnumerable)Options).GetEnumerator(); - } - - /// - IModdedOption IReadOnlyList.this[int index] => this[index]; } diff --git a/MiraAPI/PluginLoading/MiraPluginManager.cs b/MiraAPI/PluginLoading/MiraPluginManager.cs index f021c3fc..2874c7d9 100644 --- a/MiraAPI/PluginLoading/MiraPluginManager.cs +++ b/MiraAPI/PluginLoading/MiraPluginManager.cs @@ -328,7 +328,7 @@ public sealed class MiraPluginManager continue; } - if (property.PropertyType.IsAssignableTo(typeof(IModdedOptionList))) + if (property.PropertyType.IsAssignableTo(typeof(IBaseModdedOptionList))) { ModdedOptionsManager.RegisterPropertyOptionList(type, property, pluginInfo); continue; @@ -349,7 +349,7 @@ public sealed class MiraPluginManager } foreach (var field in type.GetFields() - .Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption)) || f.FieldType.IsAssignableTo(typeof(IModdedOptionList)))) + .Where(f => f.FieldType.IsAssignableTo(typeof(IModdedOption)) || f.FieldType.IsAssignableTo(typeof(IBaseModdedOptionList)))) { Error($"{field.Name} is a field, not a property. Use properties for options."); } From 3c8a841866be07564f839301b8396b41a02c77a3 Mon Sep 17 00:00:00 2001 From: Az <56699741+AlchlcDvl@users.noreply.github.com> Date: Tue, 10 Nov 2026 10:28:10 -0500 Subject: [PATCH 2/2] patch cleanup --- MiraAPI/Patches/RoleGuidePatches.cs | 169 ++++++++++++---------------- 1 file changed, 73 insertions(+), 96 deletions(-) diff --git a/MiraAPI/Patches/RoleGuidePatches.cs b/MiraAPI/Patches/RoleGuidePatches.cs index f7a28caf..ddb814f9 100644 --- a/MiraAPI/Patches/RoleGuidePatches.cs +++ b/MiraAPI/Patches/RoleGuidePatches.cs @@ -88,6 +88,8 @@ public static class RoleGuidePatches private static bool IsModifiersTabActive => ActiveGuideTabIndex == ModifiersTabIndex; + private static readonly PropertyInfo? CaretYOffset = typeof(TextBoxTMP).GetProperty("caretYOffset", BindingFlags.Instance | BindingFlags.Public); + [HarmonyPostfix] [HarmonyPriority(Priority.First)] [HarmonyPatch(typeof(MatchInfoGuide), nameof(MatchInfoGuide.CreateNormalModeSettings))] @@ -214,16 +216,6 @@ public static class RoleGuidePatches Coroutines.Start(CoPreload(__instance)); } - public static void TriggerPreload(MatchInfoGuide instance) - { - if (!instance || _populate != null) - { - return; - } - - Coroutines.Start(CoPreload(instance)); - } - private static IEnumerator CoPreload(MatchInfoGuide instance) { while (instance && (!HudManager.InstanceExists || !GameManager.Instance)) @@ -765,8 +757,7 @@ public static class RoleGuidePatches modifier.ModifierCategoryTitle, modifier.ParentMod.MiraPlugin.GetAbbreviatedModName(), null, - modifier, - modifier.TypeId)); + modifier)); } } @@ -802,8 +793,7 @@ public static class RoleGuidePatches roleBehaviour.GetCategoryTitle(), modId, roleBehaviour, - null, - (uint)roleBehaviour.Role)); + null)); } _roleEntriesMode = activeModeType; @@ -834,16 +824,14 @@ public static class RoleGuidePatches private static float GetCaretYOffset(TextBoxTMP box) { + if (CaretYOffset == null) + { + return 0f; + } + try { - var prop = typeof(TextBoxTMP).GetProperty("caretYOffset", BindingFlags.Instance | BindingFlags.Public); - - if (prop == null) - { - return 0f; - } - - return Convert.ToSingle(prop.GetValue(box), CultureInfo.InvariantCulture); + return Convert.ToSingle(CaretYOffset.GetValue(box), CultureInfo.InvariantCulture); } catch { @@ -960,14 +948,13 @@ public static class RoleGuidePatches } } - private sealed class DetailedPanel(string title, string category, string modId, RoleBehaviour? role, GameModifier? modifier, uint typeId) + private sealed class DetailedPanel(string title, string category, string modId, RoleBehaviour? role, GameModifier? modifier) { public string Title => title; public string Category => category; public string ModId => modId; public RoleBehaviour? Role => role; public GameModifier? Modifier => modifier; - public uint TypeId => typeId; public MatchInfoRolePanel? Panel { get; set; } public int Amount { get; set; } public int Chance { get; set; } @@ -1004,12 +991,12 @@ public static class RoleGuidePatches private static void UpdateSpinner() { - if (_loadingSpinner != null) - { - _loadingSpinner.gameObject.SetActive( - _loading && ActiveGuideTabIndex is RolesTabIndex or ModifiersTabIndex && - !(_wikiScroller && _wikiScroller.gameObject.activeSelf)); - } + if (_loadingSpinner == null) + return; + + _loadingSpinner.gameObject.SetActive( + _loading && ActiveGuideTabIndex is RolesTabIndex or ModifiersTabIndex && + !(_wikiScroller && _wikiScroller.gameObject.activeSelf)); } private static float GetGridScrollBounds(int count) @@ -1074,14 +1061,16 @@ public static class RoleGuidePatches foreach (var item in collection) { action(item); - if (timer.ElapsedMilliseconds > budget) + if (timer.ElapsedMilliseconds <= budget) { - timer.Restart(); - yield return null; - if (!_guide) - { - yield break; - } + continue; + } + + timer.Restart(); + yield return null; + if (!_guide) + { + yield break; } } } @@ -1188,15 +1177,17 @@ public static class RoleGuidePatches { ComputeCounts(entry); entry.Visible = entry.CanShow && MatchesSearch(entry, searchText); - if (entry.Panel) + if (!entry.Panel) { - dynamic entryType = entry.Modifier != null ? entry.Modifier : entry.Role!; - var text = GetPanelCountText(entryType, entry.Amount, entry.Chance, entry.ModId); - SetPanelCount(entry.Panel!, text); - if (!entry.Visible && entry.Panel!.gameObject.activeSelf) - { - entry.Panel.gameObject.SetActive(false); - } + continue; + } + + dynamic entryType = entry.Modifier != null ? entry.Modifier : entry.Role!; + var text = GetPanelCountText(entryType, entry.Amount, entry.Chance, entry.ModId); + SetPanelCount(entry.Panel!, text); + if (!entry.Visible && entry.Panel!.gameObject.activeSelf) + { + entry.Panel.gameObject.SetActive(false); } } @@ -1244,7 +1235,6 @@ public static class RoleGuidePatches var activeModifiers = GetActiveModifiers(); var comparisons = activeModifiers.Select(x => x.TypeId).ToList(); comparisons.AddRange(GetActiveRoles().Select(x => (uint)x.Role)); - return comparisons; } @@ -1450,26 +1440,20 @@ public static class RoleGuidePatches { if (hover) { - switch (value) + return value switch { - case SortingFilter.AllRoles: - return MiraAssets.VisibleAllHoverSprite; - case SortingFilter.DisabledOnly: - return MiraAssets.VisibleOffHoverSprite; - default: - return MiraAssets.VisibleOnHoverSprite; - } + SortingFilter.AllRoles => MiraAssets.VisibleAllHoverSprite, + SortingFilter.DisabledOnly => MiraAssets.VisibleOffHoverSprite, + _ => MiraAssets.VisibleOnHoverSprite, + }; } - switch (value) + return value switch { - case SortingFilter.AllRoles: - return MiraAssets.VisibleAllIdleSprite; - case SortingFilter.DisabledOnly: - return MiraAssets.VisibleOffIdleSprite; - default: - return MiraAssets.VisibleOnIdleSprite; - } + SortingFilter.AllRoles => MiraAssets.VisibleAllIdleSprite, + SortingFilter.DisabledOnly => MiraAssets.VisibleOffIdleSprite, + _ => MiraAssets.VisibleOnIdleSprite, + }; } public static void SwitchMethod() @@ -1535,26 +1519,20 @@ public static class RoleGuidePatches { if (hover) { - switch (value) + return value switch { - case SortingGroups.Faction: - return MiraAssets.GroupFactionHoverSprite; - case SortingGroups.AmountChance: - return MiraAssets.GroupCountHoverSprite; - default: - return MiraAssets.GroupNoneHoverSprite; - } + SortingGroups.Faction => MiraAssets.GroupFactionHoverSprite, + SortingGroups.AmountChance => MiraAssets.GroupCountHoverSprite, + _ => MiraAssets.GroupNoneHoverSprite, + }; } - switch (value) + return value switch { - case SortingGroups.Faction: - return MiraAssets.GroupFactionIdleSprite; - case SortingGroups.AmountChance: - return MiraAssets.GroupCountIdleSprite; - default: - return MiraAssets.GroupNoneIdleSprite; - } + SortingGroups.Faction => MiraAssets.GroupFactionIdleSprite, + SortingGroups.AmountChance => MiraAssets.GroupCountIdleSprite, + _ => MiraAssets.GroupNoneIdleSprite, + }; } private static void CopyTextLayout(TextMeshPro source, TextMeshPro target) @@ -1597,7 +1575,7 @@ public static class RoleGuidePatches passiveButton.ClickSound = HudManager.Instance.MapButton.ClickSound; passiveButton.OnMouseOver = new UnityEvent(); passiveButton.OnMouseOver.AddListener( - (UnityAction)(() => { panel.roleIcon.color = new Color32(255, 255, 255, 150); })); + (UnityAction)(() => panel.roleIcon.color = new Color32(255, 255, 255, 150))); passiveButton.OnMouseOut = new UnityEvent(); passiveButton.OnMouseOut.AddListener((UnityAction)(() => { panel.roleIcon.color = Color.white; })); @@ -1724,12 +1702,10 @@ public static class RoleGuidePatches var roles = GetActiveRoles().Shuffle().ToList(); foreach (var role in roles) { - if (role.RoleIconSolid == null) + if (role.RoleIconSolid != null) { - continue; + return role.RoleIconSolid; } - - return role.RoleIconSolid; } return GetRandomFactionIcon(); @@ -1920,7 +1896,7 @@ public static class RoleGuidePatches modId); } - private static string GetPanelCountText(BaseModifier modifier, int amount, int chance, string modId) + private static string GetPanelCountText(GameModifier modifier, int amount, int chance, string modId) { return modifier.GetAmountText(amount, chance, modId); } @@ -2054,12 +2030,10 @@ public static class RoleGuidePatches private static void EnterSettingsTab() { - if (!_uiInitialized) + if (_uiInitialized) { - return; + RefreshSettingsTab(true); } - - RefreshSettingsTab(true); } private static void LeaveSettingsTab() @@ -2285,16 +2259,19 @@ public static class RoleGuidePatches private static void UpdateSettingsTitle() { - if (_titleText && IsSettingsTabActive) + if (!_titleText || !IsSettingsTabActive) { - _titleText.text = GetSettingsTitle(); - if (_titleIcon) - { - _titleIcon.sprite = GetSettingsIcon(); - - _titleIcon.SetSizeLimit(0.55f); - } + return; } + + _titleText.text = GetSettingsTitle(); + if (!_titleIcon) + { + return; + } + + _titleIcon.sprite = GetSettingsIcon(); + _titleIcon.SetSizeLimit(0.55f); } ///