Change Coolheaded to be a Tarot card, Fix typo

This commit is contained in:
Emik 2026-05-19 23:37:34 +02:00
parent 726e754672
commit 203916923f
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
16 changed files with 51 additions and 38 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 17 KiB

BIN
assets/1x/tarot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

After

Width:  |  Height:  |  Size: 13 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: 68 KiB

After

Width:  |  Height:  |  Size: 68 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: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 611 B

After

Width:  |  Height:  |  Size: 611 B

BIN
assets/2x/tarot.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.4 KiB

View file

@ -330,18 +330,10 @@ return {
"cards in {C:hands}hand", "cards in {C:hands}hand",
}, },
}, },
c_Roland_coolheaded = {
name = "Coolheaded",
text = {
"Add {C:dark_edition}Frozen {}to {C:attention}#1#",
"selected {C:attention}playing",
"{C:attention}card {}or {C:attention}Joker",
},
},
c_Roland_mirror = { c_Roland_mirror = {
name = "Mirror", name = "Mirror",
text = { text = {
"Add a {C:dark_edition}Glass Tag", "Add a {C:dark_edition}Glass Seal",
"to {C:attention}#1#{} selected", "to {C:attention}#1#{} selected",
"card in {C:hands}hand", "card in {C:hands}hand",
}, },
@ -361,6 +353,16 @@ return {
text = {"{C:attention}Duplicate {}a random Joker", "{C:inactive}(Must have room)"}, text = {"{C:attention}Duplicate {}a random Joker", "{C:inactive}(Must have room)"},
}, },
}, },
Tarot = {
c_Roland_coolheaded = {
name = "Coolheaded",
text = {
"Add {C:dark_edition}Frozen {}to {C:attention}#1#",
"selected {C:attention}playing",
"{C:attention}card {}or {C:attention}Joker",
},
},
},
}, },
misc = { misc = {
challenge_names = { challenge_names = {

View file

@ -6,7 +6,7 @@
"author": [ "author": [
"Emik" "Emik"
], ],
"version": "2.4.0", "version": "2.4.1",
"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

@ -1,9 +1,10 @@
local qol = assert(SMODS.load_file "src/lib/shared.lua")() or require "lib.shared" local qol = assert(SMODS.load_file "src/lib/shared.lua")() or require "lib.shared"
local f, q = unpack(qol) local f, q = unpack(qol)
f {"challenge", "spectral", "edition", "tweaks", "blind", "charm", "joker", "back", "seal", "tag"}:each(function(v) f {"challenge", "spectral", "edition", "tweaks", "blind", "charm", "joker", "tarot", "back", "seal", "tag"}
assert(SMODS.load_file("src/" .. v .. ".lua"))(qol) :each(function(v)
end) assert(SMODS.load_file("src/" .. v .. ".lua"))(qol)
end)
if _G["Balatest"] then if _G["Balatest"] then
f {"joker", "blind", "spectral"}:each(function(v) f {"joker", "blind", "spectral"}:each(function(v)

View file

@ -67,31 +67,6 @@ spectral {
end, end,
} }
spectral {
key = "coolheaded",
config = {extra = {amount = 1}},
attributes = {"editions", "modify_card", "spectral"},
loc_vars = function(_, info_queue, card)
table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
return {vars = {card.ability.extra.amount}}
end,
can_use = function(_, card)
return u() and f(G.jokers.highlighted):concat(Bakery_API.get_highlighted()):count(function(v)
return not v.edition
end) == card.ability.extra.amount
end,
use = function()
f(G.jokers.highlighted):concat(Bakery_API.get_highlighted()):each(function(v)
q {
delay = 0.1,
func = function()
v:set_edition {Roland_frozen = true}
end,
}
end)
end,
}
spectral { spectral {
key = "dual", key = "dual",
pronouns = "they_them", pronouns = "they_them",

35
src/tarot.lua Normal file
View file

@ -0,0 +1,35 @@
SMODS.Atlas {
px = 71,
py = 95,
key = "tarot",
path = "tarot.png",
}
SMODS.Consumable {
key = "coolheaded",
pos = {x = 0, y = 0},
config = {extra = {amount = 1}},
cost = 3,
set = "Tarot",
atlas = "tarot",
attributes = {"editions", "modify_card", "spectral"},
loc_vars = function(_, info_queue, card)
table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
return {vars = {card.ability.extra.amount}}
end,
can_use = function(_, card)
return u() and f(G.jokers.highlighted):concat(Bakery_API.get_highlighted()):count(function(v)
return not v.edition
end) == card.ability.extra.amount
end,
use = function()
f(G.jokers.highlighted):concat(Bakery_API.get_highlighted()):each(function(v)
q {
delay = 0.1,
func = function()
v:set_edition {Roland_frozen = true}
end,
}
end)
end,
}