Merge branch 'feature/ddr_upgrade' into develop

.gitignore

@@ -3,4 +3,6 @@ impostor.lua
 impostor.original.lua
 prompts
 docs
-minify.lua
+minify.lua
+*.tic
+*.zip

.luacheckrc

@@ -64,6 +64,8 @@ globals = {
   "index_menu",
   "Map",
   "map",
+  "time",
+  "RLE",
 }
 
 

impostor.inc

@@ -7,6 +7,7 @@ system/system.util.lua
 system/system.print.lua
 system/system.input.lua
 system/system.asciiart.lua
+system/system.rle.lua
 logic/logic.meter.lua
 logic/logic.focus.lua
 logic/logic.day.lua

inc/init/init.context.lua

@@ -51,6 +51,8 @@ function Context.initial_data()
       current_situation = nil,
     },
     day_count = 1,
+    delta_time = 0,
+    last_frame_time = 0,
     glitch = {
       enabled = false,
       state = "active",

inc/init/init.module.lua

@@ -16,6 +16,7 @@ Day = {}
 Timer = {}
 Trigger = {}
 Discussion = {}
+RLE = {}
 AsciiArt = {}
 Ascension = {}
 MysteriousManScreen = {}

inc/screen/screen.mysterious_man.lua

@@ -68,12 +68,12 @@ end
 
 local state = STATE_TEXT
 local text_y = Config.screen.height
-local text_speed = 0.2
+local text_speed = 12 -- pixels per second
 local day_timer = 0
-local day_display_frames = 120
+local day_display_seconds = 2
 local text_done = false
 local text_done_timer = 0
-local TEXT_DONE_HOLD_FRAMES = 120
+local TEXT_DONE_HOLD_SECONDS = 2
 local selected_choice = 1
 local text = ASC_01_TEXT
 local day_text_override = nil
@@ -81,23 +81,10 @@ local on_text_complete = nil
 local show_mysterious_screen = true
 local trigger_flash_on_wake = false
 
-local function draw_mysterious_man_background()
+function MysteriousManScreen.draw_background()
     local img_values = {0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,1,0,2,4,2,1,4,2,1,4,1,0,2,4,1,0,1,4,2,1,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,1,2,1,0,1,4,1,0,2,4,2,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,4,1,0,2,4,2,0,1,2,4,1,0,2,4,1,0,1,0,4,1,0,2,4,0,1,0,1,0,1,0,4,1,0,2,4,0,1,4,1,0,2,4,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,2,1,0,1,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,2,1,0,1,2,4,1,0,2,4,1,2,0,1,0,1,0,1,2,1,2,1,0,2,4,1,0,2,4,0,1,0,1,2,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,4,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,2,1,0,1,0,2,0,1,4,1,0,2,4,1,0,1,0,1,2,0,1,4,1,0,2,4,2,1,0,1,0,1,4,1,0,2,4,2,1,0,2,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,0,1,4,1,0,2,4,2,4,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,0,1,0,1,0,1,0,1,0,1,2,1,4,2,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,4,1,0,2,4,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,2,1,4,1,0,2,4,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,2,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,2,0,1,0,1,0,4,1,0,2,4,0,1,0,1,0,2,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,0,2,0,1,4,1,0,2,4,0,1,0,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,2,0,1,0,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,0,4,1,0,2,4,1,0,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,1,0,1,0,1,2,4,1,0,2,4,2,0,1,0,1,4,1,0,2,4,2,0,1,0,1,0,4,1,0,2,4,1,0,1,0,1,0,1,4,1,0,2,4,0,1,0,1,4,2,1,0,1,2,1,2,1,0,1,2,1,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,1,2,0,1,0,2,1,0,1,2,0,1,0,2,0,1,0,1,0,1,2,0,1,0,1,0,1,0,2,0,1,0,1,0,1,0,2,0,1,0,1,0,2,1,0,1,0,1,2,0,1,0,2,0,2,1,0,1,2,0,2,1,0,1,0,1,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,2,0,2,1,0,1,0,1,0,1,0,1,0,2,1,0,1,2,0,1,0,1,2,1,0,1,0,1,0,1,0,2,1,0,2,0,1,0,1,0,2,0,1,0,1,0,2,0,1,0,2,0,1,0,1,0,2,1,0,1,2,0,1,0,1,0,1,0,1,0,2,0,1,0,2,0,1,0,2,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0}
-
     local img_runs = {1480,1,151,1,87,1,1,150,1,1,86,1,2,148,1,2,87,2,148,2,88,2,148,2,88,2,148,2,88,2,148,2,88,2,70,1,2,9,1,2,63,2,88,2,69,1,2,3,5,1,1,1,1,1,1,1,61,2,88,2,68,1,1,3,1,2,1,3,2,3,2,61,2,88,2,68,1,6,1,4,1,5,1,1,60,2,88,2,67,1,1,17,2,60,2,88,2,67,1,19,1,1,59,2,88,2,67,1,19,1,1,59,2,88,2,67,4,1,11,1,1,1,3,59,2,88,2,67,21,1,59,2,88,2,67,21,1,59,2,88,2,66,1,21,2,58,2,88,2,66,1,21,1,1,58,2,88,2,66,4,17,2,1,58,2,88,2,65,2,5,1,15,2,58,2,88,2,63,1,1,2,22,4,55,2,88,2,57,2,2,34,2,2,49,2,88,2,55,1,2,39,3,1,47,2,88,2,55,5,1,3,2,2,1,25,1,1,1,1,1,1,1,47,2,88,2,57,1,2,1,29,1,4,1,1,1,1,49,2,88,2,59,1,2,8,15,9,2,52,2,88,2,62,2,1,1,1,24,1,1,1,54,2,88,2,66,1,22,1,58,2,88,2,66,1,21,1,59,2,88,2,66,2,20,1,59,2,88,2,65,3,20,2,58,2,88,2,63,2,2,1,20,1,1,2,56,2,88,2,61,2,4,1,20,1,2,2,55,2,88,2,59,1,1,6,1,19,1,4,2,54,2,88,2,58,2,7,2,17,1,1,6,2,52,3,87,2,56,1,2,9,1,26,2,51,3,87,2,55,1,1,40,1,50,2,88,2,54,2,41,1,50,2,88,2,53,2,42,2,49,2,88,2,52,2,44,2,48,2,88,2,51,2,46,2,47,2,88,2,50,2,16,1,31,1,47,2,88,2,50,3,1,14,1,29,1,1,2,46,2,88,2,50,18,1,29,1,2,1,46,2,88,2,50,4,14,1,33,1,45,2,88,2,53,1,3,11,2,15,1,13,1,2,46,2,88,2,56,1,1,11,1,15,1,10,2,1,49,2,88,2,55,2,3,10,2,12,2,8,8,46,2,88,2,50,1,1,4,4,1,9,2,11,2,8,2,4,2,1,2,1,1,42,2,88,2,48,2,3,8,1,9,2,9,3,7,2,8,1,1,2,1,1,40,2,88,2,45,3,2,1,1,1,1,8,1,7,1,1,3,6,4,6,1,8,1,1,1,1,4,2,38,2,88,2,45,1,2,2,22,4,4,4,6,1,10,1,1,2,1,2,1,2,37,2,88,2,42,1,1,1,4,1,2,19,1,1,4,1,5,21,1,2,6,35,2,88,2,42,2,1,1,1,1,15,2,8,3,4,3,6,1,17,1,1,2,1,1,1,34,2,88,2,41,3,1,1,15,2,9,3,5,2,8,1,21,1,1,34,2,88,2,41,1,1,1,16,2,11,2,5,2,9,2,18,2,1,34,2,88,2,41,1,2,1,14,2,13,1,5,1,12,1,17,1,2,34,2,88,2,41,1,16,1,17,1,2,1,14,2,17,1,1,33,2,88,2,41,1,2,1,12,1,17,1,3,2,15,1,14,1,1,1,1,33,2,88,2,41,15,1,22,1,17,1,1,11,1,3,1,33,2,88,2,41,1,14,2,40,1,15,1,33,2,88,2,41,1,15,2,35,1,3,1,10,1,4,1,33,2,88,2,41,1,3,1,12,2,36,2,11,1,4,1,33,2,88,2,40,1,1,18,1,35,1,12,1,4,1,1,32,2,88,2,40,2,4,1,14,1,33,1,12,1,6,1,32,2,88,2,40,1,6,1,14,1,31,1,13,1,6,1,32,2,88,2,39,2,22,2,28,1,21,1,1,31,2,88,2,39,2,24,1,26,1,22,1,1,31,2,88,2,39,2,25,1,24,1,23,1,1,31,2,88,2,39,1,27,1,22,2,23,1,1,31,2,88,2,39,1,49,2,24,3,30,2,88,2,39,1,48,1,27,1,1,30,2,88,2,39,1,47,2,27,1,1,30,2,88,2,37,1,1,47,2,28,1,1,30,2,88,2,37,1,1,46,1,30,2,1,29,2,88,2,37,1,47,1,30,2,30,2,88,2,37,1,1,2,43,1,33,30,3,87,2,37,1,45,1,31,1,1,2,29,3,87,2,37,45,1,35,1,29,1,1,88,2,1,35,1,1,80,2,1,26,1,3,86,1,1,2,1,21,1,4,4,2,1,3,80,30,1,2,125,2,80,2,156,2,79,2,1,156,2,1,77,4,156,1,3,76,3,1,140,1,15,1,2,2,74,2,1,1,1,5,3,129,1,18,1,82,1,7,1,129,1,18,1,82,1,9,1,123,3,20,1,1,80,2,11,1,1,119,1,22,1,1,1,2,76,4,1,154,2,2,63,1,14,3,1,126,1,27,2,65,1,17,1,17,2,132,4,66,1,17,4,113,39,66,2,16,31,191,1,1,1,15,1,153,2,15,3,48,2,16,2,152,1,16,1,1,1,48,2,16,2,152,1,1,2,2,1,10,1,1,1,48,1,13,6,153,1,3,13,1,1,48,1,15,2,1,1,153,3,64,1,16,2,154,1,1,83,1,154,1,17,1,66,1,154,1,17,1,66,1,155,1,82,1,156,1,82,1,156,1,1,80,1,1,157,2,78,2,158,2,78,2,158,1,80,1,158,1,79,2,158,1,79,1,159,1,79,1,160,1,77,2,160,1,77,1,162,1,74,1,1,1,162,1,75,1,239,1,165,1,72,1,166,1,240,1,69,1,412,1,63,1,175,1,63,2,238,1,175,1,63,1,239,1,807}
-
+    RLE.draw(img_values, img_runs)
-    local val_i=0
-    local run=0
-    for y=0,136-1 do
-        for x=0,240-1 do
-            if run==0 then
-                val_i=val_i+1
-                run=img_runs[val_i]
-            end
-            run=run-1
-            pix(x,y,img_values[val_i])
-        end
-    end
 end
 
 local choices = {
@@ -118,7 +105,7 @@ local function go_to_day_state()
     return
   end
   state = STATE_DAY
-  day_timer = day_display_frames
+  day_timer = day_display_seconds
 end
 
 local function wake_up()
@@ -146,7 +133,7 @@ end
 local function stay_in_bed()
   Day.increase()
   state = STATE_DAY
-  day_timer = day_display_frames
+  day_timer = day_display_seconds
 end
 
 --- Starts the mysterious man screen.
@@ -171,7 +158,7 @@ function MysteriousManScreen.start(options)
   if options.skip_text then
     show_mysterious_screen = false
     state = STATE_DAY
-    day_timer = day_display_frames
+    day_timer = day_display_seconds
   else
     show_mysterious_screen = true
     state = STATE_TEXT
@@ -200,20 +187,24 @@ Screen.register({
   update = function()
     if state == STATE_TEXT then
       if not text_done then
-        text_y = text_y - text_speed
+        text_y = text_y - (text_speed * Context.delta_time)
 
         local lines = 1
         for _ in string.gmatch(text, "\n") do
           lines = lines + 1
         end
 
-        if text_y < -lines * 8 then
+        if text_y < -lines * 8 or Input.select() then
           text_done = true
-          text_done_timer = TEXT_DONE_HOLD_FRAMES
+          text_done_timer = TEXT_DONE_HOLD_SECONDS
+          -- If skipped by user, go to day state immediately
+          if Input.select() then
+            go_to_day_state()
+          end
         end
       else
-        text_done_timer = text_done_timer - 1
+        text_done_timer = text_done_timer - Context.delta_time
-        if text_done_timer <= 0 then
+        if text_done_timer <= 0 or Input.select() then
           -- to be continued
           if 4 <= Ascension.get_level() then
             Window.set_current("continued")
@@ -223,7 +214,7 @@ Screen.register({
         end
       end
     elseif state == STATE_DAY then
-      day_timer = day_timer - 1
+      day_timer = day_timer - Context.delta_time
 
       if day_timer <= 0 or Input.select() then
         if trigger_flash_on_wake or Ascension.get_level() < 1 then
@@ -248,7 +239,7 @@ Screen.register({
   end,
   draw = function()
     if show_mysterious_screen then
-      draw_mysterious_man_background()
+      MysteriousManScreen.draw_background()
     end
 
     if state == STATE_TEXT then

inc/system/system.asciiart.lua

@@ -44,7 +44,7 @@ function AsciiArt.draw(text, options)
       for j = 1, #line do
         local char = line:sub(j, j)
         if char == "#" then
-          rect(x_offset + (j - 1) * char_w, current_y, char_w - 1, char_h - 1, color)
+          rect(x_offset + (j - 1) * char_w, current_y, char_w, char_h, color)
         end
       end
       current_y = current_y + char_h + line_gap

inc/system/system.main.lua

@@ -17,6 +17,15 @@ end
 --- @within Main
 function TIC()
   init_game()
+
+  local now = time()
+  if Context.last_frame_time == 0 then
+    Context.delta_time = 0
+  else
+    Context.delta_time = (now - Context.last_frame_time) / 1000
+  end
+  Context.last_frame_time = now
+
   cls(Config.colors.black)
   local handler = Window.get_current_handler() -- Get handler from Window manager
   if handler then

inc/system/system.rle.lua

@@ -0,0 +1,22 @@
+--- @section RLE
+RLE = {}
+
+--- Draws an RLE-encoded image.
+--- @param runs table Array of run lengths.
+--- @param values table Array of pixel values (colors).
+function RLE.draw(img_values, img_runs)
+    local SCREEN_WIDTH=240
+    local SCREEN_HEIGHT=136
+    local val_i=0
+    local run=0
+    for y=0,SCREEN_HEIGHT-1 do
+        for x=0,SCREEN_WIDTH-1 do
+            if run==0 then
+                val_i=val_i+1
+                run=img_runs[val_i]
+            end
+            run=run-1
+            pix(x,y,img_values[val_i])
+        end
+    end
+end

inc/window/window.intro.brief.lua

@@ -1,6 +1,6 @@
 --- @section BriefIntroWindow
 BriefIntroWindow.y = Config.screen.height
-BriefIntroWindow.speed = 0.5
+BriefIntroWindow.speed = 30 -- pixels per second
 BriefIntroWindow.text = [[
 Norman Reds’ everyday life
 seems ordinary: work,
@@ -24,7 +24,7 @@ end
 --- Updates the brief intro window logic.
 --- @within BriefIntroWindow
 function BriefIntroWindow.update()
-  BriefIntroWindow.y = BriefIntroWindow.y - BriefIntroWindow.speed
+  BriefIntroWindow.y = BriefIntroWindow.y - (BriefIntroWindow.speed * Context.delta_time)
 
   local lines = 1
   for _ in string.gmatch(BriefIntroWindow.text, "\n") do