From d4ef8ba55196f97d347e74633486a495f17756a5 Mon Sep 17 00:00:00 2001
From: JailGamer <jailgamer@gmail.com>
Date: Sat, 11 Apr 2026 02:32:55 +0200
Subject: [PATCH] [WIP] Treballant en el jefe. Pattern mode funcionant

---
 data/imp.lua   | 902 ++++++++++++++++++++++++++-----------------------
 data/point.lua |   4 +-
 2 files changed, 487 insertions(+), 419 deletions(-)

diff --git a/data/imp.lua b/data/imp.lua
index 570712f..3dc6f0e 100644
--- a/data/imp.lua
+++ b/data/imp.lua
@@ -1,28 +1,9 @@
 cxr2 = arcade_config.character_per_row_base2
 
--- 4, 3
-
--- imp={hab=75,
---      x=24,
---      y=24,
---      w=32,
---      h=32,
---      flip=true,
---      enabled=false,
---      counter=500,
---      frame=28,
---      wait=0,
---      step=0,
---      anim={28,29,28,30},
---      bb={x=4,y=0,w=16,h=32},
---      scene_intro=false,
---      scene_object=false,
---      fight_modes={"chase","away","super","shot"},
---      mode="stop",
---      mode_cooldown=100}
-
 imp = {}
 
+local DEBUG_FN_NAME = false
+
 function imp.reset()
     imp.hit=imp.hit
     imp.update=imp.update
@@ -101,154 +82,81 @@ function imp.new(_hab, _x, _y)
        update=imp.state_normal,
        land=imp.land,
        mode_controller=imp.mode_controller,
-       --movement=imp.movement,
        advance=imp.advance,
        reduce_cooldown=imp.reduce_cooldown,
-       set_fight_mode=imp.set_fight_mode,
        think=imp.think,
+       move=imp.move,
        controller_input=imp.controller_input,
        ia=imp.ia,
        analyze_env=imp.analyze_env,
-       next_pattern_movement=imp.next_pattern_movement,
+       next_pattern_action=imp.next_pattern_action,
+       pattern_action=imp.pattern_action,
        reset_mode_cooldown=imp.reset_mode_cooldown,
        free_movement=imp.free_movement,
        free_move=imp.free_move,
-       reset_pattern_movement=imp.reset_pattern_movement
+       reset_pattern_movement=imp.reset_pattern_movement,
+       pattern_move=imp.pattern_move,
+       next_pattern_target=imp.next_pattern_target,
+       next_free_target=imp.next_free_target,
+       old_action="-"
        -- imp.enabled=false
        -- imp.counter=500
     }
 end
 
-function imp:reset_mode_cooldown( value )
-    value = value or 500
-    self.mode_cooldown = value
-    return value
-end
-
-function imp:reset_pattern_movement()
-    self.path={}
-    self.path_curr_action=1;
-end
-
-function imp:next_pattern_movement( from )
-    self.movement_type = "pattern"
-    self:reset_mode_cooldown()
-    from = from or self.path.next
-    -- obtindre uno dels possibles camins des del punt "from"
-    local next_path_idx = math.random(#self.paths[from])
-    -- Activar següent target
-    local next_path = self.paths[from][next_path_idx]
-    self.target = self.hot_points[next_path.next]
-    
-    print("TARGET ID= "..self.target.id.." HOT POINT= "..next_path.next)
-    self.path = next_path
-    self.path_curr_action = 1
-    action = self.path.actions[1].action
-    self.action_event=""
-    return action
-end
-
-function imp:free_move()
-    -- Moviment horitzontal
-    if self.target.x+self.target.bb.x>=self.x+self.bb.x then
-        action="right"
-    elseif self.target.x+self.target.bb.x<self.x+self.bb.x then
-        action="left"
-    end
-    
-    -- Els dos punts de baix pero un poc mes alt que el piso
-    local x1_check = self.x+self.bb.x
-    local x2_check = self.x+self.bb.x+self.bb.w
-    local y_check  = self.y+self.bb.h-4
-    -- Tiles on esta
-    local tile_type1, tile_code1= arc_check_tile(x1_check,y_check)
-    local tile_type2, tile_code2= arc_check_tile(x2_check,y_check)
-    
-    -- debug
-    local scr_x1, scr_y = viewp:screen_coords( x1_check, y_check )
-    local scr_x2, scr_y = viewp:screen_coords( x2_check, y_check )
-    draw.rect(scr_x1,scr_y,scr_x2-scr_x1,8,2)
-    -- /debug
-    
-    --Comprovar si está en target
-    if collision(self, self.target) then 
-        -- print("Next target "..tile_type1.." "..tile_code1) 
-        -- print("Next target "..tile_type2.." "..tile_code2) 
-        self:reset_mode_cooldown()
-        
-        
-        -- Buscar quin es el target
-        local idx = 1
-        for i=1,#self.hot_points do
-            if self.target==self.hot_points[i] then 
-                idx= i 
-                print("TARGET ID= "..self.target.id.." HOT POINT IDX= "..i.." Reached")
-            end
-        end
-        
-        -- Canviar a moviment per patro
-        action = self:next_pattern_movement(idx)
-    elseif half_collision(self, self.target) 
-           and tile_type1==tiletype.void  
-           and tile_type2==tiletype.void then -- and (self.y>self.target.y or self.y<self.target.y) ) then -- afegir que no hi haja tile per a escalar 
-        -- print("Next Target 2 "..tile_type1.." "..tile_code1)
-    elseif tile_type1~=tiletype.void 
-           or tile_type2~=tiletype.void then
-        action="jump"
-    end
-    return action
-end
-
-function imp:free_movement()
-    self.movement_type = "free"
-
-    print("Free")
-end
-
 function imp:fight()
