assets/shaders/crystal.fs

@@ -4,7 +4,7 @@
 	#define MY_HIGHP_OR_MEDIUMP mediump
 #endif
 
-extern MY_HIGHP_OR_MEDIUMP vec2 gaming;
+extern MY_HIGHP_OR_MEDIUMP vec2 crystal;
 extern MY_HIGHP_OR_MEDIUMP number dissolve;
 extern MY_HIGHP_OR_MEDIUMP number time;
 extern MY_HIGHP_OR_MEDIUMP vec4 texture_details;
@@ -51,50 +51,31 @@ vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
     return vec4(shadow ? vec3(0.,0.,0.) : tex.xyz, res > adjusted_dissolve ? (shadow ? tex.a*0.3: tex.a) : .0);
 }
 
-vec3 oklab2srgb(vec3 c)
-{
-    float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b;
-    float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b;
-    float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b;
-
-    float l = l_ * l_ * l_;
-    float m = m_ * m_ * m_;
-    float s = s_ * s_ * s_;
-
-    return vec3(
-        4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
-        -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
-        -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s
-    );
-}
-
-vec3 oklch2srgb(vec3 c)
-{
-    return oklab2srgb(vec3(c.x, c.y * cos(c.z), c.y * sin(c.z)));
-}
-
 vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords )
 {
-    MY_HIGHP_OR_MEDIUMP vec4 tex = Texel( texture, texture_coords);
+    vec4 tex = Texel( texture, texture_coords);
+    vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
 
-    if (tex.r + tex.g + tex.b > 2.5) {
-        tex = vec4(oklch2srgb(vec3(.95, 0.0325, gaming.y + texture_coords.y * 10)), tex.a);
-    }
-    else if (tex.r + tex.g + tex.b < 1.5) {
-        tex = vec4(oklch2srgb(vec3(.7, 0.0325, gaming.y + texture_coords.y * 10 + 3.14159)), tex.a);
-    }
+    number low = min(tex.r, min(tex.g, tex.b));
+    number high = max(tex.r, max(tex.g, tex.b));
+	number delta = high-low -0.1;
 
-    MY_HIGHP_OR_MEDIUMP vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
+    number fac = 0.8 + 0.9*sin(11.*uv.x+4.32*uv.y + crystal.r*12. + cos(crystal.r*5.3 + uv.y*4.2 - uv.x*4.));
+    number fac2 = 0.5 + 0.5*sin(8.*uv.x+2.32*uv.y + crystal.r*5. - cos(crystal.r*2.3 + uv.x*8.2));
+    number fac3 = 0.5 + 0.5*sin(10.*uv.x+5.32*uv.y + crystal.r*6.111 + sin(crystal.r*5.3 + uv.y*3.2));
+    number fac4 = 0.5 + 0.5*sin(3.*uv.x+2.32*uv.y + crystal.r*8.111 + sin(crystal.r*1.3 + uv.y*11.2));
+    number fac5 = sin(0.9*16.*uv.x+5.32*uv.y + crystal.r*12. + cos(crystal.r*5.3 + uv.y*4.2 - uv.x*4.));
 
-    if (!shadow &&  dissolve > 0.01){
-        if (burn_colour_2.a > 0.01){
-            tex.rgb = tex.rgb*(1.-0.6*dissolve) + 0.6*burn_colour_2.rgb*dissolve;
-        } else if (burn_colour_1.a > 0.01){
-            tex.rgb = tex.rgb*(1.-0.6*dissolve) + 0.6*burn_colour_1.rgb*dissolve;
-        }
-    }
+    number maxfac = 0.7*max(max(fac, max(fac2, max(fac3,0.0))) + (fac+fac2+fac3*fac4), 0.);
 
-    return dissolve_mask(tex, texture_coords, uv);
+    tex.rgb = tex.rgb*0.5 + vec3(0.4, 0.4, 0.8);
+
+    tex.r = tex.r-delta + delta*maxfac*(0.7 + fac5*0.27) - 0.1;
+    tex.g = tex.g-delta + delta*maxfac*(0.7 - fac5*0.27) - 0.1;
+    tex.b = tex.b-delta + delta*maxfac*0.7 - 0.1;
+    tex.a = 0.25+tex.a*(0.5*max(min(1., max(0.,0.3*max(low*0.2, delta)+ min(max(maxfac*0.1,0.), 0.4)) ), 0.) + 0.15*maxfac*(0.1+delta));
+
+    return dissolve_mask(tex*colour, texture_coords, uv);
 }
 
 extern MY_HIGHP_OR_MEDIUMP vec2 mouse_screen_pos;

