Retheme edition, use rounding for Omega Hermit

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.12"
+    "version": "1.12.13"
 }

src/edition.lua

@@ -1,15 +1,16 @@
 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
 
@@ -30,21 +31,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}
@@ -75,23 +74,23 @@ SMODS.Edition({
 })
 
 SMODS.Edition({
-    key = "crystal",
+    key = "gaming",
     loc_txt = {
-        name = "Crystal",
+        name = "Gaming",
-        label = "Crystal",
+        label = "Gaming",
         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},
+    sound = {sound = "jane_e_gaming", per = 1, vol = 0.7},
-    weight = 0,
+    weight = 1,
-    extra_cost = 10,
+    extra_cost = 20,
     in_shop = true,
     no_shadow = true,
     apply_to_float = false,
-    shader = "jane_crystal",
+    shader = "jane_gaming",
     disable_base_shader = true,
     loc_vars = function(self, _, _)
         return {vars = {self.config.e_chips, self.config.e_mult}}
@@ -128,8 +127,8 @@ SMODS.Edition({
     },
     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,
@@ -164,8 +163,8 @@ local jumbo = SMODS.Edition({
         name = "Jumbo",
         label = "Jumbo",
         text = {
-            "All card values are",
+            "All values are",
-            "{C:attention}multiplied{} by {C:attention}up to " .. jumbo_modifier,
+            "{C:attention}multiplied{} by {C:attention}" .. jumbo_modifier,
             "{C:inactive}(If possible)",
             "{C:inactive,E:1,s:0.75}Whoa, it's huge!!{}",
         },
@@ -239,8 +238,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

@@ -364,6 +364,17 @@ 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

@@ -423,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",
         },
@@ -435,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,
@@ -444,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,
 }
@@ -564,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},
@@ -575,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,
 }
 
@@ -1065,10 +1065,10 @@ SMODS.Consumable {
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
     loc_vars = function()
-        return {vars = {G.GAME.dollars ^ 1.5}}
+        return {vars = {math.ceil(G.GAME.dollars ^ 1.5)}}
     end,
     use = function()
-        ease_dollars(G.GAME.dollars ^ 1.5)
+        ease_dollars(math.ceil(G.GAME.dollars ^ 1.5))
     end,
 }
 
@@ -1111,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",
             },
         },
@@ -1122,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,
@@ -1140,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")