-    print("FIGHTING MODE")
-    -- table.insert(self.hot_points, point.new(54,5,4,12,8,"P1"))
-    -- table.insert(self.hot_points, point.new(44,5,3,12,8,"P2"))
-    -- table.insert(self.hot_points, point.new(55,7,4,12,8,"P3"))
-    -- table.insert(self.hot_points, point.new(45,7,3,12,8,"P4"))
-    -- table.insert(self.hot_points, point.new(44,12,5,12,8,"P5"))
-    -- table.insert(self.hot_points, point.new(54,12,4,12,8,"P6"))
-    
-    self.hot_points[1] = point.new(44, 5, 1,  0, 0,"P1")
-    self.hot_points[2] = point.new(45, 8, 1,  0, 0,"P2")
-    self.hot_points[3] = point.new(44,12, 5,  0, 0,"P3")
+if DEBUG_FN_NAME then print("fight") end
+    self.hot_points[1] = point.new(44, 5, 1,  0, 8,"P1")
+    self.hot_points[2] = point.new(45, 8, 1,  0, 8,"P2")
+    self.hot_points[3] = point.new(44,12, 5,  8, 0,"P3")
     self.hot_points[4] = point.new(54, 5, 4, -8, 0,"P4")
     self.hot_points[5] = point.new(54,12, 4,  8, 0,"P5")
     self.hot_points[6] = point.new(55, 8, 4,  8, 0,"P6")
