Fixed positioning errors caused by having multiple custom boss challenge icons

Author: HumabHatterZed

CHANGELOG.md

@@ -1,6 +1,9 @@
 <details>
 <summary>View Changelog</summary>
 
+# 2.22.2
+- Fixed positioning errors caused by having multiple custom boss challenge icons
+
 # 2.22.1
 - Added IShieldPreventedDamage and IShieldPreventedDamageInHand ability triggers and interfaces
 - Added TriggerBreakShield, wraps BreakShield in an IEnumerator for additional customisation by modders

InscryptionAPI/Ascension/AscensionChallengePaginator.cs

@@ -71,29 +71,37 @@ public void AddPage(List<AscensionChallengeInfo> challengeInfos)
         List<AscensionChallengeInfo> bossChallengeInfos = challengeInfos.FindAll(x => x.challengeType.GetFullChallenge().Boss);
 
         // keep track of the number of bosses that are on this page, and account for them when determining how many icons to create        
-        int numBosses = challengeInfos.Count(x => x.challengeType.GetFullChallenge().Boss);
+        int numBosses = bossChallengeInfos.Count;
         int numIcons = Mathf.Min(14, challengeObjectsForPages[0].Count) - numBosses;
 
         // the list index when we begin adding boss icons
         int bossStartingIndex = (1 + regularChallengeInfos.Count) / 2;
         int numBossesAdded = 0;
 
-        //Debug.Log($"NumIcons for Page: {numIcons}: {regularChallengeInfos.Count} {bossChallengeInfos.Count}");
+        // 14 = regular + boss * 2
+        //Debug.Log($"NumIcons for Page: {numIcons}: {regularChallengeInfos.Count} {bossChallengeInfos.Count} | {bossStartingIndex}");
 
         for (int i = 0; i < 14; i++)
         {
             GameObject objectRef = null;
 
-            if (i % 7 < bossStartingIndex + numBosses && i % 7 >= bossStartingIndex)
+            int columnIndex = i % 7;
+            //Debug.Log($"{i} ({columnIndex}) | {bossStartingIndex + numBosses} / {bossStartingIndex}");
+
+            if (columnIndex >= bossStartingIndex && columnIndex < bossStartingIndex + numBosses)
             {
+                //Debug.Log($"In boss column {i}");
                 if (numBossesAdded < numBosses)
                 {
+                    //Debug.Log($"Use boss icon");
                     numBossesAdded++;
                     objectRef = challengeObjectsForPages[0][14];
                 }
                 else
                 {
-                    i += numBosses;
+                    //Debug.Log($"Skip to end");
+                    i += numBosses - 1; // account for loop iteration
+                    continue;
                 }
             }
 
@@ -117,21 +125,22 @@ public void AddPage(List<AscensionChallengeInfo> challengeInfos)
         int infoCount = challengeInfos.Count;
         for (int i = 0; i < newPage.Count; i++)
         {
-            //Debug.Log($"Checking icon [{i}] info {infoIdx}");
+            AscensionChallengeInfo info = challengeInfos[infoIdx];
             AscensionIconInteractable interactable = newPage[i].GetComponent<AscensionIconInteractable>();
-
+            //Debug.Log($"Checking icon [{i}] info at {infoIdx} : {info.title}");
             if (i < infoCount)
             {
                 // if we're assigning boss info to an icon that isn't a boss icon
-                if (challengeInfos[infoIdx].GetFullChallenge().Boss && (interactable.coll2D as BoxCollider2D).size.y < 1f)
+                if (info.GetFullChallenge().Boss && (interactable.coll2D as BoxCollider2D).size.y < 1f)
                 {
+                    //Debug.Log("Boss error: y < 1");
                     interactable.challengeInfo = missingChallengeInfo;
                     newPage[i].AddComponent<NoneChallengeDisplayer>();
                     infoCount++;
                 }
                 else
                 {
-                    interactable.challengeInfo = challengeInfos[infoIdx];
+                    interactable.challengeInfo = info;
                     infoIdx++;
                 }
             }

InscryptionAPI/Ascension/ChallengeDisplayerPlus.cs

@@ -26,6 +26,7 @@ public static ChallengeDisplayerPlus TryAddChallengeDisplayerPlusToDisplayer(Asc
         if (plus.incompatibilityText == null)
         {
             GameObject cloned = Instantiate(displayer.titleText.gameObject);
+            cloned.name = "PixelTextLine_INCOMPATIBLE";
             cloned.transform.parent = displayer.titleText.transform.parent;
             float y = plus.originalTitlePos;
             if (displayer.descriptionText != null)
@@ -47,6 +48,7 @@ public static ChallengeDisplayerPlus TryAddChallengeDisplayerPlusToDisplayer(Asc
         if (plus.dependencyText == null)
         {
             GameObject cloned = Instantiate(displayer.titleText.gameObject);
+            cloned.name = "PixelTextLine_DEPENDENCY";
             cloned.transform.parent = displayer.titleText.transform.parent;
             float y = plus.originalTitlePos;
             if (displayer.descriptionText != null)

InscryptionAPI/InscryptionAPI.csproj

@@ -10,7 +10,7 @@
         <DebugType>full</DebugType>
         <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
         <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
-        <Version>2.22.1</Version>
+        <Version>2.22.2</Version>
     </PropertyGroup>
 
     <PropertyGroup>

InscryptionAPI/InscryptionAPIPlugin.cs

@@ -30,7 +30,7 @@ public class InscryptionAPIPlugin : BaseUnityPlugin
 {
     public const string ModGUID = "cyantist.inscryption.api";
     public const string ModName = "InscryptionAPI";
-    public const string ModVer = "2.22.0";
+    public const string ModVer = "2.22.2";
 
     public static string Directory = "";