Add new song

This commit is contained in:
Emik 2026-10-03 13:24:40 +02:00
parent bcd5e5b928
commit 537d6f54ce
Signed by: emik
GPG key ID: 6B0CD72A5E503BDF
7 changed files with 49 additions and 5 deletions

BIN
assets/sounds/music_lua.ogg Normal file

Binary file not shown.

View file

@ -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]]

View file

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

View file

@ -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

View file

@ -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,

View file

@ -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",

View file

@ -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},