- Fixed Act 2 Tutor sequence softlocking when there are no cards to display

- Fixed Act 2 Tutor sequence not displaying cards when you have less than 7 cards remaining in your deck

Author: HumabHatterZed

CHANGELOG.md

@@ -1,5 +1,7 @@
 # 2.23.4
 - Fixed GemsDraw only considering the player's slots when determining how many cards to draw
+- Fixed Act 2 Tutor sequence softlocking when there are no cards to display
+- Fixed Act 2 Tutor sequence not displaying cards when you have less than 7 cards remaining in your deck
 - Fixed Gemify affecting Blood cost when it shouldn't
 - Added Gems Cost support for ExtendedActivatedAbilityBehaviour class
 - Added extension AbilityManager.FullAbility.FlipYIfOpponent

InscryptionCommunityPatch/PixelTutor/PixelPlayableCardArray.cs

@@ -235,6 +235,11 @@ protected IEnumerator CleanUpCards()
 
     protected IEnumerator SpawnAndPlaceCards(List<CardInfo> cards, int numRows, int pageIndex, bool isDeckReview = false, bool forPositiveEffect = true)
     {
+        if (numRows < 1) {
+            PatchPlugin.Logger.LogDebug($"NumRows for PixelPlayableCardArray is 0, displaying no cards");
+            yield break;
+        }
+
         SetOverlayEnabled(true);
         SetBoardEnabled(false);
         displayedCards.ForEach(delegate (PixelPlayableCard x)
@@ -244,11 +249,6 @@ protected IEnumerator SpawnAndPlaceCards(List<CardInfo> cards, int numRows, int
         });
         displayedCards.Clear();
 
-        if (numRows < 1)
-        {
-            PatchPlugin.Logger.LogDebug($"NumRows for PixelPlayableCardArray is 0, displaying no cards");
-            yield break;
-        }
         // can only show 42 cards per page
         int maxPerPage = maxRows * maxCardsPerRow;
         int startingIndex = maxPerPage * pageIndex;
@@ -296,18 +296,17 @@ private void InitializeGamepadGrid()
     private PixelPlayableCard CreateAndPlaceCard(CardInfo info, Vector3 cardPos)
     {
         PixelPlayableCard component = Instantiate(gameObjectReference, base.transform);
+        component.transform.position = Vector3.zeroVector;
+        component.SetInfo(info);
+        component.SetFaceDown(false, true);
+        component.SetEnabled(enabled: false);
 
         PixelCardAnimationController controller = component.Anim as PixelCardAnimationController;
         controller.cardRenderer.sortingGroupID = gameObjectReference.Anim.cardRenderer.sortingGroupID;
         controller.cardbackRenderer.sortingGroupID = gameObjectReference.Anim.cardRenderer.sortingGroupID;
         controller.cardRenderer.sortingOrder = -9000;
         controller.cardbackRenderer.sortingOrder = -8000;
 
-        component.SetFaceDown(false, true);
-        component.SetInfo(info);
-        component.SetEnabled(enabled: false);
-        component.transform.position = Vector3.zeroVector;
-
         gamepadGrid.Rows[0].interactables.Add(component);
         displayedCards.Add(component);
         TweenInCard(component.transform, cardPos);
@@ -338,7 +337,15 @@ private void SetOverlayEnabled(bool enabled)
         }
     }
 
-    private int GetNumRows(int numCards) => Mathf.Min(maxRows, numCards / maxCardsPerRow);
+    private int GetNumRows(int numCards) {
+        if (numCards == 0)
+            return 0;
+
+        if (numCards < maxCardsPerRow)
+            return 1;
+
+        return Mathf.Min(maxRows, numCards / maxCardsPerRow);
+    }
     private void SetCardsEnabled(bool enabled) => displayedCards.ForEach(x => x.SetEnabled(enabled));
     private void SetBoardEnabled(bool enabled)
     {