Nerf a few consumables

manifest.json

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

src/edition.lua

@@ -96,7 +96,7 @@ SMODS.Edition({
     loc_vars = function(self, _, _)
         return {vars = {self.config.e_chips, self.config.e_mult}}
     end,
-    calculate = function(self, card, context)
+    calculate = function(_, card, context)
         if not context.post_joker and (not context.main_scoring or context.cardarea ~= G.play) then
             return
         end
@@ -126,7 +126,7 @@ SMODS.Edition({
             "{X:dark_edition,C:white}^#2#{} Mult",
         },
     },
-    config = {e_chips = 0.75, e_mult = 1.25},
+    config = {e_chips = 0.8, e_mult = 1.2},
     sound = {sound = "jane_e_moire", per = 1, vol = 0.7},
     weight = 0,
     extra_cost = 10,

src/main.lua

@@ -307,6 +307,8 @@ local orig_menu = Game.main_menu
 
 function Game:main_menu(change_context)
     Jane.sinister = nil
+    G.C.BACKGROUND.C[4] = 1
+    G.C.BACKGROUND.L[4] = 1
     orig_menu(self, change_context)
 end
 
@@ -324,6 +326,10 @@ function Game:start_run(...)
             self.GAME.banned_keys[v] = true
         end
     end
+
+    if next(SMODS.find_card("j_Bakery_Lua")) then
+        G.C.BACKGROUND.L[4] = 0
+    end
 end
 
 local orig_draw_card = draw_card

src/omega.lua

@@ -83,6 +83,7 @@ local function omega_level_up(hand, number, card)
         v.l_mult = v.l_mult * factor
     end
 
+    if not Talisman or not Talisman.config_file or not Talisman.config_file.disable_anims then
         Jane.q(function()
             play_sound("jane_boost1", 1, 0.4)
             card:juice_up(0.8, 0.5)
@@ -114,12 +115,14 @@ local function omega_level_up(hand, number, card)
                 mult = hand and G.GAME.hands[hand].mult,
             }
         )
+    end
 
     for _, v in pairs(hand and {G.GAME.hands[hand]} or G.GAME.hands) do
         v.chips = v.chips * factor
         v.mult = v.mult * factor
     end
 
+    if not Talisman or not Talisman.config_file or not Talisman.config_file.disable_anims then
         Jane.q(function()
             play_sound("jane_boost3", 1, 0.4)
             card:juice_up(0.8, 0.5)
@@ -141,6 +144,7 @@ local function omega_level_up(hand, number, card)
                 mult = hand and G.GAME.hands[hand].mult,
             }
         )
