diff --git a/manifest.json b/manifest.json index 5515b92..cec864a 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.5.20" + "version": "1.5.21" } \ No newline at end of file diff --git a/src/slugcat.lua b/src/slugcat.lua index e10c4b7..c175600 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -478,12 +478,13 @@ SMODS.Joker { loc_txt = { name = "The Saint{C:jane_RGB}#1#", text = Cryptid and { + "{C:attention}Use {}to toggle {X:legendary,C:white}Eternal{} stickers to the left", "{C:spectral}Analog{}, {C:spectral}Ankh{}, {C:spectral}Gateway{}, and", "{C:spectral,s:0.95}Summoning {s:0.95}will {C:attention,s:0.95}not destroy Jokers", "{C:jane_RGB}#2#{}#3#{X:black,C:jane_RGB,s:1.5}#4#{C:spectral}#5#{C:mult}#6#", "{C:inactive,s:1.25}#7#{C:attention,s:1.25}#8#{C:inactive,s:1.25}#9#{C:inactive}#10#", } or { - "{C:spectral}Ankh {}will {C:attention}not destroy Jokers", + "{C:attention}Use {}to toggle {X:legendary,C:white}Eternal{} stickers to the left", "{C:jane_RGB}#2#{}#3#{C:dark_edition}#4#{C:spectral}#5#", "{C:inactive,s:1.25}#6#{C:attention,s:1.25}#7#{C:inactive,s:1.25}#8#{C:inactive}#9#", }, @@ -499,7 +500,7 @@ SMODS.Joker { info_queue[#info_queue + 1] = G.P_CENTERS.c_cry_analog end - info_queue[#info_queue + 1] = G.P_CENTERS.c_ankh + info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_ankh or nil info_queue[#info_queue + 1] = Cryptid and G.P_CENTERS.c_cry_gateway or G.P_CENTERS.c_soul if Cryptid then @@ -669,6 +670,26 @@ SMODS.Joker { ascend() end, + Bakery_can_use = function(_, card) + return not card.debuff and Jane.can_use() + end, + Bakery_use_joker = function(_, card) + if card.debuff then + return + end + + for k, v in ipairs(G.jokers.cards) do + if card == v then + for i = 1, math.max(k - 1, 1) do + local joker = G.jokers.cards[i] + joker:set_eternal(not joker.ability.eternal) + joker:juice_up() + end + + return + end + end + end, } if Cryptid then