diff --git a/scenes.lua b/scenes.lua index a852f56..3033594 100644 --- a/scenes.lua +++ b/scenes.lua @@ -1,15 +1,15 @@ scenes={ intro_01= { - {x=3,y=0,flip=false,audio="abad",text={"Ah!, que bo!","Nit de Netflix amb","un bon bol de cacaus!"},die=20}, + {x=3,y=0,flip=false,audio="abad",text={"Ah!, què bo!","Nit de Netflix amb","un bon bol de cacaus!"},die=20}, }, intro_02= { {x=3,y=0,flip=false,audio="abad",text={"Eh! On està el","bol de cacaus???",""},die=20}, }, intro_03= { - {x=4,y=48,flip=true,audio="batman",musica=audio_song_batman,text={"ME'L HE ENDUT JO!!!", "S'HAN ACABAT ELS","CACAUS PA TU!"},die=20}, - {x=3,y=0,flip=false,audio="abad",text={"Qué??","Però perqué???",""},die=20}, - {x=4,y=48,flip=true,audio="batman",text={"Estás com una vaca!","Has de deixar de menjar", "eixes gorrinades"},die=20}, - {x=4,y=48,flip=true,audio="batman",text={"Mira'm a mí. Estic","tot buenorro i faig", "esport"},die=20}, + {x=4,y=48,flip=true,audio="batman",musica=audio_song_batman,text={"ME L'HE ENDUT JO!!!", "S'HAN ACABAT ELS","CACAUS PA TU!"},die=20}, + {x=3,y=0,flip=false,audio="abad",text={"Què??","Però perquè???",""},die=20}, + {x=4,y=48,flip=true,audio="batman",text={"Estàs com una vaca!","Has de deixar de menjar", "eixes gorrinades"},die=20}, + {x=4,y=48,flip=true,audio="batman",text={"Mira'm a mi. Estic","tot buenorro i faig", "esport"},die=20}, {x=3,y=0,flip=false,audio="abad",text={"Esport?????","I una merda!!","He de cuidar la panxa!"},die=20}, {x=4,y=48,flip=true,audio="batman",text={"Pos t'aguantes.","Ja pots despedir-te", "dels cacaus..."},die=20}, }, @@ -40,7 +40,7 @@ scenes={ }, gps_trobat={ {x=4,y=0,flip=false,audio="abad",text={"Ale, ja tinc el GPS.","Ara puc trobar tot","el que necessite..."}}, - {x=4,y=0,flip=false,audio="abad",text={"polsant les tecles","del 1 al 5",""}}, + {x=4,y=0,flip=false,audio="abad",text={"polsant les tecles","de l'1 al 5",""}}, }, premiere_intro={ {x=4,y=0,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}}, @@ -243,21 +243,30 @@ function update_scene() if scenes.wait==6 then scenes.wait=0 draw_scene() - if scenes.step>8 and scenes.die>0 then - scenes.die=scenes.die-1 - if scenes.die==0 then - if scenes.dnum==#scenes.current_scene then - stopmusic() - if batman.endgame then - final_init() - fade.fadeoutin() + if scenes.step>8 then + print(scenes.die) + if scenes.die>0 then + scenes.die=scenes.die-1 + if scenes.die==0 then + if scenes.dnum==#scenes.current_scene then + stopmusic() + if batman.endgame then + final_init() + fade.fadeoutin() + else + _update=old_update + end else - _update=old_update + scenes.dnum=scenes.dnum+1 + scenes.die=scenes.current_scene[scenes.dnum].die or 0 + scenes.step=2 end + end + else + if flr(time()*2)%2==0 then + sspr(104,88,7,5,118,56) else - scenes.dnum=scenes.dnum+1 - scenes.die=scenes.current_scene[scenes.dnum].die or 0 - scenes.step=2 + rectfill(118,56,125,61,12) end end end @@ -269,8 +278,12 @@ function update_scene() else pause() end - elseif btnp(KEY_SPACE) then - if scenes.step>8 then + elseif btnp(KEY_M) then + mute = not mute + end + + if scenes.step>8 then + if btnp(KEY_SPACE) or btnp(KEY_DOWN) or btnp(KEY_UP) or btnp(KEY_LEFT) or btnp(KEY_RIGHT) or btnp(KEY_RETURN) then if scenes.dnum==#scenes.current_scene then stopmusic() if batman.endgame then @@ -283,10 +296,8 @@ function update_scene() scenes.dnum=scenes.dnum+1 scenes.step=2 end - else - scenes.step=8 end - elseif btnp(KEY_M) then - mute = not mute + elseif btnp(KEY_SPACE) then + scenes.step=8 end end diff --git a/tiles.gif b/tiles.gif index 7474364..06d17bc 100644 Binary files a/tiles.gif and b/tiles.gif differ