fixes
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed

This commit is contained in:
mr.one
2026-04-29 20:45:03 +02:00
parent 3356d837c2
commit 92a217c389
19 changed files with 156 additions and 90 deletions

View File

@@ -7,7 +7,7 @@ Screen.register({
"go_to_sleep",
},
init = function()
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Audio.music_play_mystery()
Glitch.show()
else
@@ -17,7 +17,7 @@ Screen.register({
background = "bedroom",
draw = function()
if Window.get_current_id() ~= "game" then return end
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() or Ascension.get_level() == 8 then
CommuteGlitch.draw_background_flicker()
Glitch.draw()
end

View File

@@ -81,35 +81,37 @@ local ASC_67_TEXT = [[
]]
local ASC_78_TEXT = [[
The road has run out
of road.
The situation has reached
critical levels.
Norman walked back
and forth
Norman is fully aware...
until the street
forgot which way it went.
We need to stop him.
And then - finally -
he stopped walking.
Commence full reset.
]]
local ASC_89_TEXT = [[
Norman
you created this simulation
in the first place,
in the first place.
I know,
because you could never
you don't want to face
cope with reality.
the world you left behind.
You were never
You, yourself,
an impostor.
have forgoten that.
But
it doesn't matter anymore.
@@ -119,10 +121,9 @@ local ASC_89_TEXT = [[
than you think you are.
so now
now
you need to wake up
@@ -141,11 +142,16 @@ local ASC_89_TEXT = [[
you have beed talking to
you really need to stop
yourself
talking to yourself
in your sleep
in your sleep.
Damnit.
]]
local ascension_texts = {
@@ -339,10 +345,6 @@ Screen.register({
text_done_timer = text_done_timer - Context.delta_time
if text_done_timer <= 0 or (Ascension.get_level() ~= 8 and Input.select()) then
MysteriousManScreen.go_to_day_state()
-- to be continued
if 4 <= Ascension.get_level() and not break_mode then
Window.set_current("continued")
end
end
end
elseif state == STATE_DAY then

View File

@@ -5,7 +5,7 @@ Screen.register({
"do_work",
"go_to_walking_to_home",
"have_a_coffee",
"go_to_truth",
"talk_to_truth",
},
init = function()
Context.have_been_to_office = true
@@ -37,7 +37,7 @@ Screen.register({
{x = -4 + 5 * 8, y = 9 * 8}
}
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Audio.music_play_mystery()
Context.office_sprites = { "norman_echo" }
else
@@ -49,14 +49,14 @@ Screen.register({
end
end,
background = function()
return CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 and "" or "office"
return CommuteGlitch.is_max() and "" or "office"
end,
draw = function()
if Window.get_current_id() == "game" then
Sprite.draw_at("norman", 13 * 8, 9 * 8)
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
Sprite.draw_at("norman_echo", 13 * 8, 9 * 8)
if CommuteGlitch.is_max() then
Sprite.draw_at("norman_echo", 15 * 8, 9 * 8)
CommuteGlitch.draw_background_flicker()
else
CommuteGlitch.draw_sprite_list(Context.office_sprites)
@@ -65,6 +65,11 @@ Screen.register({
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 6 then
Glitch.draw()
end
if Ascension.get_level() == 8 then
CommuteGlitch.draw_background_flicker()
Glitch.draw()
end
end
end
})

View File

@@ -93,7 +93,12 @@ Screen.register({
Ascension.draw(asc_x, asc_letter_y, { spacing = asc_spacing })
end
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if Ascension.get_level() == 8 then
CommuteGlitch.draw_background_flicker()
end
if Ascension.get_level() == 8 then
CommuteGlitch.draw_background_flicker()
Glitch.draw()
end
end,

View File

@@ -29,7 +29,7 @@ Screen.register({
{x = 27 * 8, y = 11 * 8},
}
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Audio.music_play_mystery()
Context.walking_to_home_sprites = {}
else
@@ -41,7 +41,7 @@ Screen.register({
end
end,
background = function()
return CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 and "" or "street"
return CommuteGlitch.is_max() and "" or "street"
end,
draw = function()
local w = Window.get_current_id()
@@ -51,13 +51,12 @@ Screen.register({
local show_sumphore = Ascension.get_level() ~= 8
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Sprite.draw_at("norman", 7 * 8, 3 * 8)
if show_sumphore then
Sprite.draw_at("sumphore", 9 * 8, 2 * 8)
end
CommuteGlitch.draw_sprite_list(Context.walking_to_home_sprites)
CommuteGlitch.draw_background_flicker()
Glitch.draw()
else
local norman_x = Context.fast_food_approaching and (19 * 8) or (7 * 8)
@@ -74,5 +73,14 @@ Screen.register({
Glitch.draw()
end
end
if CommuteGlitch.is_max() then
CommuteGlitch.draw_background_flicker()
end
if Ascension.get_level() == 8 then
CommuteGlitch.draw_background_flicker()
Glitch.draw()
end
end
})

View File

@@ -28,7 +28,7 @@ Screen.register({
{x = 27 * 8, y = 11 * 8},
}
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
if CommuteGlitch.is_max() then
Audio.music_play_mystery()
Context.walking_to_office_sprites = Sprite.list_randomize(possible_sprites, possible_positions)
Context.walking_to_office_sprites = CommuteGlitch.corrupt_sprite_list(Context.walking_to_office_sprites)
@@ -38,7 +38,7 @@ Screen.register({
end
end,
background = function()
return CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 and "" or "street"
return CommuteGlitch.is_max() and "" or "street"
end,
update = function()
end,
@@ -52,18 +52,12 @@ Screen.register({
Sprite.draw_at("sumphore", 9 * 8, 2 * 8)
end
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
Sprite.draw_at("norman_echo", norman_x, 3 * 8)
CommuteGlitch.draw_sprite_list(Context.walking_to_office_sprites)
CommuteGlitch.draw_background_flicker()
Glitch.draw()
else
if Context.fast_food_eaten_today < 3 then
Sprite.draw_at("pizza_vendor", 19 * 8, 1 * 8)
end
Sprite.draw_at("dev_guard", 22 * 8, 3 * 8)
Sprite.draw_list(Context.walking_to_office_sprites)
if Context.fast_food_eaten_today < 3 then
Sprite.draw_at("pizza_vendor", 19 * 8, 1 * 8)
end
Sprite.draw_at("dev_guard", 22 * 8, 3 * 8)
Sprite.draw_list(Context.walking_to_office_sprites)
end
end
})