manifest.json

@@ -18,5 +18,5 @@
     "conflicts": [
         "Jen"
     ],
-    "version": "1.11.0"
+    "version": "1.10.1"
 }

src/back.lua

@@ -694,9 +694,9 @@ back {
         G.GAME.starting_voucher_count = (G.GAME.starting_voucher_count or 0) + 1
 
         Jane.q(function()
-            add_rain_world_joker()
             local wee = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_wee", "weeck")
             G.jokers:emplace(wee)
+            add_rain_world_joker()
             G.GAME.tortoise = true
             G.GAME.obsidian = true
             G.GAME.mysterious = true

src/edition.lua

@@ -119,19 +119,12 @@ local jumbo = SMODS.Edition({
 
         Jane.misprintize(card, {min = jumbo_modifier, max = jumbo_modifier}, nil, true)
 
-        if (card.ability or {}).bonus and (card.base or {}).nominal then
-            card.ability.bonus = card.ability.bonus + card.base.nominal
-        end
-
         if card.added_to_deck then
             card:add_to_deck()
         end
 
         Jane.resize(card, Jane.config.wee_sizemod)
     end,
-    on_load = function(card)
-        Jane.resize(card, Jane.config.wee_sizemod)
-    end,
     on_remove = function(card)
         if not card.Jane_jumbo then
             return
@@ -146,10 +139,6 @@ local jumbo = SMODS.Edition({
 
         Jane.misprintize(card, {min = 1 / jumbo_modifier, max = 1 / jumbo_modifier}, nil, true)
 
-        if (card.ability or {}).bonus and (card.base or {}).nominal then
-            card.ability.bonus = card.ability.bonus - card.base.nominal
-        end
-
         if was_added then
             card:add_to_deck()
         end
@@ -171,21 +160,13 @@ function Card:set_ability(...)
     local is_jumbo = self.edition and self.edition.jane_jumbo
 
     if is_jumbo then
-        if Jane.cry then
         jumbo.on_remove(self)
-        else
-            Jane.resize(self)
-        end
     end
 
     local ret = orig_set_ability(self, ...)
 
     if is_jumbo then
-        if Jane.cry then
         jumbo.on_apply(self)
-        else
-            Jane.resize(self, Jane.config.wee_sizemod)
-        end
     end
 
     return ret

src/misprintize.lua

@@ -137,7 +137,6 @@ function Jane.misprintize_tbl(name, ref_tbl, ref_value, clear, override, stack,
                     (k == "h_x_chips" and not Jane.cry) and not
                     (k == "id") and not
                     (k == "colour") and not
-                    (k == "nominal") and not
                     (k == "suit_nominal") and not
                     (k == "base_nominal") and not
                     (k == "face_nominal") and not

src/slugcat.lua

@@ -555,11 +555,11 @@ function Card:draw(layer)
     if cen and
         self.facing == "front" and
         self.config and
-        (self.added_to_deck or (self.area and self.area == G.hand)) and
+        (self.added_to_deck or (self.area and self.area == G.hand)) and not
-        not self.edition and
+        self.edition and
         (self.area == G.consumeables or cen.set ~= "Booster") and
         next(SMODS.find_card("j_jane_gourmand")) then
-        self:set_edition("e_jane_jumbo", true, true)
+        self:set_edition("e_jane_jumbo")
     end
 
     orig_draw(self, layer)
@@ -584,20 +584,20 @@ SMODS.Joker {
         text = {
             "{C:attention}Use {}to toggle itself or",
             "other Jokers to its",
-            "left's {C:legendary}Eternal{} sticker",
+            "left's {X:legendary,C:white}Eternal{} sticker",
-            "{C:attention}#4#{}#5#{C:spectral}#6#{}#7#",
+            "{C:attention}#4#{}#5#{X:black,C:jane_RGB}#6#{C:spectral}#7#",
-            "{C:inactive,s:1.25}#8#{C:attention,s:1.25}#9#{C:inactive,s:1.25}#10#",
+            "{C:inactive}#8#{C:attention}#9#{C:inactive}#10#",
             Jane.cry and "{C:inactive}(Gateway has no downside)" or nil,
         },
     },
-    config = {extra = {changes_editions = false, jokers = Jane.cry and 10 or 1, karma = 0, max_karma = Jane.cry and 10 or 3}},
+    config = {extra = {karma = 0, max_karma = Jane.cry and 20 or 3}},
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
     cost = 20,
     rarity = 4,
     blueprint_compat = true,
     loc_vars = function(_, info_queue, card)
-        info_queue[#info_queue + 1] = Jane.cry and G.P_CENTERS.c_cry_gateway or nil
+        info_queue[#info_queue + 1] = Jane.cry and G.P_CENTERS.c_cry_gateway or G.P_CENTERS.c_ankh
 
         local extra = card.ability.extra
         local karma = extra.karma
@@ -610,27 +610,28 @@ SMODS.Joker {
                 attuned and "The" or "",
                 attuned and "Attuned" or "",
                 attuned and "" or "Attune ",
-                attuned and "" or "at ",
+                attuned and "alongside its " or "after ",
-                attuned and (Jane.cry and "Gateways " or "Spectrals ") or
+                attuned and "Edition" or max_karma,
-                max_karma .. (Jane.cry and " Gateways" or " Spectrals"),
+                attuned and "" or (Jane.cry and " Gateways" or " Ankhs"),
-                attuned and "add Joker slots" or "",
+                attuned and "" or "[",
-                attuned and "[Currently " or "[",
+                attuned and "" or karma,
-                attuned and "+" .. karma or karma,
+                attuned and "(Cannot be debuffed)" or " / " .. max_karma .. "]",
-                attuned and "]" or " / " .. max_karma .. "]",
             },
         }
     end,
     update = function(_, card, _)
-        if card.edition and card.edition.Roland_frozen then
+        local extra = card.ability.extra
-            card:set_edition("e_base")
+        card.debuff_immune = extra.is_attuned
-        elseif card.children.floating_sprite then
+
-            card.children.floating_sprite:set_sprite_pos({x = card.ability.extra.is_attuned and 2 or 1, y = 0})
+        if card.children.floating_sprite then
+            card.children.floating_sprite:set_sprite_pos({x = extra.is_attuned and 2 or 1, y = 0})
         end
     end,
     calculate = function(_, card, context)
         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 20 or 2)
 
         local function ascend()
             if extra.is_attuning then
@@ -666,9 +667,14 @@ SMODS.Joker {
             end, 1)
         end
 
-        if extra.karma >= max_karma then
+        if extra.is_attuned then
-            local karma = (extra.is_attuning or extra.is_attuned) and 0 or extra.karma
+            card.debuff = false
-            G.jokers:change_size(karma * extra.jokers)
+
+            if card.ability then
+                card.ability.perishable = false
+                card.ability.perish_tally = 1e9
+            end
+        elseif extra.karma >= max_karma then
             ascend()
         end
 
@@ -679,9 +685,9 @@ SMODS.Joker {
             return
         end
 
-        local gc = context.consumeable:gc()
+        local key = context.consumeable:gc().key
 
-        if Jane.cry and gc.key ~= "c_cry_gateway" or not Jane.cry and gc.set ~= "Spectral" then
+        if Jane.cry and key ~= "c_cry_gateway" or not Jane.cry and key ~= "c_ankh" then
             return
         end
 
@@ -697,7 +703,7 @@ SMODS.Joker {
             {message = "+" .. quota .. " Karma", colour = G.C.PALE_GREEN}
         )
 
-        local _ = extra.karma <= max_karma and card_eval_status_text(
+        card_eval_status_text(
             card,
             "extra",
             nil,
@@ -710,12 +716,9 @@ SMODS.Joker {
             return
         end
 
-        G.jokers:change_size((extra.is_attuned and quota or extra.karma) * extra.jokers)
         ascend()
     end,
-    Bakery_can_use = function(_, card)
+    Bakery_can_use = Jane.can_use,
-        return Jane.can_use() and not card.debuff
-    end,
     Bakery_use_joker = function(_, card)
         for joker_index = 1, math.max(card.rank - 1, 1) do
             local joker = G.jokers.cards[joker_index]
@@ -725,9 +728,7 @@ SMODS.Joker {
                 joker.Roland_frozen_ability.eternal = joker.ability.eternal
             end
 
-            if not card.ability.extra.changes_editions or
+            if not card.ability.extra.is_attuned or joker.ability.eternal then
-                not card.ability.extra.is_attuned or
-                joker.ability.eternal then
                 joker:juice_up()
                 goto continue
             end
@@ -750,9 +751,7 @@ 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 {