From b5596bbbe04a74bf93b5f295f80d93063c506d41 Mon Sep 17 00:00:00 2001
From: Zoltan Timar <zoltan.timar.work@gmail.com>
Date: Wed, 29 Apr 2026 16:41:18 +0200
Subject: [PATCH] bugfixes

---
 inc/decision/decision.sumphore_discussion.lua | 12 +++++++++++-
 inc/init/init.ascension.lua                   |  2 +-
 inc/screen/screen.mysterious_man.lua          |  4 ++--
 inc/screen/screen.walking_to_home.lua         | 10 ++++++++--
 inc/screen/screen.walking_to_office.lua       |  5 ++++-
 5 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/inc/decision/decision.sumphore_discussion.lua b/inc/decision/decision.sumphore_discussion.lua
index 90a64b9..f1015c7 100644
--- a/inc/decision/decision.sumphore_discussion.lua
+++ b/inc/decision/decision.sumphore_discussion.lua
@@ -10,11 +10,21 @@ Decision.register({
     return Ascension.get_level() < 8
   end,
   handle = function()
+    local level = Ascension.get_level()
+
+    if level == 0 then
+      if Context.have_met_sumphore then
+        Discussion.start("homeless_guy", "game", 4)
+      else
+        Discussion.start("homeless_guy", "game")
+      end
+      return
+    end
+
     if not Context.have_met_sumphore then
       Discussion.start("homeless_guy", "game")
       return
     end
-    local level = Ascension.get_level()
 
     if level >= 1 and level <= 5 then
       Discussion.start("sumphore_disc_asc_" .. level, "game")
diff --git a/inc/init/init.ascension.lua b/inc/init/init.ascension.lua
index 96f807a..ecd95d4 100644
--- a/inc/init/init.ascension.lua
+++ b/inc/init/init.ascension.lua
@@ -21,7 +21,7 @@ local FADE_COLORS = nil
 function Ascension.get_initial()
   _increased_this_cycle = false
   return {
-    level = 8, -- FYI: change this to test ascension levels without having to play through them
+    level = 0,
   }
 end
 
diff --git a/inc/screen/screen.mysterious_man.lua b/inc/screen/screen.mysterious_man.lua
index f4eb740..d941c69 100644
--- a/inc/screen/screen.mysterious_man.lua
+++ b/inc/screen/screen.mysterious_man.lua
@@ -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 = {
diff --git a/inc/screen/screen.walking_to_home.lua b/inc/screen/screen.walking_to_home.lua
index f0f8223..22f00ab 100644
--- a/inc/screen/screen.walking_to_home.lua
+++ b/inc/screen/screen.walking_to_home.lua
@@ -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
diff --git a/inc/screen/screen.walking_to_office.lua b/inc/screen/screen.walking_to_office.lua
index d870a7e..f186ce8 100644
--- a/inc/screen/screen.walking_to_office.lua
+++ b/inc/screen/screen.walking_to_office.lua
@@ -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)