order inc files to folders

inc/window/window.game.lua

@@ -0,0 +1,35 @@
+function GameWindow.draw()
+  local currentScreenData = Context.screens[Context.current_screen]
+
+  UI.draw_top_bar(currentScreenData.name)
+
+  -- Draw platforms
+  for _, p in ipairs(currentScreenData.platforms) do
+    rect(p.x, p.y, p.w, p.h, Config.colors.green)
+  end
+
+  -- Draw items
+  for _, item in ipairs(currentScreenData.items) do
+    spr(item.sprite_id, item.x, item.y, 0)
+  end
+
+  -- Draw NPCs
+  for _, npc in ipairs(currentScreenData.npcs) do
+    spr(npc.sprite_id, npc.x, npc.y, 0)
+  end
+
+  -- Draw ground
+  rect(Context.ground.x, Context.ground.y, Context.ground.w, Context.ground.h, Config.colors.dark_grey)
+
+  -- Draw player
+  Player.draw()
+end
+
+function GameWindow.update()
+  Player.update() -- Call the encapsulated player update logic
+end
+
+function GameWindow.set_state(new_state)
+  Context.active_window = new_state
+  -- Add any state-specific initialization/cleanup here later if needed
+end

inc/window/window.intro.lua

@@ -0,0 +1,25 @@
+function IntroWindow.draw() 
+  local x = (Config.screen.width - 132) / 2 -- Centered text
+  print(Context.intro.text, x, Context.intro.y, Config.colors.green)
+end
+
+function IntroWindow.update() 
+  Context.intro.y = Context.intro.y - Context.intro.speed
+
+  -- Count lines in intro text to determine when scrolling is done
+  local lines = 1
+  for _ in string.gmatch(Context.intro.text, "\n") do
+    lines = lines + 1
+  end
+
+  -- When text is off-screen, go to menu
+  if Context.intro.y < -lines * 8 then
+    GameWindow.set_state(WINDOW_MENU)
+  end
+
+  -- Skip intro by pressing A
+  if Input.menu_confirm() then
+    GameWindow.set_state(WINDOW_MENU)
+  end
+end
+

inc/window/window.inventory.lua

@@ -0,0 +1,34 @@
+function InventoryWindow.draw()
+  UI.draw_top_bar("Inventory")
+
+  if #Context.inventory == 0 then
+    print("Inventory is empty.", 70, 70, Config.colors.light_grey)
+  else
+    for i, item in ipairs(Context.inventory) do
+			local color = Config.colors.light_grey
+			if i == Context.selected_inventory_item then
+				color = Config.colors.green
+				print(">", 60, 20 + i * 10, color)
+			end
+      print(item.name, 70, 20 + i * 10, color)
+    end
+  end
+end
+
+function InventoryWindow.update()
+  Context.selected_inventory_item = UI.update_menu(Context.inventory, Context.selected_inventory_item)
+
+  if Input.menu_confirm() and #Context.inventory > 0 then
+    local selected_item = Context.inventory[Context.selected_inventory_item]
+    PopupWindow.show_menu_dialog(selected_item, {
+      {label = "Use", action = Item.use},
+      {label = "Drop", action = Item.drop},
+      {label = "Look at", action = Item.look_at},
+      {label = "Go back", action = Item.go_back_from_inventory_action}
+    }, WINDOW_INVENTORY_ACTION)
+  end
+
+  if Input.menu_back() then
+    GameWindow.set_state(WINDOW_GAME)
+  end
+end

inc/window/window.menu.lua

@@ -0,0 +1,36 @@
+function MenuWindow.draw()
+  UI.draw_top_bar("Main Menu")
+  UI.draw_menu(Context.menu_items, Context.selected_menu_item, 108, 70)
+end
+
+function MenuWindow.update()
+  Context.selected_menu_item = UI.update_menu(Context.menu_items, Context.selected_menu_item)
+
+  if Input.menu_confirm() then
+    local selected_item = Context.menu_items[Context.selected_menu_item]
+    if selected_item and selected_item.action then
+      selected_item.action()
+    end
+  end
+end
+
+function MenuWindow.play()
+  -- Reset player state and screen for a new game
+  Context.player.x = Config.player.start_x
+  Context.player.y = Config.player.start_y
+  Context.player.vx = 0
+  Context.player.vy = 0
+  Context.player.jumps = 0
+  Context.current_screen = 1
+  GameWindow.set_state(WINDOW_GAME)
+end
+
+function MenuWindow.exit()
+  exit()
+end
+
+-- Initialize menu items after actions are defined
+Context.menu_items = {
+  {label = "Play", action = MenuWindow.play},
+  {label = "Exit", action = MenuWindow.exit}
+}

inc/window/window.popup.lua

@@ -0,0 +1,102 @@
+function PopupWindow.set_dialog_node(node_key)
+  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)
+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 or WINDOW_INVENTORY_ACTION
+    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)
+    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)
+
+  -- Display the entity's name as the dialog title
+  if Context.dialog.active_entity and Context.dialog.active_entity.name then
+    print(Context.dialog.active_entity.name, 120 - #Context.dialog.active_entity.name * 2, 45, Config.colors.green)
+  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(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)
+  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("[A] Go Back", 50, current_y + 10, Config.colors.green)
+  end
+end

inc/window/window.splash.lua

@@ -0,0 +1,11 @@
+function SplashWindow.draw()
+  print("Mr. Anderson's", 78, 60, Config.colors.green)
+  print("Addventure", 90, 70, Config.colors.green)
+end
+
+function SplashWindow.update()
+  Context.splash_timer = Context.splash_timer - 1
+  if Context.splash_timer <= 0 or Input.menu_confirm() then
+    GameWindow.set_state(WINDOW_INTRO)
+  end
+end