diff --git a/manifest.json b/manifest.json index 3e7f742..e400c26 100644 --- a/manifest.json +++ b/manifest.json @@ -16,5 +16,5 @@ "Bakery (>=3.0.0~*)" ], "conflicts": [], - "version": "1.12.0" + "version": "1.12.1" } \ No newline at end of file diff --git a/src/back.lua b/src/back.lua index cd386e2..9495267 100644 --- a/src/back.lua +++ b/src/back.lua @@ -265,6 +265,17 @@ local function redeem_omen_globe() end) end +local function increase_rates() + for _, v in ipairs(SMODS.ConsumableType.obj_buffer) do + local key = v:lower() .. "_rate" + local n = G.GAME[key] + + if type(n) == "number" then + G.GAME[key] = math.max(n, 1) + end + end +end + back { key = "obsidian", atlas = "janedecks", @@ -295,10 +306,12 @@ back { G.GAME.alt_obsidian = true G.GAME.obsidian = true redeem_omen_globe() + increase_rates() end, apply = function(_) G.GAME.obsidian = true redeem_omen_globe() + increase_rates() end, } @@ -691,6 +704,7 @@ back { end, apply = function(_) apply_orrery() + increase_rates() G.GAME.modifiers.jane_spacious = true G.GAME.used_vouchers.v_omen_globe = true G.GAME.modifiers.jane_spacious_omega = true @@ -996,3 +1010,9 @@ function CardArea:emplace(card, location, stay_flipped) end end end + +local orig_add_to_pool = SMODS.add_to_pool + +function SMODS.add_to_pool(...) + return G.GAME.obsidian or orig_add_to_pool(...) +end diff --git a/src/omega.lua b/src/omega.lua index 538110c..0d00f5a 100644 --- a/src/omega.lua +++ b/src/omega.lua @@ -1185,7 +1185,11 @@ function create_card(...) play_sound("jane_chime", 1, 0.65) end - local anims = Talisman and Talisman.config_file and Talisman.config_file.disable_anims or nil + local anims = Talisman and + Talisman.config_file and + Talisman.config_file.disable_anims or + G.GAME.modifiers.omega_replacement >= 1 / 13 or + nil Jane.q(function() G.GAME.modifiers.omegas_found = 0