assets/shaders/crystal.fs

@@ -1,117 +1,98 @@
-#if defined(VERTEX) || __VERSION__ > 100 || defined(GL_FRAGMENT_PRECISION_HIGH)
+#if defined(VERTEX) || __VERSION__ > 100 || defined(GL_FRAGMENT_PRECISION_HIGH)
-	#define MY_HIGHP_OR_MEDIUMP highp
+	#define MY_HIGHP_OR_MEDIUMP highp
-#else
+#else
-	#define MY_HIGHP_OR_MEDIUMP mediump
+	#define MY_HIGHP_OR_MEDIUMP mediump
-#endif
+#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 dissolve;
-extern MY_HIGHP_OR_MEDIUMP number time;
+extern MY_HIGHP_OR_MEDIUMP number time;
-extern MY_HIGHP_OR_MEDIUMP vec4 texture_details;
+extern MY_HIGHP_OR_MEDIUMP vec4 texture_details;
-extern MY_HIGHP_OR_MEDIUMP vec2 image_details;
+extern MY_HIGHP_OR_MEDIUMP vec2 image_details;
-extern bool shadow;
+extern bool shadow;
-extern MY_HIGHP_OR_MEDIUMP vec4 burn_colour_1;
+extern MY_HIGHP_OR_MEDIUMP vec4 burn_colour_1;
-extern MY_HIGHP_OR_MEDIUMP vec4 burn_colour_2;
+extern MY_HIGHP_OR_MEDIUMP vec4 burn_colour_2;
-
+
-vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
+vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
-{
+{
-    if (dissolve < 0.001) {
+    if (dissolve < 0.001) {
-        return vec4(shadow ? vec3(0.,0.,0.) : tex.xyz, shadow ? tex.a*0.3: tex.a);
+        return vec4(shadow ? vec3(0.,0.,0.) : tex.xyz, shadow ? tex.a*0.3: tex.a);
-    }
+    }
-
+
-    float adjusted_dissolve = (dissolve*dissolve*(3.-2.*dissolve))*1.02 - 0.01; //Adjusting 0.0-1.0 to fall to -0.1 - 1.1 scale so the mask does not pause at extreme values
+    float adjusted_dissolve = (dissolve*dissolve*(3.-2.*dissolve))*1.02 - 0.01; //Adjusting 0.0-1.0 to fall to -0.1 - 1.1 scale so the mask does not pause at extreme values
-
+
-	float t = time * 10.0 + 2003.;
+	float t = time * 10.0 + 2003.;
-	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
+	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
-    vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
+    vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+	
-	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
+	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
-	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
+	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
-	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
+	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
-
+
-    float field = (1.+ (
+    float field = (1.+ (
-        cos(length(field_part1) / 19.483) + sin(length(field_part2) / 33.155) * cos(field_part2.y / 15.73) +
+        cos(length(field_part1) / 19.483) + sin(length(field_part2) / 33.155) * cos(field_part2.y / 15.73) +
-        cos(length(field_part3) / 27.193) * sin(field_part3.x / 21.92) ))/2.;
+        cos(length(field_part3) / 27.193) * sin(field_part3.x / 21.92) ))/2.;
-    vec2 borders = vec2(0.2, 0.8);
+    vec2 borders = vec2(0.2, 0.8);
-
+
-    float res = (.5 + .5* cos( (adjusted_dissolve) / 82.612 + ( field + -.5 ) *3.14))
+    float res = (.5 + .5* cos( (adjusted_dissolve) / 82.612 + ( field + -.5 ) *3.14))
-    - (floored_uv.x > borders.y ? (floored_uv.x - borders.y)*(5. + 5.*dissolve) : 0.)*(dissolve)
+    - (floored_uv.x > borders.y ? (floored_uv.x - borders.y)*(5. + 5.*dissolve) : 0.)*(dissolve)
-    - (floored_uv.y > borders.y ? (floored_uv.y - borders.y)*(5. + 5.*dissolve) : 0.)*(dissolve)
+    - (floored_uv.y > borders.y ? (floored_uv.y - borders.y)*(5. + 5.*dissolve) : 0.)*(dissolve)
-    - (floored_uv.x < borders.x ? (borders.x - floored_uv.x)*(5. + 5.*dissolve) : 0.)*(dissolve)
+    - (floored_uv.x < borders.x ? (borders.x - floored_uv.x)*(5. + 5.*dissolve) : 0.)*(dissolve)
-    - (floored_uv.y < borders.x ? (borders.x - floored_uv.y)*(5. + 5.*dissolve) : 0.)*(dissolve);
+    - (floored_uv.y < borders.x ? (borders.x - floored_uv.y)*(5. + 5.*dissolve) : 0.)*(dissolve);
-
+
-    if (tex.a > 0.01 && burn_colour_1.a > 0.01 && !shadow && res < adjusted_dissolve + 0.8*(0.5-abs(adjusted_dissolve-0.5)) && res > adjusted_dissolve) {
+    if (tex.a > 0.01 && burn_colour_1.a > 0.01 && !shadow && res < adjusted_dissolve + 0.8*(0.5-abs(adjusted_dissolve-0.5)) && res > adjusted_dissolve) {
-        if (!shadow && res < adjusted_dissolve + 0.5*(0.5-abs(adjusted_dissolve-0.5)) && res > adjusted_dissolve) {
+        if (!shadow && res < adjusted_dissolve + 0.5*(0.5-abs(adjusted_dissolve-0.5)) && res > adjusted_dissolve) {
-            tex.rgba = burn_colour_1.rgba;
+            tex.rgba = burn_colour_1.rgba;
-        } else if (burn_colour_2.a > 0.01) {
+        } else if (burn_colour_2.a > 0.01) {
-            tex.rgba = burn_colour_2.rgba;
+            tex.rgba = burn_colour_2.rgba;
-        }
+        }
-    }
+    }
-
+
-    return vec4(shadow ? vec3(0.,0.,0.) : tex.xyz, res > adjusted_dissolve ? (shadow ? tex.a*0.3: tex.a) : .0);
+    return vec4(shadow ? vec3(0.,0.,0.) : tex.xyz, res > adjusted_dissolve ? (shadow ? tex.a*0.3: tex.a) : .0);
-}
+}
-
+
-vec3 oklab2srgb(vec3 c)
+vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords )
-{
+{
-    float l_ = c.r + 0.3963377774 * c.g + 0.2158037573 * c.b;
+    vec4 tex = Texel( texture, texture_coords);
-    float m_ = c.r - 0.1055613458 * c.g - 0.0638541728 * c.b;
+    vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
-    float s_ = c.r - 0.0894841775 * c.g - 1.2914855480 * c.b;
+
-
+    number low = min(tex.r, min(tex.g, tex.b));
-    float l = l_ * l_ * l_;
+    number high = max(tex.r, max(tex.g, tex.b));
-    float m = m_ * m_ * m_;
+	number delta = high-low -0.1;
-    float s = s_ * s_ * s_;
+
-
+    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.));
-    return vec3(
+    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));
-        4.0767416621 * l - 3.3077115913 * m + 0.2309699292 * s,
+    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));
-        -1.2684380046 * l + 2.6097574011 * m - 0.3413193965 * s,
+    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));
-        -0.0041960863 * l - 0.7034186147 * m + 1.7076147010 * s
+    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.);
-
+
-vec3 oklch2srgb(vec3 c)
+    tex.rgb = tex.rgb*0.5 + vec3(0.4, 0.4, 0.8);
-{
+
-    return oklab2srgb(vec3(c.x, c.y * cos(c.z), c.y * sin(c.z)));
+    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;
-vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords )
+    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));
-{
+
-    MY_HIGHP_OR_MEDIUMP vec4 tex = Texel( texture, texture_coords);
+    return dissolve_mask(tex*colour, texture_coords, uv);
-
+}
-    if (tex.r + tex.g + tex.b > 2.5) {
+
-        tex = vec4(oklch2srgb(vec3(.95, 0.0325, gaming.y + texture_coords.y * 10)), tex.a);
+extern MY_HIGHP_OR_MEDIUMP vec2 mouse_screen_pos;
-    }
+extern MY_HIGHP_OR_MEDIUMP float hovering;
-    else if (tex.r + tex.g + tex.b < 1.5) {
+extern MY_HIGHP_OR_MEDIUMP float screen_scale;
-        tex = vec4(oklch2srgb(vec3(.7, 0.0325, gaming.y + texture_coords.y * 10 + 3.14159)), tex.a);
+
-    }
+#ifdef VERTEX
-
+vec4 position( mat4 transform_projection, vec4 vertex_position )
-    MY_HIGHP_OR_MEDIUMP vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
+{
-
+    if (hovering <= 0.){
-    if (!shadow &&  dissolve > 0.01){
+        return transform_projection * vertex_position;
-        if (burn_colour_2.a > 0.01){
+    }
-            tex.rgb = tex.rgb*(1.-0.6*dissolve) + 0.6*burn_colour_2.rgb*dissolve;
+    float mid_dist = length(vertex_position.xy - 0.5*love_ScreenSize.xy)/length(love_ScreenSize.xy);
-        } else if (burn_colour_1.a > 0.01){
+    vec2 mouse_offset = (vertex_position.xy - mouse_screen_pos.xy)/screen_scale;
-            tex.rgb = tex.rgb*(1.-0.6*dissolve) + 0.6*burn_colour_1.rgb*dissolve;
+    float scale = 0.2*(-0.03 - 0.3*max(0., 0.3-mid_dist))
-        }
+                *hovering*(length(mouse_offset)*length(mouse_offset))/(2. -mid_dist);
-    }
+
-
+    return transform_projection * vertex_position + vec4(0,0,0,scale);
-    return dissolve_mask(tex, texture_coords, uv);
+}
-}
+#endif
-
-extern MY_HIGHP_OR_MEDIUMP vec2 mouse_screen_pos;
-extern MY_HIGHP_OR_MEDIUMP float hovering;
-extern MY_HIGHP_OR_MEDIUMP float screen_scale;
-
-#ifdef VERTEX
-vec4 position( mat4 transform_projection, vec4 vertex_position )
-{
-    if (hovering <= 0.){
-        return transform_projection * vertex_position;
-    }
-    float mid_dist = length(vertex_position.xy - 0.5*love_ScreenSize.xy)/length(love_ScreenSize.xy);
-    vec2 mouse_offset = (vertex_position.xy - mouse_screen_pos.xy)/screen_scale;
-    float scale = 0.2*(-0.03 - 0.3*max(0., 0.3-mid_dist))
-                *hovering*(length(mouse_offset)*length(mouse_offset))/(2. -mid_dist);
-
-    return transform_projection * vertex_position + vec4(0,0,0,scale);
-}
-#endif