assets/shaders/polygloss.fs

@@ -207,7 +207,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
     vec4 tex = Texel(texture, texture_coords);
     vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
 
-    // Doesn't do anything it makes the shader useable  
+    // Dummy, doesn't do anything but at least it makes the shader useable  
     if (uv.x > uv.x * 2.){
         uv = polygloss;
     }

manifest.json

@@ -16,5 +16,5 @@
         "Bakery (>=3.0.0~*)"
     ],
     "conflicts": [],
-    "version": "1.12.14"
+    "version": "1.12.2"
 }

src/back.lua

@@ -157,7 +157,7 @@ local rain_world_jokers = {
     "j_jane_saint",
 }
 
-function Jane.add_rain_world_joker()
+local function add_rain_world_joker()
     if not G.jokers then
         return
     end
@@ -200,14 +200,14 @@ back {
         },
     },
     alt_apply = function(_)
-        Jane.q(Jane.add_rain_world_joker)
+        Jane.q(add_rain_world_joker)
     end,
     apply = function(_)
-        Jane.q(Jane.add_rain_world_joker)
+        Jane.q(add_rain_world_joker)
     end,
     alt_calculate = function(_, _, context)
         if Jane.is_end_of_ante(context) then
-            Jane.add_rain_world_joker()
+            add_rain_world_joker()
         end
     end,
 }
@@ -265,12 +265,12 @@ local function redeem_omen_globe()
     end)
 end
 
-function Jane.increase_rates()
+local function increase_rates()
     for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do
         local key = v:lower() .. "_rate"
         local n = G.GAME[key]
 
-        if v ~= "jane_omegaconsumable" and type(n) == "number" then
+        if type(n) == "number" then
             G.GAME[key] = math.max(n, 1)
         end
     end
@@ -305,13 +305,13 @@ back {
     alt_apply = function(_)
         G.GAME.alt_obsidian = true
         G.GAME.obsidian = true
-        Jane.increase_rates()
         redeem_omen_globe()
+        increase_rates()
     end,
     apply = function(_)
         G.GAME.obsidian = true
-        Jane.increase_rates()
         redeem_omen_globe()
+        increase_rates()
     end,
 }
 
@@ -346,7 +346,7 @@ function get_current_pool(_type, ...)
     return pool, pool_key
 end
 
-function Jane.apply_orrery()
+local function apply_orrery()
     Jane.q(function()
         local orrery = {}
         G.GAME.orrery = orrery
@@ -361,7 +361,7 @@ function Jane.apply_orrery()
     end)
 end
 
-function Jane.rebalance_orrery()
+local function rebalance_orrery()
     local function small(x)
         return type(x) == "table" and x:to_number() or x
     end
@@ -454,12 +454,12 @@ back {
         },
     },
     alt_apply = function(_)
-        Jane.apply_orrery()
+        apply_orrery()
     end,
     apply = function(_)
-        Jane.apply_orrery()
+        apply_orrery()
     end,
-    calculate = Jane.rebalance_orrery,
+    calculate = rebalance_orrery,
     alt_calculate = function(_, _, context)
         local function small(x)
             return type(x) == "table" and x:to_number() or x
@@ -493,7 +493,7 @@ back {
             ease_discard(new_discards, true)
         end
 
-        Jane.rebalance_orrery()
+        rebalance_orrery()
     end,
 }
 
@@ -663,39 +663,6 @@ back {
     end,
 }
 
