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

This commit is contained in:
Zoltan Timar
2026-04-29 16:41:18 +02:00
parent 3e31398d9d
commit b5596bbbe0
5 changed files with 26 additions and 7 deletions

View File

@@ -407,7 +407,7 @@ Screen.register({
spr(304, nx, ny + 64, Config.colors.transparent, 4)
spr(305, nx + 32, ny + 64, Config.colors.transparent, 4)
end
elseif show_mysterious_screen then
elseif show_mysterious_screen and not break_mode then
MysteriousManScreen.draw_background()
end
@@ -431,7 +431,7 @@ Screen.register({
)
elseif state == STATE_CHOICE then
if break_mode then
if MysteriousManScreen.pending_end then
if MysteriousManScreen.pending_end or Ascension.is_fading() or Ascension.is_flashing() then
Meter.draw_ascension_only()
else
local lines = {

View File

@@ -49,16 +49,22 @@ Screen.register({
return
end
local show_sumphore = Ascension.get_level() ~= 8
if CommuteGlitch.is_active() and CommuteGlitch.get_level() >= 7 then
Sprite.draw_at("norman", 7 * 8, 3 * 8)
Sprite.draw_at("sumphore", 9 * 8, 2 * 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)
Sprite.draw_at("norman", norman_x, 3 * 8)
Sprite.draw_at("sumphore", 9 * 8, 2 * 8)
if show_sumphore then
Sprite.draw_at("sumphore", 9 * 8, 2 * 8)
end
if Context.fast_food_eaten_today < 3 then
Sprite.draw_at("pizza_vendor", 19 * 8, 1 * 8)
end

View File

@@ -46,8 +46,11 @@ Screen.register({
local w = Window.get_current_id()
if w == "game" or w == "discussion" then
local norman_x = Context.fast_food_approaching and (19 * 8) or (7 * 8)
local show_sumphore = Ascension.get_level() ~= 8
Sprite.draw_at("norman", norman_x, 3 * 8)
Sprite.draw_at("sumphore", 9 * 8, 2 * 8)
if show_sumphore then
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)