Add new song
This commit is contained in:
parent
bcd5e5b928
commit
2ebf18812f
4 changed files with 26 additions and 3 deletions
BIN
assets/sounds/music_lua.ogg
Normal file
BIN
assets/sounds/music_lua.ogg
Normal file
Binary file not shown.
|
|
@ -27,7 +27,7 @@ match_indent = true
|
||||||
target = "functions/common_events.lua"
|
target = "functions/common_events.lua"
|
||||||
pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
|
pattern = "if v.name == 'Black Hole' or v.name == 'The Soul' or v.hidden then"
|
||||||
position = "at"
|
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
|
match_indent = true
|
||||||
|
|
||||||
[[patches]]
|
[[patches]]
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,5 @@
|
||||||
"Bakery (>=3.0.0~*)"
|
"Bakery (>=3.0.0~*)"
|
||||||
],
|
],
|
||||||
"conflicts": [],
|
"conflicts": [],
|
||||||
"version": "1.12.1"
|
"version": "1.12.2"
|
||||||
}
|
}
|
||||||
|
|
@ -5,11 +5,24 @@ for i = 1, 8 do
|
||||||
SMODS.Sound({key = "gore" .. i, path = "gore" .. i .. ".ogg"})
|
SMODS.Sound({key = "gore" .. i, path = "gore" .. i .. ".ogg"})
|
||||||
end
|
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({
|
SMODS.Sound({
|
||||||
key = "music_attuned",
|
key = "music_attuned",
|
||||||
path = "music_attuned.ogg",
|
path = "music_attuned.ogg",
|
||||||
volume = 1,
|
volume = 1,
|
||||||
select_music_track = function()
|
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
|
for _, v in pairs(SMODS.find_card("j_jane_saint")) do
|
||||||
if v.ability.extra.is_attuned then
|
if v.ability.extra.is_attuned then
|
||||||
return 201
|
return 201
|
||||||
|
|
@ -25,7 +38,7 @@ SMODS.Sound({
|
||||||
path = "music_attuned_sinister.ogg",
|
path = "music_attuned_sinister.ogg",
|
||||||
volume = 1,
|
volume = 1,
|
||||||
select_music_track = function()
|
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
|
return -1 / 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
@ -39,6 +52,16 @@ SMODS.Sound({
|
||||||
end,
|
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({
|
for _, v in pairs({
|
||||||
"artificer",
|
"artificer",
|
||||||
"hunter",
|
"hunter",
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue