diff --git a/manifest.json b/manifest.json index feea30c..a7ce3db 100644 --- a/manifest.json +++ b/manifest.json @@ -18,5 +18,5 @@ "conflicts": [ "Jen" ], - "version": "1.10.9" + "version": "1.10.10" } \ No newline at end of file diff --git a/src/slugcat.lua b/src/slugcat.lua index 3e2ce89..d37dd95 100644 --- a/src/slugcat.lua +++ b/src/slugcat.lua @@ -586,13 +586,11 @@ SMODS.Joker { "other Jokers to its", "left's {X:legendary,C:white}Eternal{} sticker", "{C:attention}#4#{}#5#{X:black,C:jane_RGB}#6#{C:spectral}#7#", - "{C:spectral}Spectral {}cards may", - "appear in the shop", "{C:inactive,s:1.25}#8#{C:attention,s:1.25}#9#{C:inactive,s:1.25}#10#{C:inactive}#11#", Jane.cry and "{C:inactive}(Gateway has no downside)" or nil, }, }, - config = {extra = {karma = 0, max_karma = Jane.cry and 20 or 2}}, + config = {extra = {karma = 0, max_karma = Jane.cry and 10 or 5}}, pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0}, cost = 20, @@ -612,9 +610,9 @@ SMODS.Joker { attuned and "The" or "", attuned and "Attuned" or "", attuned and "" or "Attune ", - attuned and "alongside its " or "after ", + attuned and "alongside its " or "at ", attuned and "Edition" or max_karma, - attuned and "" or (Jane.cry and " Gateways" or " Ankhs"), + attuned and "" or (Jane.cry and " Gateways" or " Spectrals"), attuned and "" or "[", attuned and "" or karma, attuned and "" or " / " .. max_karma .. "]", @@ -634,7 +632,6 @@ SMODS.Joker { local extra = card.ability.extra local max_karma = extra.max_karma extra.is_attuned = extra.is_attuned and extra.karma >= max_karma - G.GAME.spectral_rate = math.max(G.GAME.spectral_rate, extra.is_attuned and 5 or 2) local function ascend() if extra.is_attuning then @@ -688,9 +685,9 @@ SMODS.Joker { return end - local key = context.consumeable:gc().key + local gc = context.consumeable:gc() - if Jane.cry and key ~= "c_cry_gateway" or not Jane.cry and key ~= "c_ankh" then + if Jane.cry and gc.key ~= "c_cry_gateway" or not Jane.cry and gc.set ~= "Spectral" then return end @@ -754,7 +751,9 @@ SMODS.Joker { if Cryptid and Cryptid.aliases then Cryptid.aliases["saint"] = "j_jane_saint" + Cryptid.aliases["attuned"] = "j_jane_saint" Cryptid.aliases["the saint"] = "j_jane_saint" + Cryptid.aliases["the attuned"] = "j_jane_saint" end SMODS.Joker {