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 remote-tracking branch 'origin/6.18' into 6.18

Browse Source
This commit is contained in:
XtraCube committed 2024-08-18 00:15:29 -04:00
2 parents bbfcfc89c9 d8cd288e4c
commit 1629e24b28
2 files changed
+21 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

MiraAPI/Patches/Options/RoleSettingMenuPatches.cs
+20 -5
View File
@@ -34,7 +34,7 @@ namespace MiraAPI.Patches.Options
return true;
}
float num = 0.662f;
float num = 0.522f;
__instance.AllButton.transform.parent.gameObject.SetActive(false);
__instance.AllButton.gameObject.SetActive(false);
@@ -46,9 +46,9 @@ namespace MiraAPI.Patches.Options
num -= 0.522f;
int num3 = 0;
foreach (var role in GameSettingMenuPatches.selectedMod.CustomRoles.Where(role => role.Value.TeamType == RoleTeamTypes.Crewmate))
foreach (var role in GameSettingMenuPatches.selectedMod.CustomRoles.Values.OfType<ICustomRole>().Where(role => role.Team == ModdedRoleTeams.Crewmate))
{
CreateQuotaOption(__instance, role.Value, ref num, num3);
CreateQuotaOption(__instance, role as RoleBehaviour, ref num, num3);
num3++;
}
@@ -58,9 +58,24 @@ namespace MiraAPI.Patches.Options
categoryHeaderEditRole2.transform.localPosition = new Vector3(4.986f, num, -2f);
num -= 0.522f;
foreach (var role in GameSettingMenuPatches.selectedMod.CustomRoles.Where(role => role.Value.TeamType == RoleTeamTypes.Impostor))
foreach (var role in GameSettingMenuPatches.selectedMod.CustomRoles.Values.OfType<ICustomRole>().Where(role => role.Team == ModdedRoleTeams.Impostor))
{
CreateQuotaOption(__instance, role.Value, ref num, num3);
CreateQuotaOption(__instance, role as RoleBehaviour, ref num, num3);
num3++;
}
num -= 0.4f;
CategoryHeaderEditRole categoryHeaderEditRole3 = Object.Instantiate(__instance.categoryHeaderEditRoleOrigin, Vector3.zero, Quaternion.identity, __instance.RoleChancesSettings.transform);
categoryHeaderEditRole3.SetHeader(StringNames.None, 20);
categoryHeaderEditRole3.Title.text = "Neutral Roles";
categoryHeaderEditRole3.transform.localPosition = new Vector3(4.986f, num, -2f);
num -= 0.522f;
foreach (var role in GameSettingMenuPatches.selectedMod.CustomRoles.Values.OfType<ICustomRole>().Where(role => role.Team == ModdedRoleTeams.Neutral))
{
CreateQuotaOption(__instance, role as RoleBehaviour, ref num, num3);
num3++;
}
MiraAPI/Patches/Roles/TaskAdderPatch.cs
+1 -1
View File
@@ -32,7 +32,7 @@ public static class TaskAdderPatch
newFolder.gameObject.SetActive(false);
RolesFolder.SubFolders.Add(newFolder);
if (!ModsFolders.ContainsKey(plugin.PluginId))
if (!ModsFolders.ContainsKey(plugin.PluginInfo.Metadata.Name))
{
ModsFolders.Add(plugin.PluginInfo.Metadata.Name, plugin.PluginId);
}