diff --git a/assets/1x/default/c_jane_reversetarots.png b/assets/1x/default/c_jane_reversetarots.png deleted file mode 100644 index 8563bb1..0000000 Binary files a/assets/1x/default/c_jane_reversetarots.png and /dev/null differ diff --git a/assets/2x/default/c_jane_reversetarots.png b/assets/2x/default/c_jane_reversetarots.png deleted file mode 100644 index d477970..0000000 Binary files a/assets/2x/default/c_jane_reversetarots.png and /dev/null differ diff --git a/manifest.json b/manifest.json index fb7999f..a467900 100644 --- a/manifest.json +++ b/manifest.json @@ -17,5 +17,5 @@ "conflicts": [ "Jen" ], - "version": "1.7.8" + "version": "1.7.9" } \ No newline at end of file diff --git a/src/joker.lua b/src/joker.lua index cdf77e7..54ad80c 100644 --- a/src/joker.lua +++ b/src/joker.lua @@ -757,8 +757,8 @@ SMODS.Joker { pos = {x = 0, y = 0}, soul_pos = {x = 1, y = 0}, config = {extra = {base = 2}}, - rarity = 3, - cost = 8, + cost = Cryptid and 20 or 8, + rarity = Cryptid and 4 or 3, blueprint_compat = true, loc_vars = function(_, _, card) return {vars = {card.ability.extra.base ^ food_jokers_count()}} diff --git a/src/spectral.lua b/src/spectral.lua index 1434720..84ebc8a 100644 --- a/src/spectral.lua +++ b/src/spectral.lua @@ -1,10 +1,3 @@ -SMODS.Atlas { - key = "janertarots", - px = 71, - py = 95, - path = Jane.config.texture_pack .. "/c_jane_reversetarots.png", -} - SMODS.Sound({key = "draw", path = "draw.ogg"}) local function conjure(card, number) diff --git a/src/token.lua b/src/token.lua index 7c9c65e..c7c8a64 100644 --- a/src/token.lua +++ b/src/token.lua @@ -38,6 +38,9 @@ local function on_token_use(id) add_tag(t) end +local gourmand = G.P_TAGS.j_cry_gourmand and "j_cry_gourmand" or + (G.P_TAGS.j_cry_gourmond and "j_cry_gourmond" or nil) + local vowels = {A = true, E = true, I = true, O = true, U = true} for _, v in pairs({ @@ -52,7 +55,7 @@ for _, v in pairs({ {"tag_uncommon", "Uncommon", 2, 1, 3}, {"tag_rare", "Rare", 3, 1, 5}, {"tag_cry_epic", "Epic", 4, 1, 8}, - {"tag_cry_gourmand", "Gourmand", 5, 1, 4}, + {gourmand, "Gourmand", 5, 1, 4}, {"tag_double", "Double", 0, 2, 6}, {"tag_cry_triple", "Triple", 1, 2, 8}, {"tag_cry_quadruple", "Quadruple", 2, 2, 10}, @@ -90,7 +93,7 @@ for _, v in pairs({ {"tag_cry_scope", "Scope", 5, 7, 3}, {"tag_cry_banana", "Banana", 0, 8, 4}, }) do - if Cryptid or v[1]:sub(1, 7) ~= "tag_cry" then + if v[1] and Cryptid or v[1]:sub(1, 7) ~= "tag_cry" then SMODS.Consumable { key = "token_" .. v[1], set = "jane_tokens",