AmongUsMods/MiraAPI
1
0 Fork 0
mirror of https://github.com/All-Of-Us-Mods/MiraAPI.git synced 2026-10-20 01:46:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into commission

Browse Source
This commit is contained in:
XtraCube committed 2025-06-24 12:32:43 -04:00
2 parents 4e314a0a7e 2e5f9639b3
commit 0479ff96b1
2 files changed
+15 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MiraAPI/Patches/Options/LobbyViewPanePatches.cs
+12 -5
View File
@@ -129,8 +129,10 @@ public static class LobbyViewPanePatches
__instance.rolesTabButton.SelectButton(false);
ModifiersTabButton?.SelectButton(true);
var filteredGroups = SelectedMod.InternalOptionGroups
.Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || x.OptionableType?.IsAssignableTo(typeof(BaseModifier))==true));
.Where(x => x.GroupVisible() && (x.ShowInModifiersMenu || (x.OptionableType != null && x.OptionableType.IsAssignableTo(typeof(BaseModifier)))));
DrawOptions(__instance, filteredGroups);
}
@@ -149,7 +151,8 @@ public static class LobbyViewPanePatches
}
var filteredGroups = SelectedMod.InternalOptionGroups
.Where(x => x.OptionableType == null && x.GroupVisible.Invoke());
.Where(x => x is { ShowInModifiersMenu: false, OptionableType: null } && x.GroupVisible());
DrawOptions(__instance, filteredGroups);
return false;
}
@@ -176,12 +179,15 @@ public static class LobbyViewPanePatches
{
var num = 1.44f;
foreach (var group in groups)
var groupArray = groups.Where(x => x.GroupVisible() && x.Options.Any(y => y.Visible())).ToArray();
foreach (var group in groupArray)
{
var categoryHeaderMasked = Object.Instantiate(
menu.categoryHeaderOrigin,
menu.settingsContainer,
true);
categoryHeaderMasked.SetHeader(StringNames.Name, 61);
categoryHeaderMasked.Title.text = group.GroupName;
categoryHeaderMasked.transform.localScale = Vector3.one;
@@ -193,7 +199,7 @@ public static class LobbyViewPanePatches
foreach (var option in group.Options)
{
if (!option.Visible.Invoke())
if (!option.Visible())
{
continue;
}
@@ -202,6 +208,7 @@ public static class LobbyViewPanePatches
menu.infoPanelOrigin,
menu.settingsContainer,
true);
viewSettingsInfoPanel.transform.localScale = Vector3.one;
float num2;
if (i % 2 == 0)
@@ -240,7 +247,7 @@ public static class LobbyViewPanePatches
num -= 0.85f;
}
menu.scrollBar.CalculateAndSetYBounds(menu.settingsInfo.Count + 10, 2f, 6f, 0.85f);
menu.scrollBar.SetYBoundsMax(-num - 2);
}
private static void DrawRolesTab(LobbyViewSettingsPane instance)
MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
+3 -2
View File
@@ -234,6 +234,7 @@ public static class RoleSettingMenuPatches
ScrollerNum -= 0.4f;
}
}
__instance.scrollBar.SetScrollBounds(__instance);
return false;
}
@@ -246,7 +247,7 @@ public static class RoleSettingMenuPatches
return;
}
scroller.CalculateAndSetYBounds(1.5f * Headers.Count + RoleOptionSettings.Count, 1f, 6f, 0.43f);
scroller.SetYBoundsMax(-ScrollerNum - 2);
if (RolePositions.TryGetValue(GameSettingMenuPatches.SelectedModIdx, out var scroll))
{
scroller.Inner.localPosition = scroll;
@@ -367,7 +368,7 @@ public static class RoleSettingMenuPatches
newOpt.Initialize();
}
__instance.scrollBar.CalculateAndSetYBounds(__instance.advancedSettingChildren.Count + 3, 1f, 6f, 0.45f);
__instance.scrollBar.CalculateAndSetYBounds(-num - 2, 1f, 6f, 0.45f);
__instance.scrollBar.ScrollToTop();
}