Merge branch 'feature/ddr_upgrade' into develop
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
This commit is contained in:
@@ -7,6 +7,9 @@ Screen.register({
|
||||
"go_to_sleep",
|
||||
"go_to_end",
|
||||
},
|
||||
init = function()
|
||||
Audio.music_play_room_work()
|
||||
end,
|
||||
background = "bedroom",
|
||||
draw = function()
|
||||
if Context.home_norman_visible and Window.get_current_id() == "game" then
|
||||
|
||||
@@ -178,6 +178,12 @@ Screen.register({
|
||||
name = "Mysterious Man",
|
||||
decisions = {},
|
||||
background_color = Config.colors.black,
|
||||
init = function()
|
||||
Audio.music_play_mystery()
|
||||
end,
|
||||
exit = function()
|
||||
Audio.music_stop()
|
||||
end,
|
||||
update = function()
|
||||
if state == STATE_TEXT then
|
||||
if not text_done then
|
||||
@@ -199,6 +205,11 @@ Screen.register({
|
||||
else
|
||||
text_done_timer = text_done_timer - Context.delta_time
|
||||
if text_done_timer <= 0 or Input.select() then
|
||||
-- to be continued
|
||||
if 4 <= Ascension.get_level() then
|
||||
Window.set_current("continued")
|
||||
end
|
||||
|
||||
go_to_day_state()
|
||||
end
|
||||
end
|
||||
|
||||
@@ -9,6 +9,9 @@ Screen.register({
|
||||
situations = {
|
||||
"drink_coffee",
|
||||
},
|
||||
init = function()
|
||||
Audio.music_play_room_work()
|
||||
end,
|
||||
background = "office",
|
||||
draw = function()
|
||||
if Window.get_current_id() == "game" then
|
||||
|
||||
@@ -6,6 +6,7 @@ Screen.register({
|
||||
},
|
||||
background = "bedroom",
|
||||
init = function()
|
||||
Audio.music_play_mystery()
|
||||
Context.stat_screen_active = true
|
||||
Meter.hide()
|
||||
local cx = Config.screen.width * 0.75
|
||||
|
||||
@@ -5,6 +5,9 @@ Screen.register({
|
||||
"go_to_home",
|
||||
"go_to_office",
|
||||
},
|
||||
init = function()
|
||||
Audio.music_play_room_work()
|
||||
end,
|
||||
background = "street",
|
||||
draw = function()
|
||||
if Window.get_current_id() == "game" then
|
||||
|
||||
@@ -6,6 +6,9 @@ Screen.register({
|
||||
"go_to_office",
|
||||
"sumphore_discussion",
|
||||
},
|
||||
init = function()
|
||||
Audio.music_play_room_work()
|
||||
end,
|
||||
background = "street",
|
||||
draw = function()
|
||||
if Window.get_current_id() == "game" then
|
||||
|
||||
Reference in New Issue
Block a user