remove npc and item handling

inc/window/window.minigame.ddr.lua

@@ -304,7 +304,7 @@ function MinigameDDRWindow.draw()
     if mg.bar_fill > 66 then
       bar_color = Config.colors.item -- yellow
     elseif mg.bar_fill > 33 then
-      bar_color = Config.colors.npc
+      bar_color = Config.colors.bar
     end
     
     rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)
@@ -326,7 +326,7 @@ function MinigameDDRWindow.draw()
   -- Draw falling arrows (blue)
   if mg.arrows then
     for _, arrow in ipairs(mg.arrows) do
-      draw_arrow(arrow.x, arrow.y, arrow.dir, Config.colors.npc) -- blue color
+      draw_arrow(arrow.x, arrow.y, arrow.dir, Config.colors.bar) -- blue color
     end
   end
   
@@ -345,6 +345,6 @@ function MinigameDDRWindow.draw()
       Print.text_center("Pattern Len:" .. #mg.current_song.pattern .. " Index:" .. mg.pattern_index, Config.screen.width / 2, debug_y + 10, Config.colors.green)
     end
   else
-    Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.npc)
+    Print.text_center("RANDOM MODE", Config.screen.width / 2, debug_y, Config.colors.bar)
   end
 end

inc/window/window.minigame.mash.lua

@@ -83,7 +83,7 @@ function MinigameButtonMashWindow.draw()
     if mg.bar_fill > 66 then
       bar_color = Config.colors.item -- yellow
     elseif mg.bar_fill > 33 then
-      bar_color = Config.colors.npc -- medium color
+      bar_color = Config.colors.bar -- medium color
     end
     
     rect(mg.bar_x, mg.bar_y, fill_width, mg.bar_height, bar_color)

inc/window/window.popup.lua

@@ -1,128 +1,44 @@
-function PopupWindow.set_dialog_node(node_key)
-  -- Special handling for minigame trigger
-  if node_key == "__MINIGAME_BUTTON_MASH__" then
-    MinigameButtonMashWindow.start(WINDOW_GAME)
-    return
-  end
+-- Simplified PopupWindow module
+local POPUP_X = 40
+local POPUP_Y = 40
+local POPUP_WIDTH = 160
+local POPUP_HEIGHT = 80
+local TEXT_MARGIN_X = POPUP_X + 10
+local TEXT_MARGIN_Y = POPUP_Y + 10
+local LINE_HEIGHT = 8 -- Assuming 8 pixels per line for default font
 
-  -- Special handling for rhythm minigame trigger
-  if node_key == "__MINIGAME_RHYTHM__" then
-    MinigameRhythmWindow.start(WINDOW_GAME)
-    return
-  end
+function PopupWindow.show(content_strings)
+  Context.popup.show = true
+  Context.popup.content = content_strings or {} -- Ensure it's a table
+  GameWindow.set_state(WINDOW_POPUP) -- Set active window to popup
+end
 
-  -- Special handling for DDR minigame trigger
-  -- Format: __MINIGAME_DDR__ or __MINIGAME_DDR:song_key__
-  local song_key = node_key:match("^__MINIGAME_DDR:(.+)__$")
-  if song_key then
-    -- Extract song key from the node (format: __MINIGAME_DDR/test_song__)
-    trace('Playing song: ' .. song_key)
-    MinigameDDRWindow.start(WINDOW_GAME, song_key)
-    return
-  end
-  if node_key == "__MINIGAME_DDR__" then
-    MinigameDDRWindow.start(WINDOW_GAME, nil)
-    return
-  end
-
-  local npc = Context.dialog.active_entity
-  local node = npc.dialog[node_key]
-
-  if not node then
-    GameWindow.set_state(WINDOW_GAME)
-    return
-  end
-
-  Context.dialog.current_node_key = node_key
-  Context.dialog.text = node.text
-
-  local menu_items = {}
-  if node.options then
-    for _, option in ipairs(node.options) do
-      table.insert(menu_items, {
-        label = option.label,
-        action = function()
-          PopupWindow.set_dialog_node(option.next_node)
-        end
-      })
-    end
-  end
-
-  -- if no options, it's the end of this branch.
-  if #menu_items == 0 then
-    table.insert(menu_items, {
-      label = "Go back",
-      action = function() GameWindow.set_state(WINDOW_GAME) end
-    })
-  end
-
-  Context.dialog.menu_items = menu_items
-  Context.dialog.selected_menu_item = 1
-  Context.dialog.showing_description = false
-  GameWindow.set_state(WINDOW_POPUP)
+function PopupWindow.hide()
+  Context.popup.show = false
+  Context.popup.content = {} -- Clear content
+  GameWindow.set_state(WINDOW_GAME) -- Return to game window
 end
 
 function PopupWindow.update()
