From bf93aecad1b02df9f6d8ddc1dece176208455107 Mon Sep 17 00:00:00 2001
From: Daanish <me@syedm.dev>
Date: Sat, 28 Mar 2026 11:38:20 +0000
Subject: [PATCH] Refactor event bus to use non-retrievable events; update
 collision handling and add new inventory initialization; add torch lighting
 in fog shader;

---
 assets/images/inventory.png  | Bin 6593 -> 6678 bytes
 assets/images/torch.aseprite | Bin 0 -> 637 bytes
 assets/images/torch.png      | Bin 0 -> 622 bytes
 game/character.rb            |  10 +++--
 game/enemy/ai.rb             |   4 +-
 game/enemy/base.rb           |   4 ++
 game/maze.rb                 |   6 ++-
 game/placeables/base.rb      |  42 ++++++++++++++++-----
 game/scene.rb                |  70 ++++++++++++++++++++++-------------
 game/state.rb                |  31 ++++++++++++++++
 main.rb                      |   2 +-
 utils/bus.rb                 |  35 ++++++++++--------
 utils/maze.rb                |   4 +-
 utils/scene.rb               |   2 +-
 14 files changed, 150 insertions(+), 60 deletions(-)
 create mode 100644 assets/images/torch.aseprite
 create mode 100644 assets/images/torch.png

diff --git a/assets/images/inventory.png b/assets/images/inventory.png
index e581e05bb9701139c63c527eecf5c160b4b4969d..dec661506d40933aa315a18dc71db32efec0ec66 100644
GIT binary patch
literal 6678
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
V@Av!sVl)65?CI*~vd$@?2>_AhGE@Kn

