[CHG] El contacte en el jefe fa mal

[CHG] La fireball no se pot esquivar apretant avall
[NEW] La fireball se pot para d'una cacauà

data/fireball.lua

@@ -109,7 +109,8 @@ function fireball.update()
 
         if viewp:inside(fireball.x, fireball.y, fireball.w, fireball.h) then
             if collision(fireball,abad) then
-                if fireball.power==1 and abad.update~=abad_state_crouch then
+                -- if fireball.power==1 and abad.update~=abad_state_crouch then
+                if fireball.power==1 then
                     abad_hurt(1)
                     fireball.hab=-1
                 elseif fireball.power==2 then

data/game.lua

@@ -230,6 +230,19 @@ function world_update()
                 end
             end
         end
+        
+    end
+
+    -- Xoc contra la fireball de power = 1
+    if fireball.power==1 and
+       viewp:inside(fireball.x, fireball.y, fireball.w, fireball.h)
+    then
+        for _, cacau_shot in pairs(cacau.shots()) do
+            if cacau_shot.alive and collision(fireball,cacau_shot) then
+                fireball.hab = -1
+                cacau:kill(cacau_shot)
+            end
+        end
     end
     
     if stage_update then stage_update() end

data/imp3-functions.lua

@@ -268,7 +268,7 @@ if DEBUG_FN_NAME then print("shot") end
         flip=true 
         x_ini = self.x-4
     end
-    local hab, tx, ty, off_x, off_y = coords.world_to_tile(x_ini,self.y+(self.h/4))
+    local hab, tx, ty, off_x, off_y = coords.world_to_tile(x_ini,self.y+(self.h/2))
     fireball.init(hab, tx, ty, flip, off_x, off_y)
     sound.play(audio_hit)
     

data/imp3.lua

@@ -279,6 +279,11 @@ function imp:update_normal()
         self:next_frame()
         -- colisions en personatges
         -- self:colisions()
+        if viewp:inside(self.x, self.y, self.w, self.h) then
+            if collision(abad,self) then
+                abad_hurt(1)
+            end
+        end
     end
         
 end