-  if Context.dialog.showing_description then
-    if Input.menu_confirm() or Input.menu_back() then
-      Context.dialog.showing_description = false
-      Context.dialog.text = "" -- Clear the description text
-      -- No need to change active_window, as it remains in WINDOW_POPUP
-    end
-  else
-    Context.dialog.selected_menu_item = UI.update_menu(Context.dialog.menu_items, Context.dialog.selected_menu_item)
-
-    if Input.menu_confirm() then
-      local selected_item = Context.dialog.menu_items[Context.dialog.selected_menu_item]
-      if selected_item and selected_item.action then
-        selected_item.action()
-      end
-    end
-
-    if Input.menu_back() then
-      GameWindow.set_state(WINDOW_GAME)
+  if Context.popup.show then
+    if Input.menu_confirm() or Input.menu_back() then -- Allow either A or B to close
+      PopupWindow.hide()
     end
   end
 end
 
-function PopupWindow.show_menu_dialog(entity, menu_items, dialog_active_window)
-  Context.dialog.active_entity = entity
-  Context.dialog.text = "" -- Initial dialog text is empty, name is title
-  GameWindow.set_state(dialog_active_window or WINDOW_POPUP)
-  Context.dialog.showing_description = false
-  Context.dialog.menu_items = menu_items
-  Context.dialog.selected_menu_item = 1
-end
-
-function PopupWindow.show_description_dialog(entity, description_text)
-  Context.dialog.active_entity = entity
-  Context.dialog.text = description_text
-  GameWindow.set_state(WINDOW_POPUP)
-  Context.dialog.showing_description = true
-  -- No menu items needed for description dialog
-end
-
 function PopupWindow.draw()
-  rect(40, 40, 160, 80, Config.colors.black)
-  rectb(40, 40, 160, 80, Config.colors.green)
+  if Context.popup.show then
+    rect(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.black)
+    rectb(POPUP_X, POPUP_Y, POPUP_WIDTH, POPUP_HEIGHT, Config.colors.green)
 
-  -- Display the entity's name as the dialog title
-  if Context.dialog.active_entity and Context.dialog.active_entity.name then
-    Print.text(Context.dialog.active_entity.name, 120 - #Context.dialog.active_entity.name * 2, 45, Config.colors.green)
-  end
+    local current_y = TEXT_MARGIN_Y
+    for _, line in ipairs(Context.popup.content) do
+      Print.text(line, TEXT_MARGIN_X, current_y, Config.colors.light_grey)
+      current_y = current_y + LINE_HEIGHT
+    end
 
-  -- Display the dialog content (description for "look at", or initial name/dialog for others)
-  local wrapped_lines = UI.word_wrap(Context.dialog.text, 25) -- Max 25 chars per line
-  local current_y = 55                                        -- Starting Y position for the first line of content
-  for _, line in ipairs(wrapped_lines) do
-    Print.text(line, 50, current_y, Config.colors.light_grey)
-    current_y = current_y + 8 -- Move to the next line (8 pixels for default font height + padding)
+    -- Instruction to close
+    Print.text("[A] Close", TEXT_MARGIN_X, POPUP_Y + POPUP_HEIGHT - LINE_HEIGHT - 2, Config.colors.green)
   end
-
-  -- Adjust menu position based on the number of wrapped lines
-  if not Context.dialog.showing_description then
-    UI.draw_menu(Context.dialog.menu_items, Context.dialog.selected_menu_item, 50, current_y + 2)
-  else
-    Print.text("[A] Go Back", 50, current_y + 10, Config.colors.green)
-  end
-end
+end