Merge remote-tracking branch 'origin/feat-addressables-2' into feat-addressables-2

MiraAPI/Patches/Menu/HatsTabPatches.cs

@@ -16,6 +16,7 @@ namespace MiraAPI.Patches.Menu;
 public static class HatsTabPatches
 {
     private static SortedList<string, List<HatData>> sortedHats = [];
+    private static int currentPage;
 
     [HarmonyPatch(nameof(HatsTab.OnEnable))]
     [HarmonyPrefix]
@@ -35,12 +36,31 @@ public static class HatsTabPatches
             }
         }
 
-        GenerateHats(__instance);
+        GenerateHats(__instance, currentPage);
 
         return false;
     }
 
-    private static void GenerateHats(HatsTab __instance)
+    [HarmonyPatch(typeof(HatsTab), nameof(HatsTab.Update))]
+    [HarmonyPrefix]
+
+    public static void UpdatePrefix(HatsTab __instance)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
+        {
+            currentPage--;
+            currentPage = currentPage < 0 ? sortedHats.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
+        {
+            currentPage++;
+            currentPage = currentPage > sortedHats.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+    }
+
+    private static void GenerateHats(HatsTab __instance, int page)
     {
         foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
         __instance.ColorChips.Clear();
@@ -50,31 +70,28 @@ public static class HatsTabPatches
 
         int hatIndex = 0;
 
-        foreach ((string groupName, List<HatData> hats) in sortedHats)
-        {
-            hatIndex = (hatIndex + 4) / 5 * 5; // yes it looks redundant, but consider hatindex = 0, symbolically it would be 4, the computer calculates 0.
-            var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.enabled = true;
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.EnableStencilMasking();
-            text.text = $"{groupName}";
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-            float xLerp = __instance.XRange.Lerp(0.5f);
-            float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
+        var (groupName, hats) = sortedHats.ToArray()[page];
+        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
+        text.enabled = true;
+        text.gameObject.transform.localScale = Vector3.one;
+        text.GetComponent<TextTranslatorTMP>().Destroy();
+        text.EnableStencilMasking();
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.alignment = TextAlignmentOptions.Center;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
+        text.fontSizeMin = 0f;
+        float xLerp = __instance.XRange.Lerp(0.5f);
+        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
 
-            hatIndex += 5;
-            foreach (var hat in hats.OrderBy(HatManager.Instance.allHats.IndexOf))
-            {
-                float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-                GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), hat);
-                hatIndex += 1;
-            }
+        hatIndex += 5;
+        foreach (var hat in hats.OrderBy(HatManager.Instance.allHats.IndexOf))
+        {
+            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
+            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), hat);
+            hatIndex += 1;
         }
 
         __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;

MiraAPI/Patches/Menu/NameplatesTabPatches.cs

@@ -16,7 +16,7 @@ namespace MiraAPI.Patches.Menu;
 public static class NameplatesTabPatches
 {
     private static readonly SortedList<string, List<NamePlateData>> SortedNameplates = new(new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture));
-
+    private static int currentPage;
     internal static void AddRange(IEnumerable<(string Key, NamePlateData Visor)> data)
     {
         foreach (var item in data)
@@ -33,12 +33,31 @@ public static class NameplatesTabPatches
         __instance.plateId = HatManager.Instance.GetNamePlateById(DataManager.Player.Customization.namePlate).ProdId;
 
         if (!SortedNameplates.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedNamePlates().Select(x => ("Vanilla", x)));
-        GenerateHats(__instance);
+        GenerateHats(__instance, currentPage);
 
         return false;
     }
 
