chore: re-added have_a_coffee discussion, fixed text readability, fixed centering of texts, new system.ui functions for drawing in contour, fixed ddr types, fixed meter drawing

inc/screen/screen.mysterious_man.lua

@@ -6,52 +6,52 @@ local STATE_CHOICE = "choice"
 
 local ASC_01_TEXT = [[
   Normann seems to be in line,
-  ...
+
   and stays seeking for oxes
-  ...
+
   within the confines.
-  ...
+
   Very good.
 ]]
 
 local ASC_12_TEXT = [[
   We have a problem!
-  ...
+
   Normann formed his first thought.
-  ...
+
   He saw the tracks.
 ]]
 local ASC_23_TEXT = [[
   Not good, not terrible.
-  ...
+
   Normann caught his glimpse
-  ...
+
   of another way
-  ...
+
   - quite literally -
-  ...
+
   if this continues,
-  ...
+
   we will lose control.
 ]]
 local ASC_34_TEXT = [[
   There is no turning back now for Norman.
-  ...
+
   He caught on.
-  ...
+
   I hoped it would never come to this...
 ]]
 
 --[[ Norman speaks for the first time during MM screen ]]
 local ASC_45_TEXT = [[
   Wait, who are you?
-  ...
+
   *silence*
-  ...
+
   Why am I seeing this?
-  ...
+
   *silence*
-  ...
+
 ]]
 
 local ascension_texts = {
@@ -261,16 +261,18 @@ Screen.register({
     end
 
     if state == STATE_TEXT then
-      local cx = Config.screen.width / 2
+      local screen_w = Config.screen.width
       local line_y = text_y
       for line in (text .. "\n"):gmatch("(.-)\n") do
-        Print.text_center(line, cx, line_y, Config.colors.light_grey)
+        local line_w = print(line, 0, -6, 0, false, 1)
+        local line_x = math.floor((screen_w - line_w) / 2)
+        Print.text_contour(line, (line_x - 8), line_y, Config.colors.black, false, 1)
         line_y = line_y + 8
       end
     elseif state == STATE_DAY then
       MysteriousManScreen.draw_day_switch_background()
-      local day_text = day_text_override or ("Day " .. Context.day_count)
-      Print.text_center(
+      local day_text = day_text_override or ("day " .. Context.day_count)
+      Print.text_center_contour(
         day_text,
         Config.screen.width / 2,
         Config.screen.height / 2 - 3,

inc/screen/screen.toilet.lua

@@ -36,13 +36,13 @@ Screen.register({
 
     Sprite.draw_at("norman", norman_x, norman_y)
 
-    Print.text_center("day " .. Context.day_count, cx, 10, Config.colors.white)
+    Print.text_center_contour("day " .. Context.day_count, cx, 10, Config.colors.black)
 
-    local narrative = "reflecting on my past and present\n...\nboth eventually flushed."
+    local narrative = "reflecting on my past and present...\nboth eventually flushed..."
     local wrapped = UI.word_wrap(narrative, 38)
     local text_y = 24
     for _, line in ipairs(wrapped) do
-      Print.text_center(line, cx, text_y, Config.colors.light_grey)
+      Print.text_center_contour(line, cx, text_y, Config.colors.black)
       text_y = text_y + 8
     end
 
@@ -56,26 +56,26 @@ Screen.register({
     local meter_start_y = text_y + 10
 
     local meter_list = {
-      { key = "wpm", label = "Work Productivity Meter" },
-      { key = "ism", label = "Impostor Syndrome Meter" },
-      { key = "bm",  label = "Burnout Meter" },
+      { key = "wpm", label = "Work Productivity Meter", color = Meter.COLOR_WPM },
+      { key = "ism", label = "Impostor Syndrome Meter", color = Meter.COLOR_ISM },
+      { key = "bm",  label = "Burnout Meter", color = Meter.COLOR_BM },
     }
 
     for i, meter in ipairs(meter_list) do
       local y = meter_start_y + (i - 1) * 20
 
-      Print.text_center(meter.label, cx, y, Config.colors.white)
+      Print.text_center_contour(meter.label, cx, y, meter.color, false, 1, Config.colors.white)
 
       local bar_y = y + 8
       local fill_w = math.max(0, math.floor((m[meter.key] / max_val) * bar_w))
       rect(bar_x, bar_y, bar_w, bar_h, Meter.COLOR_BG)
       if fill_w > 0 then
-        rect(bar_x, bar_y, fill_w, bar_h, Config.colors.blue)
+        rect(bar_x, bar_y, fill_w, bar_h, meter.color)
       end
 
       local decay_w = print(decay_text, 0, -6, 0, false, 1)
-      Print.text(decay_text, bar_x - decay_w - 4, bar_y, Config.colors.light_blue)
-      Print.text(mult_text, bar_x + bar_w + 4, bar_y, Config.colors.light_blue)
+      Print.text_contour(decay_text, bar_x - decay_w - 4, bar_y, Config.colors.light_blue, false, 1, Config.colors.white)
+      Print.text_contour(mult_text, bar_x + bar_w + 4, bar_y, Config.colors.light_blue, false, 1, Config.colors.white)
     end
 
     if Ascension.get_level() > 0 then