diff --git a/data/premiere.lua b/data/premiere.lua index ec4f21e..793bedc 100644 --- a/data/premiere.lua +++ b/data/premiere.lua @@ -42,10 +42,24 @@ function premiere.init() end function premiere.draw() - local scr_x, scr_y = viewp:screen_coords( premiere.x, premiere.y ) - local x = (premiere.frame&7)*premiere.w - local y = (premiere.frame>>cxr2)*premiere.h - draw.surf(x,y,premiere.w,premiere.h,scr_x,scr_y,premiere.w,premiere.h,premiere.flip) + local scr_x, scr_y = viewp:screen_coords( premiere.x, premiere.y ) + local x = (premiere.frame&7)*premiere.w + local y = (premiere.frame>>cxr2)*premiere.h + if premiere.update == premiere.update_stay then + -- dibuixar a premiere excepte els peus + draw.surf(x,y,premiere.w,premiere.h-8,scr_x,scr_y,premiere.w,premiere.h-8,premiere.flip) + -- dibuixar peus statics + scr_y = scr_y + 24; -- Posició dels peus en pantalla + if premiere.frame==13 then + draw.surf(224,16,premiere.w,8,scr_x,scr_y,premiere.w,8,premiere.flip) + elseif premiere.frame==14 then + draw.surf(224,24,premiere.w,8,scr_x,scr_y,premiere.w,8,premiere.flip) + else + draw.surf(x,y+24,premiere.w,8,scr_x,scr_y,premiere.w,8,premiere.flip) + end + else + draw.surf(x,y,premiere.w,premiere.h,scr_x,scr_y,premiere.w,premiere.h,premiere.flip) + end end function premiere.hit() @@ -222,41 +236,3 @@ function premiere.update_falling() end end end - --- function premiere.healer_init() --- if premiere.update==premiere.update_healer then return true end --- premiere.hab = 54 --- premiere.x = 2 --- premiere.y = 3 --- local world_x, world_y = coords.room_to_world(premiere.hab,premiere.x,premiere.y) --- premiere.x=world_x --- premiere.y=world_y --- premiere.health_wait = 100 --- premiere.update = premiere.update_healer --- end --- --- function premiere.update_healer() --- -- Esperar mentres dona la vida --- if premiere.health_wait>0 and premiere.health_wait<100 then --- premiere.health_wait = premiere.health_wait - 1 --- else --- premiere.x = premiere.x+1 --- end --- --- -- Lloc de pausa --- local hab, tx, ty = coords.world_to_tile(premiere.x, premiere.y) --- if hab == 55 and tx==0 and ty==3 and premiere.health_wait==100 then --- -- 55 (0,3) --- table.insert( --- dialegs, --- { actor1=premiere, --- actor2=abad, --- distancia=500, --- direccio = "", --- enabled=true, --- text="Tenne! Io t'achudo. Figo!" --- } --- ) --- premiere.health_wait = premiere.health_wait - 1 --- end --- end \ No newline at end of file diff --git a/data/stage1.lua b/data/stage1.lua index b620162..b884999 100644 --- a/data/stage1.lua +++ b/data/stage1.lua @@ -140,7 +140,7 @@ function stages.stage1_init() zombie2, abad, 150, "Aaaaaargh... per ell!", 250) local abad_x, abad_y = coords.room_to_world ( 10, 4, 3 ) - local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 ) + -- local abad_x, abad_y = coords.room_to_world ( 54, 8, 3 ) abad:move(abad_x, abad_y) abad_make_safe( true ) diff --git a/data/tiles.gif b/data/tiles.gif index ccc8a66..1065be1 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ diff --git a/data/trigger_event.lua b/data/trigger_event.lua index 9e97f14..463b0de 100644 --- a/data/trigger_event.lua +++ b/data/trigger_event.lua @@ -75,11 +75,18 @@ function trigger_ev:premiere_healer_init() end function trigger_ev:premiere_healer_update() + premiere.wait=premiere.wait+1 + -- Esperar mentres dona la vida if premiere.health_wait>0 and premiere.health_wait<100 then premiere.health_wait = premiere.health_wait - 1 else - premiere.x = premiere.x+1 + premiere.x = premiere.x+1 + if premiere.wait>=6 then + premiere.wait = 0 + premiere.step=(premiere.step+1)%4 + premiere.frame=premiere.anim[premiere.step+1] + end end -- Lloc de pausa