diff --git a/elalien.lua b/elalien.lua index ab4d166..f82e958 100644 --- a/elalien.lua +++ b/elalien.lua @@ -1,4 +1,4 @@ -elalien={hab=59,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,wait=0,step=0,anim={8,9,8,10},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false} +elalien={hab=38,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,wait=0,step=0,anim={8,9,8,10},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false} function elalien.init() elalien.hit=elalien.hit @@ -20,7 +20,7 @@ end function elalien.update_normal() elalien.wait=elalien.wait+1 - if elalien.wait==6 then + if elalien.wait>=6 then elalien.wait=0 if elalien.stairscooldown>0 then elalien.stairscooldown=elalien.stairscooldown-1 end elalien.step=(elalien.step+1)%4 @@ -30,6 +30,13 @@ function elalien.update_normal() if not elalien.flip and elalien.x==84 then elalien.hab=elalien.hab+1 elalien.x=-4 + elseif check_tile(elalien.hab,elalien.x+inc,elalien.y+14)==tiletype.nonpc then + if rnd(10)<8 then + elalien.update=elalien.update_jumping + elalien.step=0 + else + elalien.flip=not elalien.flip + end elseif check_tile(elalien.hab,elalien.x+inc,elalien.y+14)0 then option=0 end if option<5 then elalien.update=elalien.update_falling elseif option<8 then elalien.update=elalien.update_jumping elalien.step=0 + elalien.wait=0 else elalien.flip=not elalien.flip end @@ -112,14 +125,14 @@ function elalien.update_jumping() elalien.frame=9 elalien.wait=elalien.wait+1 - if elalien.wait==6 then + if elalien.wait>=6 then elalien.wait=0 local inc=12 if elalien.flip then inc=2 end if not elalien.flip and elalien.x==84 then elalien.hab=elalien.hab+1 elalien.x=-4 - elseif check_tile(elalien.hab,elalien.x+inc,elalien.y+14)=6 then elalien.wait=0 local inc=12 if elalien.flip then inc=2 end @@ -193,7 +206,7 @@ function elalien.update_stairs() elalien.frame=11 elalien.wait=elalien.wait+1 - if elalien.wait==6 then + if elalien.wait>=6 then elalien.wait=0 --if btn(KEY_RIGHT) then diff --git a/main.lua b/main.lua index 2d806cc..ee64f3a 100644 --- a/main.lua +++ b/main.lua @@ -155,7 +155,7 @@ function update_game() prnt("x"..abad.vides,114,13,2) rectfill(102+(abad.energia>>1),30,122,37,16) - mapa_update(abad.hab,premiere.hab) + mapa_update(abad.hab,elalien.hab) for key,actor in pairs(actors) do actor:update() diff --git a/map.lua b/map.lua index 9c4ca0d..f907e47 100644 --- a/map.lua +++ b/map.lua @@ -64,8 +64,8 @@ mapa={ 42,43,256,256,256,256,65,256,256,256,256,64, 256,41,256,67,256,256,256,256,68,256,256,256, 256,41,256,256,256,66,256,256,256,256,256,256, - 256,256,256,64,256,256,256,256,67,256,67,256, - 256,256,256,256,256,256,65,256,256,256,256,256, + 256,256,256,64,256,256,65,256,67,256,67,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 42,43,20,21,20,21,20,21,20,21,20,21, }, @@ -74,8 +74,8 @@ mapa={ 67,256,256,256,256,65,256,256,256,256,64,256, 256,256,67,256,256,256,256,68,256,256,256,256, 256,256,256,256,66,256,256,256,256,256,256,67, - 256,256,64,256,256,256,256,67,256,67,256,256, - 256,256,256,256,256,65,256,256,256,256,256,256, + 256,256,64,256,256,65,256,67,256,67,256,256, + 256,256,256,256,256,111,111,256,256,256,256,256, 20,21,20,21,17,256,256,17,20,21,20,21, }, @@ -84,8 +84,8 @@ mapa={ 256,256,256,256,65,256,256,256,256,64,17,17, 256,67,256,256,256,256,68,256,256,256,17,256, 256,256,256,66,256,256,256,256,256,256,17,256, - 256,64,256,256,256,256,67,256,67,256,256,256, - 256,256,256,256,65,256,256,256,256,256,256,256, + 256,64,256,256,65,256,67,256,67,256,256,256, + 256,256,256,256,256,256,256,256,256,256,256,256, 20,21,20,21,20,21,20,21,20,21,20,21, }, @@ -173,8 +173,8 @@ mapa={ { 44,45,44,45,41,256,256,41,44,45,44,45, 256,256,256,256,256,69,256,256,256,256,256,256, - 256,256,256,256,256,256,256,256,256,256,256,256, 256,256,256,256,256,256,69,256,256,256,256,256, + 256,256,256,256,256,111,111,256,256,256,256,256, 256,256,256,41,41,256,69,41,41,256,256,256, 45,44,45,42,43,256,256,42,43,44,45,44, @@ -375,8 +375,8 @@ mapa={ 29,256,256,256,256,256,69,256,256,256,256,28, 256,256,98,96,98,256,256,98,98,96,256,256, 256,256,99,256,100,256,256,99,256,100,256,256, - 256,256,256,256,256,69,256,256,10,11,256,256, - 29,28,29,28,29,256,256,28,10,11,29,28, + 256,256,256,256,256,111,111,256,10,11,256,256, + 29,28,29,28,29,69,256,28,10,11,29,28, }, -- 39 @@ -385,8 +385,8 @@ mapa={ 256,256,25,25,256,256,256,256,256,256,106,24, 256,256,256,69,256,256,256,256,256,256,95,24, 256,256,256,256,78,97,107,108,256,106,105,24, - 256,256,69,256,94,101,102,110,103,105,98,24, - 28,29,256,256,28,29,28,29,28,29,28,29, + 256,256,111,111,94,101,102,110,103,105,98,24, + 28,29,69,256,28,29,28,29,28,29,28,29, }, -- 40 @@ -475,8 +475,8 @@ mapa={ 256,256,256,256,256,256,69,256,10,11,256,256, 256,256,96,97,256,256,69,256,10,11,256,256, 256,115,99,100,256,256,256,256,10,11,256,256, - 256,101,102,103,256,69,256,256,10,11,256,256, - 19,18,19,18,19,256,256,18,19,18,19,18, + 256,101,102,103,256,111,111,256,10,11,256,256, + 19,18,19,18,19,69,256,18,19,18,19,18, }, -- 49 @@ -484,9 +484,9 @@ mapa={ 20,21,256,69,18,19,18,19,20,21,20,21, 256,256,256,256,256,256,256,256,256,256,114,256, 256,256,69,256,256,256,114,256,256,256,256,256, - 256,114,69,256,256,256,256,256,17,18,19,17, - 256,256,256,256,18,19,18,19,18,19,18,19, - 18,19,256,256,17,18,19,18,19,18,19,17, + 256,114,69,111,256,256,256,256,17,18,19,17, + 256,256,111,256,18,19,18,19,18,19,18,19, + 18,19,256,69,17,18,19,18,19,18,19,17, }, -- 50 @@ -575,7 +575,7 @@ mapa={ 256,256,256,256,256,69,256,256,256,256,256,256, 256,113,70,71,114,256,256,112,107,108,113,256, 256,256,86,87,256,256,69,256,109,110,256,256, - 256,256,256,256,256,256,69,256,256,256,256,256, + 256,256,256,256,256,111,111,256,256,256,256,256, 37,36,37,36,37,256,256,36,37,36,37,36, }, @@ -584,7 +584,7 @@ mapa={ 34,35,256,256,34,35,34,35,34,35,34,35, 256,256,256,69,256,256,256,256,256,256,256,256, 256,256,69,256,256,256,97,96,256,256,256,256, - 256,256,256,256,256,256,99,100,256,256,256,256, + 256,256,111,111,256,256,99,100,256,256,256,256, 256,41,120,119,41,256,256,256,8,9,256,256, 3,41,46,47,41,3,36,37,8,9,36,37, @@ -675,7 +675,7 @@ mapa={ 24,97,256,256,256,256,256,256,256,256,256,256, 24,99,256,256,256,69,256,256,256,256,256,256, 24,256,95,256,113,69,256,256,114,75,76,256, - 24,101,102,103,256,256,256,256,256,91,92,256, + 24,101,102,103,256,111,111,256,256,91,92,256, 28,28,29,28,29,256,69,28,29,28,29,28, }, @@ -774,7 +774,7 @@ mapa={ 51,52,53,51,52,256,256,52,53,51,52,17, 256,256,256,256,256,256,69,256,256,256,256,17, 256,256,256,256,256,69,256,256,256,256,256,17, - 256,256,256,256,256,256,256,106,256,256,78,17, + 256,256,256,256,256,111,111,106,256,256,78,17, 256,256,256,256,17,118,119,17,256,95,94,17, 51,52,53,53,51,53,52,53,51,52,51,17, diff --git a/mapa.lua b/mapa.lua index 7b23017..81282b2 100644 --- a/mapa.lua +++ b/mapa.lua @@ -1,5 +1,5 @@ --mapa={} -tiletype={void=0,stair=1,switch=2,half=3,block=4} +tiletype={void=0,nonpc=1,stair=2,switch=3,half=4,block=5} mapa.wait=0 mapa.step=0 function mapa_do_backup() @@ -137,6 +137,8 @@ function check_tile(hab,x,y) return tiletype.switch elseif tile<64 then return tiletype.block + elseif tile==111 then + return tiletype.nonpc else return tiletype.void end diff --git a/tiles.gif b/tiles.gif index 8ebaae5..9a489e2 100644 Binary files a/tiles.gif and b/tiles.gif differ