+    end
 
     for k, v in pairs(hand and {[hand] = G.GAME.hands[hand]} or G.GAME.hands) do
         SMODS.upgrade_poker_hands({
@@ -200,7 +204,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "{C:dark_edition}Sagittarius A*",
         text = {
-            "{C:attention}Nonuples {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}planet level {}of {C:attention}every hand",
         },
@@ -221,7 +225,7 @@ SMODS.Consumable {
         self:bulk_use(card, area, copier, 1)
     end,
     bulk_use = function(_, card, _, _, number)
-        omega_level_up(nil, number * 2, card)
+        omega_level_up(nil, number, card)
     end,
 }
 
@@ -544,7 +548,7 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegaspectrals",
     loc_vars = function()
-        return {vars = {2000}}
+        return {vars = {200}}
     end,
     can_use = function()
         return Jane.can_use() and next(G.hand.cards)
@@ -554,7 +558,7 @@ SMODS.Consumable {
             Jane.q(function()
                 v:sell_card()
                 local amount = (v:norank() and 1 or v:get_id()) * G.GAME.dollars - G.GAME.dollars
-                ease_dollars(Jane.cry and amount or math.min(amount, 2000))
+                ease_dollars(Jane.cry and amount or math.min(amount, 200))
             end)
         end
     end,
@@ -857,7 +861,7 @@ for _, v in ipairs({
             name = v.o .. " {C:dark_edition}Omega",
             text = {
                 "Enhance {C:attention}selected playing",
-                "{C:attention}cards {}to {C:attention}" .. v.c .. "{} cards,",
+                "{C:attention}cards {}to {C:attention}" .. v.c .. "{} cards",
                 "{C:attention}Duplicate {}each card {C:attention}10 times",
             },
         },
@@ -963,6 +967,12 @@ SMODS.Consumable {
 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()
@@ -973,6 +983,10 @@ local function create_many(set, count, rarity)
 
     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
 
@@ -996,6 +1010,10 @@ SMODS.Consumable {
     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
@@ -1038,9 +1056,8 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Hermit {C:dark_edition}Omega",
         text = {
-            "Gain {X:money,C:dark_edition}+$^2",
+            "Gain {X:money,C:dark_edition}+$^1.5",
             "{C:inactive}(Currently {C:money}+$#1#{C:inactive})",
-            not Jane.cry and "{C:inactive}(Max of {C:money}$#2#{C:inactive})" or nil,
         },
     },
     pos = {x = 0, y = 9},
@@ -1050,15 +1067,11 @@ SMODS.Consumable {
     hidden = true,
     atlas = "janeomegatarots",
     can_use = Jane.can_use,
-    loc_vars = function(self)
+    loc_vars = function()
-        return {vars = {self.money(), 20000}}
+        return {vars = {G.GAME.dollars ^ 1.5}}
     end,
-    use = function(self)
+    use = function()
-        ease_dollars(self.money())
+        ease_dollars(G.GAME.dollars ^ 1.5)
-    end,
-    money = function()
-        return not (G.GAME or {}).dollars and 0 or
-            (Jane.cry and G.GAME.dollars ^ 2 or math.min(G.GAME.dollars ^ 2, 20000))
     end,
 }
 
@@ -1068,7 +1081,7 @@ SMODS.Consumable {
     loc_txt = {
         name = "The Wheel of Fortune {C:dark_edition}Omega",
         text = {
-            "Create {C:dark_edition,E:1}100 {C:attention}consumables",
+            "Create {C:dark_edition,E:1}50 {C:attention}consumables",
             "{C:inactive}(Adds a temporary Showman)",
             "{C:inactive}(Doesn't require room)",
         },
@@ -1084,7 +1097,7 @@ SMODS.Consumable {
         return {vars = {((G.GAME or {}).dollars or 0) ^ 2}}
     end,
     use = function()
-        create_many("Consumeables", 100)
+        create_many("Consumeables", 50)
     end,
 }
 
@@ -1194,6 +1207,10 @@ SMODS.Consumable {
                 "bm",
                 "generic1"
             )
+
+            Jane.q(function()
+                G.C.BACKGROUND.L[4] = 1 - i / 60
+            end)
         end
 
         if not G.P_CENTERS.j_Bakery_Lua then
@@ -1215,6 +1232,19 @@ SMODS.Consumable {
             play_sound("jane_enchant", 0.75, 1)
             G.GAME.banned_keys.j_Bakery_Lua = true
             G.GAME.banned_keys.c_jane_soul_omega = true
+
+            local function darken(i)
+                if i > 450 then
+                    return
+                end
+
+                Jane.q(function()
+                    G.C.BACKGROUND.C[4] = i / 450
+                    darken(i + 1)
+                end, 1 / 60, "REAL", "after", false, false)
+            end
+
+            darken(0)
         end, 0.75, "REAL", "after")
     end,
 }

src/slugcat.lua

@@ -831,7 +831,7 @@ SMODS.Joker {
     loc_txt = {
         name = "The Rot",
         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,
         },
     },
@@ -843,12 +843,6 @@ SMODS.Joker {
     in_pool = function()
         return true, {allow_duplicates = true}
     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)
         local function has_room()
             return G.jokers.config.card_count < G.jokers.config.card_limit