From 6f0b00442d1dff993a444d18e78724dbfd33dca1 Mon Sep 17 00:00:00 2001 From: JailDoctor Date: Fri, 13 Jan 2023 14:24:21 +0100 Subject: [PATCH] - Ortografia - Indicador de "pulsa tecla per a seguir" - Es pot seguir pulsant qualsevol tecla --- scenes.lua | 59 +++++++++++++++++++++++++++++++---------------------- tiles.gif | Bin 4854 -> 4861 bytes 2 files changed, 35 insertions(+), 24 deletions(-) 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 74743648401078e9b388c0825a07dde08f137fa5..06d17bca099c33c3d0affc66f6b91d268415855b 100644 GIT binary patch delta 1320 zcmV+@1=sraCH*C^=M8@-cMJvq>Z36Q008ze5SrMLh3Hz!29hEfk|c>j4w;ZObdo5^ zeVRy-fu#`YvoQsrG3tX6Qw0FC|7cYbDK#Pq03xYbAUS9>VRH;vl!T;=R3vy)$4~_^ zlQKDzIPp|CDG;={lM;!O58+xqDG)%(lRW8@50QNwh=FMIi5-7ed0|#h7;=$m$&m?h zmOI&TQmIF^rG>p^SzxJ!JXU#!bb?m}RF7t0;s_CN=|gbYV-#VRV9Avy*q23E5p5-P z3UQbhL75Aom>YqasppuF37LU~TAe9)Ng0~HqK_7cRUB~;sc8^zClCVQnhK#>J}H~d z@|vxAo1tl$5P^T10|7Pw05+WgQ^I)=uUVY1$(6%3o0{n=0FXGxX`Hq>EYT@=yxE(h z@|&a58T%xhiqV?I8J)Blo0(~S016rc zfffRR6SirbjG38=`Jk!Oocj5p5(+KTDV>qI5jbIthM}S7d7R_fn-DRg4H`KQ`kX7; zp%l8C?TMWVS`d7gmOUW=2w;&3aeDf>l?tJt15u*_k)wLEqqu3HF!`et5qQqo5|r=6b1C z3axo#qN!<-?rN=i2>=gRaW+Rr824kzIGB{@qO8fU&Z??YYOdwVuFdJEVAHDnS*=kT zuY7-6EG^_57Fik*8?paNvAm_4{t6lpB>)@Cu?G+~+d*)+nxwjNrt<0lCkd`O!4ejm zH0jx|3*l!M=z;< zwkxs2Lc5qtx~8kC194+B3z23UW*z&w)T+C+JGqyqdDEj1?w1qQ_iqcaywh8~3~GBI;_M=JeiXzmrp#E92o!#tiVI8!fhnPR9mpEn!O;XM{+F; e5jWh#OS}*t_Qaz}m5!;XY&^t@I;h4G5CA*jX>-E> delta 1313 zcmV++1>XAoCH5t-=M8^YgbJZP8dCrOU>^gai5yvouBB`r8ImA5k|^Ym30XrXd6L|x zi4-Xi>a#HgpfT!$5mN;KvuITk|0y*g2>>CfSsyuQG+}cLIFy8>j8xQ;1rd`l8Iw5i zR5mFPw3w3;X_F7(T0AKbKB<#B$&(L}eH@5^X!MC4hm>LllOTU_MC&q^IoWYesYkV? zg}r52T&aaTR(Xfil92&ak7i)v2oY-OLu%P$6akl9iIpdKmw1UKZ6$RI5ttX@mo1@Yh`^1}y zahkumoUXZ=nWYfOX`HC3oD~0I0G=71r{`F05uTGLoP@~$+$os}a1rsjp6Uq^Sn3GAE3z|B|xt<(qpU~oupSDiH2@paK!1k+Y!5xuW+8 zp%HqX&{?Aw+7swPqzC{2Ediu5x)3!w5HmWW3Ob*%DWD6{qdpp;$0;;Onh=-xq8F+V zqS>9e$)A6%IS@FiH#(}HReGg6ng9auWbrwqU!fUWTAKvQq>%}t37Vr)s-$bmri+;X zeiolCffgtMqhP9m12Sng;(Ng?qy*WjYa^^$;ctk(K(ZtE93N;Q#_*wE5anFF~3$kvh}) zu>#kfhdQ!P%3JzcrB>RqEZd_MSh6wu8cu&}ZpS()9m@b^JDn37aAi8RbRnE3+nod} zwELR12K%ry2qT9Kc7pH|wnNGrL=QA7t|L@3n~-deL)JGn^{yILzOugia; z%PP8|yAXMcf_(e1kG8R^3$dl?xgPg#3Nby$TYVg%y#2NimsfqzyAby1GlIvw&I@+# zmwC?{cFs$r&^`KBq?sVOISBv*DohrG!Pz3iKLo3{`M@Vp~uyv5tR+k2yf zYQBtzzUkY(>pQ>BixSUEz(seY@~eNm1AxF|hrH{1zx6wI`U|K0`!N1{c>N|%{U*T2 zJHG|Y!C;D_+X|%8ZF{}_X9Kv>b!x)NCBWJ=3{Jxv{ zbpZ!YG>nllOvFRnn2pJnN&J)>82|)Kz&#wr+QY+#nx)S=FBX`-|2q&GS;QF-(Zx;N XnNVq&Hi?*qdd3TEsBD@O0RaFz7?x