-    private static void GenerateHats(NameplatesTab __instance)
+    [HarmonyPatch(typeof(NameplatesTab), nameof(NameplatesTab.Update))]
+    [HarmonyPrefix]
+
+    public static void UpdatePrefix(NameplatesTab __instance)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
+        {
+            currentPage--;
+            currentPage = currentPage < 0 ? SortedNameplates.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
+        {
+            currentPage++;
+            currentPage = currentPage > SortedNameplates.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+    }
+
+    private static void GenerateHats(NameplatesTab __instance, int page)
     {
         foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
         __instance.ColorChips.Clear();
@@ -48,31 +67,28 @@ public static class NameplatesTabPatches
 
         int hatIndex = 0;
 
-        foreach ((string groupName, List<NamePlateData> visors) in SortedNameplates)
-        {
-            hatIndex = (hatIndex + 1) / 2 * 2; // yes it looks redundant, but consider hatindex = 0, symbolically it would be 4, the computer calculates 0.
-            var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.enabled = true;
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.EnableStencilMasking();
-            text.text = $"{groupName}";
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-            float xLerp = __instance.XRange.Lerp(0.5f);
-            float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
+        var (groupName, nameplates) = SortedNameplates.ToArray()[page];
+        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
+        text.enabled = true;
+        text.gameObject.transform.localScale = Vector3.one;
+        text.GetComponent<TextTranslatorTMP>().Destroy();
+        text.EnableStencilMasking();
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.alignment = TextAlignmentOptions.Center;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
+        text.fontSizeMin = 0f;
+        float xLerp = __instance.XRange.Lerp(0.5f);
+        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
 
-            hatIndex += 2;
-            foreach (var visor in visors.OrderBy(HatManager.Instance.allNamePlates.IndexOf))
-            {
-                float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-                GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
-                hatIndex += 1;
-            }
+        hatIndex += 2;
+        foreach (var visor in nameplates.OrderBy(HatManager.Instance.allNamePlates.IndexOf))
+        {
+            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
+            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
+            hatIndex += 1;
         }
 
         __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;

MiraAPI/Patches/Menu/SkinsTabPatches.cs

@@ -16,6 +16,7 @@ namespace MiraAPI.Patches.Menu;
 public static class SkinsTabPatches
 {
     private static SortedList<string, List<SkinData>> sortedSkins = [];
+    private static int currentPage;
 
     [HarmonyPatch(nameof(SkinsTab.OnEnable))]
     [HarmonyPrefix]
@@ -35,12 +36,31 @@ public static class SkinsTabPatches
             }
         }
 
-        GenerateHats(__instance);
+        GenerateHats(__instance, currentPage);
 
         return false;
     }
 
-    private static void GenerateHats(SkinsTab __instance)
+    [HarmonyPatch(typeof(SkinsTab), nameof(SkinsTab.Update))]
+    [HarmonyPrefix]
+
+    public static void UpdatePrefix(SkinsTab __instance)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
+        {
+            currentPage--;
+            currentPage = currentPage < 0 ? sortedSkins.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
+        {
+            currentPage++;
+            currentPage = currentPage > sortedSkins.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+    }
+
+    private static void GenerateHats(SkinsTab __instance, int page)
     {
         foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
         __instance.ColorChips.Clear();
@@ -50,31 +70,28 @@ public static class SkinsTabPatches
 
         int hatIndex = 0;
 
-        foreach ((string groupName, List<SkinData> skins) in sortedSkins)
-        {
-            hatIndex = (hatIndex + 4) / 5 * 5; // yes it looks redundant, but consider hatindex = 0, symbolically it would be 4, the computer calculates 0.
-            var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.enabled = true;
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.EnableStencilMasking();
-            text.text = $"{groupName}";
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-            float xLerp = __instance.XRange.Lerp(0.5f);
-            float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
+        var (groupName, skins) = sortedSkins.ToArray()[page];
+        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
+        text.enabled = true;
+        text.gameObject.transform.localScale = Vector3.one;
+        text.GetComponent<TextTranslatorTMP>().Destroy();
+        text.EnableStencilMasking();
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.alignment = TextAlignmentOptions.Center;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
+        text.fontSizeMin = 0f;
+        float xLerp = __instance.XRange.Lerp(0.5f);
+        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
 
-            hatIndex += 5;
-            foreach (var skin in skins.OrderBy(HatManager.Instance.allSkins.IndexOf))
-            {
-                float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-                GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), skin);
-                hatIndex += 1;
-            }
+        hatIndex += 5;
+        foreach (var skin in skins.OrderBy(HatManager.Instance.allSkins.IndexOf))
+        {
+            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
+            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), skin);
+            hatIndex += 1;
         }
 
         __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;

MiraAPI/Patches/Menu/VisorsTabPatches.cs

