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) {
+    number low = min(tex.r, min(tex.g, tex.b));
-        tex = vec4(oklch2srgb(vec3(.95, 0.0325, gaming.y + texture_coords.y * 10)), tex.a);
+    number high = max(tex.r, max(tex.g, tex.b));
-    }
+	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);
-    }
 
-    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){
+    number maxfac = 0.7*max(max(fac, max(fac2, max(fac3,0.0))) + (fac+fac2+fac3*fac4), 0.);
-        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;
-        }
-    }
 
-    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;

manifest.json

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

src/back.lua

@@ -664,23 +664,19 @@ back {
 }
 
 function Jane.display_omega_odds()
-    local omega_replacement = ((G.GAME or {}).modifiers or {}).omega_replacement
+    if not ((G.GAME or {}).modifiers or {}).omega_replacement then
-
-    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", 0.75, 1)
-
+    play_sound("jane_pop")
-    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,
+        0.0001,
         G.C.jane_RGB,
         1.5,
         nil,
@@ -688,8 +684,8 @@ function Jane.display_omega_odds()
         nil,
         "cm",
         "jane_pop",
-        0.75,
+        1,
-        pitch,
+        1.5,
         nil,
         nil,
         G.SETTINGS.GAMESPEED * handy_speed * 3
@@ -736,19 +732,8 @@ back {
         end
     end,
     apply = function(_)
-        for _, v in ipairs({
+        G.GAME.banned_keys.j_Bakery_Lua = true
-            "j_Bakery_Lua",
+        G.GAME.modifiers.omega_replacement = 1 / 301
-            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
-
-        G.GAME.modifiers.omega_replacement = (not _G["MP"] or not _G["MP"]["LOBBY"]) and 1 / 301 or 0
     end,
     alt_calculate = function(_, ...)
         for _, v in pairs(G.P_CENTERS) do
@@ -764,44 +749,10 @@ 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
+            G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement ^ 0.765
             Jane.q(Jane.display_omega_odds)
         end
-
-            return
-        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

@@ -104,8 +104,8 @@ SMODS.Challenge {
         G.GAME.modifiers.jane_spacious = true
         G.GAME.used_vouchers.v_omen_globe = true
         G.GAME.modifiers.jane_spacious_omega = true
+        G.GAME.modifiers.omega_replacement = 1 / 301
         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()
@@ -117,12 +117,14 @@ SMODS.Challenge {
             save_run()
         end)
     end,
-    calculate = function(card, context)
+    calculate = function(_, 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
+            G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement ^ 0.765
+            Jane.q(Jane.display_omega_odds)
+
             Jane.q(function()
                 Jane.empowered()
             end)

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,
+    weight = 10,
-    extra_cost = 5,
+    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(_, 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,
+    weight = 0,
-    extra_cost = 20,
+    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 card values are",
-            "All values are",
+            "{C:attention}multiplied{} by {C:attention}up to " .. jumbo_modifier,
-            "{C:attention,s:" .. Jane.config.wee_sizemod .. "}" ..
+            "{C:inactive}(If possible)",
-            "multiplied" ..
+            "{C:inactive,E:1,s:0.75}Whoa, it's huge!!{}",
-            "{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)
@@ -245,8 +239,8 @@ local jumbo = SMODS.Edition({
         end
     end,
     sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5},
-    weight = 7,
+    weight = 6,
-    extra_cost = 10,
+    extra_cost = 5,
     in_shop = true,
     shader = false,
     apply_to_float = false,

src/main.lua

@@ -34,14 +34,17 @@ local function update_omega_from_collection()
         return
     end
 
+    local flag
+
     for i = 1, #buffer do
         if buffer[i] == "jane_omegaconsumable" then
             table.remove(buffer, i)
+            flag = true
             i = i - 1
         end
     end
 
-    if G.GAME.modifiers.omega_replacement then
+    if not flag and G.GAME.modifiers.omega_replacement then
         buffer[#buffer + 1] = "jane_omegaconsumable"
     end
 end
@@ -289,13 +292,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
@@ -333,12 +329,6 @@ 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
@@ -364,17 +354,6 @@ function Game:start_run(...)
     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
 
 ---@diagnostic disable-next-line: lowercase-global

src/omega.lua

@@ -66,7 +66,7 @@ local function create_card_set(needle, edition, amount)
 end
 
 local function omega_level_up(hand, number, card)
-    local factor = 2 ^ number
+    local factor = 3 ^ number
 
     update_hand_text(
         {sound = "button", volume = 0.7, pitch = 0.8, delay = 0.3},
@@ -173,9 +173,9 @@ for _, v in ipairs({
         loc_txt = {
             name = v.n .. " {C:dark_edition}Omega",
             text = {
-                "{C:attention}Doubles {C:chips}Chips{}, {C:chips}Level Chips{},",
+                "{C:attention}Triples {C:chips}Chips{}, {C:chips}Level Chips{},",
                 "{C:mult}Mult{}, {C:mult}Level Mult{}, and",
-                "{C:planet}Level {}of {C:attention}" .. v.h,
+                "{C:planet}planet level {}of {C:attention}" .. v.h,
             },
         },
         set = "jane_omegaconsumable",
@@ -204,8 +204,9 @@ SMODS.Consumable {
     loc_txt = {
         name = "{C:dark_edition}Sagittarius A*",
         text = {
-            "{C:attention}Double {}the {C:planet}Level",
+            "{C:attention}Triples {C:chips}Chips{}, {C:chips}Level Chips{},",
-            "of played hand",
+            "{C:mult}Mult{}, {C:mult}Level Mult{}, and",
+            "{C:planet}planet level {}of {C:attention}every hand",
         },
     },
     set = "jane_omegaconsumable",
@@ -214,20 +215,17 @@ SMODS.Consumable {
     cost = 15,
     soul_rate = 0,
     atlas = "janeomegaplanets",
-    pronouns = "any_all",
     hidden = true,
-    can_use = function(_, card)
+    can_stack = true,
-        return Jane.can_use() and card.area ~= G.consumeables
+    can_divide = true,
+    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,
-    use = function(self)
+    bulk_use = function(_, card, _, _, number)
-        SMODS.add_card({key = self.key, area = G.consumeables, set = self.set})
+        omega_level_up(nil, number, card)
-    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,
 }
 
@@ -247,7 +245,7 @@ SMODS.Consumable {
     can_use = function()
         return Jane.can_use() and
             G.jokers.highlighted[1] and
-            #G.jokers.cards < G.jokers.config.card_limit
+            #G.jokers.cards + 3 <= G.jokers.config.card_limit
     end,
     use = function(self, card, area, copier)
         self:bulk_use(card, area, copier, 1)
@@ -259,9 +257,7 @@ SMODS.Consumable {
             return
         end
 
-        local count = math.min(number * 3, G.jokers.config.card_limit - #G.jokers.cards)
+        for _ = 1, 3 * number do
-
-        for _ = 1, count do
             SMODS.copy_card(joker):start_materialize()
         end
     end,
@@ -273,8 +269,9 @@ SMODS.Consumable {
     loc_txt = {
         name = "Aura {C:dark_edition}Omega",
         text = {
-            "Apply {C:dark_edition}Negative {}to",
+            "Apply {C:dark_edition}Crystal {}to all",
-            "{C:attention}all playing cards",
+            "{C:attention}selected Jokers {}and",
+            "{C:attention}playing cards",
         },
     },
     pos = {x = 0, y = 1},
@@ -284,14 +281,20 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function(_, info_queue)
-        info_queue[#info_queue + 1] = {key = "e_negative_playing_card", set = "Edition", config = {extra = 1}}
+        info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_crystal
     end,
     can_use = function()
         if not Jane.can_use() then
             return false
         end
 
-        for _, v in ipairs(G.playing_cards) do
+        for _, v in ipairs(G.jokers.highlighted) 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
@@ -300,9 +303,15 @@ SMODS.Consumable {
         return false
     end,
     use = function()
-        for _, v in ipairs(G.playing_cards) do
+        for _, v in ipairs(G.jokers.highlighted) do
             if not v.edition then
-                v:set_edition({negative = true})
+                v:set_edition({jane_crystal = 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,
@@ -314,8 +323,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "Cryptid {C:dark_edition}Omega",
         text = {
-            "Create {C:attention}52{} copies of a",
+            "Create {C:attention}20{} copies of",
-            "{C:attention}selected playing card",
+            "{C:attention}selected playing cards",
         },
     },
     pos = {x = 0, y = 2},
@@ -325,14 +334,16 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and #G.hand.highlighted == 1
+        return Jane.can_use() and next(G.hand.highlighted)
     end,
     use = function(self, card, area, copier)
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        for _ = 1, number * 52 do
+        for _, v in ipairs(G.hand.highlighted) do
-            SMODS.copy_card(G.hand.highlighted[1]):start_materialize()
+            for _ = 1, 20 * number do
+                SMODS.copy_card(v):start_materialize()
+            end
         end
     end,
 }
@@ -370,10 +381,8 @@ for _, v in ipairs({
             end
 
             for _, card in pairs(G.playing_cards) do
-                if card.area ~= G.hand then
                 card:set_seal(v.s, true, true)
             end
-            end
         end,
     }
 end
@@ -423,7 +432,7 @@ SMODS.Consumable {
         name = "Familiar {C:dark_edition}Omega",
         text = {
             "Add a {C:attention}full set{} of",
-            "{C:dark_edition,E:1}Gaming {C:attention}Kings{}, {C:dark_edition,E:1}Moire",
+            "{C:dark_edition,E:1}Moire {C:attention}Kings{}, {C:dark_edition,E:1}Crystal",
             "{C:attention}Queens{}, and {C:dark_edition,E:1}Polygloss",
             "{C:attention}Jacks {}to your deck",
         },
@@ -435,8 +444,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,
@@ -444,8 +453,8 @@ SMODS.Consumable {
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        create_card_set("_K", "e_jane_gaming", number)
+        create_card_set("_K", "e_jane_moire", number)
-        create_card_set("_Q", "e_jane_moire", number)
+        create_card_set("_Q", "e_jane_crystal", number)
         create_card_set("_J", "e_jane_polygloss", number)
     end,
 }
@@ -526,8 +535,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "Immolate {C:dark_edition}Omega",
         text = {
-            "{C:money}Sells{} all remaining",
+            "{C:money}Sells{} all cards {C:attention}in hand",
-            "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,
@@ -543,10 +551,10 @@ SMODS.Consumable {
         return {vars = {200}}
     end,
     can_use = function()
-        return Jane.can_use() and next(G.deck.cards)
+        return Jane.can_use() and next(G.hand.cards)
     end,
     use = function()
-        for _, v in pairs(G.deck.cards) do
+        for _, v in pairs(G.hand.cards) do
             Jane.q(function()
                 v:sell_card()
                 local amount = (v:norank() and 1 or v:get_id()) * G.GAME.dollars - G.GAME.dollars
@@ -564,8 +572,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}Gaming{} on {C:attention}odd ranks",
+            "{C:dark_edition,E:1}Polygloss{} on {C:attention}odd ranks",
-            "{C:dark_edition,E:1}Polygloss{} on {C:attention}even ranks",
+            "{C:dark_edition,E:1}Crystal{} on {C:attention}even ranks",
         },
     },
     pos = {x = 0, y = 9},
@@ -575,23 +583,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_polygloss", number)
+        create_card_set("_2", "e_jane_crystal", number)
-        create_card_set("_3", "e_jane_gaming", number)
+        create_card_set("_3", "e_jane_polygloss", number)
-        create_card_set("_4", "e_jane_polygloss", number)
+        create_card_set("_4", "e_jane_crystal", number)
-        create_card_set("_5", "e_jane_gaming", number)
+        create_card_set("_5", "e_jane_polygloss", number)
-        create_card_set("_6", "e_jane_polygloss", number)
+        create_card_set("_6", "e_jane_crystal", number)
-        create_card_set("_7", "e_jane_gaming", number)
+        create_card_set("_7", "e_jane_polygloss", number)
-        create_card_set("_8", "e_jane_polygloss", number)
+        create_card_set("_8", "e_jane_crystal", number)
-        create_card_set("_9", "e_jane_gaming", number)
+        create_card_set("_9", "e_jane_polygloss", number)
-        create_card_set("_T", "e_jane_polygloss", number)
+        create_card_set("_T", "e_jane_crystal", number)
     end,
 }
 
@@ -601,9 +609,10 @@ SMODS.Consumable {
     loc_txt = {
         name = "Ouija {C:dark_edition}Omega",
         text = {
-            "Converts all playing",
+            "{C:attention}Playing cards {}whose",
-            "cards' {C:attention}rank {}to the",
+            "rank doesn't match any",
-            "{C:attention}selected card",
+            "of the {C:attention}selected cards",
+            "will be {C:red}destroyed",
         },
     },
     pos = {x = 0, y = 11},
@@ -613,44 +622,34 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and
+        return Jane.can_use() and next(G.hand.highlighted)
-            #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(_, card)
+    use = function()
-        Jane.q(function()
+        if not next(G.hand.highlighted) then
-            play_sound("tarot1")
+            return
-            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 rank = G.hand.highlighted[1].base.value
+        local destroy = {}
 
-        Jane.q(function()
         for _, c in pairs(G.playing_cards) do
-                assert(SMODS.change_base(c, nil, rank))
+            local safe = c.highlighted
-            end
-        end)
 
-        for i = 1, #G.hand.cards do
+            if not safe then
-            local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
+                for _, h in pairs(G.hand.highlighted) do
-
+                    if h:get_id() == c:get_id() or
-            Jane.q(function()
+                        (h:norank() and c:norank()) then
-                G.hand.cards[i]:flip()
+                        safe = true
-                play_sound("tarot2", percent, 0.6)
+                        break
-                G.hand.cards[i]:juice_up(0.3, 0.3)
-            end, 0.15, nil, "after")
                     end
+                end
+            end
+
+            if not safe then
+                destroy[#destroy + 1] = c
+            end
+        end
+
+        SMODS.destroy_cards(destroy)
     end,
 }
 
@@ -660,94 +659,58 @@ SMODS.Consumable {
     loc_txt = {
         name = "Sigil {C:dark_edition}Omega",
         text = {
-            "Converts all playing",
+            "{C:attention}Playing cards {}whose",
-            "cards' {C:attention}suit {}to the",
+            "suit doesn't match any",
-            "{C:attention}selected card",
+            "of the {C:attention}selected cards",
+            "will be {C:red}destroyed",
         },
     },
     pos = {x = 0, y = 12},
     soul_pos = {x = 1, y = 12},
-    cost = 175,
     soul_rate = 0,
-    hidden = true,
+    cost = 175,
     atlas = "janeomegaspectrals",
     can_use = function()
-        return Jane.can_use() and
+        return Jane.can_use() and next(G.hand.highlighted)
-            #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(_, card)
+    use = function()
-        Jane.q(function()
+        local destroy = {}
-            play_sound("tarot1")
-            card:juice_up(0.3, 0.5)
-        end, 0.4, nil, "after")
 
-        for i = 1, #G.hand.cards do
+        if not next(G.hand.highlighted) then
-            local percent = 1.15 - (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
+            return
-
-            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 suit = G.hand.highlighted[1].base.suit
-
-        Jane.q(function()
         for _, c in pairs(G.playing_cards) do
-                assert(SMODS.change_base(c, suit))
+            local safe = c.highlighted
-            end
-        end)
 
-        for i = 1, #G.hand.cards do
+            if not safe then
-            local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
+                for _, h in pairs(G.hand.highlighted) do
-
+                    if SMODS.has_any_suit(h) or
-            Jane.q(function()
+                        h.base.suit == c.base.suit or
-                G.hand.cards[i]:flip()
+                        (h:norank() and c:norank()) then
-                play_sound("tarot2", percent, 0.6)
+                        safe = true
-                G.hand.cards[i]:juice_up(0.3, 0.3)
+                        break
-            end, 0.15, nil, "after")
                     end
+                end
+            end
+
+            if not safe then
+                destroy[#destroy + 1] = c
+            end
+        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 = {
-            "Fill empty {C:attention}Joker Slots",
+            "Create all {C:legendary,E:1}Legendary",
-            "with random {C:red}Rare {C:attention}Jokers",
+            "{C:dark_edition,E:1}Jane {C:attention}Jokers",
-            "{C:inactive}(Adds a temporary Showman)",
         },
     },
     pos = {x = 0, y = 15},
@@ -756,11 +719,33 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegaspectrals",
-    can_use = function()
+    loc_vars = function(self, info_queue)
-        return Jane.can_use() and #G.jokers.cards < G.jokers.config.card_limit
+        for _, v in ipairs(self.jokers()) do
+            info_queue[#info_queue + 1] = v
+        end
     end,
-    use = function()
+    can_use = function(self)
-        create_many("Joker", G.jokers.config.card_limit - #G.jokers.cards, "Rare")
+        return Jane.can_use() and #G.jokers.cards + #self.jokers() <= G.jokers.config.card_limit
+    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,
 }
 
@@ -769,7 +754,10 @@ SMODS.Consumable {
     set = "jane_omegaconsumable",
     loc_txt = {
         name = "The Fool {C:dark_edition}Omega",
-        text = {"Clone {C:attention}any {}selected card"},
+        text = {
+            "Create {C:attention}2{} random",
+            "{C:jane_RGB,E:1}Omega{} cards",
+        },
     },
     pos = {x = 0, y = 0},
     soul_pos = {x = 1, y = 0},
@@ -777,46 +765,18 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegatarots",
-    can_use = function(self, card)
+    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
-
-        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(self, card)
+    use = function()
-        SMODS.copy_card(self:highlighted(card)[1])
+        for _ = 1, 2 do
-    end,
+            if #G.consumeables.cards < G.consumeables.config.card_limit then
-    highlighted = function(_, card)
+                local orig = G.GAME.banned_keys.c_jane_soul_omega
-        local cards = {}
+                G.GAME.banned_keys.c_jane_soul_omega = true
-
+                SMODS.add_card({set = "jane_omegaconsumable"})
-        for _, v in pairs(G.I.CARDAREA) do
+                G.GAME.banned_keys.c_jane_soul_omega = orig
-            for _, vv in pairs(v.highlighted) do
-                if vv ~= card then
-                    table.insert(cards, vv)
             end
         end
-        end
-
-        return cards
     end,
 }
 
@@ -902,7 +862,7 @@ for _, v in ipairs({
             text = {
                 "Enhance {C:attention}selected playing",
                 "{C:attention}cards {}to {C:attention}" .. v.c .. "{} cards",
-                "{C:attention}Duplicate {}each card {C:attention}3 times",
+                "{C:attention}Duplicate {}each card {C:attention}10 times",
             },
         },
         pos = {x = 0, y = v.omega},
@@ -966,7 +926,7 @@ for _, v in ipairs({
 
             Jane.q(function()
                 for _, h in ipairs(to_copy) do
-                    for _ = 1, 3 do
+                    for _ = 1, 10 do
                         SMODS.copy_card(h):start_materialize()
                     end
                 end
@@ -981,7 +941,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "The High Priestess {C:dark_edition}Omega",
         text = {
-            "All {C:attention}playing cards",
+            "Every {C:attention}Joker{}, {C:attention}consumable{},",
+            "and {C:attention}playing card{} will",
             "trigger {C:spectral}Black Hole",
         },
     },
@@ -996,24 +957,37 @@ SMODS.Consumable {
     end,
     can_use = Jane.can_use,
     use = function()
-        SMODS.upgrade_poker_hands({hands = G.handlist, level_up = #G.playing_cards})
+        SMODS.upgrade_poker_hands({
+            hands = G.handlist,
+            level_up = #G.jokers.cards + #G.consumeables.cards + #G.playing_cards,
+        })
     end,
 }
 
-function Jane.omega(key)
+local function create_many(set, count, rarity)
-    local banned, soul, black_hole   =
+    local showman = SMODS.add_card({key = "j_ring_master", set = "Joker"})
-        G.GAME.banned_keys, "c_jane_soul_omega", "c_jane_black_hole_omega"
+    showman:set_perishable(true)
+    local ban = {}
 
-    local orig_soul, orig_black_hole = banned[soul], banned[black_hole]
+    for _, v in pairs(G.P_CENTER_POOLS.jane_omegaconsumable) do
-    banned[soul], banned[black_hole] = true, true
+        ban[v.key] = G.GAME.banned_keys[v.key]
+        G.GAME.banned_keys[v.key] = true
+    end
 
-    local omega_card                 = SMODS.add_card({
+    for _ = 1, count do
-        set = "jane_omegaconsumable",
+        Jane.q(function()
-        key = pseudorandom_element(G.P_CENTER_POOLS.jane_omegaconsumable, pseudoseed(key or "omega")).key,
+            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
 
-    banned[soul], banned[black_hole] = orig_soul, orig_black_hole
+    Jane.q(function()
-    return omega_card
+        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 {
@@ -1022,8 +996,11 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Emperor {C:dark_edition}Omega",
         text = {
-            "Create {C:attention}2{} random",
+            "Create a random {C:red}Rare",
-            "{C:jane_RGB,E:1}Omega{} cards",
+            "{C:attention}Joker {}for every {C:attention}King",
+            "in your deck",
+            "{C:inactive}(Currently #1#)",
+            "{C:inactive}(Adds a temporary Showman)",
         },
     },
     pos = {x = 0, y = 4},
@@ -1032,18 +1009,44 @@ SMODS.Consumable {
     soul_rate = 0,
     hidden = true,
     atlas = "janeomegatarots",
+    loc_vars = function()
+        if not G.playing_cards then
+            return
+        end
+
+        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()
-        return Jane.can_use() and #G.consumeables.cards <= G.consumeables.config.card_limit
+        if not Jane.can_use() then
+            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 = math.min(G.consumeables.config.card_limit - #G.consumeables.cards - 1, 2)
+        local count = 0
 
-        for _ = 1, count do
+        for _, v in pairs(G.playing_cards) do
-            Jane.q(function()
+            if not v:norank() and v:get_id() == 13 then
-                play_sound("jane_draw")
+                count = count + 1
-                Jane.omega()
-            end, 0.4)
             end
+        end
+
+        create_many("Joker", count, "Rare")
     end,
 }
 
@@ -1065,10 +1068,10 @@ SMODS.Consumable {
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
     loc_vars = function()
-        return {vars = {math.ceil(G.GAME.dollars ^ 1.5)}}
+        return {vars = {G.GAME.dollars ^ 1.5}}
     end,
     use = function()
-        ease_dollars(math.ceil(G.GAME.dollars ^ 1.5))
+        ease_dollars(G.GAME.dollars ^ 1.5)
     end,
 }
 
@@ -1111,7 +1114,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}Gaming{}, {C:dark_edition,E:1}Moire{},",
+                "to {C:dark_edition,E:1}Crystal{}, {C:dark_edition,E:1}Moire{},",
                 "or {C:dark_edition,E:1}Polygloss",
             },
         },
@@ -1122,7 +1125,7 @@ for _, vv in pairs({
         hidden = true,
         atlas = "janeomegatarots",
         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_crystal
             info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_moire
             info_queue[#info_queue + 1] = G.P_CENTERS.e_jane_polygloss
         end,
@@ -1140,7 +1143,7 @@ for _, vv in pairs({
             return false
         end,
         use = function()
-            local editions = {"jane_gaming", "jane_moire", "jane_polygloss"}
+            local editions = {"jane_crystal", "jane_moire", "jane_polygloss"}
 
             play_sound("jane_pop")
 
@@ -1185,7 +1188,6 @@ SMODS.Consumable {
     cost = 0,
     soul_rate = 0,
     hidden = true,
-    pronouns = "any_all",
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
     use = function(_, card)
@@ -1282,15 +1284,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 or 0
+            local copy = G.GAME.modifiers.omegas_found
-            G.GAME.modifiers.omegas_found = copy + 1
+            G.GAME.modifiers.omegas_found = (G.GAME.modifiers.omegas_found or 0) + 1
 
             Jane.q(function()
                 card:set_ability(G.P_CENTERS[key])
                 card:juice_up(1.5, 1.5)
                 card:set_cost()
 
-                if copy <= 0 then
+                if not copy or copy <= 0 then
                     local pitch = math.pow(2 ^ (1 / 6), G.GAME.modifiers.omegas_found - 1)
 
                     if not G.GAME.obsidian then
@@ -1317,7 +1319,7 @@ function create_card(...)
                                 })
                             end)
 
-                            if ({c_jane_soul_omega = true, c_jane_black_hole_omega = true})[key] then
+                            if key == "c_jane_soul_omega" 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,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},