Add more joker art

This commit is contained in:
Emik 2026-03-19 00:21:06 +01:00
parent 1bf6ac6a91
commit 87be46c360
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
12 changed files with 42 additions and 3 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 64 KiB

BIN
assets/1x/joker.png.kra Normal file

Binary file not shown.

BIN
assets/1x/joker.png~ Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 62 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: 70 KiB

After

Width:  |  Height:  |  Size: 74 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

@ -126,6 +126,10 @@ return {
}, },
}, },
Joker = { Joker = {
j_Roland_arctic = {
name = "Arctic Circle",
text = {"Retrigger all", "{C:dark_edition}Frozen {}cards"},
},
j_Roland_basket = { j_Roland_basket = {
name = "Basket", name = "Basket",
text = { text = {

View file

@ -31,8 +31,14 @@ local function destructible(card)
return not card.highlighted and not (card.ability or {}).eternal return not card.highlighted and not (card.ability or {}).eternal
end end
---@param card Card
local function is_carbon(card) local function is_carbon(card)
return card.edition and card.edition.key == "e_Bakery_Carbon" return (card:get_edition() or {}).e_Bakery_Carbon
end
---@param card Card
local function is_frozen(card)
return (card:get_edition() or {}).e_Roland_frozen
end end
local function is_mergeable_with(x) local function is_mergeable_with(x)
@ -408,8 +414,9 @@ joker {
} }
joker { joker {
key = "sunny", -- Cracked egg key = "sunny",
pronouns = "they_them", pronouns = "they_them",
artist = "char",
cost = 2, cost = 2,
rarity = 1, rarity = 1,
eternal_compat = false, eternal_compat = false,
@ -516,6 +523,7 @@ joker {
joker { joker {
key = "sapling", key = "sapling",
pronouns = "they_them", pronouns = "they_them",
artist = "char",
cost = 4, cost = 4,
rarity = 1, rarity = 1,
config = {extra = {mult = 15, suits = 3}}, config = {extra = {mult = 15, suits = 3}},
@ -641,7 +649,7 @@ joker {
return (context.joker_main or context.forcetrigger) and {card = card, xmult = self:xmult_frozen(card)} or nil return (context.joker_main or context.forcetrigger) and {card = card, xmult = self:xmult_frozen(card)} or nil
end, end,
xmult_frozen = function(self, card) xmult_frozen = function(self, card)
if not card.edition or not card.edition.Roland_frozen then if not is_frozen(card) then
return self.xmult() return self.xmult()
end end
@ -744,3 +752,30 @@ joker {
end end
end, end,
} }
joker {
key = "arctic",
pronouns = "it_its",
cost = 10,
rarity = 3,
eternal_compat = true,
blueprint_compat = true,
perishable_compat = true,
loc_vars = function(_, info_queue)
table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
end,
calculate = function(_, card, context)
local playing_card = context.repetition and is_frozen(context.other_card) and {repetitions = 1} or nil
return SMODS.merge_effects(
f(G.jokers.cards):where(is_frozen):map(function(v)
return SMODS.blueprint_effect(card, v, context)
end):concat(playing_card):where(function(v)
return type(v) == "table"
end):map(function(v)
v.colour = G.C.BLACK
return v
end):table()
)
end,
}