@@ -15,7 +15,7 @@ namespace MiraAPI.Patches.Menu;
 public static class VisorsTabPatches
 {
     private static readonly SortedList<string, List<VisorData>> SortedVisors = new(new ControllableComparer<string>(["vanilla"], [], StringComparer.InvariantCulture));
-
+    private static int currentPage;
     internal static void AddRange(IEnumerable<(string Key, VisorData Visor)> data)
     {
         foreach (var item in data)
@@ -32,12 +32,31 @@ public static class VisorsTabPatches
         __instance.visorId = HatManager.Instance.GetVisorById(DataManager.Player.Customization.Visor).ProdId;
 
         if (!SortedVisors.ContainsKey("Vanilla")) AddRange(DestroyableSingleton<HatManager>.Instance.GetUnlockedVisors().Select(x => ("Vanilla", x)));
-        GenerateHats(__instance);
+        GenerateHats(__instance, currentPage);
 
         return false;
     }
 
-    private static void GenerateHats(VisorsTab __instance)
+    [HarmonyPatch(typeof(VisorsTab), nameof(VisorsTab.Update))]
+    [HarmonyPrefix]
+
+    public static void UpdatePrefix(VisorsTab __instance)
+    {
+        if (Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl) || Input.GetKeyDown(KeyCode.LeftArrow))
+        {
+            currentPage--;
+            currentPage = currentPage < 0 ? SortedVisors.Count - 1 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+        else if (Input.GetKeyDown(KeyCode.Tab) || Input.GetKeyDown(KeyCode.RightArrow))
+        {
+            currentPage++;
+            currentPage = currentPage > SortedVisors.Count - 1 ? 0 : currentPage;
+            GenerateHats(__instance, currentPage);
+        }
+    }
+
+    private static void GenerateHats(VisorsTab __instance, int page)
     {
         foreach (ColorChip instanceColorChip in __instance.ColorChips) instanceColorChip.gameObject.Destroy();
         __instance.ColorChips.Clear();
@@ -47,31 +66,28 @@ public static class VisorsTabPatches
 
         int hatIndex = 0;
 
-        foreach ((string groupName, List<VisorData> visors) in SortedVisors)
-        {
-            hatIndex = (hatIndex + 4) / 5 * 5; // yes it looks redundant, but consider hatindex = 0, symbolically it would be 4, the computer calculates 0.
-            var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
-            text.enabled = true;
-            text.gameObject.transform.localScale = Vector3.one;
-            text.GetComponent<TextTranslatorTMP>().Destroy();
-            text.EnableStencilMasking();
-            text.text = $"{groupName}";
-            text.alignment = TextAlignmentOptions.Center;
-            text.fontSize = 3f;
-            text.fontSizeMax = 3f;
-            text.fontSizeMin = 0f;
-            float xLerp = __instance.XRange.Lerp(0.5f);
-            float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-            text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
+        var (groupName, visors) = SortedVisors.ToArray()[page];
+        var text = Object.Instantiate(groupNameText, __instance.scroller.Inner);
+        text.enabled = true;
+        text.gameObject.transform.localScale = Vector3.one;
+        text.GetComponent<TextTranslatorTMP>().Destroy();
+        text.EnableStencilMasking();
+        text.text = $"{groupName}\nPress Ctrl or Tab to cycle pages";
+        text.alignment = TextAlignmentOptions.Center;
+        text.fontSize = 3f;
+        text.fontSizeMax = 3f;
+        text.fontSizeMin = 0f;
+        float xLerp = __instance.XRange.Lerp(0.5f);
+        float yLerp = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+        text.transform.localPosition = new Vector3(xLerp, yLerp, -1f);
 
-            hatIndex += 5;
-            foreach (var visor in visors.OrderBy(HatManager.Instance.allVisors.IndexOf))
-            {
-                float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
-                float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
-                GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
-                hatIndex += 1;
-            }
+        hatIndex += 5;
+        foreach (var visor in visors.OrderBy(HatManager.Instance.allVisors.IndexOf))
+        {
+            float hatXposition = __instance.XRange.Lerp(hatIndex % __instance.NumPerRow / (__instance.NumPerRow - 1f));
+            float hatYposition = __instance.YStart - hatIndex / __instance.NumPerRow * __instance.YOffset;
+            GenerateColorChip(__instance, new Vector2(hatXposition, hatYposition), visor);
+            hatIndex += 1;
         }
 
         __instance.scroller.ContentYBounds.max = -(__instance.YStart - (hatIndex + 1) / __instance.NumPerRow * __instance.YOffset) - 3f;

MiraAPI/Patches/Modifiers/EndGameDidWinPatch.cs

@@ -2,13 +2,15 @@
 using HarmonyLib;
 using MiraAPI.Modifiers;
 using MiraAPI.Modifiers.Types;
+using MiraAPI.Utilities;
+using Reactor.Utilities;
 
 namespace MiraAPI.Patches.Modifiers;
 
-[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.CoEndGame))]
+[HarmonyPatch(typeof(AmongUsClient), nameof(AmongUsClient.OnGameEnd))]
 public static class EndGameDidWinPatch
 {
-    public static void Prefix()
+    public static void Postfix()
     {
         var gameOverReason = EndGameResult.CachedGameOverReason;
         EndGameResult.CachedWinners.Clear();
@@ -17,18 +19,26 @@ public static class EndGameDidWinPatch
         for (var i = 0; i < GameData.Instance.PlayerCount; i++)
         {
             var networkedPlayerInfo = players[i];
-            if (networkedPlayerInfo == null)
+            if (!networkedPlayerInfo)
             {
                 continue;
             }
 
             var didWin = networkedPlayerInfo.Role.DidWin(gameOverReason);
 
-            var modifierWin = networkedPlayerInfo.Object?.GetModifierComponent().GetModifiers<GameModifier>()
-                .FirstOrDefault(x => x.DidWin(gameOverReason) != null)?.DidWin(gameOverReason);
-            if (modifierWin != null)
+            bool? modifierDidWin = null;
+            foreach (var modifier in networkedPlayerInfo.Object.GetModifiers<GameModifier>().OrderByDescending(x => x.Priority()))
             {
-                didWin = modifierWin.Value;
+                var result = modifier.DidWin(gameOverReason);
+                if (!result.HasValue) continue;
+
+                modifierDidWin = result.Value;
+                break;
+            }
+
+            if (modifierDidWin.HasValue)
+            {
+                didWin = modifierDidWin.Value;
             }
 
             if (didWin)