manifest.json

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

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
-            if Jane.is_end_of_ante(context) then
+            G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement ^ 0.9
-                G.GAME.modifiers.omega_replacement = G.GAME.modifiers.omega_replacement ^ 0.95
+            Jane.q(Jane.display_omega_odds)
-                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

@@ -333,12 +333,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 +358,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

@@ -247,7 +247,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 +259,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,
@@ -331,7 +329,7 @@ SMODS.Consumable {
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, _, _, _, number)
-        for _ = 1, number * 52 do
+        for _ = 1, 52 * number do
             SMODS.copy_card(G.hand.highlighted[1]):start_materialize()
         end
     end,
@@ -370,9 +368,7 @@ 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)
-                    card:set_seal(v.s, true, true)
-                end
             end
         end,
     }
@@ -423,7 +419,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 +431,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 +440,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,
 }
@@ -564,8 +560,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 +571,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,
 }
 
@@ -636,11 +632,11 @@ SMODS.Consumable {
 
         local rank = G.hand.highlighted[1].base.value
 
-        Jane.q(function()
+        for _, c in pairs(G.playing_cards) do
-            for _, c in pairs(G.playing_cards) do
+            Jane.q(function()
                 assert(SMODS.change_base(c, nil, rank))
-            end
+            end)
-        end)
+        end
 
         for i = 1, #G.hand.cards do
             local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
@@ -695,11 +691,11 @@ SMODS.Consumable {
 
         local suit = G.hand.highlighted[1].base.suit
 
-        Jane.q(function()
+        for _, c in pairs(G.playing_cards) do
-            for _, c in pairs(G.playing_cards) do
+            Jane.q(function()
                 assert(SMODS.change_base(c, suit))
-            end
+            end)
-        end)
+        end
 
         for i = 1, #G.hand.cards do
             local percent = 0.85 + (i - 0.999) / (#G.hand.cards - 0.998) * 0.3
@@ -745,7 +741,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "Wraith {C:dark_edition}Omega",
         text = {
-            "Fill empty {C:attention}Joker Slots",
+            "Fill all {C:attention}Joker Slots",
             "with random {C:red}Rare {C:attention}Jokers",
             "{C:inactive}(Adds a temporary Showman)",
         },
@@ -760,7 +756,7 @@ SMODS.Consumable {
         return Jane.can_use() and #G.jokers.cards < G.jokers.config.card_limit
     end,
     use = function()
-        create_many("Joker", G.jokers.config.card_limit - #G.jokers.cards, "Rare")
+        create_many("Joker", #G.jokers.cards - G.jokers.config.card_limit, "Rare")
     end,
 }
 
@@ -1000,22 +996,6 @@ SMODS.Consumable {
     end,
 }
 
-function Jane.omega(key)
-    local banned, soul, black_hole   =
-        G.GAME.banned_keys, "c_jane_soul_omega", "c_jane_black_hole_omega"
-
-    local orig_soul, orig_black_hole = banned[soul], banned[black_hole]
-    banned[soul], banned[black_hole] = true, true
-
-    local omega_card                 = SMODS.add_card({
-        set = "jane_omegaconsumable",
-        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 {
     key = "emperor_omega",
     set = "jane_omegaconsumable",
@@ -1033,16 +1013,29 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegatarots",
     can_use = function()
-        return Jane.can_use() and #G.consumeables.cards <= G.consumeables.config.card_limit
+        return Jane.can_use() and #G.consumeables.cards < G.consumeables.config.card_limit
     end,
     use = function()
-        local count = math.min(G.consumeables.config.card_limit - #G.consumeables.cards - 1, 2)
+        for _ = 1, 2 do
+            if #G.consumeables.cards < G.consumeables.config.card_limit then
+                local banned, soul, black_hole   =
+                    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
-                play_sound("jane_draw")
+
-                Jane.omega()
+                SMODS.add_card(
-            end, 0.4)
+                    {
+                        set = "jane_omegaconsumable",
+                        key = pseudorandom_element(
+                            G.P_CENTER_POOLS.jane_omegaconsumable,
+                            pseudoseed("emperor_omega")
+                        ).key,
+                    }
+                )
+
+                banned[soul], banned[black_hole] = orig_soul, orig_black_hole
+            end
         end
     end,
 }
@@ -1065,10 +1058,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 +1104,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 +1115,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 +1133,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")
 
@@ -1282,15 +1275,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

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},