Refactor character and enemy AI movement logic; implement delta time for smoother updates and replace object (a reserved keyword) with prop.

game/props/base.rb

@@ -0,0 +1,74 @@
+class Prop
+  SIZE = [25, 15]
+
+  # The base class for all props in the game. Props are things that can be interacted with, but do not move (unlike characters).
+  # They cannot be walked through, but can be interacted with (e.g. a chest can be opened, a torch can be lit, a radar can be used).
+  # They are placed at the center of a tile, and their position is represented by the tile coordinate
+  # A prop is one that is placed at the center of a tile (radar, torch & chest)
+  attr_reader :x, :y
+
+  def initialize(x, y)
+    @x = x
+    @y = y
+    @frames_count = 0
+    @spritesheet = nil
+  end
+
+  def collides?(rect)
+    return true if intersects?(self.rect, rect)
+    false
+  end
+
+  def rect
+    [@x * 120 + 90 - SIZE[0] / 2, @y * 120 + 90 - SIZE[1], *SIZE]
+  end
+
+  def update
+    # For now, placeables don't have any behavior
+  end
+
+  def draw
+    return unless @spritesheet
+
+    cam_x, cam_y = $bus.get(:camera_pos) || [0, 0]
+    screen_x = @x * 120 + 90 - cam_x
+    screen_y = @y * 120 + 90 - cam_y
+
+    elapsed = Gosu.milliseconds / 1000.0
+    frame_index = ((elapsed * @frames_count).floor) % @frames_count
+
+    @spritesheet[frame_index].draw(screen_x - 20, screen_y - 20, screen_y, 2, 2)
+
+    return unless DEBUG
+
+    # collision box centered on same point
+    Gosu.draw_rect(screen_x - SIZE[0] / 2, screen_y - SIZE[1], *SIZE, Gosu::Color.new(0x88ff0000), Float::INFINITY)
+  end
+end
+
+class Radar < Prop
+  def initialize(x, y)
+    super(x, y)
+    @frames_count = 4
+    @spritesheet = Gosu::Image.load_tiles("assets/images/radar.png", 20, 20, retro: true)
+  end
+end
+
+class Torch < Prop
+  def initialize(x, y)
+    super(x, y)
+    @frames_count = 4
+    @spritesheet = Gosu::Image.load_tiles("assets/images/torch.png", 20, 20, retro: true)
+  end
+end
+
+class Chest < Prop
+  def initialize(x, y)
+    super(x, y)
+    @wood = rand(0..64)
+    @metal = rand(0..16)
+    @science = rand(0..4)
+    @frames_count = 1
+    @spritesheet = Gosu::Image.load_tiles("assets/images/chest.png", 20, 20, retro: true)
+  end
+end

game/props/handler.rb

@@ -0,0 +1,86 @@
+require_relative "base"
+
+class PropsHandler
+  attr_reader :props
+
+  def initialize
+    @props = []
+    @grid = {}
+
+    spawn_chests!
+
+    $bus.on(:collides?) do |rect|
+      nearby_props(rect).any? { |p| p.collides?(rect) } ? :prop : nil
+    end
+
+    $bus.on(:prop_at) do |x, y|
+      @grid[[x, y]]
+    end
+
+    $bus.on(:nearby_torches) do |rect|
+      nearby_props(rect).select { |p| p.is_a?(Torch) }.map { |t| t.rect }
+    end
+  end
+
+  def spawn_chests!
+    world_size = $bus.get(:maze_size) || [0, 0]
+
+    cell_size = 10
+
+    (0...world_size[0]).step(cell_size) do |cx|
+      (0...world_size[1]).step(cell_size) do |cy|
+
+        # Random position inside this cell
+        x = cx + rand(cell_size)
+        y = cy + rand(cell_size)
+
+        next if x >= world_size[0] || y >= world_size[1]
+
+        # Keep your spawn exclusion
+        next if (x - 2).abs <= 1 && (y - 2).abs <= 1
+
+        next if $bus.get(:room?, x, y)
+
+        chest = Chest.new(x, y)
+        @props << chest
+        @grid[[x, y]] = chest
+      end
+    end
+  end
+
+  def nearby_props(rect)
+    x, y, w, h = rect
+
+    min_tx = ((x) / 120).floor
+    max_tx = ((x + w) / 120).floor
+    min_ty = ((y) / 120).floor
+    max_ty = ((y + h) / 120).floor
+
+    results = []
+
+    (min_tx..max_tx).each do |tx|
+      (min_ty..max_ty).each do |ty|
+        p = @grid[[tx, ty]]
+        results << p if p
+      end
+    end
+
+    results
+  end
+
+  def add(prop)
+    @props << prop
+
+    key = [prop.x, prop.y]
+    @grid[key] = prop
+  end
+
+  def update
+    @props.each(&:update)
+  end
+
+  def draw
+    cam = $bus.get(:camera_pos) || [0, 0]
+    nearby_props([*cam, *SCREEN_SIZE]).each(&:draw)
+  end
+end