[WIP] Triggers

- Algo de neteja de codi

data/trigger.lua

@@ -1,17 +1,29 @@
 trigger={}
 
 function trigger.new(_hab,_x,_y,_fun)
-    return {hab=_hab,x=_x,y=_y,fun=_fun,update=trigger.update,draw=trigger.draw,bb={x=0,y=0,w=8,h=8}}
+    local world_x, world_y = coords.room_to_world(_hab,_x,_y)
+    return {
+        name="trigger",
+        hab=_hab,
+        x=world_x,
+        y=world_y,
+        w=16,
+        h=16,
+        fun=_fun,
+        update=trigger.update,
+        draw=trigger.draw,
+        bb={x=0,y=0,w=16,h=16} }
 end
 
 function trigger:draw()
     -- do nothing
-    --rectfill(self.x,self.y,self.x+8,self.y+8,3)
+    local scr_x, scr_y = viewp:screen_coords( self.x, self.y )
+    draw.rectf(scr_x,scr_y,self.w,self.h,3)
 end
 
 function trigger:update()
     if self.hab==abad.hab then
-        if aabb(abad,self) then
+        if collision(abad,self) then
             self:fun()
         end
     end