diff --git a/assets/1x/spectral.png b/assets/1x/spectral.png index 74d2c48..890f4d2 100644 Binary files a/assets/1x/spectral.png and b/assets/1x/spectral.png differ diff --git a/assets/1x/tarot.png b/assets/1x/tarot.png new file mode 100644 index 0000000..2a55219 Binary files /dev/null and b/assets/1x/tarot.png differ diff --git a/assets/2x/back.png b/assets/2x/back.png index 645cbc4..3cf3fc1 100644 Binary files a/assets/2x/back.png and b/assets/2x/back.png differ diff --git a/assets/2x/blind.png b/assets/2x/blind.png index 99495d1..a10c8e9 100644 Binary files a/assets/2x/blind.png and b/assets/2x/blind.png differ diff --git a/assets/2x/charm.png b/assets/2x/charm.png index e875133..9a405dc 100644 Binary files a/assets/2x/charm.png and b/assets/2x/charm.png differ diff --git a/assets/2x/icon.png b/assets/2x/icon.png index 3717c95..041f3bd 100644 Binary files a/assets/2x/icon.png and b/assets/2x/icon.png differ diff --git a/assets/2x/joker.png b/assets/2x/joker.png index 86406e5..e6a9a7e 100644 Binary files a/assets/2x/joker.png and b/assets/2x/joker.png differ diff --git a/assets/2x/seal.png b/assets/2x/seal.png index 1fdc640..079ef28 100644 Binary files a/assets/2x/seal.png and b/assets/2x/seal.png differ diff --git a/assets/2x/spectral.png b/assets/2x/spectral.png index d489ad6..81a74dd 100644 Binary files a/assets/2x/spectral.png and b/assets/2x/spectral.png differ diff --git a/assets/2x/tag.png b/assets/2x/tag.png index ee1d461..8641e2d 100644 Binary files a/assets/2x/tag.png and b/assets/2x/tag.png differ diff --git a/assets/2x/tarot.png b/assets/2x/tarot.png new file mode 100644 index 0000000..c244c82 Binary files /dev/null and b/assets/2x/tarot.png differ diff --git a/localization/en-us.lua b/localization/en-us.lua index 6059911..41033a6 100644 --- a/localization/en-us.lua +++ b/localization/en-us.lua @@ -330,18 +330,10 @@ return { "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 = { name = "Mirror", text = { - "Add a {C:dark_edition}Glass Tag", + "Add a {C:dark_edition}Glass Seal", "to {C:attention}#1#{} selected", "card in {C:hands}hand", }, @@ -361,6 +353,16 @@ return { 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 = { challenge_names = { diff --git a/manifest.json b/manifest.json index 1b3790f..06355a1 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "author": [ "Emik" ], - "version": "2.4.0", + "version": "2.4.1", "badge_colour": "8BE9FD", "main_file": "src/main.lua", "badge_text_colour": "44475A", diff --git a/src/main.lua b/src/main.lua index e40381d..a5239d0 100644 --- a/src/main.lua +++ b/src/main.lua @@ -1,9 +1,10 @@ local qol = assert(SMODS.load_file "src/lib/shared.lua")() or require "lib.shared" local f, q = unpack(qol) -f {"challenge", "spectral", "edition", "tweaks", "blind", "charm", "joker", "back", "seal", "tag"}:each(function(v) - assert(SMODS.load_file("src/" .. v .. ".lua"))(qol) -end) +f {"challenge", "spectral", "edition", "tweaks", "blind", "charm", "joker", "tarot", "back", "seal", "tag"} + :each(function(v) + assert(SMODS.load_file("src/" .. v .. ".lua"))(qol) + end) if _G["Balatest"] then f {"joker", "blind", "spectral"}:each(function(v) diff --git a/src/spectral.lua b/src/spectral.lua index 76f7ca1..595a008 100644 --- a/src/spectral.lua +++ b/src/spectral.lua @@ -67,31 +67,6 @@ spectral { 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 { key = "dual", pronouns = "they_them", diff --git a/src/tarot.lua b/src/tarot.lua new file mode 100644 index 0000000..cc0303d --- /dev/null +++ b/src/tarot.lua @@ -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, +}