Add new song

lovely.toml

@@ -27,7 +27,7 @@ match_indent = true
 target = "functions/common_events.lua"
 pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
 position = "at"
-payload = "if Jane and Jane.hidden(v) or v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
+payload = "if Jane and Jane.hidden(v) or not Jane and (v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden) then"
 match_indent = true
 
 [[patches]]

manifest.json

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

src/back.lua

@@ -228,7 +228,7 @@ if Jane.cry then
         },
         alt_loc_txt = {
             name = "Sleeve?",
-            text = {"{C:attention}Ante order {}is {C:green,E:1}randomized"},
+            text = {"{C:attention}Ante order {}is", "{C:green,E:1}randomized"},
         },
         alt_apply = function(_)
             G.GAME.mysterious = true

src/omega.lua

@@ -30,7 +30,19 @@ SMODS.Atlas {
 
 SMODS.ConsumableType {
     key = "jane_omegaconsumable",
-    loc_txt = {collection = "Omega Cards", name = "Omega"},
+    loc_txt = {
+        collection = "Omega Cards",
+        name = "Omega",
+        undiscovered = {
+            name = "Not Discovered",
+            text = {
+                "Purchase or use",
+                "this {C:dark_edition,E:1}rare {}card in",
+                "an unseeded run to",
+                "learn what it does",
+            },
+        },
+    },
     default = "c_jane_pluto_omega",
     secondary_colour = G.C.jane_RGB,
     primary_colour = G.C.BLACK,
@@ -1160,36 +1172,41 @@ function create_card(...)
 
                 if not copy or copy <= 0 then
                     local pitch = math.pow(2 ^ (1 / 6), G.GAME.modifiers.omegas_found - 1)
-                    play_sound("jane_omegacard", pitch, 0.4)
+
+                    if not G.GAME.obsidian then
+                        play_sound("jane_omegacard", pitch, 0.4)
+                    end
 
                     Jane.q(function()
-                        Jane.q(function()
+                        if not G.GAME.obsidian then
-                            local handy_speed = ((Handy or {}).speed_multiplier or {}).value or 1
+                            Jane.q(function()
+                                local handy_speed = ((Handy or {}).speed_multiplier or {}).value or 1
 
-                            local text = "Omega!" .. (G.GAME.modifiers.omegas_found > 1 and
+                                local text = "Omega!" .. (G.GAME.modifiers.omegas_found > 1 and
-                                (" X" .. number_format(G.GAME.modifiers.omegas_found)) or
+                                    (" X" .. number_format(G.GAME.modifiers.omegas_found)) or
-                                "")
+                                    "")
 
-                            attention_text({
+                                attention_text({
-                                text = text,
+                                    text = text,
-                                scale = 1.4,
+                                    scale = 1.4,
-                                align = "cm",
+                                    align = "cm",
-                                major = G.play,
+                                    major = G.play,
-                                colour = G.C.jane_RGB,
+                                    colour = G.C.jane_RGB,
-                                offset = {x = 0, y = -2.7},
+                                    offset = {x = 0, y = -2.7},
-                                hold = G.SETTINGS.GAMESPEED * handy_speed * 2,
+                                    hold = G.SETTINGS.GAMESPEED * handy_speed * 2,
-                            })
+                                })
-                        end)
+                            end)
 
-                        if key == "c_jane_soul_omega" then
+                            if key == "c_jane_soul_omega" then
-                            play_sound("jane_chime", 1, 0.65)
+                                play_sound("jane_chime", 1, 0.65)
+                            end
                         end
 
                         local anims = Talisman and
                             Talisman.config_file and
                             Talisman.config_file.disable_anims or
                             G.GAME.modifiers.omega_replacement >= 1 / 13 or
-                            nil
+                            G.GAME.obsidian
 
                         Jane.q(function()
                             G.GAME.modifiers.omegas_found = 0

src/slugcat.lua

@@ -5,11 +5,24 @@ for i = 1, 8 do
     SMODS.Sound({key = "gore" .. i, path = "gore" .. i .. ".ogg"})
 end
 
+local function playing()
+    return ({
+        [G.STATES.PLAY_TAROT] = true,
+        [G.STATES.HAND_PLAYED] = true,
+        [G.STATES.DRAW_TO_HAND] = true,
+        [G.STATES.SELECTING_HAND] = true,
+    })[G.STATE]
+end
+
 SMODS.Sound({
     key = "music_attuned",
     path = "music_attuned.ogg",
     volume = 1,
     select_music_track = function()
+        if not playing() or next(SMODS.find_card("j_Bakery_Lua")) then
+            return -1 / 0
+        end
+
         for _, v in pairs(SMODS.find_card("j_jane_saint")) do
             if v.ability.extra.is_attuned then
                 return 201
@@ -25,7 +38,7 @@ SMODS.Sound({
     path = "music_attuned_sinister.ogg",
     volume = 1,
     select_music_track = function()
-        if not Jane.sinister then
+        if not Jane.sinister or not playing() or next(SMODS.find_card("j_Bakery_Lua")) then
             return -1 / 0
         end
 
@@ -39,6 +52,16 @@ SMODS.Sound({
     end,
 })
 
+SMODS.Sound({
+    key = "music_lua",
+    path = "music_lua.ogg",
+    pitch = 1,
+    volume = 1,
+    select_music_track = function()
+        return playing() and next(SMODS.find_card("j_Bakery_Lua")) and 203 or -1 / 0
+    end,
+})
+
 for _, v in pairs({
     "artificer",
     "hunter",

src/token.lua

@@ -13,6 +13,15 @@ SMODS.ConsumableType {
     loc_txt = {
         collection = "Tokens",
         name = "Token",
+        undiscovered = {
+            name = "Not Discovered",
+            text = {
+                "Purchase or use",
+                "this card in an",
+                "unseeded run to",
+                "learn what it does",
+            },
+        },
     },
     shop_rate = 0,
     collection_rows = {6, 6},