Skip to content

Fix showman_double_legendary and perkeo_observatory filter bugs #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Xaric23 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix showman_double_legendary and perkeo_observatory filter bugs #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion filters/perkeo_observatory.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ long filter(instance* inst) {
} else continue;
for (int c = 0; c < _pack.size; c++) {
if (cards[c] == The_Soul) {
if (next_joker(inst, S_Soul, antes[i]) == Perkeo) return 1;
// Fix: Properly manage lock state for The_Soul and generated legendary
inst->locked[The_Soul] = false;
item legendary = next_joker(inst, S_Soul, antes[i]);
inst->locked[legendary] = true;
if (legendary == Perkeo) return 1;
}
}
}
Expand Down
6 changes: 5 additions & 1 deletion filters/showman_double_legendary.cl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ long filter(instance* inst) {
return 0;
}

if (next_shop_item(inst, ante).value != Showman && next_shop_item(inst, ante).value != Showman) {
// Fix: Store shop items to avoid calling next_shop_item() twice
// Each call advances RNG state, so we need to capture both items
shopitem item1 = next_shop_item(inst, ante);
shopitem item2 = next_shop_item(inst, ante);
if (item1.value != Showman && item2.value != Showman) {
return 0;
}

Expand Down