Snapshot

1 files changed, 6 insertions, 3 deletions

diff --git a/collisions.lua b/collisions.lua
index 04575c4..f57554e 100644
--- a/collisions.lua
+++ b/collisions.lua
@@ -1,14 +1,17 @@
-sw, sh = 8, 8
 function is_colliding(a, b)
     ax1, bx1 = a.position.x, b.position.x
-    ax2, bx2 = ax1 + sw, bx1 + sw
+    ax2, bx2 = ax1 + SPRITE_DIMS.x, bx1 + SPRITE_DIMS.y
     ay1, by1 = a.position.y, b.position.y
-    ay2, by2 = ay1 + sh, by1 + sh
+    ay2, by2 = ay1 + SPRITE_DIMS.y, by1 + SPRITE_DIMS.x
     return (ax1 < bx2 and ax2 > bx1
                 and ay1 < by2 and ay2 > by1)
 end
 
 function handle_collision(a, b)
+    if a.entity_type == Entities.Sword and b.entity_type == Entities.Player and b.equipped[a.id] == nil then
+        b:equip(a)
+        return
+    end
     if a.damage and b.health then
         if b:is_in_iframe() then
             return