Enhance localization

assets/shaders/gaming.fs

@@ -4,7 +4,7 @@
 	#define MY_HIGHP_OR_MEDIUMP mediump
 #endif
 
-extern MY_HIGHP_OR_MEDIUMP vec2 crystal;
+extern MY_HIGHP_OR_MEDIUMP vec2 gaming;
 extern MY_HIGHP_OR_MEDIUMP number dissolve;
 extern MY_HIGHP_OR_MEDIUMP number time;
 extern MY_HIGHP_OR_MEDIUMP vec4 texture_details;
@@ -51,31 +51,50 @@ 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 )
 {
-    vec4 tex = Texel( texture, texture_coords);
+    MY_HIGHP_OR_MEDIUMP vec4 tex = Texel( texture, texture_coords);
-    vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
 
-    number low = min(tex.r, min(tex.g, tex.b));
+    if (tex.r + tex.g + tex.b > 2.5) {
-    number high = max(tex.r, max(tex.g, tex.b));
+        tex = vec4(oklch2srgb(vec3(.95, 0.0325, gaming.y + texture_coords.y * 10)), tex.a);
-	number delta = high-low -0.1;
+    }
+    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 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.));
+    MY_HIGHP_OR_MEDIUMP vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
-    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.));
 
-    number maxfac = 0.7*max(max(fac, max(fac2, max(fac3,0.0))) + (fac+fac2+fac3*fac4), 0.);
+    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;
+        }
+    }
 
-    tex.rgb = tex.rgb*0.5 + vec3(0.4, 0.4, 0.8);
+    return dissolve_mask(tex, texture_coords, uv);
-
-    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;

manifest.json

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

src/back.lua

@@ -157,7 +157,7 @@ local rain_world_jokers = {
     "j_jane_saint",
 }
 
-local function add_rain_world_joker()
+function Jane.add_rain_world_joker()
     if not G.jokers then
         return
     end
@@ -200,14 +200,14 @@ back {
         },
     },
     alt_apply = function(_)
-        Jane.q(add_rain_world_joker)
+        Jane.q(Jane.add_rain_world_joker)
     end,
     apply = function(_)
-        Jane.q(add_rain_world_joker)
+        Jane.q(Jane.add_rain_world_joker)
     end,
     alt_calculate = function(_, _, context)
         if Jane.is_end_of_ante(context) then
-            add_rain_world_joker()
+            Jane.add_rain_world_joker()
         end
     end,
 }
@@ -265,12 +265,12 @@ local function redeem_omen_globe()
     end)
 end
 
-local function increase_rates()
+function Jane.increase_rates()
     for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do
         local key = v:lower() .. "_rate"
         local n = G.GAME[key]
 
-        if type(n) == "number" then
+        if v ~= "jane_omegaconsumable" and 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
 
-local function apply_orrery()
+function Jane.apply_orrery()
     Jane.q(function()
         local orrery = {}
         G.GAME.orrery = orrery
@@ -361,7 +361,7 @@ local function apply_orrery()
     end)
 end
 
-local function rebalance_orrery()
+function Jane.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(_)
-        apply_orrery()
+        Jane.apply_orrery()
     end,
     apply = function(_)
-        apply_orrery()
+        Jane.apply_orrery()
     end,
-    calculate = rebalance_orrery,
+    calculate = Jane.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
 
-        rebalance_orrery()
+        Jane.rebalance_orrery()
     end,
 }
 
