Compare commits

..

12 commits
1.12.2 ... main

10 changed files with 776 additions and 487 deletions

View file

@ -4,7 +4,7 @@
#define MY_HIGHP_OR_MEDIUMP mediump #define MY_HIGHP_OR_MEDIUMP mediump
#endif #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 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;
@ -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); 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 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; extern MY_HIGHP_OR_MEDIUMP vec2 mouse_screen_pos;

View file

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

View file

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

View file

@ -157,7 +157,7 @@ local rain_world_jokers = {
"j_jane_saint", "j_jane_saint",
} }
local function add_rain_world_joker() function Jane.add_rain_world_joker()
if not G.jokers then if not G.jokers then
return return
end end
@ -200,14 +200,14 @@ back {
}, },
}, },
alt_apply = function(_) alt_apply = function(_)
Jane.q(add_rain_world_joker) Jane.q(Jane.add_rain_world_joker)
end, end,
apply = function(_) apply = function(_)
Jane.q(add_rain_world_joker) Jane.q(Jane.add_rain_world_joker)
end, end,
alt_calculate = function(_, _, context) alt_calculate = function(_, _, context)
if Jane.is_end_of_ante(context) then if Jane.is_end_of_ante(context) then
add_rain_world_joker() Jane.add_rain_world_joker()
end end
end, end,
} }
@ -265,12 +265,12 @@ local function redeem_omen_globe()
end) end)
end end
local function increase_rates() function Jane.increase_rates()
for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do
local key = v:lower() .. "_rate" local key = v:lower() .. "_rate"
local n = G.GAME[key] 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) G.GAME[key] = math.max(n, 1)
end end
end end
@ -305,13 +305,13 @@ back {
alt_apply = function(_) alt_apply = function(_)
G.GAME.alt_obsidian = true G.GAME.alt_obsidian = true
G.GAME.obsidian = true G.GAME.obsidian = true
Jane.increase_rates()
redeem_omen_globe() redeem_omen_globe()
increase_rates()
end, end,
apply = function(_) apply = function(_)
G.GAME.obsidian = true G.GAME.obsidian = true
Jane.increase_rates()
redeem_omen_globe() redeem_omen_globe()
increase_rates()
end, end,
} }
@ -346,7 +346,7 @@ function get_current_pool(_type, ...)
return pool, pool_key return pool, pool_key
end end
local function apply_orrery() function Jane.apply_orrery()
Jane.q(function() Jane.q(function()
local orrery = {} local orrery = {}
G.GAME.orrery = orrery G.GAME.orrery = orrery
@ -361,7 +361,7 @@ local function apply_orrery()
end) end)
end end
local function rebalance_orrery() function Jane.rebalance_orrery()
local function small(x) local function small(x)
return type(x) == "table" and x:to_number() or x return type(x) == "table" and x:to_number() or x
end end
@ -454,12 +454,12 @@ back {
}, },
}, },
alt_apply = function(_) alt_apply = function(_)
apply_orrery() Jane.apply_orrery()
end, end,
apply = function(_) apply = function(_)
apply_orrery() Jane.apply_orrery()
end, end,
calculate = rebalance_orrery, calculate = Jane.rebalance_orrery,
alt_calculate = function(_, _, context) alt_calculate = function(_, _, context)
local function small(x) local function small(x)
return type(x) == "table" and x:to_number() or x return type(x) == "table" and x:to_number() or x
@ -493,7 +493,7 @@ back {
ease_discard(new_discards, true) ease_discard(new_discards, true)
end end
rebalance_orrery() Jane.rebalance_orrery()
end, end,
} }
@ -663,6 +663,39 @@ back {
end, 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 = { local banned_keys = {
sleeve_Seen_Seen = true, sleeve_Seen_Seen = true,
sleeve_jane_omega = true, sleeve_jane_omega = true,
@ -675,8 +708,8 @@ back {
loc_txt = { loc_txt = {
name = "Omega Deck", name = "Omega Deck",
text = { 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 = { alt_loc_txt = {
@ -703,22 +736,19 @@ back {
end end
end, end,
apply = function(_) 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, end,
alt_calculate = function(_, ...) alt_calculate = function(_, ...)
for _, v in pairs(G.P_CENTERS) do 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) G.hand.config.card_limit = math.max(G.hand.config.card_limit or 12, 12)
end, end,
calculate = function(_, _, context) 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 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, end,
} }

View file

@ -93,3 +93,45 @@ G.localization.misc.v_text.ch_c_jane_downpour2 =
G.localization.misc.v_text.ch_c_jane_downpour3 = G.localization.misc.v_text.ch_c_jane_downpour3 =
{"{C:attention}Boss Blind {}is defeated, or {C:red}lose"} {"{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"}

View file

@ -1,18 +1,61 @@
SMODS.Shader({key = "moire", path = "moire.fs"}) 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.Shader({key = "polygloss", path = "polygloss.fs"})
SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"}) SMODS.Sound({key = "e_jumbo", path = "e_jumbo.ogg"})
SMODS.Sound({key = "e_moire", path = "e_moire.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"}) SMODS.Sound({key = "e_polygloss", path = "e_polygloss.ogg"})
local function get_weight(self) local function get_weight(self)
return self.weight * return self.weight *
G.GAME.edition_rate * G.GAME.edition_rate *
(G.GAME.modifiers.omega_replacement and 0 or 1) *
(next(SMODS.find_card "j_jane_saint") and 10 or 1) (next(SMODS.find_card "j_jane_saint") and 10 or 1)
end 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({ SMODS.Edition({
key = "polygloss", key = "polygloss",
loc_txt = { loc_txt = {
@ -30,21 +73,19 @@ SMODS.Edition({
}, },
config = { config = {
mult = 2, mult = 2,
chips = 22, chips = 21,
x_mult = 1.2, x_mult = 1.2,
p_dollars = 1, p_dollars = 1,
e_mult = Jane.cry and 1.02 or nil, e_mult = Jane.cry and 1.02 or nil,
}, },
sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4}, sound = {sound = "jane_e_polygloss", per = 1.2, vol = 0.4},
weight = 10, weight = 7,
extra_cost = 2, extra_cost = 5,
in_shop = true, in_shop = true,
shader = "jane_polygloss", shader = "jane_polygloss",
apply_to_float = false, apply_to_float = false,
loc_vars = function(self, _, _) 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.e_mult
vars[#vars + 1] = self.config.p_dollars vars[#vars + 1] = self.config.p_dollars
return {vars = vars} return {vars = vars}
@ -74,48 +115,6 @@ SMODS.Edition({
get_weight = get_weight, 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({ SMODS.Edition({
key = "moire", key = "moire",
loc_txt = { loc_txt = {
@ -128,8 +127,8 @@ SMODS.Edition({
}, },
config = {e_chips = 0.8, e_mult = 1.2}, config = {e_chips = 0.8, e_mult = 1.2},
sound = {sound = "jane_e_moire", per = 1, vol = 0.7}, sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
weight = 0, weight = 1,
extra_cost = 10, extra_cost = 20,
in_shop = true, in_shop = true,
shader = "jane_moire", shader = "jane_moire",
apply_to_float = false, apply_to_float = false,
@ -161,13 +160,20 @@ local jumbo_modifier = Jane.cry and 100 or 2
local jumbo = SMODS.Edition({ local jumbo = SMODS.Edition({
key = "jumbo", key = "jumbo",
loc_txt = { loc_txt = {
name = "Jumbo", name = "{s:" .. math.pow(Jane.config.wee_sizemod, 2) .. "}" .. "Jumbo",
label = "Jumbo", label = "Jumbo",
text = { 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) on_apply = function(card)
@ -239,8 +245,8 @@ local jumbo = SMODS.Edition({
end end
end, end,
sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5}, sound = {sound = "jane_e_jumbo", per = 1, vol = 0.5},
weight = 6, weight = 7,
extra_cost = 5, extra_cost = 10,
in_shop = true, in_shop = true,
shader = false, shader = false,
apply_to_float = false, apply_to_float = false,

View file

@ -12,10 +12,9 @@ end
Jane = { Jane = {
cry = SMODS.Mods.Cryptid and not SMODS.Mods.Cryptid.disabled, cry = SMODS.Mods.Cryptid and not SMODS.Mods.Cryptid.disabled,
config = { config = {
omega_chance = 1 / 301,
texture_pack = "default", texture_pack = "default",
wee_sizemod = math.sqrt(2), 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"))() assert(SMODS.load_file("src/misprintize.lua"))()
end 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() function Jane.can_use()
return not (((G.play and #G.play.cards > 0) or return not (((G.play and #G.play.cards > 0) or
(G.CONTROLLER.locked) or (G.CONTROLLER.locked) or
@ -52,7 +70,8 @@ function Jane.card_status_text(
volume, volume,
pitch, pitch,
trigger, trigger,
f f,
hold
) )
if (delay or 0) <= 0 then if (delay or 0) <= 0 then
if type(f) == "function" then if type(f) == "function" then
@ -62,7 +81,7 @@ function Jane.card_status_text(
attention_text({ attention_text({
text = text, text = text,
scale = size or 1, scale = size or 1,
hold = 0.7, hold = hold or 0.7,
backdrop_colour = colour or (G.C.FILTER), backdrop_colour = colour or (G.C.FILTER),
align = align or "bm", align = align or "bm",
major = card, major = card,
@ -94,7 +113,7 @@ function Jane.card_status_text(
attention_text({ attention_text({
text = text, text = text,
scale = size or 1, 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), backdrop_colour = colour or (G.C.FILTER),
align = align or "bm", align = align or "bm",
major = card, major = card,
@ -270,6 +289,13 @@ end
local orig_can_highlight = CardArea.can_highlight local orig_can_highlight = CardArea.can_highlight
function 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 if self ~= G.consumeables then
return orig_can_highlight(self, ...) return orig_can_highlight(self, ...)
end end
@ -306,8 +332,17 @@ end
local orig_menu = Game.main_menu local orig_menu = Game.main_menu
function Game:main_menu(change_context) function Game:main_menu(change_context)
Jane.sinister = nil
orig_menu(self, change_context) orig_menu(self, change_context)
G.ARGS.score_intensity.ambientSurreal1,
G.ARGS.score_intensity.ambientSurreal2,
G.ARGS.score_intensity.ambientSurreal3,
G.ARGS.score_intensity.ambientSurreal4 = 0, 0, 0, 0
update_omega_from_collection()
G.C.BACKGROUND.C[4] = 1
G.C.BACKGROUND.L[4] = 1
Jane.sinister = nil
end end
local orig_start_run = Game.start_run local orig_start_run = Game.start_run
@ -315,15 +350,29 @@ local orig_start_run = Game.start_run
function Game:start_run(...) function Game:start_run(...)
orig_start_run(self, ...) orig_start_run(self, ...)
self.GAME.modifiers.omegas_found = nil 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 if self.GAME.banned_keys then
for _, v in pairs(Jane.config.bans) do for _, v in pairs(Jane.config.bans) do
self.GAME.banned_keys[v] = true self.GAME.banned_keys[v] = true
end end
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 end
local orig_draw_card = draw_card local orig_draw_card = draw_card

File diff suppressed because it is too large Load diff

View file

@ -315,7 +315,7 @@ SMODS.Joker {
atlas = "janegourmand", atlas = "janegourmand",
loc_txt = { loc_txt = {
name = "The Gourmand", 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}, pos = {x = 0, y = 0},
soul_pos = {x = 1, y = 0}, soul_pos = {x = 1, y = 0},
@ -336,7 +336,6 @@ local function add_to_consumable_ability_by(n)
return type(v) == "number" and v + n or type(v) == "table" and f(v):map(new):table() or v return type(v) == "number" and v + n or type(v) == "table" and f(v):map(new):table() or v
end end
---@param card Card
return function(card) return function(card)
local ability = card.ability or {} local ability = card.ability or {}
@ -832,7 +831,7 @@ SMODS.Joker {
loc_txt = { loc_txt = {
name = "The Rot", name = "The Rot",
text = { 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, Jane.cry and "end of {C:attention}every ante" or nil,
}, },
}, },
@ -844,12 +843,6 @@ SMODS.Joker {
in_pool = function() in_pool = function()
return true, {allow_duplicates = true} return true, {allow_duplicates = true}
end, 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) calculate = Jane.cry and function(_, card, context)
local function has_room() local function has_room()
return G.jokers.config.card_count < G.jokers.config.card_limit return G.jokers.config.card_count < G.jokers.config.card_limit