-    self.hot_points[7] = abad
+    self.hot_points[7] = point.new(55, 8, 0,  0, 0,"P7")
+    self.hot_points[8] = point.new(54, 5, 0,  0, 0,"P8")
+    self.hot_points[9] = point.new(54, 9, 1,  0, 0,"P9")
+    self.hot_points[10] = point.new(55,4, 1, 0, 0,"P10")
+    self.hot_points[11] = abad
 
     self.target = self.hot_points[6]
     self.path = {next=6, actions={{action="right",event="target"}}}
     
     self.paths[1] = { 
-        {next=3, actions= {{action="jumpfwd", event="land"},
+        {next=3, actions= {{action="right"  , event="prefall"},
+                           {action="jumpfwd", event="land"},
                            {action="right"  , event="target"}}},
         {next=4, actions= {{action="right"  , event="land"},
                            {action="left"   , event="target"}}},
+        {next=3, actions= {{action="right"  , event="prefall"},
+                           {action="jumpfwd", event="land"},
+                           {action="right"  , event="target"}}},
         {next=5, actions= {{action="right"  , event="target"}}}
     }
     self.paths[2] = {
-        {next=3, actions={{action="jumpfwd", event="land"},
+        {next=3, actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd", event="land"},
                           {action="left"   , event="target"}}},
         {next=6, actions={{action="left"   , event="land"},
                           {action="right"  , event="target"}}},
+        {next=3, actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd", event="land"},
+                          {action="left"   , event="target"}}},        
         {next=5, actions={{action="left"   , event="target"}}}
     }
     self.paths[3] = {
         {next=1, actions={{action="left"   , event="prefall"},
                           {action="jumpfwd", event="land"},
+                          {action="left"   , event="prefall"},
                           {action="jump"   , event="target"}}},
         {next=2, actions={{action="right"  , event="prefall"},
                           {action="jumpfwd", event="land"},
+                          {action="right"  , event="prefall"},
                           {action="jump"   , event="target"}}},
-        {next=4, actions={{action="jumpfwd", event="land"},
+        {next=4, actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd", event="land"},
+                          {action="right"  , event="land"},
                           {action="left"   , event="target"}}},
-        {next=5, actions={{action="jumpfwd", event="land"},
+        {next=5, actions={{action="left"   , event="land"},
                           {action="right"  , event="target"}}},
         {next=6, actions={{action="left"   , event="land"},
                           {action="right"  , event="target"}}}
@@ -256,7 +164,8 @@ function imp:fight()
     self.paths[4] = {
         {next=1, actions={{action="jump" , event="target"}}},
         {next=5, actions={{action="right", event="target"}}},
-        {next=6, actions={{action="right", event="target"}}}
+        {next=6, actions={{action="right", event="target"}}},
+        {next=8, actions={{action="jump" , event="target"}}},
     }
     self.paths[5] = {
         {next=4, actions={{action="left" , event="target"}}},
@@ -264,8 +173,45 @@ function imp:fight()
     }
     self.paths[6] = {
         {next=2, actions={{action="jump", event="target"}}},
-        {next=5, actions={{action="left", event="target"}}}
+        {next=5, actions={{action="left", event="target"}}},
+        {next=7, actions={{action="jump", event="target"}}},
+        {next=4, actions={{action="left", event="target"}}}
     }
+    self.paths[7] = {
+        {next=5, actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd", event="land"},
+                          {action="left"   , event="target"}}},
+        {next=10,actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd", event="land"},
+                          {action="left"   , event="target"}}},
+        {next=2, actions={{action="jump"   , event="target"}}}
+    }
+    self.paths[8] = {
+        {next=5, actions={{action="right"   , event="prefall"},
+                         {action="jumpfwd" , event="land"},
+                         {action="right"   , event="target"}}},
+        {next=9, actions={{action="right"   , event="prefall"},
+                          {action="jumpfwd" , event="land"},
+                          {action="right"   , event="target"}}},
+        {next=1, actions={{action="jump"    , event="target"}}}
+    }
+    self.paths[9] = {
+        {next=5, actions={{action="right"   , event="target"}}},
+        {next=1, actions={{action="left"   , event="prefall"},
+                          {action="jumpfwd" , event="land"},
+                          {action="left"   , event="prefall"},
+                          {action="jump"    , event="target"}}},
+        {next=4, actions={{action="left"    , event="target"}}}
+    }
+    self.paths[10] = {
+        {next=5, actions={{action="left"    , event="target"}}},
+        {next=2, actions={{action="right"    , event="prefall"},
+                          {action="jumpfwd" , event="land"},
+                          {action="right"    , event="prefall"},
+                          {action="jump"    , event="target"}}},
+        {next=6, actions={{action="right"   , event="target"}}}
+    }
+    self.paths[11] = {}
 
     self.mode="chase"
 end
@@ -296,10 +242,11 @@ function imp:draw()
 end
 
 function imp:hit()
-    print("HIT!")
+if DEBUG_FN_NAME then print("hit") end
 end
 
 function imp:do_jump ( jumpfwd )
+if DEBUG_FN_NAME then print("do_jump") end
 -- msg_print(0,0,"do_jump",true)
     -- Inicialització de fer el salt
     jumpfwd = jumpfwd or false
@@ -310,8 +257,377 @@ function imp:do_jump ( jumpfwd )
     self.action=""
 end
 
-function imp:analyze_env()
+function imp:state_jumping()
+if DEBUG_FN_NAME then print("state_jumping") end
+    -- msg_print(0,0,"state_jumping",true)
+    -- ??
+    self.wait=self.wait+1
+    self.wait=0
+
+    -- Pujar o caure
+    if self.jump_height<self.max_jump_height then
+        -- Comprovar que pasa en l'aire
+        self:jump()
+    else
+        -- Canviar a mode caure
+        self.update=imp.state_falling
+    end
+    self.step=self.step+1
+
+    -- cap endavant?
+    if self.jumpfwd then self:advance() end
     
+    self:ia()
+end
+
+function imp:jump()
+if DEBUG_FN_NAME then print("jump") end
+-- msg_print(0,0,"jump",true)
+    local vspace = self.vmove_space
+    -- Els dos punts de dalt del personatge
+    local x1_check = self.x+self.bb.x
+    local x2_check = self.x+self.bb.x+self.bb.w
+    local y_check = self.y-vspace; -- posicio de dalt
+    
+    -- Comprovar on està pegant
+    local tile1_hit_type= arc_check_tile(x1_check, y_check )
+    local tile2_hit_type= arc_check_tile(x2_check, y_check)
+    local not_block_tile = tile1_hit_type ~= tiletype.block and tile2_hit_type ~= tiletype.block
+    
+    -- Fer l'acció que correspon
+    if not_block_tile then
+        -- Ascendir
+        self.y=self.y-vspace
+    else
+        -- Si es un bloc permetre gastar l'espai no pintat
+        local tile1_hit = arc_get_tile(x1_check, y_check )
+        local tile2_hit = arc_get_tile(x2_check, y_check)
+        local half_block1 = mapa_is_half_block_tile(map_to_editor_tile(tile1_hit))
+        local half_block2 = mapa_is_half_block_tile(map_to_editor_tile(tile2_hit))
+        local full_block1 = tile1_hit_type == tiletype.block and not half_block1
+        local full_block2 = tile2_hit_type == tiletype.block and not half_block2
+        local full_block = full_block1 and full_block2
+        local half_block = half_block1 or half_block2
+        -- Si ninguno dels tiles tocats es un block complet
+        -- i almenys un dels tiles tocats es mig tile
+        -- permetre continuar en el salt
+        if not full_block and half_block then
+            if self.jump_in_half_block==0 and not self.jump_in_half_block_used then
+                self.jump_in_half_block = arcade_config.tiles_height / 2
+            end
+            if self.jump_in_half_block>0 then
+                self.y=self.y-vspace
+                self.jump_in_half_block = self.jump_in_half_block-1
+                self.jump_in_half_block_used = true
+            end
+        end
+    end
+    
+    -- Registrar el desplaçament
+    self.jump_height = self.jump_height+1
+end
+
+function imp:state_walking()
+if DEBUG_FN_NAME then print("state_walking") end
+-- msg_print(16,48,"state_walking",true)
+
+    -- Limitar la velocitat de moviment
+    self.wait=self.wait+1
+    
+    -- representació del moviment
+    -- Selecció de frame
+    if self.wait==6 then
+        self.wait=0
+        self.step=(self.step+1)%4
+        self.frame=self.anim[self.step+1]
+    end
+    
+    -- Comprovar dos punts de contacte del personatge en el piso a vore si cau
+    local x1_check = self.x+self.bb.x
+    local x2_check = x1_check+self.bb.w
+    local y_check = self.y+self.bb.h; -- base del personatge
+    local tile1 = arc_check_tile(x1_check,y_check)
+    local tile2 = arc_check_tile(x2_check,y_check)
+    if tile1==tiletype.void and tile2==tiletype.void then
+        -- si no hi ha piso, caure
+        self.update=imp.state_falling
+        return
+    end
+    
+    self:advance()
+    self:ia()
+end
+
+function imp:state_falling()
+if DEBUG_FN_NAME then print("state_falling") end
+-- msg_print(16,16,"state_falling",true)
+
+    self.frame=30
+    self.wait=self.wait+1
+    
+    -- Si toca terra canviar el mode
+    if self:land() then
+        self.update=imp.state_normal
+        return
+    end    
+    
+    -- Seguir caiguent
+    self.y=self.y+1
+    self.jump_height = self.jump_height-1
+    self.falling=self.falling+1
+    
+    -- Caiguent cap endavant?
+    if self.jumpfwd then self:advance() end
+    self:ia()
+end
+
+function imp:land ()
+if DEBUG_FN_NAME then print("land") end
+-- msg_print(16,32,"land",true)
+    -- Els dos punts de baix de l'abad
+    local x1_check = self.x+self.bb.x
+    local x2_check = self.x+self.bb.x+self.bb.w
+    local y_check = self.y+self.bb.h
+    
+    -- Comprovar on està aterrant
+    local tile1_hit= arc_check_tile(x1_check, y_check )
+    local tile2_hit= arc_check_tile(x2_check, y_check)
+    local floor_tile = tile1_hit>=tiletype.half or tile2_hit>=tiletype.half
+    
+    -- Encara que siga un tile de piso s'ha de comprovar que 
+    -- la y es un múltiple de l'alt dels tiles
+    local over_tile = (y_check & 0xF) == 0 
+    
+    local can_land = floor_tile and over_tile
+    
+    if can_land then
+        self.jump_in_half_block_used = false
+        self.jump_height = 0
+        self.action_event = "land"
+    end
+    
+    return can_land
+end
+
+function imp:advance()
+if DEBUG_FN_NAME then print("advance") end
+-- msg_print(0,0,"advance",true)
+    local step_length=self.step_length; --lo que avança el imp cada pas
+    local limit=tiletype.block
+    
+    if self.update~=imp.state_walking then limit=tiletype.half end
+
+    local x_check = self.x+self.bb.x+self.bb.w+step_length
+    -- if self.flip then 
+        -- step_length = -step_length 
+        -- x_check = self.x+self.bb.x+step_length
+    -- end
+    
+    -- self.action=="right"
+    -- if self.action=="left" then
+-- print("ADVANCE => "..self.movement)
+    if self.movement=="left" then 
+        step_length = -step_length 
+        x_check = self.x+self.bb.x+step_length
+    end
+    
+    local y_check = self.y+self.bb.h-4
+    
+    if arc_check_tile(x_check, y_check)<limit then
+        self.x=self.x+step_length
+    end
+
+    local hab,xx, yy = coords.world_to_tile(self.x, self.y)
+    self.hab = hab
+    -- self.movement = ""
+end
+
+-- Controlador principal del personatge
+function imp:state_normal()
+if DEBUG_FN_NAME then print("state_normal") end
+    self.frame=28
+    self.wait=0
+    self.step=0
+    self.jumpfwd=false
+    self.jump_height = 0
+    self:ia()
+end
+
+function imp:state_super()
+if DEBUG_FN_NAME then print("state_super") end
+    self.mode = self.fight_modes["super"]
+    self.mode_cooldown=1
+    self.super_cooldown=2000
+    self.update=imp.state_normal
+end
+
+function imp:shot(actor)
+if DEBUG_FN_NAME then print("shot") end
+    self.mode = self.fight_modes["shot"]
+    self.mode_cooldown=1
+    print("FIREBALL!!")
+    self.shot_cooldown = 500
+end
+
+function imp:do_flip(actor)
+if DEBUG_FN_NAME then print("do_flip") end
+    if actor.x<self.x then self.flip=true else self.flip=false end
+end
+
+function imp:reduce_cooldown()
+if DEBUG_FN_NAME then print("reduce_cooldown") end
+    if self.mode=="stop" then return end
+    
+    self.mode_cooldown  = self.mode_cooldown  -1
+    self.super_cooldown = self.super_cooldown -1
+    self.shoot_cooldown = self.shoot_cooldown -1
+end
+
+function imp:reset_mode_cooldown( value )
+if DEBUG_FN_NAME then print("reset_mode_cooldown") end
+    value = value or 500
+    self.mode_cooldown = value
+    return value
+end
+
+function imp:reset_pattern_movement()
+if DEBUG_FN_NAME then print("reset_pattern_movement") end
+    self.path={}
+    self.path_curr_action=1;
+end
+
+function imp:pattern_action()
+if DEBUG_FN_NAME then print("pattern_action") end
+    local action = self.path.actions[self.path_curr_action].action
+    -- print("PATTERN");
+    -- print("    TARGET= "..self.path.next)
+    -- print("    ACTION= "..action)
+    return action
+end
+
+function imp:pattern_move()
+if DEBUG_FN_NAME then print("pattern_move") end
+    local path_event = self.path.actions[self.path_curr_action].event
+-- print("    PATH_EVENT= "..path_event)
+-- print("    ACTION_EV = "..self.action_event)
+    -- Si no s'ha donat l'event mantindre el moviment
+    if self.action_event~=path_event then
+        action = self.path.actions[self.path_curr_action].action
+    else
+    -- Si s'ha donat l'event avançar el punter del path
+-- print("    #"..self.path_curr_action.." / "..#self.path.actions)
+        if self.path_curr_action<#self.path.actions then
+            -- En el path
+            self.path_curr_action = self.path_curr_action + 1
+-- print("    CURR_ACC= "..self.path_curr_action)
+            action = self:pattern_action()
+-- print("    ACTION 1= "..action)
+        else
+            -- Path acabat, anar al següent
+            action = self:next_pattern_action()
+-- print("    ACTION 2= "..action)
+        end
+    end
+-- print("    ACTION    ="..action)
+    return action
+end
+
+function imp:next_pattern_target(from)
+if DEBUG_FN_NAME then print("next_pattern_target") end
+    -- obtindre uno dels possibles camins des del punt "from" (en el que està)
+    local next_path_idx = math.random(#self.paths[from])
+        
+    self.path = self.paths[from][next_path_idx]
+    self.path_curr_action = 1
+    self.target = self.hot_points[self.path.next]
+end
+
+function imp:next_pattern_action( from )
+    from = from or self.path.next
+if DEBUG_FN_NAME then print("next_pattern_action "..from) end
+    if #self.paths[from]>0 then
+        self.movement_type = "pattern"
+        self:reset_mode_cooldown()
+        -- Activar següent target
+        self:next_pattern_target(from)
+        action = self:pattern_action()
+        -- self.action_event=""
+    else
+        self:free_movement()
+        action = self:free_move()
+    end
+    return action
+end
+
+function imp:free_movement()
+if DEBUG_FN_NAME then print("free_movement") end
+    self.movement_type = "free"
+
+    print("Free")
+end
+
+function imp:free_move()
+if DEBUG_FN_NAME then print("free_move") end
+    -- Moviment horitzontal
+    if self.target.x+self.target.bb.x>=self.x+self.bb.x then
+        action="right"
+    elseif self.target.x+self.target.bb.x<self.x+self.bb.x then
+        action="left"
+    end
+    
+    -- Els dos punts de baix pero un poc mes alt que el piso
+    local x1_check = self.x+self.bb.x
+    local x2_check = self.x+self.bb.x+self.bb.w
+    local y_check  = self.y+self.bb.h-4
+    -- Tiles on esta
+    local tile_type1, tile_code1= arc_check_tile(x1_check,y_check)
+    local tile_type2, tile_code2= arc_check_tile(x2_check,y_check)
+    
+    -- debug
+    local scr_x1, scr_y = viewp:screen_coords( x1_check, y_check )
+    local scr_x2, scr_y = viewp:screen_coords( x2_check, y_check )
+    draw.rect(scr_x1,scr_y,scr_x2-scr_x1,8,2)
+    -- /debug
+    
+    --Comprovar si está en target
+    if collision(self, self.target) then 
+        self:reset_mode_cooldown()
+
+        -- Buscar quin es el target
+        local idx = 1
+        for i=1,#self.hot_points do
+            if self.target==self.hot_points[i] then 
+                idx= i 
+                -- print("TARGET ID= "..self.target.id.." HOT POINT IDX= "..i.." Reached")
+            end
+        end
+        
+        -- Canviar a moviment per patro
+        action = self:next_pattern_action(idx)
+    -- elseif half_collision(self, self.target) 
+    --        and tile_type1==tiletype.void  
+    --        and tile_type2==tiletype.void then -- and (self.y>self.target.y or self.y<self.target.y) ) then -- afegir que no hi haja tile per a escalar 
+    --     -- print("Next Target 2 "..tile_type1.." "..tile_code1)
+    -- elseif tile_type1~=tiletype.void 
+    --        or tile_type2~=tiletype.void then
+    --     action="jump"
+    end
+    
+    return action
+end
+
+function imp:next_free_target()
+if DEBUG_FN_NAME then print("next_free_target") end
+    local new_point = math.random(#self.hot_points)
+    if self.target == self.hot_points[new_point] then 
+        new_point = ((new_point+1)%#self.hot_points)+1 
+    end
+    self.old_target = self.target
+    self.target=self.hot_points[new_point]
+end
+
+function imp:analyze_env()
+if DEBUG_FN_NAME then print("analyze_env") end
     -- Distancia fins els punts
     local scr_x, scr_y = viewp:screen_coords(self.x, self.y)
     -- for _, p in pairs(self.hot_points) do
@@ -369,6 +685,13 @@ function imp:analyze_env()
 
     -- Cau al següent moviment
     self.analisis.going_to_fall = false
+    if self.movement=="left" then
+        x1_check=x1_check-self.step_length
+        x2_check=x2_check-self.step_length
+    elseif self.movement=="right" then
+        x1_check=x1_check+self.step_length
+        x2_check=x2_check+self.step_length
+    end
     local tile_type1, tile_code1= arc_check_tile(x1_check,y_check)
     local tile_type2, tile_code2= arc_check_tile(x2_check,y_check)
     if tile_type1==tiletype.void and tile_type2==tiletype.void then
@@ -479,257 +802,36 @@ function imp:analyze_env()
 end
 
 function imp:ia()
+if DEBUG_FN_NAME then print("ia") end
     self:reduce_cooldown()
     -- if self.update==imp.state_jumping or self.update==imp.state_falling then
-    --     -- self:set_fight_mode()
     --     -- self:think()
+    --     -- self:move()
     -- end
     self:analyze_env()
     if self.update==imp.state_walking or self.update==imp.state_normal then
-        self:set_fight_mode()
         self:think()
+        self:move()
     end
     self:controller_input() 
 end
 
-
-function imp:state_jumping()
-    -- msg_print(0,0,"state_jumping",true)
-    -- ??
-    self.wait=self.wait+1
-    self.wait=0
-
-    -- Pujar o caure
-    if self.jump_height<self.max_jump_height then
-        -- Comprovar que pasa en l'aire
-        self:jump()
-    else
-        -- Canviar a mode caure
-        self.update=imp.state_falling
-    end
-    self.step=self.step+1
-
-    -- cap endavant?
-    if self.jumpfwd then self:advance() end
-    
-    self:ia()
-end
-
-function imp:jump()
--- msg_print(0,0,"jump",true)
-    local vspace = self.vmove_space
-    -- Els dos punts de dalt del personatge
-    local x1_check = self.x+self.bb.x
-    local x2_check = self.x+self.bb.x+self.bb.w
-    local y_check = self.y-vspace; -- posicio de dalt
-    
-    -- Comprovar on està pegant
-    local tile1_hit_type= arc_check_tile(x1_check, y_check )
-    local tile2_hit_type= arc_check_tile(x2_check, y_check)
-    local not_block_tile = tile1_hit_type ~= tiletype.block and tile2_hit_type ~= tiletype.block
-    
-    -- Fer l'acció que correspon
-    if not_block_tile then
-        -- Ascendir
-        self.y=self.y-vspace
-    else
-        -- Si es un bloc permetre gastar l'espai no pintat
-        local tile1_hit = arc_get_tile(x1_check, y_check )
-        local tile2_hit = arc_get_tile(x2_check, y_check)
-        local half_block1 = mapa_is_half_block_tile(map_to_editor_tile(tile1_hit))
-        local half_block2 = mapa_is_half_block_tile(map_to_editor_tile(tile2_hit))
-        local full_block1 = tile1_hit_type == tiletype.block and not half_block1
-        local full_block2 = tile2_hit_type == tiletype.block and not half_block2
-        local full_block = full_block1 and full_block2
-        local half_block = half_block1 or half_block2
-        -- Si ninguno dels tiles tocats es un block complet
-        -- i almenys un dels tiles tocats es mig tile
-        -- permetre continuar en el salt
-        if not full_block and half_block then
-            if self.jump_in_half_block==0 and not self.jump_in_half_block_used then
-                self.jump_in_half_block = arcade_config.tiles_height / 2
-            end
-            if self.jump_in_half_block>0 then
-                self.y=self.y-vspace
-                self.jump_in_half_block = self.jump_in_half_block-1
-                self.jump_in_half_block_used = true
-            end
-        end
-    end
-    
-    -- Registrar el desplaçament
-    self.jump_height = self.jump_height+1
-end
-
-function imp:state_walking()
--- msg_print(16,48,"state_walking",true)
-
-    -- Limitar la velocitat de moviment
-    self.wait=self.wait+1
-    
-    -- representació del moviment
-    -- Selecció de frame
-    if self.wait==6 then
-        self.wait=0
-        self.step=(self.step+1)%4
-        self.frame=self.anim[self.step+1]
-    end
-    
-    -- Comprovar dos punts de contacte del personatge en el piso a vore si cau
-    local x1_check = self.x+self.bb.x
-    local x2_check = x1_check+self.bb.w
-    local y_check = self.y+self.bb.h; -- base del personatge
-    local tile1 = arc_check_tile(x1_check,y_check)
-    local tile2 = arc_check_tile(x2_check,y_check)
-    if tile1==tiletype.void and tile2==tiletype.void then
-        -- si no hi ha piso, caure
-        self.update=imp.state_falling
-        return
-    end
-    
-    self:advance()
-    self:ia()
-end
-
-function imp:state_falling()
--- msg_print(16,16,"state_falling",true)
-
-    self.frame=30
-    self.wait=self.wait+1
-    
-    -- Si toca terra canviar el mode
-    if self:land() then
-        self.update=imp.state_normal
-        self.action_event = "land"
-        return
-    end    
-    
-    -- Seguir caiguent
-    self.y=self.y+1
-    self.jump_height = self.jump_height-1
-    self.falling=self.falling+1
-    
-    -- Caiguent cap endavant?
-    if self.jumpfwd then self:advance() end
-    self:ia()
-end
-
-function imp:land ()
--- msg_print(16,32,"land",true)
-    -- Els dos punts de baix de l'abad
-    local x1_check = self.x+self.bb.x
-    local x2_check = self.x+self.bb.x+self.bb.w
-    local y_check = self.y+self.bb.h
-    
-    -- Comprovar on està aterrant
-    local tile1_hit= arc_check_tile(x1_check, y_check )
-    local tile2_hit= arc_check_tile(x2_check, y_check)
-    local floor_tile = tile1_hit>=tiletype.half or tile2_hit>=tiletype.half
-    
-    -- Encara que siga un tile de piso s'ha de comprovar que 
-    -- la y es un múltiple de l'alt dels tiles
-    local over_tile = (y_check & 0xF) == 0 
-    
-    local can_land = floor_tile and over_tile
-    
-    if can_land then
-        self.jump_in_half_block_used = false
-        self.jump_height = 0
-    end
-    
-    return can_land
-end
-
-function imp:advance()
--- msg_print(0,0,"advance",true)
-    local step_length=self.step_length; --lo que avança el imp cada pas
-    local limit=tiletype.block
-    
-    if self.update~=imp.state_walking then limit=tiletype.half end
-
-    local x_check = self.x+self.bb.x+self.bb.w+step_length
-    -- if self.flip then 
-        -- step_length = -step_length 
-        -- x_check = self.x+self.bb.x+step_length
-    -- end
-    
-    -- self.action=="right"
-    -- if self.action=="left" then 
-    if self.movement=="left" then 
-        step_length = -step_length 
-        x_check = self.x+self.bb.x+step_length
-    end
-    
-    local y_check = self.y+self.bb.h-4
-    
-    if arc_check_tile(x_check, y_check)<limit then
-        self.x=self.x+step_length
-    end
-
-    local hab,xx, yy = coords.world_to_tile(self.x, self.y)
-    self.hab = hab
-    self.movement = ""
-end
-
--- Controlador principal del personatge
-function imp:state_normal()
--- msg_print(0,0,"state_normal",true)
-    self.frame=28
-    self.wait=0
-    self.step=0
-    self.jumpfwd=false
-    self.jump_height = 0
-    self:ia()
-end
-
--- function imp:chase()
---     self.mode = self.fight_modes["chase"]
---     self.mode_cooldown = 150+math.random(50)-1
--- end
-
--- function imp:away()
---     self.mode = self.fight_modes["away"]
---     self.mode_cooldown = 150+math.random(50)-1
--- end
-
-function imp:state_super()
-    self.mode = self.fight_modes["super"]
-    self.mode_cooldown=1
-    print("SUPER POWER")
-    self.super_cooldown=2000
-    self.update=imp.state_normal
-end
-
-function imp:shot(actor)
-    self.mode = self.fight_modes["shot"]
-    self.mode_cooldown=1
-    print("FIREBALL!!")
-    self.shot_cooldown = 500
-end
-
-function imp:do_flip(actor)
-    if actor.x<self.x then self.flip=true else self.flip=false end
-end
-
 -------------------------------
 -- imp.controller_input()
 --
 -- Traduir a una entrada de pad
 -------------------------------
 function imp:controller_input()
--- msg_print(0,0,"move",true) 
-    -- self.action = self:movement(abad)
+if DEBUG_FN_NAME then print("controller_input") end
     
     if self.action == "right" or self.action == "left" then
         self.movement = self.action
         self.update=imp.state_walking
-        -- abad.flip=false
     elseif self.action == "jump" then
         self:do_jump()
     elseif self.action == "jumpfwd" then
         self:do_jump(true)
     elseif self.action == "shot" then
-        -- abad_shot_cacau()
         self:shot()
     elseif self.action == "super" then
         self.update=imp.state_super
@@ -738,97 +840,72 @@ function imp:controller_input()
 end
 
 -------------------------------
--- imp.think()
+-- imp.move()
 --
 -- Cridar en cada iteració per 
 -- a triar l'acció a fer i
 -- traduir a acció de pad
 -------------------------------
-function imp:think( )
-    -- local check_x =  
-    -- local check_y = 
+function imp:move( )
+if DEBUG_FN_NAME then print("move") end
     local action = "stay"
     
     if self.mode=="stop" then return action end
     
-    if self.analisis.going_to_fall then self.action_event="prefall" end
+    if self.analisis.going_to_fall  then self.action_event="prefall" end
     if self.analisis.target_reached then self.action_event="target" end
     
     if self.movement_type=="free" then
         msg_print(10,20,"FREE",true)
-
         action = self:free_move()
     else
         msg_print(10,20,"PATTERN "..self.action_event,true)
-        -- print("Pattern")
-        if self.action_event~=self.path.actions[self.path_curr_action].event then
-            action = self.path.actions[self.path_curr_action].action
-        else
-            if self.path_curr_action<#self.path then
-                self.path_curr_action = self.path_curr_action + 1
-            else
-                action = self:next_pattern_movement()
-            end
-        end
+        action=self:pattern_move()
     end
-    self.action = action
 
+    if self.old_action~=action then 
+        self.old_action=action
+        -- print(self.old_action)
+    end
+    
+    self.action = action
+    self.action_event = ""
+    
     return action
 end
 
-function imp:reduce_cooldown()
-    if self.mode=="stop" then return end
-    
-    self.mode_cooldown  = self.mode_cooldown  -1
-    self.super_cooldown = self.super_cooldown -1
-    self.shoot_cooldown = self.shoot_cooldown -1
-end
-
 -------------------------------
--- imp.set_fight_mode()
+-- imp.think()
 --
 -- Cridar en cada iteració per 
--- a canviar el mode de lluita
+-- a determinar que fer
 -------------------------------
-function imp:set_fight_mode()
+function imp:think()
+if DEBUG_FN_NAME then print("think") end
     if self.mode=="stop" then return end
+    -- print("SET FIGHT MODE")
     
+    -- S'ha acabat el temps per a arribar a un target
     if self.mode_cooldown <= 0 then
+        -- Canviar a moviment lliure
         self:free_movement()
+        
         -- seleccionar mode d'acció
         local last_mode=self.mode
-        -- self.mode_cooldown = 150+math.random(50)-1
+        
+        -- Reinicialitzar el patró de moviment i el cooldown
         self:reset_mode_cooldown()
         self:reset_pattern_movement()
-        -- self.mode=math.random(#self.fight_modes)
-        -- 
-        -- if self.mode==self.fight_modes["super"] and self.super_cooldown>0 then self.mode=self.fight_modes["shot"] end
-        -- if self.mode==self.fight_modes["shot"]  and self.shot_cooldown>0  then self.mode=self.fight_modes["chase"] end
         
         self.mode=self.fight_modes["chase"]
         
-        -- print("cambiar modo => "..self.fight_modes[self.mode])
-        -- if self.movement_type == "free" then
-            local new_point = math.random(#self.hot_points)
-            if self.target == self.hot_points[new_point] then 
-                new_point = ((new_point+1)%#self.hot_points)+1 
-            end
-            self.old_target = self.target
-            self.target=self.hot_points[new_point]
-            print("Next random target => "..self.target.id)
-        -- else
-            --if self.action_event=="target" then
-            --    print(self.old_target.id)
-            --end
-        -- end
+        -- Seleccionar el següent target aleatoriament
+        self:next_free_target()
+        
+        print("Next random target => "..self.target.id)
     end
-    --     -- if self.mode==last_mode then self.mode=((last_mode+1)%#self.fight_modes)+1 end
-    -- elseif self.mode_cooldown == 0 then
-    --     if self.shot_cooldown<=0 then self.mode=self.fight_modes["shot"] end;
-    -- end
     
     self:do_flip(abad)
-    -- self:movement(abad)
     
     --if imp.wait==6 then
     --    imp.wait=0
@@ -867,12 +944,3 @@ function imp:set_fight_mode()
     -- 
     --end
 end
-
-function imp:collision()
-    -- comprovar colisio en l'abad
-    if viewp:inside(self.x, self.y, self.w, self.h) then
-        if collision(abad,self) then
-            abad_hurt(1)
-        end
-    end
-end
diff --git a/data/point.lua b/data/point.lua
index 4c18eee..6c5e638 100644
--- a/data/point.lua
+++ b/data/point.lua
@@ -21,10 +21,10 @@ function point:draw(fill)
     -- debug rect
     if not fill then
         draw.rect(scr_x,scr_y,self.w,self.h,3)
-        draw.rect(scr_x+self.bb.x,scr_y,self.bb.w,self.h,2)
+        -- draw.rect(scr_x+self.bb.x,scr_y,self.bb.w,self.h,2)
     else
         draw.rectf(scr_x,scr_y,self.w,self.h,3)
-        draw.rectf(scr_x+self.bb.x,scr_y,self.bb.w,self.h,2)
+        -- draw.rectf(scr_x+self.bb.x,scr_y,self.bb.w,self.h,2)
     end
 end