Add more joker art

This commit is contained in:
Emik 2026-03-19 01:05:23 +01:00
parent 455e08bbf7
commit 286d1c6dc7
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
9 changed files with 7 additions and 7 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 64 KiB

After

Width:  |  Height:  |  Size: 70 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 82 KiB

After

Width:  |  Height:  |  Size: 82 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 33 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 79 KiB

After

Width:  |  Height:  |  Size: 79 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1 KiB

After

Width:  |  Height:  |  Size: 1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View file

@ -33,12 +33,12 @@ end
---@param card Card ---@param card Card
local function is_carbon(card) local function is_carbon(card)
return (card:get_edition() or {}).e_Bakery_Carbon return card.edition and card.edition.key == "e_Bakery_Carbon"
end end
---@param card Card ---@param card Card
local function is_frozen(card) local function is_frozen(card)
return (card:get_edition() or {}).e_Roland_frozen return card.edition and card.edition.key == "e_Roland_frozen"
end end
local function is_mergeable_with(x) local function is_mergeable_with(x)
@ -248,6 +248,7 @@ joker {
joker { joker {
key = "mrsbones", key = "mrsbones",
pronouns = "she_her", pronouns = "she_her",
artist = "char",
config = {extra = {xmult = 4, requirement = 4}}, config = {extra = {xmult = 4, requirement = 4}},
cost = G.P_CENTERS.j_mr_bones.cost - 1, cost = G.P_CENTERS.j_mr_bones.cost - 1,
rarity = 2, rarity = 2,
@ -758,6 +759,7 @@ joker {
pronouns = "it_its", pronouns = "it_its",
cost = 10, cost = 10,
rarity = 3, rarity = 3,
config = {extra = {repetitions = 1}},
eternal_compat = true, eternal_compat = true,
blueprint_compat = true, blueprint_compat = true,
perishable_compat = true, perishable_compat = true,
@ -765,12 +767,10 @@ joker {
table.insert(info_queue, G.P_CENTERS.e_Roland_frozen) table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
end, end,
calculate = function(_, card, context) calculate = function(_, card, context)
local playing_card = context.repetition and is_frozen(context.other_card) and {repetitions = 1} or nil return (context.repetition and is_frozen(context.other_card)) and {repetitions = 1} or SMODS.merge_effects(
return SMODS.merge_effects(
f(G.jokers.cards):where(is_frozen):map(function(v) f(G.jokers.cards):where(is_frozen):map(function(v)
return SMODS.blueprint_effect(card, v, context) return SMODS.blueprint_effect(card, v, context) or true
end):concat(playing_card):where(function(v) end):where(function(v)
return type(v) == "table" return type(v) == "table"
end):map(function(v) end):map(function(v)
v.colour = G.C.BLACK v.colour = G.C.BLACK