.gitignore

@@ -38,6 +38,3 @@ luac.out
 *.i*86
 *.x86_64
 *.hex
-
-# Syncthing
-.stfolder

config.lua

@@ -6,5 +6,4 @@ return {
     import_funky = false,
     no_highlight_limit = true,
     no_wild_debuff = true,
-    scribable_basket = false,
 }

localization/en-us.lua

@@ -9,6 +9,14 @@ return {
                     "that are {C:dark_edition}debuffed #1# times",
                 },
             },
+            b_Roland_go = {
+                name = "Pass GO Deck",
+                text = {
+                    "Start with a {C:attention}Credit Card",
+                    "Set money to {C:money}$0 {}when",
+                    "entering the shop",
+                },
+            },
             b_Roland_swapper = {
                 name = "Swapper Deck",
                 text = {
@@ -29,7 +37,7 @@ return {
             BakeryCharm_Roland_fat = {
                 name = "fat i phone",
                 text = {
-                    "{C:attention}+#1# Booster Pack {}slots",
+                    -- "{C:attention}+#1# Booster Pack {}slots",
                     "All {C:attention}Booster Packs {}are {C:attention}Mega",
                     "{C:inactive}(Whenever applicable)",
                 },
@@ -118,18 +126,6 @@ return {
             },
         },
         Joker = {
-            j_Roland_arctic = {
-                name = "Arctic Circle",
-                text = {"Retrigger all", "{C:dark_edition}Frozen {}cards"},
-            },
-            j_Roland_basket = {
-                name = "Basket",
-                text = {
-                    "Sell this Joker to",
-                    "create {C:dark_edition}Negative {}copies",
-                    "of every consumable",
-                },
-            },
             j_Roland_bulldozer = {
                 name = "Bulldozer",
                 text = {
@@ -173,14 +169,6 @@ return {
                     },
                 },
             },
-            j_Roland_hardboiled = {
-                name = "Hard-Boiled",
-                text = {
-                    "Sell this Joker to",
-                    "turn all cards in",
-                    "hand {C:dark_edition}Frozen",
-                },
-            },
             j_Roland_jokersr = {
                 name = "Joker Sr.",
                 text = {"{X:mult,C:white}X#1#{} Mult"},
@@ -229,14 +217,6 @@ return {
                 name = "Ms. Joker",
                 text = {"{C:chips}+#1#{} Chips"},
             },
-            j_Roland_nilly = {
-                name = "Nilly",
-                text = {
-                    "Toggleable {X:mult,C:white}X0{} Mult",
-                    "{C:inactive}(Currently {C:attention}#1#{C:inactive})",
-                    "{C:inactive,s:0.75,E:1}Wait... what?",
-                },
-            },
             j_Roland_oops = {
                 name = "Oops! All 7s",
                 text = {
@@ -258,10 +238,6 @@ return {
                     "least {C:attention}#2# suits",
                 },
             },
-            j_Roland_suitable = {
-                name = "Suitable",
-                text = {"{V:1}#1# {}are {C:attention}Wild", "Suit changes", "every round"},
-            },
             j_Roland_sunny = {
                 name = "Sunny Side Up",
                 text = {
@@ -320,10 +296,25 @@ return {
                 name = "Efflorescent Sleeve",
                 text = {
                     "{C:attention}Blinds{} are {C:dark_edition}debuffed",
-                    "{C:dark_edition}({X:dark_edition,C:white}(ante * #2#){C:dark_edition}) times",
+                    "{C:dark_edition}({X:dark_edition,C:white}ante{} {X:dark_edition,C:white}number{C:dark_edition}) times",
                     "{C:inactive}(Instead of #1#)",
                 },
             },
+            sleeve_Roland_go = {
+                name = "Pass GO Sleeve",
+                text = {
+                    "Start with a {C:attention}Credit Card",
+                    "Set money to {C:money}$0 {}when",
+                    "entering the shop",
+                },
+            },
+            sleeve_Roland_go_alt = {
+                name = "Free Parking Sleeve",
+                text = {
+                    "Start with an additional",
+                    "{X:attention,C:white}#1#{C:attention} Credit Cards",
+                },
+            },
             sleeve_Roland_swapper = {
                 name = "Swapper Sleeve",
                 text = {
@@ -381,12 +372,6 @@ return {
                 },
             },
         },
-        Tag = {
-            tag_Roland_invisible = {
-                name = "Invisible Tag",
-                text = {"{C:attention}Duplicate {}a random Joker", "{C:inactive}(Must have room)"},
-            },
-        },
     },
     misc = {
         challenge_names = {
@@ -395,7 +380,6 @@ return {
             c_Roland_Eternally_Crimson = "Eternally Crimson",
             c_Roland_Eternally_Verdant = "Eternally Verdant",
             c_Roland_Eternally_Violet = "Eternally Violet",
-            c_Roland_Go = "Pass GO",
             c_Roland_Jokerful = "Jokerful",
             c_Roland_Ornate = "Ornate",
             c_Roland_Pastries = "Sweet Pastries",
@@ -403,8 +387,6 @@ return {
         },
         v_dictionary = {
             b_Roland_bye = "Bye!",
-            b_Roland_disabled = "Disabled",
-            b_Roland_enabled = "Enabled",
             b_Roland_comma = ", ",
             b_Roland_debuffed = "DEBUFFED",
             b_Roland_entering_shop = "Entering shop!",
@@ -412,7 +394,6 @@ return {
             b_Roland_fuse = "FUSE",
             b_Roland_equinox_assist = "Assist: Only hide text (Equinox)",
             b_Roland_fusable_escapey = "Fusable Escapey (overpowered)",
-            b_Roland_scribable_basket = "Scribable Basket (overpowered)",
             b_Roland_harsh_ante_scaling = "Harsh ante scaling (Ante 40+)",
             b_Roland_illusion_seal = "Allow seals from Illusion voucher",
             b_Roland_import_funky = "Debug: Import funky.lua",
@@ -421,7 +402,6 @@ return {
             b_Roland_no_wild_debuff = "No wild card debuffs",
             b_Roland_na = "N/A",
             b_Roland_of = " of ",
-            b_Roland_toggle = "TOGGLE",
         },
         labels = {
             Roland_frozen = "Frozen",
@@ -433,7 +413,6 @@ return {
             ch_c_Roland_Eternally_Crimson = {"{C:attention}Crimson Heart{}'s effect is active every blind"},
             ch_c_Roland_Eternally_Verdant = {"{C:attention}Verdant Leaf{}'s effect is active every blind"},
             ch_c_Roland_Eternally_Violet = {"{C:attention}Violet Vessel{}'s effect is active every blind"},
-            ch_c_Roland_Go = {"Set money to {C:money}$0 {}when entering the shop"},
             ch_c_Roland_Jokerful = {"The only jokers are {C:mult}Joker{} and {C:chips}Ms. Joker"},
             ch_c_Roland_Ornate = {"Anything vanilla is banned"},
             ch_c_Roland_Pastries = {"All blinds, cards, and tags are of {C:gold}Bakery{} or {C:blue}Roland"},

manifest.json

@@ -6,7 +6,7 @@
     "author": [
         "Emik"
     ],
-    "version": "2.2.12",
+    "version": "2.1.4",
     "badge_colour": "8BE9FD",
     "main_file": "src/main.lua",
     "badge_text_colour": "44475A",
@@ -15,8 +15,8 @@
     "provides": [],
     "conflicts": [],
     "dependencies": [
-        "Steamodded (>=1.0~*)",
+        "Steamodded (>=1.*)",
         "Lovely (>=0.6)",
-        "Bakery (>=0.1.26~*)"
+        "Bakery (>=1.3.2~*)"
     ]
 }

src/back.lua

@@ -74,9 +74,8 @@ back {
     key = "blossom",
     pronouns = "any_all",
     config = {extra = {times = 2}},
-    attributes = {"boss_blind"},
     loc_vars = function(self, _, _)
-        return {vars = {self.config.extra.times, self.config.extra.alt_times}}
+        return {vars = {self.config.extra.times}}
     end,
     apply = function(_, _)
         G.GAME.modifiers.Roland_blossom_deck = true
@@ -92,11 +91,9 @@ back {
             return
         end
 
-        local count = self:is_alt() and
-            G.GAME.round_resets.ante * self.config.extra.alt_times or
-            self.config.extra.times
+        local count = self:is_alt() and G.GAME.round_resets.ante or self.config.extra.times
 
-        f(count):each(function()
+        for _ = 1, count do
             G.GAME.blind:disable()
 
             q {
@@ -107,20 +104,59 @@ back {
                     play_sound "timpani"
                 end,
             }
+        end
+    end,
+}
+
+back {
+    key = "go",
+    pronouns = "he_him",
+    config = {extra = {times = 1, alt_times = 5}},
+    loc_vars = function(self, info_queue, _)
+        local _ = info_queue and table.insert(info_queue, G.P_CENTERS.j_credit_card)
+        return {vars = {self.config.extra.alt_times - self.config.extra.times}}
+    end,
+    apply = function(self)
+        q(function()
+            local count = self:is_alt() and self.config.extra.alt_times or self.config.extra.times
+
+            for _ = 1, count do
+                local c = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_credit_card", "Roland_go")
+                c:add_to_deck()
+                c:start_materialize()
+                G.jokers:emplace(c)
+            end
         end)
     end,
+    calculate = function(_, card, context)
+        if not context.starting_shop then
+            return
+        end
+
+        ease_dollars(-G.GAME.dollars)
+
+        attention_text {
+            text = localize "k_nope_ex",
+            backdrop_colour = G.C.MONEY,
+            offset = {x = 0, y = 0},
+            silent = true,
+            major = card,
+            align = "cm",
+            scale = 1.3,
+            hold = 1.4,
+        }
+    end,
 }
 
 back {
     key = "swapper",
     pronouns = "he_him",
-    attributes = {"spectral", "tarot"},
     apply = function(self)
         local modifiers = G.GAME.modifiers
         modifiers.Roland_swapper_deck = true
         modifiers.Roland_alt_swapper_deck = modifiers.Roland_alt_swapper_deck or self:is_alt()
     end,
-    calculate = f().noop,
+    calculate = function() end,
 }
 
 local swapper = {Spectral = "Tarot", Tarot = "Spectral"}

src/blind.lua

@@ -337,8 +337,6 @@ function SMODS.current_mod:calculate(context)
         modifiers.Roland_martingale_seed = (modifiers.Roland_martingale_seed or 0) + 1
     end
 
-    local _ = type(G.calccontext) == "function" and G.calccontext(context)
-    local _ = type(G.calckeys) == "function" and G.calckeys(f(context):keys())
     local _ = type(G.calc) == "function" and G.calc(f(context):keys():string())
     local improbable, orig = G.GAME.modifiers.Roland_improbable, G.GAME.probabilities
 

src/challenge.lua

@@ -52,29 +52,6 @@ end
 local jokerful, vanillas, pastries, amber, cerulean, crimson, verdant, violet, final
 = bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans(), bans()
 
-SMODS.Challenge {
-    key = "Go",
-    rules = {custom = {{id = "Roland_Go"}}},
-    jokers = {{id = "j_credit_card"}},
-    pronouns = "he_him",
-    calculate = function(self, context)
-        if context.starting_shop then
-            ease_dollars(-G.GAME.dollars)
-
-            attention_text {
-                text = localize "k_nope_ex",
-                backdrop_colour = G.C.MONEY,
-                offset = {x = 0, y = 0},
-                silent = true,
-                major = self,
-                align = "cm",
-                scale = 1.3,
-                hold = 1.4,
-            }
-        end
-    end,
-}
-
 SMODS.Challenge {
     key = "Jokerful",
     rules = {custom = {{id = "Roland_Jokerful"}}},

src/charm.lua

@@ -79,7 +79,6 @@ end
 charm {
     key = "wii",
     pronouns = "they_them",
-    attributes = {"skip"},
     calculate = function(_, card, context)
         if not context.skip_blind then
             return
@@ -117,17 +116,16 @@ end
 charm {
     key = "fat",
     pronouns = "he_they",
-    attributes = {"passive"},
-    config = {extra = {mod = 1}},
-    loc_vars = function(_, _, card)
-        return {vars = {card.ability.extra.mod}}
-    end,
-    equip = function(_, card)
-        SMODS.change_booster_limit(card.ability.extra.mod)
-    end,
-    unequip = function(card)
-        SMODS.change_booster_limit(-card.ability.extra.mod)
-    end,
+    -- config = {extra = {mod = 1}},
+    -- loc_vars = function(_, _, card)
+    --     return {vars = {card.ability.extra.mod}}
+    -- end,
+    -- equip = function(_, card)
+    --     SMODS.change_booster_limit(card.ability.extra.mod)
+    -- end,
+    -- unequip = function(card)
+    --     SMODS.change_booster_limit(-card.ability.extra.mod)
+    -- end,
 }
 
 local orig_init = Card.init
@@ -162,7 +160,6 @@ end
 charm {
     key = "cocacola",
     pronouns = "he_they",
-    attributes = {"passive", "tarot", "spectral"},
     equip = function()
         f(G.consumeables.cards):each(add_to_consumable_ability_by(1))
     end,
@@ -187,7 +184,6 @@ charm {
     key = "hand",
     pronouns = "he_him",
     config = {extra = {hands = -2, hand_size = 5}},
-    attributes = {"hands", "hand_size", "passive"},
     loc_vars = function(_, _, card)
         local extra = card.ability.extra
         return {vars = {extra.hand_size, extra.hands}}

src/edition.lua

@@ -16,6 +16,7 @@ local frozen_sounds = f(4):map(frozen_sound):map("key"):table()
 
 local needs_chip_mult_override = {
     Bull = true,
+    Estate = true,
     Erosion = true,
     Misprint = true,
     TierList = true,
@@ -35,7 +36,6 @@ local current_round_overrides = {
     Obelisk = "most_played_poker_hand",
     ["Ancient Joker"] = "ancient_card",
     Wherewolf = "Bakery_Wherewolf_card",
-    j_Roland_suitable = "Roland_suitable",
 }
 
 SMODS.current_mod.frozen_chip_mult = needs_chip_mult_override
@@ -53,15 +53,10 @@ local function freeze(card)
 
     card.Roland_frozen_ability = card.Roland_frozen_ability or copy(card.ability)
     card.ability = card.Roland_frozen_ability and copy(card.Roland_frozen_ability) or card.ability
-    local ability, ret = card.ability, card.Roland_frozen_ability
+    local ret = card.Roland_frozen_ability
+    local ability = card.ability
 
-    if type(ability) ~= "table" then
-        return ret
-    end
-
-    ability.seal = ability.seal or {}
-
-    if not ability.name or not G.GAME.current_round then
+    if type(ability) ~= "table" or not ability.name or not G.GAME.current_round then
         return ret
     end
 
@@ -80,7 +75,6 @@ SMODS.Edition {
     key = "frozen",
     shader = "frozen",
     sound = {sound = "Roland_frozen", per = 1, vol = 0.8},
-    attributes = {"passive", "scaling"},
     weight = 8,
     extra_cost = 4,
     in_shop = true,
@@ -89,8 +83,6 @@ SMODS.Edition {
         freeze(card)
     end,
     on_remove = function(card)
-        card.Roland_frozen_proxy = nil
-        card.Roland_frozen_estate = nil
         card.Roland_frozen_ability = nil
     end,
     get_weight = function(self)
@@ -132,11 +124,6 @@ local orig_calculate_joker = Card.calculate_joker
 function Card:calculate_joker(context, ...)
     local is_frozen = self.edition and self.edition.Roland_frozen
 
-    if is_frozen and self.ability.name == "Loyalty Card" then
-        return (context.joker_main and self.ability.loyalty_remaining == 0) and
-            {xmult = self.ability.extra.Xmult} or nil
-    end
-
     if is_frozen and self.ability.name == "Turtle Bean" then
         return
     end
@@ -168,6 +155,8 @@ function Card:calculate_joker(context, ...)
                 ability.Roland_frozen_mult_mod or
                 ability.Roland_frozen_chip_mod or
                 ability.Roland_frozen_xmult,
+                (ability.Roland_frozen_mult_mod and ability.Roland_frozen_chip_mod) and
+                ability.Roland_frozen_chip_mod or nil,
             },
         },
     }
@@ -193,57 +182,6 @@ function Card:calculate_dollar_bonus(...)
     return orig_calculate_dollar_bonus(self, ...)
 end
 
-q(function()
-    local estate = G.P_CENTERS.j_Bakery_Estate
-
-    if not estate then
-        return
-    end
-
-    ---@param card Card|{ Roland_frozen_estate: integer }
-    local function estate_pos(card)
-        if card.area ~= G.jokers and card.area.config.type ~= "title" then
-            return 1
-        end
-
-        card.Roland_frozen_estate = card.Roland_frozen_estate and
-            card.Roland_frozen_estate or
-            (f(card.area.cards):swap():any(function(_, k)
-                return k == card
-            end) or 1)
-
-        return card.Roland_frozen_estate
-    end
-
-    local orig_calculate = estate.calculate
-
-    function estate:calculate(card, context, ...)
-        if not card or not card.edition or not card.edition.Roland_frozen then
-            return orig_calculate(self, card, context, ...)
-        end
-
-        if not context.joker_main then
-            return
-        end
-
-        local joker_count = estate_pos(card)
-        local extra = card.ability.extra or {}
-        return {chips = extra.chips * joker_count, mult = extra.mult * joker_count}
-    end
-
-    local orig_loc_vars = estate.loc_vars
-
-    function estate:loc_vars(info_queue, card, ...)
-        if not card or not card.edition or not card.edition.Roland_frozen then
-            return orig_loc_vars(self, info_queue, card, ...)
-        end
-
-        local joker_count = estate_pos(card)
-        local extra = card.ability.extra or {}
-        return {vars = {extra.chips * joker_count, extra.mult * joker_count}}
-    end
-end)
-
 q(function()
     local proxy = G.P_CENTERS.j_Bakery_Proxy
 
@@ -251,25 +189,25 @@ q(function()
         return
     end
 
-    ---@param card Card|{ Roland_frozen_proxy: number }
     local function get_proxied_joker(card)
         if not G.jokers or not G.jokers.cards then
             return
         end
 
-        card.Roland_frozen_proxy = card.Roland_frozen_proxy or
-            (Bakery_API.get_proxied_joker() or card).unique_val
+        local ability = freeze(card)
 
         ---@param v Card
         local function eq(v)
-            return v.unique_val == card.Roland_frozen_proxy
+            return v.unique_val == ability.Roland_frozen_proxy
         end
 
+        ability.Roland_frozen_proxy = (Bakery_API.get_proxied_joker() or card).unique_val
         return f(G.jokers.cards):any(eq) ---@type Card?
     end
 
     local orig_calculate = proxy.calculate
 
+    ---@param card Card|{ Roland_frozen_ability: table }
     function proxy:calculate(card, context, ...)
         if not card or not card.edition or not card.edition.Roland_frozen then
             return orig_calculate(self, card, context, ...)
@@ -296,17 +234,3 @@ q(function()
         return {vars = {var}}
     end
 end)
-
-q(function()
-    local orig_flip_double_sided = (Bakery_API or {}).flip_double_sided
-
-    if not orig_flip_double_sided then
-        return
-    end
-
-    function Bakery_API.flip_double_sided(card, ...)
-        if not card.edition or not card.edition.Roland_frozen then
-            return orig_flip_double_sided(card, ...)
-        end
-    end
-end)

src/joker.lua

@@ -12,19 +12,13 @@ local joker = (function()
         return ret
     end
 
-    ---@param tbl SMODS.Joker|{artist?: string, sinis?: boolean|{x: number, y: number}, soul_pos?: boolean|{x: number, y: number}, attributes?: Attributes[]}
+    ---@param tbl SMODS.Joker|{artist?: string, sinis?: boolean|{x: number, y: number}, soul_pos?: boolean|{x: number, y: number}}
     return function(tbl)
         tbl.pos = inc()
         tbl.atlas = "joker"
         tbl.artist = tbl.artist and "Roland_" .. tbl.artist or nil
         tbl.soul_pos = tbl.soul_pos and inc() or nil
         tbl.sinis = tbl.sinis and inc() or nil
-
-        if ((tbl.config or {}).extra or {}).flipped ~= nil then
-            tbl.config.extra.front_pos = tbl.pos
-            tbl.config.extra.back_pos = inc()
-        end
-
         local joker = SMODS.Joker(tbl)
 
         q(function()
@@ -37,16 +31,10 @@ local function destructible(card)
     return not card.highlighted and not (card.ability or {}).eternal
 end
 
----@param card Card
 local function is_carbon(card)
     return card.edition and card.edition.key == "e_Bakery_Carbon"
 end
 
----@param card Card
-local function is_frozen(card)
-    return card.edition and card.edition.key == "e_Roland_frozen"
-end
-
 local function is_mergeable_with(x)
     return function(y)
         return x.rank ~= y.rank and
@@ -95,16 +83,10 @@ SMODS.Atlas {
     py = 95,
 }
 
-SMODS.Sound {
-    key = "nilly",
-    path = "nilly.ogg",
-}
-
 joker {
     key = "escapey",
     pronouns = "they_them",
     config = {extra = {hands = 2}},
-    attributes = {"destroy_card", "tarot", "planet", "spectral", "tag"},
     cost = 4,
     rarity = 2,
     sinis = true,
@@ -135,9 +117,6 @@ joker {
             },
         }
     end,
-    calculate = function(self, card, context)
-        return context.forcetrigger and self.proc(card) or nil
-    end,
     Bakery_can_use = function(self, card)
         return not card.debuff and u() and (self.exchangable() or self.fusable(card))
     end,
@@ -149,6 +128,9 @@ joker {
                     "b_Roland_fuse" or "b_Roland_escape"),
         }
     end,
+    calculate = function(self, card, context)
+        return context.forcetrigger and self.proc(card) or nil
+    end,
     Bakery_use_joker = function(self, card)
         if card.debuff then
             return
@@ -248,7 +230,6 @@ joker {
     blueprint_compat = true,
     perishable_compat = true,
     config = {extra = {chips = 30}},
-    attributes = {"chips"},
     loc_vars = function(_, _, card)
         return {vars = {card.ability.extra.chips}}
     end,
@@ -261,9 +242,7 @@ joker {
 joker {
     key = "mrsbones",
     pronouns = "she_her",
-    artist = "char",
     config = {extra = {xmult = 4, requirement = 4}},
-    attributes = {"xmult"},
     cost = G.P_CENTERS.j_mr_bones.cost - 1,
     rarity = 2,
     eternal_compat = false,
@@ -298,7 +277,6 @@ joker {
     key = "phytoestrogens",
     pronouns = "she_her",
     config = {extra = {xmult = 0.25}},
-    attributes = {"mult", "xmult"},
     cost = 8,
     rarity = 3,
     eternal_compat = true,
@@ -322,7 +300,6 @@ joker {
     pronouns = "it_its",
     artist = "char",
     config = {extra = {price = 4, hand_name = "Four of a Kind"}},
-    attributes = {"sell_value", "scaling", "economy", "hand_type"},
     cost = 4,
     rarity = 1,
     eternal_compat = true,
@@ -351,7 +328,6 @@ joker {
     pronouns = "it_its",
     artist = "char",
     config = {extra = {mult_gain = 4, hand_name = "Four of a Kind", mult = 0}},
-    attributes = {"mult", "scaling", "hand_type"},
     cost = 4,
     rarity = 2,
     eternal_compat = true,
@@ -382,7 +358,6 @@ joker {
     pronouns = "it_its",
     artist = "char",
     config = {extra = {times = 4, hand_name = "Four of a Kind"}},
-    attributes = {"generation", "hand_type"},
     cost = 8,
     rarity = 3,
     eternal_compat = false,
@@ -410,7 +385,7 @@ joker {
                 return
             end
 
-            f(extra.times):each(function()
+            for _ = 1, extra.times do
                 G.playing_card = (G.playing_card or 0) + 1
                 G.deck.config.card_limit = G.deck.config.card_limit + 1
                 local chosen = pseudorandom_element(scored_cards, pseudoseed "Roland_trimino")
@@ -420,7 +395,7 @@ joker {
                 copy:start_materialize()
                 table.insert(copied, copy)
                 table.insert(G.playing_cards, copy)
-            end)
+            end
 
             SMODS.calculate_effect({{message = localize "k_copied_ex", message_card = card}}, card)
             playing_card_joker_effects(copied)
@@ -433,10 +408,8 @@ joker {
 }
 
 joker {
-    key = "sunny",
+    key = "sunny", -- Cracked egg
     pronouns = "they_them",
-    artist = "char",
-    attributes = {"food", "on_sell"},
     cost = 2,
     rarity = 1,
     eternal_compat = false,
@@ -493,60 +466,9 @@ joker {
     end,
 }
 
-joker {
-    key = "hardboiled",
-    pronouns = "they_them",
-    attributes = {"food", "editions", "modify_card", "on_sell"},
-    cost = 5,
-    rarity = 2,
-    eternal_compat = false,
-    blueprint_compat = true,
-    perishable_compat = true,
-    loc_vars = function(_, info_queue)
-        table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
-    end,
-    calculate = function(_, _, context)
-        return (context.selling_self or context.forcetrigger) and f(G.hand.cards):each(function(v)
-            q {
-                delay = 0.1,
-                func = function()
-                    v:set_edition {Roland_frozen = true}
-                end,
-            }
-        end) or nil
-    end,
-}
-
-joker {
-    key = "basket",
-    pronouns = "they_them",
-    attributes = {"food", "generation", "on_sell"},
-    cost = 8,
-    rarity = 3,
-    eternal_compat = false,
-    blueprint_compat = true,
-    perishable_compat = true,
-    loc_vars = function(_, info_queue)
-        table.insert(info_queue, negative)
-    end,
-    calculate = function(_, _, context)
-        return (context.selling_self or context.forcetrigger) and f(G.consumeables.cards):each(function(v)
-            q {
-                delay = 1,
-                func = function()
-                    play_sound "timpani"
-                    SMODS.add_card {edition = "e_negative", key = v.config.center.key}
-                end,
-            }
-        end) or nil
-    end,
-}
-
 joker {
     key = "sapling",
     pronouns = "they_them",
-    artist = "char",
-    attributes = {"mult", "suit"},
     cost = 4,
     rarity = 1,
     config = {extra = {mult = 15, suits = 3}},
@@ -580,9 +502,8 @@ joker {
     key = "yard",
     pronouns = "he_him",
     config = {extra = {money = 2}},
-    attributes = {"economy"},
-    cost = 4,
-    rarity = 1,
+    cost = 6,
+    rarity = 2,
     eternal_compat = true,
     blueprint_compat = true,
     perishable_compat = true,
@@ -595,63 +516,9 @@ joker {
     end,
 }
 
-joker {
-    key = "suitable",
-    pronouns = "she_they",
-    attributes = {"suit", "passive", "hearts", "diamonds", "spades", "clubs"},
-    cost = 4,
-    rarity = 2,
-    eternal_compat = true,
-    blueprint_compat = false,
-    perishable_compat = true,
-    loc_vars = function(_, info_queue)
-        table.insert(info_queue, G.P_CENTERS.m_wild)
-        local suit = (G.GAME.current_round.Roland_suitable or {}).suit or "Spades"
-        return {vars = {localize(suit, "suits_plural"), colours = {G.C.SUITS[suit]}}}
-    end,
-    add_to_deck = function()
-        G.GAME.modifiers.Roland_suitable = (G.GAME.modifiers.Roland_suitable or 0) + 1
-    end,
-    remove_from_deck = function()
-        G.GAME.modifiers.Roland_suitable = (G.GAME.modifiers.Roland_suitable or 0) - 1
-    end,
-}
-
-function SMODS.current_mod.reset_game_globals()
-    local immutable = f(SMODS.find_card "j_Roland_suitable"):any(is_frozen)
-    local suitable = {suit = "Spades"}
-
-    G.GAME.current_round.Roland_suitable = immutable and
-        G.GAME.current_round.Roland_suitable or suitable
-
-    if immutable then
-        return
-    end
-
-    local suits = f(G.playing_cards):where(SMODS.has_no_suit, false):table()
-    local card = pseudorandom_element(suits, "Roland_suitable" .. G.GAME.round_resets.ante)
-    suitable.suit = card and card.base.suit or suitable.suit
-end
-
-local orig_get_enhancements = SMODS.get_enhancements
-
-function SMODS.get_enhancements(card, ...)
-    if (G.GAME.modifiers.Roland_suitable or 0) <= 0 or
-        card.base.suit ~= G.GAME.current_round.Roland_suitable.suit or
-        (card.area ~= G.hand and card.area ~= G.play) then
-        return orig_get_enhancements(card, ...)
-    end
-
-    local ret = orig_get_enhancements(card, ...) or {}
-    ret.m_wild = true
-    return ret
-end
-
 joker {
     key = "misfortune",
     pronouns = "she_they",
-    artist = "char",
-    attributes = {"discard", "generation", "seals"},
     cost = 6,
     rarity = 2,
     eternal_compat = true,
@@ -671,8 +538,7 @@ joker {
 joker {
     key = "temple",
     pronouns = "any_all",
-    config = {extra = {xmult = 2}},
-    attributes = {"xmult", "enhancements"},
+    config = {extra = {xmult = 1.5}},
     cost = 6,
     rarity = 2,
     eternal_compat = true,
@@ -699,7 +565,6 @@ joker {
     key = "jokersr",
     pronouns = "he_him",
     config = {extra = {xmult = 1.25}},
-    attributes = {"xmult"},
     cost = 2,
     rarity = 2,
     eternal_compat = true,
@@ -717,20 +582,19 @@ joker {
 joker {
     key = "bulldozer",
     pronouns = "it_its",
-    attributes = {"xmult"},
     cost = 6,
     rarity = 2,
     eternal_compat = true,
     blueprint_compat = true,
     perishable_compat = true,
-    loc_vars = function(self, _, card)
+    loc_vars = function(self, card, _)
         return {vars = {self:xmult_frozen(card)}}
     end,
     calculate = function(self, card, context)
         return (context.joker_main or context.forcetrigger) and {card = card, xmult = self:xmult_frozen(card)} or nil
     end,
     xmult_frozen = function(self, card)
-        if not is_frozen(card) then
+        if not card.edition or not card.edition.Roland_frozen then
             return self.xmult()
         end
 
@@ -756,7 +620,6 @@ joker {
     key = "martingale",
     pronouns = "he_him",
     config = {extra = {odds = 2}},
-    attributes = {"xmult", "chance"},
     cost = 8,
     rarity = 2,
     eternal_compat = true,
@@ -805,7 +668,6 @@ joker {
     cost = 7,
     rarity = 3,
     config = {extra = {probability = 1, probability_mult = 2, reset = 1}},
-    attributes = {"hands", "mod_chance", "scaling"},
     eternal_compat = true,
     blueprint_compat = false,
     perishable_compat = true,
@@ -835,75 +697,3 @@ joker {
         end
     end,
 }
-
-joker {
-    key = "nilly",
-    pronouns = "any_all",
-    config = {extra = {flipped = false}},
-    attributes = {"xmult"},
-    cost = 0,
-    rarity = 3,
-    eternal_compat = true,
-    blueprint_compat = true,
-    perishable_compat = true,
-    loc_vars = function(_, _, card)
-        return {
-            vars = {localize {
-                type = "variable",
-                key = card.ability.extra.flipped and "b_Roland_enabled" or "b_Roland_disabled",
-            }},
-        }
-    end,
-    inject = function(...)
-        SMODS.Joker.inject(...)
-        Bakery_API.double_sided_jokers.j_Roland_nilly = true
-    end,
-    calculate = function(_, card, context)
-        if (not context.joker_main or not card.ability.extra.flipped) and not context.forcetrigger then
-            return
-        end
-
-        mult = mod_mult(0)
-        update_hand_text({delay = 0}, {chips = hand_chips, mult = mult})
-        return {sound = "Roland_nilly", message = "0X " .. localize "k_mult", colour = G.C.MULT, card = card}
-    end,
-    Bakery_can_use = function(_, card)
-        return not card.debuff
-    end,
-    Bakery_use_button_text = function(_, card)
-        return localize {
-            type = "variable",
-            key = card.debuff and "b_Roland_debuffed" or "b_Roland_toggle",
-        }
-    end,
-    Bakery_use_joker = function(_, card)
-        local _ = card.debuff or Bakery_API.flip_double_sided(card)
-    end,
-}
-
-joker {
-    key = "arctic",
-    pronouns = "it_its",
-    cost = 10,
-    rarity = 3,
-    config = {extra = {repetitions = 1}},
-    attributes = {"retrigger", "editions"},
-    eternal_compat = true,
-    blueprint_compat = true,
-    perishable_compat = true,
-    loc_vars = function(_, info_queue)
-        table.insert(info_queue, G.P_CENTERS.e_Roland_frozen)
-    end,
-    calculate = function(_, card, context)
-        return (context.repetition and is_frozen(context.other_card)) and {repetitions = 1} or SMODS.merge_effects(
-            f(G.jokers.cards):where(is_frozen):map(function(v)
-                return SMODS.blueprint_effect(card, v, context) or true
-            end):where(function(v)
-                return type(v) == "table"
-            end):map(function(v)
-                v.colour = G.C.BLACK
-                return v
-            end):table()
-        )
-    end,
-}

src/lib/funky.lua

@@ -342,20 +342,6 @@ function f:values()
     end)
 end
 
----@generic K, V
----@param self F|{ [K]: V }
----@return F|{ [V]: K }
----@nodiscard
-function f:swap()
-    return f.new(function()
-        local k, v = self:next()
-
-        if k ~= nil then
-            return v, k
-        end
-    end)
-end
-
 ---@generic K, V
 ---@param self F|{ [K]: V }
 ---@param skip? integer
@@ -441,7 +427,7 @@ end
 ---@param func F|fun(v: V, k: K): boolean
 ---@return boolean|V
 ---@nodiscard
----@overload fun(self: F|{ [K]: V }, func: string?): boolean|V
+---@overload fun(self: F|{ [K]: V }, func: string): boolean|V
 function f:any(func)
     func = type(func) == "string" and f.index(func) or func
 
@@ -459,7 +445,7 @@ end
 ---@param func F|fun(v: V, k: K): boolean
 ---@return boolean|V
 ---@nodiscard
----@overload fun(self: F|{ [K]: V }, func: string?): boolean|V
+---@overload fun(self: F|{ [K]: V }, func: string): boolean|V
 function f:all(func)
     func = type(func) == "string" and f.index(func) or func
 

src/lib/shared.lua

@@ -23,7 +23,6 @@ local function protect_ev(fun)
     return fun
 end
 
----@alias Attributes "mult"|"chips"|"xmult"|"xchips"|"score"|"xscore"|"blindsize"|"xblindsize"|"balance"|"swap"|"retrigger"|"scaling"|"reset"|"suit"|"diamonds"|"hearts"|"spades"|"clubs"|"hand_type"|"rank"|"ace"|"two"|"three"|"four"|"five"|"six"|"seven"|"eight"|"nine"|"ten"|"jack"|"queen"|"king"|"face"|"economy"|"generation"|"destroy_card"|"hands"|"discard"|"hand_size"|"chance"|"joker_slot"|"mod_chance"|"copying"|"full_deck"|"passive"|"joker"|"tarot"|"planet"|"spectral"|"enhancements"|"seals"|"editions"|"tag"|"skip"|"modify_card"|"perma_bonus"|"prevents_death"|"boss_blind"|"reroll"|"on_sell"|"sell_value"|"food"|"space"
 if false then
     -- This allows for better type inference.
     SMODS.Mods.Roland.config = require "config"

src/main.lua

@@ -1,7 +1,7 @@
 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)
+f {"challenge", "spectral", "edition", "tweaks", "blind", "charm", "joker", "back", "seal"}:each(function(v)
     assert(SMODS.load_file("src/" .. v .. ".lua"))(qol)
 end)
 
@@ -61,7 +61,6 @@ function SMODS.current_mod.config_tab()
                 toggle "no_highlight_limit",
                 _G["Talisman"] and toggle "harsh_ante_scaling",
                 toggle "fusable_escapey",
-                G.P_CENTERS.c_Bakery_Scribe and toggle "scribable_basket",
                 toggle "equinox_assist",
                 SMODS.Mods.DebugPlus and toggle "import_funky",
             },

src/seal.lua

@@ -11,7 +11,6 @@ SMODS.Seal {
     key = "glass",
     atlas = "seal",
     pos = {x = 0, y = 0},
-    attributes = {"destroy_card", "tag"},
     badge_colour = HEX "a6a6a6ff",
     pronouns = "he_him",
     calculate = function(_, card, context)

src/spectral.lua

@@ -1,5 +1,7 @@
 local f, q, u = unpack(... or require "lib.shared")
 
+local negative = {key = "e_negative_consumable", set = "Edition", config = {extra = 1}}
+
 local spectral = (function()
     local x = 0
 
@@ -38,10 +40,9 @@ spectral {
     key = "afterimage",
     pronouns = "he_they",
     artist = "aster",
-    attributes = {"editions", "modify_card", "hand_size", "spectral"},
     config = {extra = {amount = 1, hand = -2}},
     loc_vars = function(_, info_queue, card)
-        table.insert(info_queue, {key = "e_negative_playing_card", set = "Edition", config = {extra = 1}})
+        table.insert(info_queue, negative)
         return {vars = {card.ability.extra.amount, card.ability.extra.hand}}
     end,
     can_use = function(_, card)
@@ -70,7 +71,6 @@ spectral {
 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}}
@@ -96,7 +96,6 @@ spectral {
     key = "dual",
     pronouns = "they_them",
     config = {extra = {amount = 2}},
-    attributes = {"seal", "modify_card", "spectral"},
     loc_vars = function(_, _, card)
         return {vars = {card.ability.extra.amount}}
     end,
@@ -110,7 +109,7 @@ spectral {
         f(cards):take(card.ability.extra.amount):each(function(v)
             local seal
 
-            for _ = 1, 64 do
+            for _ = 1, 31 do
                 seal = SMODS.poll_seal {guaranteed = true}
 
                 if seal ~= "Roland_glass" then
@@ -127,7 +126,6 @@ spectral {
     key = "mirror",
     pronouns = "he_him",
     config = {extra = {amount = 1}},
-    attributes = {"seal", "modify_card", "spectral"},
     loc_vars = function(_, info_queue, card)
         table.insert(info_queue, G.P_SEALS.Roland_glass)
         return {vars = {card.ability.extra.amount}}
@@ -149,9 +147,8 @@ local void = spectral {
     soul_rate = 0.003,
     soul_set = "Spectral",
     config = {extra = {amount = 2}},
-    attributes = {"destroy_card", "generation", "spectral"},
     loc_vars = function(_, info_queue, card)
-        table.insert(info_queue, {key = "e_negative_consumable", set = "Edition", config = {extra = 1}})
+        table.insert(info_queue, negative)
         table.insert(info_queue, G.P_CENTERS.c_cryptid)
         return {vars = {card.ability.extra.amount}}
     end,
@@ -182,12 +179,12 @@ local void = spectral {
             f(cards):each(destroy)
             f(G.jokers.cards):each(calculate_joker)
 
-            f(card.ability.extra.amount):each(function()
+            for _ = 1, card.ability.extra.amount do
                 local cryptid = create_card(nil, G.consumeables, nil, nil, nil, nil, "c_cryptid", "void")
                 cryptid:set_edition({negative = true}, true)
                 cryptid:add_to_deck()
                 G.consumeables:emplace(cryptid)
-            end)
+            end
         end
 
         play_sound("Roland_void", 1, 0.7)

src/tag.lua

@@ -1,34 +0,0 @@
-SMODS.Atlas {
-    px = 34,
-    py = 34,
-    key = "tag",
-    path = "tag.png",
-}
-
-SMODS.Tag {
-    key = "invisible",
-    atlas = "tag",
-    min_ante = 2,
-    pos = {x = 0, y = 0},
-    apply = function(_, tag)
-        local modifiers = G.GAME.modifiers
-
-        if tag.triggered or
-            not next(G.jokers.cards) or
-            #G.jokers.cards + (modifiers.Roland_invisible or 0) >= G.jokers.config.card_limit then
-            return
-        end
-
-        tag.triggered = true
-        modifiers.Roland_invisible = (modifiers.Roland_invisible or 0) + 1
-
-        tag:yep("!", G.C.GREY, function()
-            local copied = pseudorandom_element(G.jokers.cards, pseudoseed "Roland_invisible")
-            local copy = copy_card(copied)
-            G.jokers:emplace(copy)
-            copy:add_to_deck()
-            modifiers.Roland_invisible = (modifiers.Roland_invisible or 0) - 1
-            return true
-        end)
-    end,
-}

src/tweaks.lua

@@ -17,7 +17,9 @@ function CardArea:can_highlight(...)
 end
 
 function Card:set_debuff(...)
-    if SMODS.get_enhancements(self).m_wild and SMODS.Mods.Roland.config.no_wild_debuff then
+    if self.config and
+        self.config.center_key == "m_wild" and
+        SMODS.Mods.Roland.config.no_wild_debuff then
         self.debuff = false
     else
         orig_set_debuff(self, ...)
@@ -114,7 +116,7 @@ end
 local orig_get_blind_amount = get_blind_amount
 
 ---@param ante number
----@return table|number
+---@return number
 local function blind(ante)
     return ante == 39 and 1e294 or (_G["to_number"] or f().id)(orig_get_blind_amount(ante))
 end
@@ -135,25 +137,10 @@ function get_blind_amount(ante, ...)
     end
 
     --- @type { constants?: { TEN: table }, new: (fun(self: self, arr?: number[], sign?: number, noNormalize?: boolean): table), pow: (fun(x: number, y: number): number) }
-    local big, rem = _G["Big"], tonumber(blind((ante % loop) + 1))
+    local big, rem = _G["Big"], (ante % loop) + 1
 
     return ante / 15 >= loop and big:new(f(blind(ante - (loop * 15))):map(f().const(10)):table()) or
-        (ante / 9 >= loop and big:new(f(ante / loop - 8):map(f().const(10)):concat {rem}:table()) or
-            (ante / 2 >= loop and big:new {rem, ante / loop} or
-                (big.constants and big.constants.TEN or big:new {10}):pow(rem)))
+        (ante / 9 >= loop and big:new(f(ante / loop - 8):map(f().const(10)):concat {blind(rem)}:table()) or
+            (ante / 2 >= loop and big:new {blind(rem), ante / loop} or
+                (big.constants and big.constants.TEN or big:new {10}):pow(blind(rem))))
 end
-
-q(function()
-    if not G.P_CENTERS.c_Bakery_Scribe then
-        return
-    end
-
-    local orig_can_use = G.P_CENTERS.c_Bakery_Scribe.can_use
-
-    function G.P_CENTERS.c_Bakery_Scribe.can_use(...)
-        return orig_can_use(...) and
-            (SMODS.Mods.Roland.config.scribable_basket or f(G.jokers.highlighted):all(function(v)
-                return v.config.center.key ~= "j_Roland_basket"
-            end))
-    end
-end)