refact by claude

2026-02-23 10:22:41 +01:00
parent 272a54ea87
commit 39e06d1d09
8 changed files with 31 additions and 31 deletions
--- a/11
+++ b/11
@@ -58,8 +58,8 @@ export: build
 	@ls -lh $(PROJECT)-$(VERSION).* $(PROJECT).tic $(PROJECT).html.zip 2>/dev/null || true

 watch:
-	make build
-	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do make build; done
+	$(MAKE) build
+	fswatch -o $(SRC_DIR) $(ORDER) assets | while read; do $(MAKE) build; done

 import_assets: $(OUTPUT)
 	@TIC_CMD="load $(OUTPUT) &"; \
@@ -221,10 +221,3 @@ docs: build

 .PHONY: all build export watch import_assets export_assets clean lint ci-version ci-export ci-upload ci-update install_precommit_hook docs

-#-- <WAVES>
-#-- 000:224578acdeeeeddcba95434567653100
-#-- </WAVES>
-#
-#-- <SFX>
-#-- 000:000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000000000
-#-- </SFX>
--- a/impostor.inc
+++ b/impostor.inc
@@ -3,7 +3,6 @@ init/init.module.lua
 init/init.config.lua
 init/init.minigame.lua
 init/init.meter.lua
-init/init.window.lua
 init/init.context.lua
 system/system.util.lua
 system/system.print.lua
--- a/inc/audio/audio.manager.lua
+++ b/inc/audio/audio.manager.lua
@@ -11,6 +11,7 @@ function Audio.music_play_room_street_1() end
 --- Plays room street 2 music.
 function Audio.music_play_room_street_2() end
 --- Plays room music.
+-- TODO: function name is incomplete, determine the correct room identifier
 function Audio.music_play_room_() end
 --- Plays room work music.
 function Audio.music_play_room_work() end
--- a/inc/init/init.window.lua
+++ b/inc/init/init.window.lua
--- a/inc/system/system.ui.lua
+++ b/inc/system/system.ui.lua
@@ -123,10 +123,13 @@ function UI.draw_decision_selector(decisions, selected_decision_index)
  if #decisions > 0 then
    local selected_decision = decisions[selected_decision_index]
    local decision_label = selected_decision.label
-    local text_width = #decision_label * 4     local text_y = bar_y + 4
-        local text_x = (Config.screen.width - text_width) / 2
-        Print.text("<", 2, text_y, Config.colors.green)
-        Print.text(decision_label, text_x, text_y, Config.colors.item)         Print.text(">", Config.screen.width - 6, text_y, Config.colors.green)   end
+    local text_width = #decision_label * 4
+    local text_y = bar_y + 4
+    local text_x = (Config.screen.width - text_width) / 2
+    Print.text("<", 2, text_y, Config.colors.green)
+    Print.text(decision_label, text_x, text_y, Config.colors.item)
+    Print.text(">", Config.screen.width - 6, text_y, Config.colors.green)
+  end
 end

 --- Draws meters.
--- a/inc/window/window.audiotest.lua
+++ b/inc/window/window.audiotest.lua
@@ -19,7 +19,7 @@ function AudioTestWindow.generate_menuitems(list_func, index_func)
                if current_func then
                    current_func()
                else
-                    trace("Invalid Audio function: " .. list_func[index_menu])
+                    trace("Invalid Audio function: " .. list_func[index_func])
                end
            end
        },
--- a/inc/window/window.configuration.lua
+++ b/inc/window/window.configuration.lua
@@ -6,13 +6,13 @@ ConfigurationWindow = {
 --- Initializes configuration window.
 function ConfigurationWindow.init()
  ConfigurationWindow.controls = {
-    UI.create_decision_item(
+    UI.create_action_item(
      "Save",
      function() Config.save() end
    ),
-    UI.create_decision_item(
+    UI.create_action_item(
      "Restore Defaults",
-      function() Config.restore_defaults() end
+      function() Config.reset() end
    ),
  }
 end
@@ -21,7 +21,8 @@ end
 function ConfigurationWindow.draw()
  UI.draw_top_bar("Configuration")

-  local x_start = 10   local y_start = 40
+  local x_start = 10
+  local y_start = 40
  local x_value_right_align = Config.screen.width - 10
  local char_width = 4
  for i, control in ipairs(ConfigurationWindow.controls) do
@@ -31,22 +32,23 @@ function ConfigurationWindow.draw()
      local value = control.get()
      local label_text = control.label
      local value_text = string.format(control.format, value)
-
-            local value_x = x_value_right_align - (#value_text * char_width)
+      local value_x = x_value_right_align - (#value_text * char_width)

      if i == ConfigurationWindow.selected_control then
        color = Config.colors.item
-        Print.text("<", x_start -8, current_y, color)
-        Print.text(label_text, x_start, current_y, color)         Print.text(value_text, value_x, current_y, color)
-        Print.text(">", x_value_right_align + 4, current_y, color)       else
+        Print.text("<", x_start - 8, current_y, color)
+        Print.text(label_text, x_start, current_y, color)
+        Print.text(value_text, value_x, current_y, color)
+        Print.text(">", x_value_right_align + 4, current_y, color)
+      else
        Print.text(label_text, x_start, current_y, color)
        Print.text(value_text, value_x, current_y, color)
      end
-    elseif control.type == "decision_item" then
+    elseif control.type == "action_item" then
      local label_text = control.label
      if i == ConfigurationWindow.selected_control then
        color = Config.colors.item
-        Print.text("<", x_start -8, current_y, color)
+        Print.text("<", x_start - 8, current_y, color)
        Print.text(label_text, x_start, current_y, color)
        Print.text(">", x_start + 8 + (#label_text * char_width) + 4, current_y, color)
      else
@@ -80,14 +82,16 @@ function ConfigurationWindow.update()
  if control then
    if control.type == "numeric_stepper" then
      local current_value = control.get()
-      if btnp(2) then         local new_value = math.max(control.min, current_value - control.step)
+      if Input.left() then
+        local new_value = math.max(control.min, current_value - control.step)
        control.set(new_value)
-      elseif btnp(3) then         local new_value = math.min(control.max, current_value + control.step)
+      elseif Input.right() then
+        local new_value = math.min(control.max, current_value + control.step)
        control.set(new_value)
      end
-    elseif control.type == "decision_item" then
+    elseif control.type == "action_item" then
      if Input.menu_confirm() then
-        control.decision()
+        control.action()
      end
    end
  end
--- a/inc/window/window.game.lua
+++ b/inc/window/window.game.lua
@@ -15,7 +15,7 @@ end
 --- Updates the game window logic.
 function GameWindow.update()
  if Input.menu_back() then
-    Context.current_window = "menu"
+    Window.set_current("menu")
    MenuWindow.refresh_menu_items()
    return
  end