@@ -663,6 +663,39 @@ 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,
@@ -675,8 +708,8 @@ back {
     loc_txt = {
         name = "Omega Deck",
         text = {
-            "Applies the {C:legendary,E:1}upsides",
+            "{C:jane_RGB}Omega {}cards may appear",
-            "of {C:attention}every Jane deck",
+            "Odds increase per {C:attention}ante",
         },
     },
     alt_loc_txt = {
@@ -703,22 +736,19 @@ back {
         end
     end,
     apply = function(_)
-        apply_orrery()
+        for _, v in ipairs({
-        increase_rates()
+            "j_Bakery_Lua",
-        G.GAME.modifiers.jane_spacious = true
+            not Jane.cry and "tag_charm" or nil,
-        G.GAME.used_vouchers.v_omen_globe = true
+            "tag_meteor",
-        G.GAME.modifiers.jane_spacious_omega = true
+            "tag_ethereal",
-        G.GAME.starting_voucher_count = (G.GAME.starting_voucher_count or 0) + 1
+            "c_jane_token_tag_charm",
+            "c_jane_token_tag_meteor",
+            "c_jane_token_tag_ethereal",
+        }) do
+            G.GAME.banned_keys[v] = true
+        end
 
-        Jane.q(function()
+        G.GAME.modifiers.omega_replacement = (not _G["MP"] or not _G["MP"]["LOBBY"]) and 1 / 301 or 0
-            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
@@ -734,14 +764,44 @@ back {
         G.hand.config.card_limit = math.max(G.hand.config.card_limit or 12, 12)
     end,
     calculate = function(_, _, context)
-        rebalance_orrery()
+        if not _G["MP"] or not _G["MP"]["LOBBY"] then
-        G.GAME.mysterious = nil
+            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
 
-        if Jane.is_end_of_ante(context) then
+            return
-            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,3 +93,45 @@ 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,18 +1,61 @@
 SMODS.Shader({key = "moire", path = "moire.fs"})
-SMODS.Shader({key = "crystal", path = "crystal.fs"})
+SMODS.Shader({key = "gaming", path = "gaming.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_crystal", path = "e_crystal.ogg"})
+SMODS.Sound({key = "e_gaming", path = "e_gaming.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 = {
@@ -30,21 +73,19 @@ SMODS.Edition({
     },
     config = {
         mult = 2,
-        chips = 22,
+        chips = 21,
         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 = 10,
+    weight = 7,
-    extra_cost = 2,
+    extra_cost = 5,
     in_shop = true,
     shader = "jane_polygloss",
     apply_to_float = false,
     loc_vars = function(self, _, _)
-        local vars = {self.config.chips}
+        local vars = {self.config.chips, self.config.mult, self.config.x_mult}
-        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}
@@ -74,48 +115,6 @@ 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 = {
@@ -126,10 +125,10 @@ SMODS.Edition({
             "{X:dark_edition,C:white}^#2#{} Mult",
         },
     },
-    config = {e_chips = 0.75, e_mult = 1.25},
+    config = {e_chips = 0.8, e_mult = 1.2},
     sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
-    weight = 0,
+    weight = 1,
-    extra_cost = 10,
+    extra_cost = 20,
     in_shop = true,
     shader = "jane_moire",
     apply_to_float = false,
@@ -161,13 +160,20 @@ local jumbo_modifier = Jane.cry and 100 or 2
 local jumbo = SMODS.Edition({
     key = "jumbo",
     loc_txt = {
-        name = "Jumbo",
+        name = "{s:" .. math.pow(Jane.config.wee_sizemod, 2) .. "}" .. "Jumbo",
         label = "Jumbo",
         text = {
-            "All card values are",
+            "{s:" .. Jane.config.wee_sizemod .. "}" ..
-            "{C:attention}multiplied{} by {C:attention}up to " .. jumbo_modifier,
+            "All values are",
-            "{C:inactive}(If possible)",
+            "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" ..
-            "{C:inactive,E:1,s:0.75}Whoa, it's huge!!{}",
+            "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!!",
         },
     },
     on_apply = function(card)
@@ -239,8 +245,8 @@ local jumbo = SMODS.Edition({
         end
     end,
     sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5},
-    weight = 6,
+    weight = 7,
-    extra_cost = 5,
+    extra_cost = 10,
     in_shop = true,
     shader = false,
     apply_to_float = false,

src/main.lua

@@ -12,10 +12,9 @@ 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_Bakery_Lua", "j_cry_crustulum", "c_cry_hammerspace"},
+        bans = {"j_cry_crustulum", "c_cry_hammerspace"},
     },
 }
 
@@ -28,6 +27,25 @@ 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
@@ -52,7 +70,8 @@ function Jane.card_status_text(
     volume,
     pitch,
     trigger,
-    f
+    f,
+    hold
 )
     if (delay or 0) <= 0 then
         if type(f) == "function" then
@@ -62,7 +81,7 @@ function Jane.card_status_text(
         attention_text({
             text = text,
             scale = size or 1,
-            hold = 0.7,
+            hold = hold or 0.7,
             backdrop_colour = colour or (G.C.FILTER),
             align = align or "bm",
             major = card,
@@ -94,7 +113,7 @@ function Jane.card_status_text(
                 attention_text({
                     text = text,
                     scale = size or 1,
-                    hold = 0.7 + (delay or 0),
+                    hold = (hold or 0.7) + (delay or 0),
                     backdrop_colour = colour or (G.C.FILTER),
                     align = align or "bm",
                     major = card,
@@ -270,6 +289,13 @@ 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
@@ -306,8 +332,17 @@ end
 local orig_menu = Game.main_menu
 
 function Game:main_menu(change_context)
-    Jane.sinister = nil
     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
 end
 
 local orig_start_run = Game.start_run
@@ -315,15 +350,29 @@ 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)
-    self.GAME.modifiers.omega_replacement =
+    update_omega_from_collection()
-        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/omega.lua

@@ -36,10 +36,10 @@ SMODS.ConsumableType {
         undiscovered = {
             name = "Not Discovered",
             text = {
-                "Purchase or use",
+                "Use this {C:dark_edition,E:1}very rare",
-                "this {C:dark_edition,E:1}rare {}card in",
+                "card in an unseeded",
-                "an unseeded run to",
+                "run to learn what",
-                "learn what it does",
+                "it is {C:dark_edition,E:1}capable of",
             },
         },
     },
@@ -66,7 +66,7 @@ local function create_card_set(needle, edition, amount)
 end
 
 local function omega_level_up(hand, number, card)
-    local factor = 3 ^ number
+    local factor = 2 ^ number
 
     update_hand_text(
         {sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3},
@@ -83,64 +83,68 @@ local function omega_level_up(hand, number, card)
         v.l_mult = v.l_mult * factor
     end
 
-    Jane.q(function()
+    if not Talisman or not Talisman.config_file or not Talisman.config_file.disable_anims then
-        play_sound("jane_boost1", 1, 0.4)
+        Jane.q(function()
-        card:juice_up(0.8, 0.5)
+            play_sound("jane_boost1", 1, 0.4)
-    end, 1, nil, "after")
+            card:juice_up(0.8, 0.5)
+        end, 1, nil, "after")
 
-    update_hand_text({delay = 1}, {chips = "X" .. factor, StatusText = true})
+        update_hand_text({delay = 1}, {chips = "X" .. factor, StatusText = true})
 
-    Jane.q(function()
+        Jane.q(function()
-        play_sound("jane_boost2", 1, 0.4)
+            play_sound("jane_boost2", 1, 0.4)
-        card:juice_up(0.8, 0.5)
+            card:juice_up(0.8, 0.5)
-    end, 1, nil, "after")
+        end, 1, nil, "after")
 
-    update_hand_text({delay = 1}, {mult = "X" .. factor, StatusText = true})
+        update_hand_text({delay = 1}, {mult = "X" .. factor, StatusText = true})
 
-    update_hand_text(
+        update_hand_text(
-        {sound = "button", volume = 0.7, pitch = 1, delay = 1},
+            {sound = "button", volume = 0.7, pitch = 1, delay = 1},
-        {
+            {
-            chips = hand and G.GAME.hands[hand].l_chips,
+                chips = hand and G.GAME.hands[hand].l_chips,
-            mult = hand and G.GAME.hands[hand].l_mult,
+                mult = hand and G.GAME.hands[hand].l_mult,
-        }
+            }
-    )
+        )
 
-    delay(1)
+        delay(1)
 
-    update_hand_text(
+        update_hand_text(
-        {sound = "button", volume = 0.7, pitch = 0.8, delay = 1},
+            {sound = "button", volume = 0.7, pitch = 0.8, delay = 1},
-        {
+            {
-            chips = hand and G.GAME.hands[hand].chips,
+                chips = hand and G.GAME.hands[hand].chips,
-            mult = hand and G.GAME.hands[hand].mult,
+                mult = hand and G.GAME.hands[hand].mult,
-        }
+            }
-    )
+        )
+    end
 
     for _, v in pairs(hand and {G.GAME.hands[hand]} or G.GAME.hands) do
         v.chips = v.chips * factor
         v.mult = v.mult * factor
     end
 
-    Jane.q(function()
+    if not Talisman or not Talisman.config_file or not Talisman.config_file.disable_anims then
-        play_sound("jane_boost3", 1, 0.4)
+        Jane.q(function()
-        card:juice_up(0.8, 0.5)
+            play_sound("jane_boost3", 1, 0.4)
-    end, 1, nil, "after")
+            card:juice_up(0.8, 0.5)
+        end, 1, nil, "after")
 
-    update_hand_text({delay = 1}, {chips = "X" .. factor, StatusText = true})
+        update_hand_text({delay = 1}, {chips = "X" .. factor, StatusText = true})
 
-    Jane.q(function()
+        Jane.q(function()
-        play_sound("jane_boost4", 1, 0.4)
+            play_sound("jane_boost4", 1, 0.4)
-        card:juice_up(0.8, 0.5)
+            card:juice_up(0.8, 0.5)
-    end, 1, nil, "after")
+        end, 1, nil, "after")
 
-    update_hand_text({delay = 1}, {mult = "X" .. factor, StatusText = true})
+        update_hand_text({delay = 1}, {mult = "X" .. factor, StatusText = true})
 
-    update_hand_text(
+        update_hand_text(
-        {sound = "button", volume = 0.7, pitch = 1, delay = 1},
+            {sound = "button", volume = 0.7, pitch = 1, delay = 1},
-        {
+            {
-            chips = hand and G.GAME.hands[hand].chips,
+                chips = hand and G.GAME.hands[hand].chips,
-            mult = hand and G.GAME.hands[hand].mult,
+                mult = hand and G.GAME.hands[hand].mult,
-        }
+            }
-    )
+        )
+    end
 
     for k, v in pairs(hand and {[hand] = G.GAME.hands[hand]} or G.GAME.hands) do
         SMODS.upgrade_poker_hands({
@@ -169,9 +173,9 @@ for _, v in ipairs({
         loc_txt = {
             name = v.n .. " {C:dark_edition}Omega",
             text = {
-                "{C:attention}Triples {C:chips}Chips{}, {C:chips}Level Chips{},",
+                "{C:attention}Doubles {C:chips}Chips{}, {C:chips}Level Chips{},",
                 "{C:mult}Mult{}, {C:mult}Level Mult{}, and",
-                "{C:planet}planet level {}of {C:attention}" .. v.h,
+                "{C:planet}Level {}of {C:attention}" .. v.h,
             },
         },
         set = "jane_omegaconsumable",
@@ -200,9 +204,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "{C:dark_edition}Sagittarius A*",
         text = {
-            "{C:attention}Nonuples {C:chips}Chips{}, {C:chips}Level Chips{},",
+            "{C:attention}Double {}the {C:planet}Level",
-            "{C:mult}Mult{}, {C:mult}Level Mult{}, and",
+            "of played hand",
-            "{C:planet}planet level {}of {C:attention}every hand",
         },
     },
     set = "jane_omegaconsumable",
@@ -211,17 +214,20 @@ SMODS.Consumable {
     cost = 15,
     soul_rate = 0,
     atlas = "janeomegaplanets",
+    pronouns = "any_all",
     hidden = true,
-    can_stack = true,
+    can_use = function(_, card)
-    can_divide = true,
+        return Jane.can_use() and card.area ~= G.consumeables
-    can_bulk_use = true,
-    can_mass_use = true,
-    can_use = Jane.can_use,
-    use = function(self, card, area, copier)
-        self:bulk_use(card, area, copier, 1)
     end,
-    bulk_use = function(_, card, _, _, number)
+    use = function(self)
-        omega_level_up(nil, number * 2, card)
+        SMODS.add_card({key = self.key, area = G.consumeables, set = self.set})
+    end,
+    calculate = function(_, card, context)
+        return context.before and G.GAME.hands[context.scoring_name] and {
+            card = card,
+            message = localize("k_level_up_ex"),
+            level_up = G.GAME.hands[context.scoring_name].level,
+        } or nil
     end,
 }
 
@@ -241,7 +247,7 @@ SMODS.Consumable {
     can_use = function()
         return Jane.can_use() and
             G.jokers.highlighted[1] and
-            #G.jokers.cards + 3 <= G.jokers.config.card_limit
+            #G.jokers.cards < G.jokers.config.card_limit
     end,
     use = function(self, card, area, copier)
         self:bulk_use(card, area, copier, 1)
@@ -253,7 +259,9 @@ SMODS.Consumable {
             return
         end
 
-        for _ = 1, 3 * number do
+        local count = math.min(number * 3, G.jokers.config.card_limit - #G.jokers.cards)
+
+        for _ = 1, count do
             SMODS.copy_card(joker):start_materialize()
         end
     end,
@@ -265,9 +273,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "Aura {C:dark_edition}Omega",
         text = {
-            "Apply {C:dark_edition}Crystal {}to all",
+            "Apply {C:dark_edition}Negative {}to",
-            "{C:attention}selected Jokers {}and",
+            "{C:attention}all playing cards",
-            "{C:attention}playing cards",
         },
     },
     pos = {x = 0, y = 1},
@@ -277,20 +284,14 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function(_, info_queue)
-        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_crystal
+        info_queue[#info_queue + 1] = {key = "e_negative_playing_card", set = "Edition", config = {extra = 1}}
     end,
     can_use = function()
         if not Jane.can_use() then
             return false
         end
 
-        for _, v in ipairs(G.jokers.highlighted) do
+        for _, v in ipairs(G.playing_cards) do
-            if not v.edition then
-                return true
-            end
-        end
-
-        for _, v in ipairs(G.hand.highlighted) do
             if not v.edition then
                 return true
             end
@@ -299,15 +300,9 @@ SMODS.Consumable {
         return false
     end,
     use = function()
-        for _, v in ipairs(G.jokers.highlighted) do
+        for _, v in ipairs(G.playing_cards) do
             if not v.edition then
-                v:set_edition({jane_crystal = true})
+                v:set_edition({negative = true})
-            end
-        end
-
-        for _, v in ipairs(G.hand.highlighted) do
-            if not v.edition then
-                v:set_edition({jane_crystal = true})
             end
         end
     end,
@@ -319,8 +314,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "Cryptid {C:dark_edition}Omega",
         text = {
-            "Create {C:attention}20{} copies of",
+            "Create {C:attention}52{} copies of a",
-            "{C:attention}selected playing cards",
+            "{C:attention}selected playing card",
         },
     },
     pos = {x = 0, y = 2},
@@ -330,16 +325,14 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and next(G.hand.highlighted)
+        return Jane.can_use() and #G.hand.highlighted == 1
     end,
     use = function(self, card, area, copier)
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        for _, v in ipairs(G.hand.highlighted) do
+        for _ = 1, number * 52 do
-            for _ = 1, 20 * number do
+            SMODS.copy_card(G.hand.highlighted[1]):start_materialize()
-                SMODS.copy_card(v):start_materialize()
-            end
         end
     end,
 }
@@ -377,7 +370,9 @@ for _, v in ipairs({
             end
 
             for _, card in pairs(G.playing_cards) do
-                card:set_seal(v.s, true, true)
+                if card.area ~= G.hand then
+                    card:set_seal(v.s, true, true)
+                end
             end
         end,
     }
@@ -428,7 +423,7 @@ SMODS.Consumable {
         name = "Familiar {C:dark_edition}Omega",
         text = {
             "Add a {C:attention}full set{} of",
-            "{C:dark_edition,E:1}Moire {C:attention}Kings{}, {C:dark_edition,E:1}Crystal",
+            "{C:dark_edition,E:1}Gaming {C:attention}Kings{}, {C:dark_edition,E:1}Moire",
             "{C:attention}Queens{}, and {C:dark_edition,E:1}Polygloss",
             "{C:attention}Jacks {}to your deck",
         },
@@ -440,8 +435,8 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function(_, info_queue)
+        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_gaming
         info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_moire
-        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_crystal
         info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_polygloss
     end,
     can_use = Jane.can_use,
@@ -449,8 +444,8 @@ SMODS.Consumable {
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        create_card_set("_K", "e_jane_moire", number)
+        create_card_set("_K", "e_jane_gaming", number)
-        create_card_set("_Q", "e_jane_crystal", number)
+        create_card_set("_Q", "e_jane_moire", number)
         create_card_set("_J", "e_jane_polygloss", number)
     end,
 }
@@ -531,7 +526,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "Immolate {C:dark_edition}Omega",
         text = {
-            "{C:money}Sells{} all cards {C:attention}in hand",
+            "{C:money}Sells{} all remaining",
+            "cards in the deck",
             "Each card {C:money}sold {}multiplies",
             "{C:money}money{} by its {C:attention}rank",
             not Jane.cry and "{C:inactive}(Max of {C:money}$#1#{C:inactive} each)" or nil,
@@ -544,17 +540,17 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function()
-        return {vars = {2000}}
+        return {vars = {200}}
     end,
     can_use = function()
-        return Jane.can_use() and next(G.hand.cards)
+        return Jane.can_use() and next(G.deck.cards)
     end,
     use = function()
-        for _, v in pairs(G.hand.cards) do
+        for _, v in pairs(G.deck.cards) do
             Jane.q(function()
                 v:sell_card()
                 local amount = (v:norank() and 1 or v:get_id()) * G.GAME.dollars - G.GAME.dollars
-                ease_dollars(Jane.cry and amount or math.min(amount, 2000))
+                ease_dollars(Jane.cry and amount or math.min(amount, 200))
             end)
         end
     end,
@@ -568,8 +564,8 @@ SMODS.Consumable {
         text = {
             "Add a {C:attention}full set{} of cards",
             "{C:attention}2{} through {C:attention}10 {}to your deck",
-            "{C:dark_edition,E:1}Polygloss{} on {C:attention}odd ranks",
+            "{C:dark_edition,E:1}Gaming{} on {C:attention}odd ranks",
-            "{C:dark_edition,E:1}Crystal{} on {C:attention}even ranks",
+            "{C:dark_edition,E:1}Polygloss{} on {C:attention}even ranks",
         },
     },
     pos = {x = 0, y = 9},
@@ -579,23 +575,23 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function(_, info_queue)
+        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_gaming
         info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_polygloss
-        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_crystal
     end,
     can_use = Jane.can_use,
     use = function(self, card, area, copier)
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        create_card_set("_2", "e_jane_crystal", number)
+        create_card_set("_2", "e_jane_polygloss", number)
-        create_card_set("_3", "e_jane_polygloss", number)
+        create_card_set("_3", "e_jane_gaming", number)
-        create_card_set("_4", "e_jane_crystal", number)
+        create_card_set("_4", "e_jane_polygloss", number)
-        create_card_set("_5", "e_jane_polygloss", number)
+        create_card_set("_5", "e_jane_gaming", number)
-        create_card_set("_6", "e_jane_crystal", number)
+        create_card_set("_6", "e_jane_polygloss", number)
-        create_card_set("_7", "e_jane_polygloss", number)
+        create_card_set("_7", "e_jane_gaming", number)
-        create_card_set("_8", "e_jane_crystal", number)
+        create_card_set("_8", "e_jane_polygloss", number)
-        create_card_set("_9", "e_jane_polygloss", number)
+        create_card_set("_9", "e_jane_gaming", number)
-        create_card_set("_T", "e_jane_crystal", number)
+        create_card_set("_T", "e_jane_polygloss", number)
     end,
 }
 
@@ -605,10 +601,9 @@ SMODS.Consumable {
     loc_txt = {
         name = "Ouija {C:dark_edition}Omega",
         text = {
-            "{C:attention}Playing cards {}whose",
+            "Converts all playing",
-            "rank doesn't match any",
+            "cards' {C:attention}rank {}to the",
-            "of the {C:attention}selected cards",
+            "{C:attention}selected card",
-            "will be {C:red}destroyed",
         },
     },
     pos = {x = 0, y = 11},
@@ -618,34 +613,44 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and next(G.hand.highlighted)
+        return Jane.can_use() and
+            #G.hand.highlighted == 1 and
+            not SMODS.has_no_suit(G.hand.highlighted[1]) and
+            not SMODS.has_no_rank(G.hand.highlighted[1])
     end,
-    use = function()
+    use = function(_, card)
-        if not next(G.hand.highlighted) then
+        Jane.q(function()
-            return
+            play_sound("tarot1")
+            card:juice_up(0.3, 0.5)
+        end, 0.4, nil, "after")
+
+        for i = 1, #G.hand.cards do
+            local percent = 1.15 - (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
+
+            Jane.q(function()
+                G.hand.cards[i]:flip()
+                play_sound("card1", percent)
+                G.hand.cards[i]:juice_up(0.3, 0.3)
+            end, 0.15, nil, "after")
         end
 
-        local destroy = {}
+        local rank = G.hand.highlighted[1].base.value
 
-        for _, c in pairs(G.playing_cards) do
+        Jane.q(function()
-            local safe = c.highlighted
+            for _, c in pairs(G.playing_cards) do
-
+                assert(SMODS.change_base(c, nil, rank))
-            if not safe then
-                for _, h in pairs(G.hand.highlighted) do
-                    if h:get_id() == c:get_id() or
-                        (h:norank() and c:norank()) then
-                        safe = true
-                        break
-                    end
-                end
             end
+        end)
 
-            if not safe then
+        for i = 1, #G.hand.cards do
-                destroy[#destroy + 1] = c
+            local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
-            end
+
+            Jane.q(function()
+                G.hand.cards[i]:flip()
+                play_sound("tarot2", percent, 0.6)
+                G.hand.cards[i]:juice_up(0.3, 0.3)
+            end, 0.15, nil, "after")
         end
-
-        SMODS.destroy_cards(destroy)
     end,
 }
 
@@ -655,58 +660,94 @@ SMODS.Consumable {
     loc_txt = {
         name = "Sigil {C:dark_edition}Omega",
         text = {
-            "{C:attention}Playing cards {}whose",
+            "Converts all playing",
-            "suit doesn't match any",
+            "cards' {C:attention}suit {}to the",
-            "of the {C:attention}selected cards",
+            "{C:attention}selected card",
-            "will be {C:red}destroyed",
         },
     },
     pos = {x = 0, y = 12},
     soul_pos = {x = 1, y = 12},
-    soul_rate = 0,
     cost = 175,
+    soul_rate = 0,
+    hidden = true,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and next(G.hand.highlighted)
+        return Jane.can_use() and
+            #G.hand.highlighted == 1 and
+            not SMODS.has_no_suit(G.hand.highlighted[1]) and
+            not SMODS.has_no_rank(G.hand.highlighted[1])
     end,
-    use = function()
+    use = function(_, card)
-        local destroy = {}
+        Jane.q(function()
+            play_sound("tarot1")
+            card:juice_up(0.3, 0.5)
+        end, 0.4, nil, "after")
 
-        if not next(G.hand.highlighted) then
+        for i = 1, #G.hand.cards do
-            return
+            local percent = 1.15 - (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
+
+            Jane.q(function()
+                G.hand.cards[i]:flip()
+                play_sound("card1", percent)
+                G.hand.cards[i]:juice_up(0.3, 0.3)
+            end, 0.15, nil, "after")
         end
 
-        for _, c in pairs(G.playing_cards) do
+        local suit = G.hand.highlighted[1].base.suit
-            local safe = c.highlighted
 
-            if not safe then
+        Jane.q(function()
-                for _, h in pairs(G.hand.highlighted) do
+            for _, c in pairs(G.playing_cards) do
-                    if SMODS.has_any_suit(h) or
+                assert(SMODS.change_base(c, suit))
-                        h.base.suit == c.base.suit or
-                        (h:norank() and c:norank()) then
-                        safe = true
-                        break
-                    end
-                end
             end
+        end)
 
-            if not safe then
+        for i = 1, #G.hand.cards do
-                destroy[#destroy + 1] = c
+            local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
-            end
+
+            Jane.q(function()
+                G.hand.cards[i]:flip()
+                play_sound("tarot2", percent, 0.6)
+                G.hand.cards[i]:juice_up(0.3, 0.3)
+            end, 0.15, nil, "after")
         end
-
-        SMODS.destroy_cards(destroy)
     end,
 }
 
+local function create_many(set, count, rarity)
+    local showman = SMODS.add_card({key = "j_ring_master", set = "Joker"})
+    showman:set_perishable(true)
+    local ban = {}
+
+    for _, v in pairs(G.P_CENTER_POOLS.jane_omegaconsumable) do
+        ban[v.key] = G.GAME.banned_keys[v.key]
+        G.GAME.banned_keys[v.key] = true
+    end
+
+    for _ = 1, count do
+        Jane.q(function()
+            SMODS.add_card({set = set, rarity = rarity, key_append = "jane_" .. set}):juice_up(0.3, 0.5)
+            play_sound("timpani")
+        end, 0.4, nil, "after")
+    end
+
+    Jane.q(function()
+        SMODS.destroy_cards({showman})
+
+        for _, v in pairs(G.P_CENTER_POOLS.jane_omegaconsumable) do
+            G.GAME.banned_keys[v.key] = ban[v.key]
+        end
+    end)
+end
+
 SMODS.Consumable {
     key = "wraith_omega",
     set = "jane_omegaconsumable",
     loc_txt = {
         name = "Wraith {C:dark_edition}Omega",
         text = {
-            "Create all {C:legendary,E:1}Legendary",
+            "Fill empty {C:attention}Joker Slots",
-            "{C:dark_edition,E:1}Jane {C:attention}Jokers",
+            "with random {C:red}Rare {C:attention}Jokers",
+            "{C:inactive}(Adds a temporary Showman)",
         },
     },
     pos = {x = 0, y = 15},
@@ -715,33 +756,11 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegaspectrals",
-    loc_vars = function(self, info_queue)
+    can_use = function()
-        for _, v in ipairs(self.jokers()) do
+        return Jane.can_use() and #G.jokers.cards < G.jokers.config.card_limit
-            info_queue[#info_queue + 1] = v
-        end
     end,
-    can_use = function(self)
+    use = function()
-        return Jane.can_use() and #G.jokers.cards + #self.jokers() <= G.jokers.config.card_limit
+        create_many("Joker", G.jokers.config.card_limit - #G.jokers.cards, "Rare")
-    end,
-    use = function(self)
-        for _, v in ipairs(self.jokers()) do
-            SMODS.add_card({key = v.key, set = "Joker"})
-        end
-    end,
-    jokers = function()
-        local out = {}
-
-        for _, v in pairs(G.P_CENTERS) do
-            if v.set == "Joker" and
-                v.mod and
-                v.mod.id == "jane" and
-                type(v.rarity) == "number" and
-                v.rarity == 4 then
-                out[#out + 1] = v
-            end
-        end
-
-        return out
     end,
 }
 
@@ -750,10 +769,7 @@ SMODS.Consumable {
     set = "jane_omegaconsumable",
     loc_txt = {
         name = "The Fool {C:dark_edition}Omega",
-        text = {
+        text = {"Clone {C:attention}any {}selected card"},
-            "Create {C:attention}2{} random",
-            "{C:jane_RGB,E:1}Omega{} cards",
-        },
     },
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
@@ -761,18 +777,46 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegatarots",
-    can_use = function()
+    can_use = function(self, card)
-        return Jane.can_use() and #G.consumeables.cards < G.consumeables.config.card_limit
+        if not Jane.can_use() then
+            return false
+        end
+
+        local cards = self:highlighted(card)
+
+        if #cards ~= 1 then
+            return false
+        end
+
+        local area = cards[1].area
+
+        if not area or not area.config then
+            return false
+        end
+
+        if area == G.hand then
+            return true
+        end
+
+        local limits = area.config.card_limits
+        local free = card.area == area and 1 or 0
+        return not limits or not limits.extra_slots_used or #area.cards < area.config.card_limit + free
     end,
-    use = function()
+    use = function(self, card)
-        for _ = 1, 2 do
+        SMODS.copy_card(self:highlighted(card)[1])
-            if #G.consumeables.cards < G.consumeables.config.card_limit then
+    end,
-                local orig = G.GAME.banned_keys.c_jane_soul_omega
+    highlighted = function(_, card)
-                G.GAME.banned_keys.c_jane_soul_omega = true
+        local cards = {}
-                SMODS.add_card({set = "jane_omegaconsumable"})
+
-                G.GAME.banned_keys.c_jane_soul_omega = orig
+        for _, v in pairs(G.I.CARDAREA) do
+            for _, vv in pairs(v.highlighted) do
+                if vv ~= card then
+                    table.insert(cards, vv)
+                end
             end
         end
+
+        return cards
     end,
 }
 
@@ -857,8 +901,8 @@ for _, v in ipairs({
             name = v.o .. " {C:dark_edition}Omega",
             text = {
                 "Enhance {C:attention}selected playing",
-                "{C:attention}cards {}to {C:attention}" .. v.c .. "{} cards,",
+                "{C:attention}cards {}to {C:attention}" .. v.c .. "{} cards",
-                "{C:attention}Duplicate {}each card {C:attention}10 times",
+                "{C:attention}Duplicate {}each card {C:attention}3 times",
             },
         },
         pos = {x = 0, y = v.omega},
@@ -922,7 +966,7 @@ for _, v in ipairs({
 
             Jane.q(function()
                 for _, h in ipairs(to_copy) do
-                    for _ = 1, 10 do
+                    for _ = 1, 3 do
                         SMODS.copy_card(h):start_materialize()
                     end
                 end
@@ -937,8 +981,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "The High Priestess {C:dark_edition}Omega",
         text = {
-            "Every {C:attention}Joker{}, {C:attention}consumable{},",
+            "All {C:attention}playing cards",
-            "and {C:attention}playing card{} will",
             "trigger {C:spectral}Black Hole",
         },
     },
@@ -953,27 +996,24 @@ SMODS.Consumable {
     end,
     can_use = Jane.can_use,
     use = function()
-        SMODS.upgrade_poker_hands({
+        SMODS.upgrade_poker_hands({hands = G.handlist, level_up = #G.playing_cards})
-            hands = G.handlist,
-            level_up = #G.jokers.cards + #G.consumeables.cards + #G.playing_cards,
-        })
     end,
 }
 
-local function create_many(set, count, rarity)
+function Jane.omega(key)
-    local showman = SMODS.add_card({key = "j_ring_master", set = "Joker"})
+    local banned, soul, black_hole   =
-    showman:set_perishable(true)
+        G.GAME.banned_keys, "c_jane_soul_omega", "c_jane_black_hole_omega"
 
-    for _ = 1, count do
+    local orig_soul, orig_black_hole = banned[soul], banned[black_hole]
-        Jane.q(function()
+    banned[soul], banned[black_hole] = true, true
-            SMODS.add_card({set = set, rarity = rarity, key_append = "jane_" .. set}):juice_up(0.3, 0.5)
-            play_sound("timpani")
-        end, 0.4, nil, "after")
-    end
 
-    Jane.q(function()
+    local omega_card                 = SMODS.add_card({
-        SMODS.destroy_cards({showman})
+        set = "jane_omegaconsumable",
-    end)
+        key = pseudorandom_element(G.P_CENTER_POOLS.jane_omegaconsumable, pseudoseed(key or "omega")).key,
+    })
+
+    banned[soul], banned[black_hole] = orig_soul, orig_black_hole
+    return omega_card
 end
 
 SMODS.Consumable {
@@ -982,11 +1022,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Emperor {C:dark_edition}Omega",
         text = {
-            "Create a random {C:red}Rare",
+            "Create {C:attention}2{} random",
-            "{C:attention}Joker {}for every {C:attention}King",
+            "{C:jane_RGB,E:1}Omega{} cards",
-            "in your deck",
-            "{C:inactive}(Currently #1#)",
-            "{C:inactive}(Adds a temporary Showman)",
         },
     },
     pos = {x = 0, y = 4},
@@ -995,40 +1032,18 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegatarots",
-    loc_vars = function()
-        local count = 0
-
-        for _, v in pairs(G.playing_cards) do
-            if not v:norank() and v:get_id() == 13 then
-                count = count + 1
-            end
-        end
-
-        return {vars = {count}}
-    end,
     can_use = function()
-        if not Jane.can_use() then
+        return Jane.can_use() and #G.consumeables.cards <= G.consumeables.config.card_limit
-            return false
-        end
-
-        for _, v in pairs(G.playing_cards) do
-            if not v:norank() and v:get_id() == 13 then
-                return true
-            end
-        end
-
-        return false
     end,
     use = function()
-        local count = 0
+        local count = math.min(G.consumeables.config.card_limit - #G.consumeables.cards - 1, 2)
 
-        for _, v in pairs(G.playing_cards) do
+        for _ = 1, count do
-            if not v:norank() and v:get_id() == 13 then
+            Jane.q(function()
-                count = count + 1
+                play_sound("jane_draw")
-            end
+                Jane.omega()
+            end, 0.4)
         end
-
-        create_many("Joker", count, "Rare")
     end,
 }
 
@@ -1038,9 +1053,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Hermit {C:dark_edition}Omega",
         text = {
-            "Gain {X:money,C:dark_edition}+$^2",
+            "Gain {X:money,C:dark_edition}+$^1.5",
             "{C:inactive}(Currently {C:money}+$#1#{C:inactive})",
-            not Jane.cry and "{C:inactive}(Max of {C:money}$#2#{C:inactive})" or nil,
         },
     },
     pos = {x = 0, y = 9},
@@ -1050,15 +1064,11 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
-    loc_vars = function(self)
+    loc_vars = function()
-        return {vars = {self.money(), 20000}}
+        return {vars = {math.ceil(G.GAME.dollars ^ 1.5)}}
     end,
-    use = function(self)
+    use = function()
-        ease_dollars(self.money())
+        ease_dollars(math.ceil(G.GAME.dollars ^ 1.5))
-    end,
-    money = function()
-        return not (G.GAME or {}).dollars and 0 or
-            (Jane.cry and G.GAME.dollars ^ 2 or math.min(G.GAME.dollars ^ 2, 20000))
     end,
 }
 
@@ -1068,7 +1078,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Wheel of Fortune {C:dark_edition}Omega",
         text = {
-            "Create {C:dark_edition,E:1}100 {C:attention}consumables",
+            "Create {C:dark_edition,E:1}50 {C:attention}consumables",
             "{C:inactive}(Adds a temporary Showman)",
             "{C:inactive}(Doesn't require room)",
         },
@@ -1084,7 +1094,7 @@ SMODS.Consumable {
         return {vars = {((G.GAME or {}).dollars or 0) ^ 2}}
     end,
     use = function()
-        create_many("Consumeables", 100)
+        create_many("Consumeables", 50)
     end,
 }
 
@@ -1101,7 +1111,7 @@ for _, vv in pairs({
             name = "The " .. string.upper(string.sub(vv.b, 1, 1)) .. string.sub(vv.b, 2, string.len(vv.b)) .. " {C:dark_edition}Omega",
             text = {
                 "Convert {C:attention}all {C:" .. string.lower(vv.s) .. "}" .. vv.s,
-                "to {C:dark_edition,E:1}Crystal{}, {C:dark_edition,E:1}Moire{},",
+                "to {C:dark_edition,E:1}Gaming{}, {C:dark_edition,E:1}Moire{},",
                 "or {C:dark_edition,E:1}Polygloss",
             },
         },
@@ -1112,7 +1122,7 @@ for _, vv in pairs({
         hidden = true,
         atlas = "janeomegatarots",
         loc_vars = function(_, info_queue)
-            info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_crystal
+            info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_gaming
             info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_moire
             info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_polygloss
         end,
@@ -1130,7 +1140,7 @@ for _, vv in pairs({
             return false
         end,
         use = function()
-            local editions = {"jane_crystal", "jane_moire", "jane_polygloss"}
+            local editions = {"jane_gaming", "jane_moire", "jane_polygloss"}
 
             play_sound("jane_pop")
 
@@ -1175,6 +1185,7 @@ SMODS.Consumable {
     cost = 0,
     soul_rate = 0,
     hidden = true,
+    pronouns = "any_all",
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
     use = function(_, card)
@@ -1194,6 +1205,10 @@ SMODS.Consumable {
                 "bm",
                 "generic1"
             )
+
+            Jane.q(function()
+                G.C.BACKGROUND.L[4] = 1 - i / 60
+            end)
         end
 
         if not G.P_CENTERS.j_Bakery_Lua then
@@ -1201,9 +1216,16 @@ SMODS.Consumable {
         end
 
         Jane.q(function()
+            local lua = G.GAME.banned_keys.j_Bakery_Lua
+
+            if G.GAME.banned_keys.j_Bakery_Lua then
+                SMODS.destroy_cards(G.jokers.cards, {bypass_eternal = true})
+                G.jokers:change_size(1 - G.jokers.config.card_limits.base)
+            else
+                G.jokers:change_size(1)
+            end
+
             G.GAME.banned_keys.j_Bakery_Lua = nil
-            SMODS.destroy_cards(G.jokers.cards, {bypass_eternal = true})
-            G.jokers:change_size(1 - G.jokers.config.card_limits.base)
 
             SMODS.add_card {
                 set = "Joker",
@@ -1213,8 +1235,21 @@ SMODS.Consumable {
             }
 
             play_sound("jane_enchant", 0.75, 1)
-            G.GAME.banned_keys.j_Bakery_Lua = true
+            G.GAME.banned_keys.j_Bakery_Lua = lua
-            G.GAME.banned_keys.c_jane_soul_omega = true
+            G.GAME.banned_keys.c_jane_soul_omega = lua
+
+            local function darken(i)
+                if i > 450 then
+                    return
+                end
+
+                Jane.q(function()
+                    G.C.BACKGROUND.C[4] = i / 450
+                    darken(i + 1)
+                end, 1 / 60, "REAL", "after", false, false)
+            end
+
+            darken(0)
         end, 0.75, "REAL", "after")
     end,
 }
@@ -1237,7 +1272,7 @@ end
 function create_card(...)
     local card = orig_create_card(...)
 
-    if G.STATE ~= G.STATES.SMODS_BOOSTER_OPENED or not card.gc then
+    if G.STATE ~= G.STATES.SMODS_BOOSTER_OPENED or not card.gc or not G.GAME.modifiers.omega_replacement then
         return card
     end
 
@@ -1247,15 +1282,15 @@ function create_card(...)
         if not G.GAME.banned_keys[key] and
             card:gc().key:sub(2) == key:sub(#"c_jane_", #key - #"_omega") and
             pseudorandom("omega_replacement") < G.GAME.modifiers.omega_replacement then
-            local copy = G.GAME.modifiers.omegas_found
+            local copy = G.GAME.modifiers.omegas_found or 0
-            G.GAME.modifiers.omegas_found = (G.GAME.modifiers.omegas_found or 0) + 1
+            G.GAME.modifiers.omegas_found = copy + 1
 
             Jane.q(function()
                 card:set_ability(G.P_CENTERS[key])
                 card:juice_up(1.5, 1.5)
                 card:set_cost()
 
-                if not copy or copy <= 0 then
+                if copy <= 0 then
                     local pitch = math.pow(2 ^ (1 / 6), G.GAME.modifiers.omegas_found - 1)
 
                     if not G.GAME.obsidian then
@@ -1282,7 +1317,7 @@ function create_card(...)
                                 })
                             end)
 
-                            if key == "c_jane_soul_omega" then
+                            if ({c_jane_soul_omega = true, c_jane_black_hole_omega = true})[key] then
                                 play_sound("jane_chime", 1, 0.65)
                             end
                         end

src/slugcat.lua

@@ -315,7 +315,7 @@ SMODS.Joker {
     atlas = "janegourmand",
     loc_txt = {
         name = "The Gourmand",
-        text = {"All cards are {C:dark_edition}Jumbo"},
+        text = {"All cards are {C:dark_edition,s:" .. Jane.config.wee_sizemod .. "}Jumbo"},
     },
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
@@ -831,7 +831,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,12 +843,6 @@ 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