Remove unplayable garbage

This commit is contained in:
Emik 2026-05-24 16:05:31 +02:00
parent 8dd12284f7
commit f521dcf873
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
3 changed files with 155 additions and 174 deletions

View file

@ -415,7 +415,6 @@ return {
c_Roland_Jokerful = "Jokerful", c_Roland_Jokerful = "Jokerful",
c_Roland_Ornate = "Ornate", c_Roland_Ornate = "Ornate",
c_Roland_Pastries = "Sweet Pastries", c_Roland_Pastries = "Sweet Pastries",
c_Roland_Showdown = "Showdown",
c_Roland_Spin_To_Win = "Spin to Win", c_Roland_Spin_To_Win = "Spin to Win",
}, },
v_dictionary = { v_dictionary = {
@ -454,7 +453,6 @@ return {
ch_c_Roland_Jokerful = {"The only jokers are {C:mult}Joker{} and {C:chips}Ms. Joker"}, ch_c_Roland_Jokerful = {"The only jokers are {C:mult}Joker{} and {C:chips}Ms. Joker"},
ch_c_Roland_Ornate = {"Anything vanilla is banned"}, ch_c_Roland_Ornate = {"Anything vanilla is banned"},
ch_c_Roland_Pastries = {"All blinds, cards, and tags are of {C:gold}Bakery{} or {C:blue}Roland"}, ch_c_Roland_Pastries = {"All blinds, cards, and tags are of {C:gold}Bakery{} or {C:blue}Roland"},
ch_c_Roland_Showdown = {"Showdown blinds are {C:attention}Venerable Visage"},
ch_c_Roland_Showdown_Amber = {"Showdown blinds are {C:attention}Amber Acorn {}(stacks with above)"}, ch_c_Roland_Showdown_Amber = {"Showdown blinds are {C:attention}Amber Acorn {}(stacks with above)"},
ch_c_Roland_Showdown_Cerulean = {"Showdown blinds are {C:attention}Cerulean Bell {}(stacks with above)"}, ch_c_Roland_Showdown_Cerulean = {"Showdown blinds are {C:attention}Cerulean Bell {}(stacks with above)"},
ch_c_Roland_Showdown_Crimson = {"Showdown blinds are {C:attention}Crimson Heart {}(stacks with above)"}, ch_c_Roland_Showdown_Crimson = {"Showdown blinds are {C:attention}Crimson Heart {}(stacks with above)"},

View file

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

View file

@ -45,8 +45,8 @@ local function is_vanilla(v)
end) end)
end end
local vanillas, pastries, amber, cerulean, crimson, verdant, violet, final local vanillas, pastries, amber, cerulean, crimson, verdant, violet
= bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans() = bans(), bans(), bans(), bans(), bans(), bans(), bans()
SMODS.Challenge { SMODS.Challenge {
key = "Go", key = "Go",
@ -104,8 +104,7 @@ SMODS.Challenge {
pronouns = "she_them", pronouns = "she_them",
} }
local finalizers = { SMODS.Challenge {
SMODS.Challenge {
key = "Eternally_Amber", key = "Eternally_Amber",
rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}}, rules = {custom = {{id = "Roland_Eternally_Amber"}, {id = "Roland_Showdown_Amber"}}},
restrictions = amber, restrictions = amber,
@ -140,8 +139,9 @@ local finalizers = {
end, end,
} }
end, end,
}, }
SMODS.Challenge {
SMODS.Challenge {
key = "Eternally_Cerulean", key = "Eternally_Cerulean",
rules = {custom = {{id = "Roland_Eternally_Cerulean"}, {id = "Roland_Showdown_Cerulean"}}}, rules = {custom = {{id = "Roland_Eternally_Cerulean"}, {id = "Roland_Showdown_Cerulean"}}},
restrictions = cerulean, restrictions = cerulean,
@ -164,8 +164,9 @@ local finalizers = {
G.hand:add_to_highlighted(v) G.hand:add_to_highlighted(v)
end) end)
end, end,
}, }
SMODS.Challenge {
SMODS.Challenge {
key = "Eternally_Crimson", key = "Eternally_Crimson",
rules = {custom = {{id = "Roland_Eternally_Crimson"}, {id = "Roland_Showdown_Crimson"}}}, rules = {custom = {{id = "Roland_Eternally_Crimson"}, {id = "Roland_Showdown_Crimson"}}},
restrictions = crimson, restrictions = crimson,
@ -222,8 +223,9 @@ local finalizers = {
mod.Roland_Eternally_Crimson = not context.hand_drawn and mod.Roland_Eternally_Crimson = not context.hand_drawn and
mod.Roland_Eternally_Crimson or nil mod.Roland_Eternally_Crimson or nil
end, end,
}, }
SMODS.Challenge {
SMODS.Challenge {
key = "Eternally_Verdant", key = "Eternally_Verdant",
rules = {custom = {{id = "Roland_Eternally_Verdant"}, {id = "Roland_Showdown_Verdant"}}}, rules = {custom = {{id = "Roland_Eternally_Verdant"}, {id = "Roland_Showdown_Verdant"}}},
restrictions = verdant, restrictions = verdant,
@ -242,8 +244,9 @@ local finalizers = {
end) end)
end end
end, end,
}, }
SMODS.Challenge {
SMODS.Challenge {
key = "Eternally_Violet", key = "Eternally_Violet",
rules = {custom = {{id = "Roland_Eternally_Violet"}, {id = "Roland_Showdown_Violet"}}}, rules = {custom = {{id = "Roland_Eternally_Violet"}, {id = "Roland_Showdown_Violet"}}},
restrictions = violet, restrictions = violet,
@ -253,25 +256,6 @@ local finalizers = {
G.GAME.blind.chip_text = number_format(G.GAME.blind.chips) G.GAME.blind.chip_text = number_format(G.GAME.blind.chips)
end end
end, end,
},
}
SMODS.Challenge {
key = "Showdown",
rules = {custom = {
{id = "Roland_Eternally_Amber"},
{id = "Roland_Eternally_Cerulean"},
{id = "Roland_Eternally_Crimson"},
{id = "Roland_Eternally_Verdant"},
{id = "Roland_Eternally_Violet"},
{id = "Roland_Showdown"},
}},
restrictions = final,
calculate = function(_, context)
f(finalizers):each(function(v)
v:calculate(context)
end)
end,
} }
q(function() q(function()
@ -291,7 +275,6 @@ q(function()
{G.P_BLINDS, is_showdown_except "bl_final_heart", crimson.banned_other}, {G.P_BLINDS, is_showdown_except "bl_final_heart", crimson.banned_other},
{G.P_BLINDS, is_showdown_except "bl_final_leaf", verdant.banned_other}, {G.P_BLINDS, is_showdown_except "bl_final_leaf", verdant.banned_other},
{G.P_BLINDS, is_showdown_except "bl_final_vessel", violet.banned_other}, {G.P_BLINDS, is_showdown_except "bl_final_vessel", violet.banned_other},
{G.P_BLINDS, is_showdown_except "bl_Roland_venerable_visage", final.banned_other},
}:each(function(v) }:each(function(v)
f(v[1]):where(v[2]):each(adder(v[3])) f(v[1]):where(v[2]):each(adder(v[3]))
end) end)