-function Jane.display_omega_odds()
-    local omega_replacement = ((G.GAME or {}).modifiers or {}).omega_replacement
-
-    if not omega_replacement or omega_replacement == 0 then
-        return
-    end
-
-    local handy_speed = ((Handy or {}).speed_multiplier or {}).value or 1
-    local pitch = 0.9 + (0.2 * math.random())
-
-    play_sound("jane_pop", pitch * 0.75, 0.75)
-    play_sound("jane_pop", pitch * 1.5, 0.75)
-
-    Jane.card_status_text(
-        nil,
-        "Omega Cards are now a 1 in " .. number_format(1 / G.GAME.modifiers.omega_replacement),
-        0,
-        0.0005,
-        G.C.jane_RGB,
-        1.5,
-        nil,
-        nil,
-        nil,
-        "cm",
-        "jane_pop",
-        0.75,
-        pitch,
-        nil,
-        nil,
-        G.SETTINGS.GAMESPEED * handy_speed * 3
-    )
-end
-
 local banned_keys = {
     sleeve_Seen_Seen = true,
     sleeve_jane_omega = true,
@@ -708,8 +675,8 @@ back {
     loc_txt = {
         name = "Omega Deck",
         text = {
-            "{C:jane_RGB}Omega {}cards may appear",
-            "Odds increase per {C:attention}ante",
+            "Applies the {C:legendary,E:1}upsides",
+            "of {C:attention}every Jane deck",
         },
     },
     alt_loc_txt = {
@@ -736,19 +703,22 @@ back {
         end
     end,
     apply = function(_)
-        for _, v in ipairs({
-            "j_Bakery_Lua",
-            not Jane.cry and "tag_charm" or nil,
-            "tag_meteor",
-            "tag_ethereal",
-            "c_jane_token_tag_charm",
-            "c_jane_token_tag_meteor",
-            "c_jane_token_tag_ethereal",
-        }) do
-            G.GAME.banned_keys[v] = true
-        end
+        apply_orrery()
+        increase_rates()
+        G.GAME.modifiers.jane_spacious = true
+        G.GAME.used_vouchers.v_omen_globe = true
+        G.GAME.modifiers.jane_spacious_omega = true
+        G.GAME.starting_voucher_count = (G.GAME.starting_voucher_count or 0) + 1
 
-        G.GAME.modifiers.omega_replacement = (not _G["MP"] or not _G["MP"]["LOBBY"]) and 1 / 301 or 0
+        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)
+            G.GAME.tortoise = true
+            G.GAME.obsidian = true
+            G.GAME.mysterious = true
+            save_run()
+        end)
     end,
     alt_calculate = function(_, ...)
         for _, v in pairs(G.P_CENTERS) do
@@ -764,44 +734,14 @@ back {
         G.hand.config.card_limit = math.max(G.hand.config.card_limit or 12, 12)
     end,
     calculate = function(_, _, context)
-        if not _G["MP"] or not _G["MP"]["LOBBY"] then
-            if Jane.is_end_of_ante(context) then
-                G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement ^ 0.95
-                Jane.q(Jane.display_omega_odds)
-            end
+        rebalance_orrery()
+        G.GAME.mysterious = nil
 
-            return
+        if Jane.is_end_of_ante(context) then
+            Jane.q(function()
+                Jane.empowered()
+            end)
         end
-
-        if not context.end_of_round or
-            context.individual or
-            context.repetition or
-            context.blueprint then
-            return
-        end
-
-        local blind = ({
-            ["Small Blind"] = 8,
-            ["Big Blind"] = 5,
-        })[G.GAME.blind.name] or 2
-
-        local ante = G.GAME.round_resets.ante
-        local chance = 1 - math.pow(300 / 301, ante * 9 - blind)
-        local key = "omega_mp_" .. number_format(ante) .. "_" .. number_format(blind)
-
-        Jane.q(function()
-            G.GAME.modifiers.omega_replacement = chance
-            Jane.display_omega_odds()
-            G.GAME.modifiers.omega_replacement = 0
-        end)
-
-        if pseudorandom(key) >= chance then
-            return
-        end
-
-        Jane.q(function()
-            Jane.omega(key)
-        end)
     end,
 }
 

src/challenge.lua

@@ -93,45 +93,3 @@ G.localization.misc.v_text.ch_c_jane_downpour2 =
 
 G.localization.misc.v_text.ch_c_jane_downpour3 =
 {"{C:attention}Boss Blind {}is defeated, or {C:red}lose"}
-
-SMODS.Challenge {
-    key = "jerma",
-    loc_txt = {name = "Jerma"},
-    rules = {custom = {{id = "jane_jerma1"}, {id = "jane_jerma2"}}},
-    apply = function(_)
-        Jane.apply_orrery()
-        Jane.increase_rates()
-        G.GAME.modifiers.jane_spacious = true
-        G.GAME.used_vouchers.v_omen_globe = true
-        G.GAME.modifiers.jane_spacious_omega = true
-        G.GAME.starting_voucher_count = (G.GAME.starting_voucher_count or 0) + 1
-        G.GAME.modifiers.omega_replacement = (not _G["MP"] or not _G["MP"]["LOBBY"]) and 1 / 301 or 0
-
-        Jane.q(function()
-            Jane.add_rain_world_joker()
-            local wee = create_card("Joker", G.jokers, nil, nil, nil, nil, "j_wee", "weeck")
-            G.jokers:emplace(wee)
-            G.GAME.tortoise = true
-            G.GAME.obsidian = true
-            G.GAME.mysterious = true
-            save_run()
-        end)
-    end,
-    calculate = function(card, context)
-        G.P_CENTERS.b_jane_omega:calculate(card, context)
-        Jane.rebalance_orrery()
-        G.GAME.mysterious = nil
-
-        if Jane.is_end_of_ante(context) then
-            Jane.q(function()
-                Jane.empowered()
-            end)
-        end
-    end,
-}
-
-G.localization.misc.v_text.ch_c_jane_jerma1 =
-{"Applies the {C:legendary,E:1}upsides"}
-
-G.localization.misc.v_text.ch_c_jane_jerma2 =
-{"of {C:attention}every Jane deck"}

src/edition.lua

@@ -1,61 +1,18 @@
 SMODS.Shader({key = "moire", path = "moire.fs"})
-SMODS.Shader({key = "gaming", path = "gaming.fs"})
+SMODS.Shader({key = "crystal", path = "crystal.fs"})
 SMODS.Shader({key = "polygloss", path = "polygloss.fs"})
 
 SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"})
 SMODS.Sound({key = "e_moire", path = "e_moire.ogg"})
-SMODS.Sound({key = "e_gaming", path = "e_gaming.ogg"})
+SMODS.Sound({key = "e_crystal", path = "e_crystal.ogg"})
 SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
 
 local function get_weight(self)
     return self.weight *
         G.GAME.edition_rate *
-        (G.GAME.modifiers.omega_replacement and 0 or 1) *
         (next(SMODS.find_card "j_jane_saint") and 10 or 1)
 end
 
-SMODS.Edition({
-    key = "gaming",
-    loc_txt = {
-        name = "Gaming",
-        label = "Gaming",
-        text = {
-            "{C:blue}+Mult{} Chips",
-            "{C:red}+Chips{} Mult",
-        },
-    },
-    config = {e_chips = 1.2, e_mult = 0.8},
-    sound = {sound = "jane_e_gaming", per = 1, vol = 0.7},
-    weight = 1,
-    extra_cost = 20,
-    in_shop = true,
-    no_shadow = true,
-    apply_to_float = false,
-    shader = "jane_gaming",
-    disable_base_shader = true,
-    loc_vars = function(self, _, _)
-        return {vars = {self.config.e_chips, self.config.e_mult}}
-    end,
-    calculate = function(_, card, context)
-        if not context.post_joker and (not context.main_scoring or context.cardarea ~= G.play) then
-            return
-        end
-
-        return {
-            extra = {
-                card = card,
-                chips = mult,
-                colour = G.C.jane_RGB,
-                extra = {
-                    card = card,
-                    mult = hand_chips + mult,
-                    colour = G.C.jane_RGB,
-                },
-            },
-        }
-    end,
-})
-
 SMODS.Edition({
     key = "polygloss",
     loc_txt = {
@@ -73,19 +30,21 @@ SMODS.Edition({
     },
     config = {
         mult = 2,
-        chips = 21,
+        chips = 22,
         x_mult = 1.2,
         p_dollars = 1,
         e_mult = Jane.cry and 1.02 or nil,
     },
     sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
-    weight = 7,
-    extra_cost = 5,
+    weight = 10,
+    extra_cost = 2,
     in_shop = true,
     shader = "jane_polygloss",
     apply_to_float = false,
     loc_vars = function(self, _, _)
-        local vars = {self.config.chips, self.config.mult, self.config.x_mult}
+        local vars = {self.config.chips}
+        vars[#vars + 1] = self.config.mult
+        vars[#vars + 1] = self.config.x_mult
         vars[#vars + 1] = self.config.e_mult
         vars[#vars + 1] = self.config.p_dollars
         return {vars = vars}
@@ -115,6 +74,48 @@ SMODS.Edition({
     get_weight = get_weight,
 })
 
+SMODS.Edition({
+    key = "crystal",
+    loc_txt = {
+        name = "Crystal",
+        label = "Crystal",
+        text = {
+            "{C:blue}+Mult{} Chips",
+            "{C:red}+Chips{} Mult",
+        },
+    },
+    config = {e_chips = 1.2, e_mult = 0.8},
+    sound = {sound = "jane_e_crystal", per = 1, vol = 0.7},
+    weight = 0,
+    extra_cost = 10,
+    in_shop = true,
+    no_shadow = true,
+    apply_to_float = false,
+    shader = "jane_crystal",
+    disable_base_shader = true,
+    loc_vars = function(self, _, _)
+        return {vars = {self.config.e_chips, self.config.e_mult}}
+    end,
+    calculate = function(self, card, context)
+        if not context.post_joker and (not context.main_scoring or context.cardarea ~= G.play) then
+            return
+        end
+
+        return {
+            extra = {
+                card = card,
+                chips = mult,
+                colour = G.C.jane_RGB,
+                extra = {
+                    card = card,
+                    mult = hand_chips + mult,
+                    colour = G.C.jane_RGB,
+                },
+            },
+        }
+    end,
+})
+
 SMODS.Edition({
     key = "moire",
     loc_txt = {
@@ -127,8 +128,8 @@ SMODS.Edition({
     },
     config = {e_chips = 0.8, e_mult = 1.2},
     sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
-    weight = 1,
-    extra_cost = 20,
+    weight = 0,
+    extra_cost = 10,
     in_shop = true,
     shader = "jane_moire",
     apply_to_float = false,
@@ -160,20 +161,13 @@ local jumbo_modifier = Jane.cry and 100 or 2
 local jumbo = SMODS.Edition({
     key = "jumbo",
     loc_txt = {
-        name = "{s:" .. math.pow(Jane.config.wee_sizemod, 2) .. "}" .. "Jumbo",
+        name = "Jumbo",
         label = "Jumbo",
         text = {
-            "{s:" .. Jane.config.wee_sizemod .. "}" ..
-            "All values are",
-            "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" ..
-            "multiplied" ..
-            "{s:" .. Jane.config.wee_sizemod .. "}" ..
-            " by " ..
-            "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" ..
-            jumbo_modifier,
-            "{C:inactive,s:" .. Jane.config.wee_sizemod .. "}" ..
-            "(If possible)",
-            "{C:inactive,E:1}Whoa, it's huge!!",
+            "All card values are",
+            "{C:attention}multiplied{} by {C:attention}up to " .. jumbo_modifier,
+            "{C:inactive}(If possible)",
+            "{C:inactive,E:1,s:0.75}Whoa, it's huge!!{}",
         },
     },
     on_apply = function(card)
@@ -245,8 +239,8 @@ local jumbo = SMODS.Edition({
         end
     end,
     sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5},
-    weight = 7,
-    extra_cost = 10,
+    weight = 6,
+    extra_cost = 5,
     in_shop = true,
     shader = false,
     apply_to_float = false,

src/main.lua

@@ -12,9 +12,10 @@ end
 Jane = {
     cry = SMODS.Mods.Cryptid and not SMODS.Mods.Cryptid.disabled,
     config = {
+        omega_chance = 1 / 301,
         texture_pack = "default",
         wee_sizemod = math.sqrt(2),
-        bans = {"j_cry_crustulum", "c_cry_hammerspace"},
+        bans = {"j_Bakery_Lua", "j_cry_crustulum", "c_cry_hammerspace"},
     },
 }
 
@@ -27,25 +28,6 @@ if not Jane.misprintize then
     assert(SMODS.load_file("src/misprintize.lua"))()
 end
 
-local function update_omega_from_collection()
-    local buffer = SMODS.ConsumableType.visible_buffer
-
-    if not buffer then
-        return
-    end
-
-    for i = 1, #buffer do
-        if buffer[i] == "jane_omegaconsumable" then
-            table.remove(buffer, i)
-            i = i - 1
-        end
-    end
-
-    if G.GAME.modifiers.omega_replacement then
-        buffer[#buffer + 1] = "jane_omegaconsumable"
-    end
-end
-
 function Jane.can_use()
     return not (((G.play and #G.play.cards > 0) or
             (G.CONTROLLER.locked) or
@@ -70,8 +52,7 @@ function Jane.card_status_text(
     volume,
     pitch,
     trigger,
-    f,
-    hold
+    f
 )
     if (delay or 0) <= 0 then
         if type(f) == "function" then
@@ -81,7 +62,7 @@ function Jane.card_status_text(
         attention_text({
             text = text,
             scale = size or 1,
-            hold = hold or 0.7,
+            hold = 0.7,
             backdrop_colour = colour or (G.C.FILTER),
             align = align or "bm",
             major = card,
@@ -113,7 +94,7 @@ function Jane.card_status_text(
                 attention_text({
                     text = text,
                     scale = size or 1,
-                    hold = (hold or 0.7) + (delay or 0),
+                    hold = 0.7 + (delay or 0),
                     backdrop_colour = colour or (G.C.FILTER),
                     align = align or "bm",
                     major = card,
@@ -289,13 +270,6 @@ end
 local orig_can_highlight = CardArea.can_highlight
 
 function CardArea:can_highlight(...)
-    for _, v in pairs(type(self.cards) == "table" and self.cards or {}) do
-        if (((v or {}).config or {}).center or {}).key == "c_jane_fool_omega" then
-            self.config.highlighted_limit = math.max(self.config.highlighted_limit, 2)
-            return true
-        end
-    end
-
     if self ~= G.consumeables then
         return orig_can_highlight(self, ...)
     end
@@ -332,17 +306,8 @@ end
 local orig_menu = Game.main_menu
 
 function Game:main_menu(change_context)
-    orig_menu(self, change_context)
-
-    G.ARGS.score_intensity.ambientSurreal1,
-    G.ARGS.score_intensity.ambientSurreal2,
-    G.ARGS.score_intensity.ambientSurreal3,
-    G.ARGS.score_intensity.ambientSurreal4 = 0, 0, 0, 0
-
-    update_omega_from_collection()
-    G.C.BACKGROUND.C[4] = 1
-    G.C.BACKGROUND.L[4] = 1
     Jane.sinister = nil
+    orig_menu(self, change_context)
 end
 
 local orig_start_run = Game.start_run
@@ -350,29 +315,15 @@ local orig_start_run = Game.start_run
 function Game:start_run(...)
     orig_start_run(self, ...)
     self.GAME.modifiers.omegas_found = nil
-    Jane.q(Jane.display_omega_odds)
-    update_omega_from_collection()
+
+    self.GAME.modifiers.omega_replacement =
+        self.GAME.modifiers.omega_replacement or Jane.config.omega_chance
 
     if self.GAME.banned_keys then
         for _, v in pairs(Jane.config.bans) do
             self.GAME.banned_keys[v] = true
         end
     end
-
-    if self.GAME.banned_keys.j_Bakery_Lua and next(SMODS.find_card("j_Bakery_Lua")) then
-        G.C.BACKGROUND.L[4] = 0
-    end
-end
-
-local orig_card_collection_UIBox = SMODS.card_collection_UIBox
-
-function SMODS.card_collection_UIBox(_pool, rows, ...)
-    if _pool == G.P_CENTER_POOLS.Edition then
-        rows[1] = rows[1] + 1
-        rows[2] = rows[2] + 1
-    end
-
-    return orig_card_collection_UIBox(_pool, rows, ...)
 end
 
 local orig_draw_card = draw_card

src/slugcat.lua

@@ -315,7 +315,7 @@ SMODS.Joker {
     atlas = "janegourmand",
     loc_txt = {
         name = "The Gourmand",
-        text = {"All cards are {C:dark_edition,s:" .. Jane.config.wee_sizemod .. "}Jumbo"},
+        text = {"All cards are {C:dark_edition}Jumbo"},
     },
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
@@ -336,6 +336,7 @@ local function add_to_consumable_ability_by(n)
         return type(v) == "number" and v + n or type(v) == "table" and f(v):map(new):table() or v
     end
 
+    ---@param card Card
     return function(card)
         local ability = card.ability or {}
 
@@ -831,7 +832,7 @@ SMODS.Joker {
     loc_txt = {
         name = "The Rot",
         text = {
-            Jane.cry and "{C:attention}Duplicates itself{} at the" or "{C:inactive,E:1}Does nothing",
+            Jane.cry and "{C:attention}Duplicates itself{} at the" or "{C:inactive,E:1}Does nothing?",
             Jane.cry and "end of {C:attention}every ante" or nil,
         },
     },
@@ -843,6 +844,12 @@ SMODS.Joker {
     in_pool = function()
         return true, {allow_duplicates = true}
     end,
+    add_to_deck = function()
+        G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement * 2
+    end,
+    remove_from_deck = function()
+        G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement / 2
+    end,
     calculate = Jane.cry and function(_, card, context)
         local function has_room()
             return G.jokers.config.card_count < G.jokers.config.card_limit