Skip to content

Commit 79b862b

Browse files
committed
Update OuijaJsonFilterDesc.cs
1 parent cc41bea commit 79b862b

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Motely/filters/OuijaJsonFilterDesc.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -905,6 +905,7 @@ private static int CheckJoker(ref MotelySingleSearchContext ctx, OuijaConfig.Fil
905905

906906
DebugLogger.Log($"[CheckJoker] Found Buffoon pack #{i+1}, checking for jokers...");
907907
var contents = ctx.GetNextBuffoonPackContents(ante, pack.GetPackSize());
908+
var contents = ctx.GetNextBuffoonPackContents(ante, pack.GetPackCardCount());
908909

909910
DebugLogger.Log($"[CheckJoker] Buffoon pack size: {pack.GetPackSize()}, contains {contents.Length} jokers");
910911

@@ -1195,7 +1196,7 @@ private static bool CheckTarot(ref MotelySingleSearchContext ctx, OuijaConfig.Fi
11951196
var shopSlots = clause.Sources?.ShopSlots;
11961197
int maxSlots = shopSlots != null && shopSlots.Length > 0 ?
11971198
shopSlots.Max() + 1 :
1198-
(ante == 1 ? ShopState.ShopSlotsAnteOne : ShopState.ShopSlots);
1199+
(ante == 1 ? 5 : 6);
11991200

12001201
// PERFORMANCE: Use HashSet for O(1) slot lookups
12011202
var slotSet = shopSlots != null ? new HashSet<int>(shopSlots) : null;
@@ -1288,7 +1289,7 @@ private static bool CheckPlanet(ref MotelySingleSearchContext ctx, OuijaConfig.F
12881289
var shopSlots = clause.Sources?.ShopSlots;
12891290
int maxSlots = shopSlots != null && shopSlots.Length > 0 ?
12901291
shopSlots.Max() + 1 :
1291-
(ante == 1 ? ShopState.ShopSlotsAnteOne : ShopState.ShopSlots);
1292+
(ante == 1 ? 5 : 6);
12921293

12931294
// PERFORMANCE: Use HashSet for O(1) slot lookups
12941295
var slotSet = shopSlots != null ? new HashSet<int>(shopSlots) : null;
@@ -1388,7 +1389,7 @@ private static bool CheckSpectral(ref MotelySingleSearchContext ctx, OuijaConfig
13881389
{
13891390
DebugLogger.Log($"[CheckSpectral] Checking shop slots in ante {ante}...");
13901391
DebugLogger.Log($"[CheckSpectral] Context deck: {ctx.Deck}");
1391-
int maxSlots = ante == 1 ? ShopState.ShopSlotsAnteOne : ShopState.ShopSlots;
1392+
int maxSlots = ante == 1 ? 5 : 6;
13921393

13931394
for (int i = 0; i < maxSlots; i++)
13941395
{
@@ -1568,7 +1569,7 @@ private static bool CheckSpectral(ref MotelySingleSearchContext ctx, OuijaConfig
15681569

15691570
var shopSlots = clause.Sources?.ShopSlots;
15701571
// ALWAYS iterate through all shop slots to keep stream in sync
1571-
int maxSlots = ante == 1 ? ShopState.ShopSlotsAnteOne : ShopState.ShopSlots;
1572+
int maxSlots = ante == 1 ? 5 : 6;
15721573

15731574
DebugLogger.Log($"[CheckSpectral] Shop slots requested: {(shopSlots != null ? string.Join(",", shopSlots) : "all")}, iterating through {maxSlots} slots");
15741575
DebugLogger.Log($"[CheckSpectral] Shop stream info: DoesProvideSpectrals={shopStream.DoesProvideSpectrals}, SpectralRate={shopStream.SpectralRate}, TotalRate={shopStream.TotalRate}");

0 commit comments

Comments
 (0)