diff --git a/data/peu.lua b/data/peu.lua index f7c7a19..5c919d8 100644 --- a/data/peu.lua +++ b/data/peu.lua @@ -10,7 +10,8 @@ peu_gif_row = 2 peu={name="peu",hab=5,x=6,y=3,w=32,h=32,bb={x=0,y=0,w=16,h=16}} function peu.init() - local habs={{18,8},{16,2},{16,7},{15,5},{27,1},{27,10},{29,2},{38,8},{69,2},{79,3}} + -- local habs={{18,8},{16,2},{16,7},{15,5},{27,1},{27,10},{29,2},{38,8},{69,2},{79,3}} + local habs={{69,0},{78,5},{59,8},{27,8},{16,0},{18,8}} local r=1+math.random(0,#habs-1) peu.hab=habs[r][1] -- peu.x=habs[r][2]*8 @@ -37,16 +38,16 @@ function peu.draw() end function peu.update() - -- if peu.hab==abad.hab then - -- if aabb(abad,peu) then - -- abad.objects.peu=true - -- if elalien.scene_intro then - -- start_scene(scenes.peu_trobat) - -- else - -- start_scene(scenes.peu_trobat_nointro) - -- end - -- if abad.objects.gps~=nil then current_camera=4 end - -- remove_actor(peu) - -- end - -- end + if peu.hab==abad.hab then + if collision(abad,peu) then + abad.objects.peu=true + if elalien.scene_intro then + start_scene(scenes.peu_trobat) + else + start_scene(scenes.peu_trobat_nointro) + end + -- if abad.objects.gps~=nil then current_camera=4 end + remove_actor(peu) + end + end end diff --git a/data/tiles.gif b/data/tiles.gif index 1065be1..c051ce1 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