literal 6593
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
Rnyv?F^K|udS?83{1OQ@>EbjmS

diff --git a/assets/images/torch.aseprite b/assets/images/torch.aseprite
new file mode 100644
index 0000000000000000000000000000000000000000..95d1329ce95c773866950fceb8574a8fe71edd89
GIT binary patch
literal 637
zcmb<rVqkc%l#wBTL4-kpfsuiMA%y`MC@?UB1Q`Sv1dxTP#{SF5!0_uM3)of`1_lN(
z1_lOp1+bM!c4RRyFtC7Jr@+9#prl~ps$r96Y1kiTeZNrc=7O|$hiCo%WH$3@K-NA3
z^C@}WnfgKADn>Sz_Vy(P2~E*?50hvAk3ak5^zA?Y|No!8c6&=*duCQvWLQv{Q`Z_J
zqnqK$*Q<B+PxtD|H;@O}q`-`1_kWO!7<>{dQ;QS~{TLY-SV4|pU}X5u1XC5jAjD8H
z=k0ZGu0sX_Y!BoP_I}}bbSYFYcIUf8q5Tg+W2(6PpOm(on&R`zc&^Q_2CvDD@`h^j
zJ$)C8xyID;hf3cpof=hDC%i{FeZO|J<R^_AZOO+fW|<yOE_Us|oyGOF);|C3>YXJI
zzkVvNI$N=|)1*1>_s;0g^0qO>2c#oJa`XB>pWJphUFqxs_3PHxm9sthpC3;<uvzT;
z)Z)v}j`w%H{8ICJ?(2n?M?bH%d=hB=UjK_#`>Beey(VmDEcnmtoEN+P<CCiE-&XW`
z-`gMkeZ{egP5Sdz{<y1n-?-Y@fAfVi^X@OMUA1&)SnQ_d)iw3US<d&rnR@Nf>)z*v
zZr@JE{kIOfy<V^Xck24@26p~xrT%T-SH0G`dQ9a_<$r0bb$jz`yyodVPk*xG+d{9i
R&c;)2+*<RUS+q=NIsiVT;Kcv{

literal 0
HcmV?d00001

diff --git a/assets/images/torch.png b/assets/images/torch.png
new file mode 100644
index 0000000000000000000000000000000000000000..c5e5c583cb4e8a055f17c277b747ddca871b120a
GIT binary patch
literal 622
zcmeAS@N?(olHy`uVBq!ia0y~yU<hDfU=ZP8V_;yAy0Pmz0|NtNage(c!@6@aFBuq^
zG(24#Ln2z=&M@>o>>$w=KRfB5CP!|DqejGp3<s;7J4#+Y3lR9j&gFE__XWSe9WK^-
zSH%Q#@sHwDoJ_l0#TEv!zE#m+l|3`JeEM#cS*tF5nX7mI`_rA~<<nz?64vd%n3DVY
z?|$1KnYaEO`ZUSswo31oygMrv+zgyAXW!@k+UJ(wsi}LamH8PGA_FUY=Inm4|G`8?
zl?|bj*2?EUSooKVVMUo5L&LE&AybhFn#&4Gs?J{f9@8e=)_#s9%DDUYUH`O@xUb?B
z1?pBE(*+VU?`AN5n8D2O{2gmf-xZ?-V;=vI5V?=$x^fJs)|9F3+tb3adMfu7j%>f|
zw8C#&PDrku%5Ahlzu#2-)p8r9wKJb4-G91KW~RSnKaawtT^Co)uzc5YY*}@C^tMlj
zwA1=pgH~2dNxT{SFmR{b;tv+BPgIwL_V9gU7xB0)ShB%>!Lwxttz+sQSKL|P_T=Cu
z=E|6BF_DiZ%}nBA2)KWH*-szCuUjQ|7)IZ@pVs1@RA=*)OT=HLDr5hpzI}@$pK4xz
ze)Z>O6T53-jSI`wc`vQ`WW($c7n+kUabsoi_eVQ<A06}VV%=u!a`M#UO}E{Tp7G?J
z6LV)#%G1R1-wao*BV{V?7*9CR(Ui76<!NoY9-qy5-I|+kyA@YHE1kcH`G<wv+YOyt
z^0u7#+?cVZwzjk5>!L@8q7(jm89dr2Tx<3I=gc1Fe8-^oKZ6$vG-}2LKR!5_S3zWT
j&@zSM!l!3N!{kMcpBM<FaOW{FFfe$!`njxgN@xNAH0T`6

literal 0
HcmV?d00001

diff --git a/game/character.rb b/game/character.rb
index 03784e4..5c5bf33 100644
--- a/game/character.rb
+++ b/game/character.rb
@@ -37,9 +37,13 @@ class Character
     @current_animation = :idle_front
     @facing = :front
 
-    $bus.on_retrievable(:player_position) do
+    $bus.on(:player_position) do
       next [@world_x, @world_y]
     end
+
+    $bus.on(:collides?) do |rect|
+      next collides?(rect) ? :character : nil
+    end
   end
 
   def rect
@@ -95,13 +99,13 @@ class Character
     steps.times do
       # X axis
       @world_x += step_dx
-      if ($bus.get(:collides?, rect) & [:wall, :object])&.any?
+      if ($bus.get_all(:collides?, rect) & [:wall, :object])&.any?
         @world_x -= step_dx
       end
 
       # Y axis
       @world_y += step_dy
-      if ($bus.get(:collides?, rect) & [:wall, :object])&.any?
+      if ($bus.get_all(:collides?, rect) & [:wall, :object])&.any?
         @world_y -= step_dy
       end
     end
diff --git a/game/enemy/ai.rb b/game/enemy/ai.rb
index 725f905..0bcb48e 100644
--- a/game/enemy/ai.rb
+++ b/game/enemy/ai.rb
@@ -19,7 +19,7 @@ class EnemyAI
     player_tile = [(player_x - 90) / 120, (player_y - 90) / 120].map(&:round)
     enemy_tile  = [(@enemy.x - 90) / 120, (@enemy.y - 90) / 120].map(&:round)
 
-    return if $bus.get(:collides?, @enemy.rect)&.include?(:character)
+    return if $bus.get_all(:collides?, @enemy.rect)&.include?(:character)
 
     object_in_tile = $bus.get(:object_at, enemy_tile[0], enemy_tile[1])
 
@@ -134,7 +134,7 @@ class EnemyAI
     @enemy.x += dx
     @enemy.y += dy
 
-    if $bus.get(:collides?, @enemy.rect)&.include?(:character)
+    if $bus.get_all(:collides?, @enemy.rect)&.include?(:character)
       # Attack player
     end
   end
diff --git a/game/enemy/base.rb b/game/enemy/base.rb
index eb4e045..d235359 100644
--- a/game/enemy/base.rb
+++ b/game/enemy/base.rb
@@ -10,6 +10,10 @@ class Enemy
     @h = 30
 
     @ai = EnemyAI.new(self, :chase)
+
+    $bus.on(:collides?) do |rect|
+      next collides?(rect) ? :enemy : nil
+    end
   end
 
   def rect
diff --git a/game/maze.rb b/game/maze.rb
index c24b975..20f539f 100644
--- a/game/maze.rb
+++ b/game/maze.rb
@@ -6,9 +6,13 @@ class Maze
     @spritesheet = Gosu::Image.load_tiles("assets/images/walls.png", 20, 40, retro: true)
     puts @spritesheet.size
 
-    $bus.on_retrievable(:maze_solve) do |x1, y1, x2, y2|
+    $bus.on(:maze_solve) do |x1, y1, x2, y2|
       next @maze.solve(x1, y1, x2, y2)
     end
+
+    $bus.on(:collides?) do |rect|
+      next collides?(rect) ? :wall : nil
+    end
   end
 
   def collides?(rect)
diff --git a/game/placeables/base.rb b/game/placeables/base.rb
index 5e037c7..f28174e 100644
--- a/game/placeables/base.rb
+++ b/game/placeables/base.rb
@@ -12,6 +12,14 @@ class Placeable
     @y = y
     @frames_count = 0
     @spritesheet = nil
+
+    $bus.on(:object_at) do |x, y|
+      next @x == x && @y == y ? self : nil
+    end
+
+    $bus.on(:collides?) do |rect|
+      next collides?(rect) ? :object : nil
+    end
   end
 
   def collides?(rect)
@@ -54,25 +62,41 @@ class Radar < Placeable
   end
 end
 
+class Torch < Placeable
+  def initialize(x, y)
+    super(x, y)
+    @frames_count = 4
+    @spritesheet = Gosu::Image.load_tiles("assets/images/torch.png", 20, 20, retro: true)
+
+    $bus.on(:torch_position) do
+      next rect
+    end
+  end
+end
+
+class Chest < Placeable
+  def initialize(x, y)
+    super(x, y)
+    @frames_count = 1
+    @spritesheet = Gosu::Image.load_tiles("assets/images/chest.png", 20, 20, retro: true)
+  end
+end
+
 class ObjectHandler
   attr_reader :objects
 
   def initialize
     start_room_coords = $bus.get(:start_room_coords)
-    @objects = [Radar.new(start_room_coords[0] / 2 - 1, start_room_coords[1] / 2 - 1)]
-
-    $bus.on_retrievable(:object_at) do |x, y|
-      next @objects.find { |obj| obj.x == x && obj.y == y }
-    end
+    @objects = [
+      Torch.new(start_room_coords[0] / 2 - 1, start_room_coords[1] / 2 - 1),
+      Torch.new(start_room_coords[0] / 2 + 3, start_room_coords[1] / 2),
+      Torch.new(start_room_coords[0] / 2, start_room_coords[1] / 2 - 1),
+    ]
   end
 
   def add(object)
     @objects << object
   end
-  
-  def collides?(rect)
-    @objects.any? { |obj| obj.collides?(rect) }
-  end
 
   def update
     @objects.each(&:update)
diff --git a/game/scene.rb b/game/scene.rb
index 25531a5..b8a08f6 100644
--- a/game/scene.rb
+++ b/game/scene.rb
@@ -27,18 +27,9 @@ class Game < Scene
       @camera = pos
     end
 
-    $bus.on_retrievable(:camera_pos) do
+    $bus.on(:camera_pos) do
       next @camera
     end
-
-    $bus.on_retrievable(:collides?) do |rect|
-      collisions = []
-      collisions << :wall if @maze.collides?(rect)
-      collisions << :character if @character.collides?(rect)
-      collisions << :enemy if @enemies.collides?(rect)
-      collisions << :object if @objects.collides?(rect)
-      next collisions
-    end
   end
 
   def draw
@@ -74,13 +65,19 @@ class Game < Scene
   def draw_fog!
     cam_x, cam_y = @camera
     cell = 10
-    i_radius = 90.0
-    o_radius = 400.0
+    p_i_radius = 80.0
+    p_o_radius = 350.0
+    t_i_radius = 10.0
+    o_radius = 160.0
 
     # Player screen position
     px = SCREEN_SIZE[0] / 2.0
     py = SCREEN_SIZE[1] / 2.0
 
+    # Collect all light sources (player + torches)
+    torches = $bus.get_all(:torch_position)
+    torch_lights = torches.map { |t| [t[0] - cam_x, t[1] - cam_y] }
+
     tiles_x = (SCREEN_SIZE[0] / cell) + 2
     tiles_y = (SCREEN_SIZE[1] / cell) + 2
 
@@ -89,22 +86,45 @@ class Game < Scene
         sx = i * cell
         sy = j * cell
 
-        dist = Math.sqrt((sx - px)**2 + (sy - py)**2)
+        light_strength = 0.0
 
-        if dist < i_radius
-          next  # fully clear
-        elsif dist > o_radius
-          alpha = 255
-        else
-          t = (dist - i_radius) / (o_radius - i_radius)  # 0..1
-          world_x = (sx + cam_x) * 0.005
-          world_y = (sy + cam_y) * 0.005
-          # Sample noise at world position so it scrolls with camera
-          # Add time-based offsets for animation
-          noise = (@noise[world_x + Gosu.milliseconds / 5000.0, world_y + Gosu.milliseconds / 6000.0] + 1.0) / 2.0
-          alpha = (t * (1.0 + noise) * 255).to_i.clamp(0, 255)
+        d = Math.sqrt((px - sx)**2 + (py - sy)**2)
+        if d < p_i_radius
+          light_strength = 1.0
+        elsif d < p_o_radius
+          t = (d - p_i_radius) / (p_o_radius - p_i_radius) # 0..1
+          light_strength = 1.0 - t
         end
 
+        torch_lights.each do |lx, ly|
+          d = Math.sqrt((sx - lx)**2 + (sy - ly)**2)
+
+          if d < t_i_radius
+            strength = 1.0
+          elsif d < o_radius
+            t = (d - t_i_radius) / (o_radius - t_i_radius) # 0..1
+            strength = 1.0 - t
+          else
+            strength = 0.0
+          end
+
+          light_strength += strength
+        end
+
+        light_strength = light_strength.clamp(0.0, 1.0)
+
+        t = 1.0 - light_strength
+
+        world_x = (sx + cam_x) * 0.005
+        world_y = (sy + cam_y) * 0.005
+
+        noise = (@noise[
+          world_x + Gosu.milliseconds / 5000.0,
+          world_y + Gosu.milliseconds / 6000.0
+        ] + 1.0) / 2.0
+
+        alpha = (t * (1.0 + noise) * 255).to_i.clamp(0, 255)
+
         Gosu.draw_rect(sx, sy, cell, cell, Gosu::Color.new(alpha, 0, 0, 0), 10000 + sy)
       end
     end
diff --git a/game/state.rb b/game/state.rb
index 9c1e414..042c841 100644
--- a/game/state.rb
+++ b/game/state.rb
@@ -4,4 +4,35 @@ class State
   # also their health, stealth, and memory bars
   # it can handle mouse input for inventory management and item usage
   # it can also handle keyboard input for quick item usage
+
+  def initialize
+    @inventory = {
+      # basic resources
+      :wood => 0,
+      :metal => 0,
+      :science => 0,
+
+      # nuetrals
+      :torch => 0,
+      :radar => 0,
+
+      # placeable weapons
+      :landmine => 0,
+      :shrodingers_mine => 0,
+      :event_horizon => 0,
+
+      # attack weapons
+      :occams_razor => 0,
+      :quantum_bow => 0,
+      :blade_of_recursion => 0,
+
+      # utility weapon
+      :lorentz_field => 0
+    }
+    @inventory_selected = :wood
+    @upgrades = []
+    @health = 100
+    @stealth = 100
+    @memory = 256
+  end
 end
\ No newline at end of file
diff --git a/main.rb b/main.rb
index bce9d98..0804305 100644
--- a/main.rb
+++ b/main.rb
@@ -20,7 +20,7 @@ class Window < Gosu::Window
 
     $bus.on(:quit_game) { close! }
 
-    $bus.on_retrievable(:mouse_pos) do
+    $bus.on(:mouse_pos) do
       next mouse_relative(mouse_x, mouse_y)
     end
 
diff --git a/utils/bus.rb b/utils/bus.rb
index a485352..026bb62 100644
--- a/utils/bus.rb
+++ b/utils/bus.rb
@@ -2,12 +2,11 @@ class EventBus
   def initialize
     # store callbacks with owner: {event => [ {callback:, owner:} ] }
     @events = Hash.new { |h, k| h[k] = [] }
-    @retrievable_events = {}
   end
 
   # Emit an event
   def emit(event, *args)
-    @events[event].each do |h|
+    @events[event].dup.each do |h|
       h[:callback].call(*args)
     end
   end
@@ -28,30 +27,34 @@ class EventBus
     on(event, owner: owner, &wrapper)
   end
 
+  # Unsubscribe from an event
   def off(event, &callback)
     @events[event].reject! { |h| h[:callback] == callback }
   end
 
-  # Register a retrievable event (only one allowed)
-  def on_retrievable(event, owner = nil, &callback)
-    owner ||= callback.binding.eval("self")
-    @retrievable_events[event] = { callback: callback, owner: owner }
-  end
-
-  # Get data from a retrievable event
+  # For events that return a value (e.g. queries), get the first non-nil response
   def get(event, *args)
-    if @retrievable_events[event]
-      @retrievable_events[event][:callback].call(*args)
-    else
-      nil
+    @events[event].dup.each do |h|
+      result = h[:callback].call(*args)
+      return result unless result.nil?
     end
+    nil
   end
 
-  # Unsubscribe from an object's events
-  def unlisten_owner(owner)
+  # For events that return multiple values (e.g. queries), get all non-nil responses
+  def get_all(event, *args)
+    results = []
+    @events[event].dup.each do |h|
+      result = h[:callback].call(*args)
+      results << result unless result.nil?
+    end
+    results
+  end
+
+  # Unsubscribe all events for a given owner (e.g. when an object is destroyed)
+  def remove_owner(owner)
     @events.each do |event, handlers|
       handlers.reject! { |h| h[:owner] == owner }
     end
-    @retrievable_events.delete_if { |_, h| h[:owner] == owner }
   end
 end
\ No newline at end of file
diff --git a/utils/maze.rb b/utils/maze.rb
index 5fc9e02..4a273c3 100644
--- a/utils/maze.rb
+++ b/utils/maze.rb
@@ -15,14 +15,14 @@ class MazeData
 
     return if standalone
 
-    $bus.on_retrievable(:start_room_coords) do
+    $bus.on(:start_room_coords) do
       next @start_room ? [@start_room[0] * 2 + 1, @start_room[1] * 2 + 1] : nil
     end
 
     return unless DEBUG
 
     print_debug
-    $bus.on_retrievable(:boss_room_coords) do
+    $bus.on(:boss_room_coords) do
       next @boss_rooms.first ? [@boss_rooms.first[0] * 2 + 1, @boss_rooms.first[1] * 2 + 1] : nil
     end
   end
diff --git a/utils/scene.rb b/utils/scene.rb
index a730797..44ce2ff 100644
--- a/utils/scene.rb
+++ b/utils/scene.rb
@@ -14,6 +14,6 @@ class Scene
   end
 
   def close
-    $bus.unlisten_owner(self)
+    $bus.remove_owner(self)
   end
 end
\ No newline at end of file