emik/Roland
1
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle missing joker

Browse source
This commit is contained in:
Emik 2026-05-24 16:00:46 +02:00
parent b0cef44d4c
commit 8dd12284f7
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
2 changed files with 8 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
manifest.json
View file

@ -6,7 +6,7 @@
"author": [ "author": [
"Emik" "Emik"
], ],
"version": "2.6.4", "version": "2.6.5",
"badge_colour": "8BE9FD", "badge_colour": "8BE9FD",
"main_file": "src/main.lua", "main_file": "src/main.lua",
"badge_text_colour": "44475A", "badge_text_colour": "44475A",

29
src/challenge.lua
View file

@ -30,10 +30,6 @@ local function is_center_banned_from_pastry(v)
return arcana_boosters[v.key] or pastries_targets[v.set] and is_banned_from_pastry(v) return arcana_boosters[v.key] or pastries_targets[v.set] and is_banned_from_pastry(v)
end end
local function is_joker(v)
return v.set == "Joker" and not ({j_joker = true, j_Roland_msjoker = true})[v.key]
end
local function is_showdown_except(key) local function is_showdown_except(key)
---@param v SMODS.Blind ---@param v SMODS.Blind
---@param k string ---@param k string
@ -49,8 +45,8 @@ local function is_vanilla(v)
end) end)
end end
local jokerful, vanillas, pastries, amber, cerulean, crimson, verdant, violet, final local vanillas, pastries, amber, cerulean, crimson, verdant, violet, final
= bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans() = bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans()
SMODS.Challenge { SMODS.Challenge {
key = "Go", key = "Go",
@ -75,7 +71,7 @@ SMODS.Challenge {
end, end,
} }
SMODS.Challenge { local spin_to_win = SMODS.Challenge {
key = "Spin_To_Win", key = "Spin_To_Win",
jokers = f(4):map(f().const {id = "j_Bakery_Spinner", eternal = true}):table(), jokers = f(4):map(f().const {id = "j_Bakery_Spinner", eternal = true}):table(),
restrictions = {banned_cards = {{id = "c_Roland_coolheaded"}}}, restrictions = {banned_cards = {{id = "c_Roland_coolheaded"}}},
@ -94,13 +90,6 @@ SMODS.Challenge {
rotation = 0, rotation = 0,
} }
SMODS.Challenge {
key = "Jokerful",
rules = {custom = {{id = "Roland_Jokerful"}}},
restrictions = jokerful,
pronouns = "he_him",
}
SMODS.Challenge { SMODS.Challenge {
key = "Ornate", key = "Ornate",
rules = {custom = {{id = "Roland_Ornate"}}}, rules = {custom = {{id = "Roland_Ornate"}}},
@ -115,13 +104,6 @@ SMODS.Challenge {
pronouns = "she_them", pronouns = "she_them",
} }
SMODS.Challenge {
key = "Pastries",
rules = {custom = {{id = "Roland_Pastries"}}},
restrictions = pastries,
pronouns = "she_them",
}
local finalizers = { local finalizers = {
SMODS.Challenge { SMODS.Challenge {
key = "Eternally_Amber", key = "Eternally_Amber",
@ -293,8 +275,11 @@ SMODS.Challenge {
} }
q(function() q(function()
if not G.P_CENTERS.j_Bakery_Spinner then
spin_to_win.jokers = nil
end
f { f {
{G.P_CENTERS, is_joker, jokerful.banned_cards},
{G.P_TAGS, is_vanilla, vanillas.banned_tags}, {G.P_TAGS, is_vanilla, vanillas.banned_tags},
{G.P_BLINDS, is_vanilla, vanillas.banned_other}, {G.P_BLINDS, is_vanilla, vanillas.banned_other},
{G.P_CENTERS, is_vanilla, vanillas.banned_cards}, {G.P_CENTERS, is_vanilla, vanillas.banned_cards},