diff --git a/assets/sounds/music_lua.ogg b/assets/sounds/music_lua.ogg new file mode 100644 index 0000000..d47141e Binary files /dev/null and b/assets/sounds/music_lua.ogg differ diff --git a/lovely.toml b/lovely.toml index 396bba8..5403299 100644 --- a/lovely.toml +++ b/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]] diff --git a/manifest.json b/manifest.json index e400c26..bb86304 100644 --- a/manifest.json +++ b/manifest.json @@ -16,5 +16,5 @@ "Bakery (>=3.0.0~*)" ], "conflicts": [], - "version": "1.12.1" + "version": "1.12.2" } \ No newline at end of file diff --git a/src/slugcat.lua b/src/slugcat.lua index 5240239..2d4a586 100644 --- a/src/slugcat.lua +++ b/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",