From 3a7fa450130d7605207bcf8f736cce7fb878d01f Mon Sep 17 00:00:00 2001 From: JailGamer Date: Mon, 16 Mar 2026 23:02:49 +0100 Subject: [PATCH] =?UTF-8?q?Afegida=20funci=C3=B3=20per=20a=20mostrar=20el?= =?UTF-8?q?=20text=20en=20gran=20en=20borde=20negre.=20Canviades=20algunes?= =?UTF-8?q?=20crides=20a=20text()=20per=20la=20nova=20arc=5FtextB().=20Alg?= =?UTF-8?q?uns=20tiles=20nous?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/game.lua | 6 ++++-- data/main.lua | 31 +++++++++++++++++++++++++++++-- data/scenes.lua | 22 ++++++++++++++++------ data/score.lua | 2 +- data/tiles.gif | Bin 10994 -> 11001 bytes 5 files changed, 50 insertions(+), 11 deletions(-) diff --git a/data/game.lua b/data/game.lua index 4195692..fc691f3 100644 --- a/data/game.lua +++ b/data/game.lua @@ -251,7 +251,8 @@ function update_game() draw_hab(abad.hab,0,0) --text(abad.hab,1,1,2) draw_hab(cameras[current_camera].hab,0,48) - text(camera_names[current_camera],2*o2aX,49*o2aX,8) + -- text(camera_names[current_camera],2*o2aX,49*o2aX,8) + arc_text(camera_names[current_camera],2*o2aX,49*o2aX,8) score.draw() surf.source(tiles) @@ -343,7 +344,8 @@ function update_menu() end surf.cls(16) - text("C A C A U S", 42*o2aX, 8*o2aX, 15) + -- text("C A C A U S", 42*o2aX, 8*o2aX, 15) + arc_textB("C A C A U S", 42*o2aX, 8*o2aX, 15) menu_state() end diff --git a/data/main.lua b/data/main.lua index e8e069a..37f833e 100644 --- a/data/main.lua +++ b/data/main.lua @@ -115,8 +115,8 @@ function text(str,x,y,col) end function arc_text(str, x, y, col) - curr_surf_tgt = surf.target() - curr_surf_src = surf.source() + local curr_surf_tgt = surf.target() + local curr_surf_src = surf.source() local sw = arcade_config.org_resolucion.width local sh = arcade_config.org_resolucion.height local dw = arcade_config.resolucion.width @@ -124,6 +124,33 @@ function arc_text(str, x, y, col) surf.target(textsf) surf.cls(0) draw.text(str,0,0,col) + -- print("arc_ "..str) + surf.source(textsf) + surf.target(curr_surf_tgt) + draw.surf(0,0,sw,sh,x,y,dw,dh) + surf.source(curr_surf_src) +end + +function arc_textB(str, x, y, col) + local curr_surf_tgt = surf.target() + local curr_surf_src = surf.source() + local sw = arcade_config.org_resolucion.width + local sh = arcade_config.org_resolucion.height + local dw = arcade_config.resolucion.width + local dh = arcade_config.resolucion.height + surf.target(textsf) + surf.cls(0) + draw.text(str,0,0,16) + draw.text(str,1,0,16) + draw.text(str,2,0,16) + draw.text(str,0,1,16) + draw.text(str,2,1,16) + draw.text(str,0,2,16) + draw.text(str,1,2,16) + draw.text(str,2,2,16) + + draw.text(str,1,1,col) + -- print("arc_B "..str) surf.source(textsf) surf.target(curr_surf_tgt) draw.surf(0,0,sw,sh,x,y,dw,dh) diff --git a/data/scenes.lua b/data/scenes.lua index f531fa7..66f23a2 100644 --- a/data/scenes.lua +++ b/data/scenes.lua @@ -213,7 +213,9 @@ function draw_scene() draw.surf(scenes.current_scene[scenes.dnum].x,scenes.current_scene[scenes.dnum].y,avatar_w,avatar_h,98*o2aX,8*o2aX,20*o2aX,20*o2aX,true) end elseif scenes.step==5 then - text(string.sub(scenes.current_scene[scenes.dnum].text[1],1,scenes.char),txt_x*o2aX,7*o2aX,2) + -- text(string.sub(scenes.current_scene[scenes.dnum].text[1],1,scenes.char),txt_x*o2aX,7*o2aX,2) + view.origin(0,scenes.offset-20) -- Ni idea de perquè 38, o es 19*o2aX? + arc_textB(string.sub(scenes.current_scene[scenes.dnum].text[1],1,scenes.char),txt_x*o2aX,7*o2aX,2) if scenes.char<#scenes.current_scene[scenes.dnum].text[1] then scenes.step=scenes.step-1 scenes.char=scenes.char+1 @@ -222,7 +224,9 @@ function draw_scene() scenes.char=1 end elseif scenes.step==6 then - text(string.sub(scenes.current_scene[scenes.dnum].text[2],1,scenes.char),txt_x*o2aX,15*o2aX,2) + -- text(string.sub(scenes.current_scene[scenes.dnum].text[2],1,scenes.char),txt_x*o2aX,15*o2aX,2) + view.origin(0,scenes.offset-20) -- Ni idea de perquè 38, o es 19*o2aX? + arc_textB(string.sub(scenes.current_scene[scenes.dnum].text[2],1,scenes.char),txt_x*o2aX,15*o2aX,2) if scenes.char<#scenes.current_scene[scenes.dnum].text[2] then scenes.step=scenes.step-1 scenes.char=scenes.char+1 @@ -231,7 +235,9 @@ function draw_scene() scenes.char=1 end elseif scenes.step==7 then - text(string.sub(scenes.current_scene[scenes.dnum].text[3],1,scenes.char),txt_x*o2aX,23*o2aX,2) + -- text(string.sub(scenes.current_scene[scenes.dnum].text[3],1,scenes.char),txt_x*o2aX,23*o2aX,2) + view.origin(0,scenes.offset-20) -- Ni idea de perquè 38, o es 19*o2aX? + arc_textB(string.sub(scenes.current_scene[scenes.dnum].text[3],1,scenes.char),txt_x*o2aX,23*o2aX,2) if scenes.char<#scenes.current_scene[scenes.dnum].text[3] then scenes.step=scenes.step-1 scenes.char=scenes.char+1 @@ -250,9 +256,13 @@ function draw_scene() draw.rectf(97*o2aX,7*o2aX,24*o2aX,22*o2aX,16) draw.surf(scenes.current_scene[scenes.dnum].x,scenes.current_scene[scenes.dnum].y,avatar_w,avatar_h,98*o2aX,8*o2aX,20*o2aX,20*o2aX,true) end - text(scenes.current_scene[scenes.dnum].text[1],txt_x*o2aX,7*o2aX,2) - text(scenes.current_scene[scenes.dnum].text[2],txt_x*o2aX,15*o2aX,2) - text(scenes.current_scene[scenes.dnum].text[3],txt_x*o2aX,23*o2aX,2) + -- text(scenes.current_scene[scenes.dnum].text[1],txt_x*o2aX,7*o2aX,2) + -- text(scenes.current_scene[scenes.dnum].text[2],txt_x*o2aX,15*o2aX,2) + -- text(scenes.current_scene[scenes.dnum].text[3],txt_x*o2aX,23*o2aX,2) + view.origin(0,scenes.offset-20) -- Ni idea de perquè 38, o es 19*o2aX? + arc_textB(scenes.current_scene[scenes.dnum].text[1],txt_x*o2aX,7*o2aX,2) + arc_textB(scenes.current_scene[scenes.dnum].text[2],txt_x*o2aX,15*o2aX,2) + arc_textB(scenes.current_scene[scenes.dnum].text[3],txt_x*o2aX,23*o2aX,2) end if scenes.step<=8 then scenes.step=scenes.step+1 end view.origin(0,0) diff --git a/data/score.lua b/data/score.lua index e98525d..c70b6f6 100644 --- a/data/score.lua +++ b/data/score.lua @@ -4,7 +4,7 @@ function score.create() score.surf=surf.new(32*o2aX,96*o2aX) surf.target(score.surf) surf.cls(16) - draw.surf(0,0,16*o2aX,9*o2aX,5,9*o2aX,16*o2aX,9*o2aX,true) + draw.surf(0,0,16*o2aX,9*o2aX,5*o2aX,9*o2aX,16*o2aX,9*o2aX,true) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,0) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,0) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,0) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,0) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,8*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,8*o2aX) draw.surf(48*o2aX,64*o2aX,8*o2aX,8*o2aX,0,16*o2aX) draw.surf(56*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,16*o2aX) draw.surf(32*o2aX,64*o2aX,8*o2aX,8*o2aX,0,24*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,8*o2aX,24*o2aX) draw.surf(48*o2aX,72*o2aX,8*o2aX,8*o2aX,16*o2aX,24*o2aX) draw.surf(40*o2aX,64*o2aX,8*o2aX,8*o2aX,24*o2aX,24*o2aX) diff --git a/data/tiles.gif b/data/tiles.gif index 4f585f2f1c4df6d03f9073ce828004f2e6055404..a00ebc9de9f15ef099e5035486d44aafd3c85e45 100644 GIT binary patch delta 2633 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 delta 2626 zcmV-I3cdCDRq|B~M@dFFIbi?+00HL$u?)^2e+YRyV!Rf2gYf-j*#OQANfx~|My*M0L8EV*w9x<>}3xC`BxwJ*uTE+*OL14ryuyk zCpocLi1KS4gy=rP<3Ek)3B=O~_+vVl<2lBn2;cL&zk9obXuO5EK=PBEjfe?}K)|`1 zK#W*G2K>6$_zVa%5%y5N^8-8qM2HMze>)gVhz~pp8&n7c^gH#lh!QlxX*0m*k_hRe zzu23-0*ecTs3~eILFG$7=Mz5I3%~(fo#~VQzu04)91OwUbH9V|K@*(0yGsZGAVT>& zLKREGgIGd@uruxx!L#$cu#iHFsJSdG!YjnWD%8RqghL)oh%fxXF%-kXBg4nLe?vo* z!8SCAnxY>sOu`ZDLmhlUxsXE+v_U*HL*wf}1FS$o>_RjQMAvY+i6}!OEJ7UnLPne) zM`XeN^TUaYib^~PJH$jeE%z2ECW_G=p`44F|3yEMe4ezK#6kRMd!#pF}Q7pyrM zoI*>KoLY=LI~>Dh{6r*NEnoaae|GDZYIM*h~dUQ#9M8V^;vYYHDo8(BH1i_E= zNmD$@`4h_0TgRf*Lr`bB!INC96ZWJtH}A&z>?(3 zOZ3WH^h9%9KeBAVzjF$-e>@!JSWE0{qMHOqxD-Y~{76`gKf6T8f{aOpWXFbt!^g~s zu>?$bJh7OF4;y?+RU{#Ow2MxR!v4q%z>*_M`HP8Z+(dGG#lM`yi4#1pb2-qA4$(|P z(k#s`<4mMHysb2dkz_{7Y|T7`&8A4ejiASTgU-XaI_HDQiO@~8f0P`y`w0dPD;ef;*?C1 zq(Z%P&DCi<%+!mqjLu37zvnx^`4oWT`?3kA>BJW=EPzZ&$=y^Ku}-M)wuzvzt5>b%BX+%x<$ zQtPw59u2qTM9KARPf&!?AGQ9q2BkPLWJwZii|a$uw9vocTrDQWLb!%ltDLp@FtU7S%d7zeO4 z5gQzNI)E!$HP5`#%^cBS)YOc?OgrRMPxV!G6x1dS(WErgV&%{&9X~)>)m9C*SB0pZ zkX4>COU)e9e_Pc%Yu(g8-$jZtJr|++Tr`! zhX`A?e_h+CJzI#JSI9t$wM|u$ecQNA+*_sFx}{hQwFs@KM4$cH1@KsM%hjXZT9bv> zf=!5<5Zks*h^S?V{)TYe$WzxMZM>a`Jl4I!%*_bN9X`ta*~<+#*p1hOZC990Sf(Wp8%g$}kDS#Lnw9%pF~={@7-n{R^$wW>v1`V7}&f z4rh!o=5GF8WpUnFaz1BsK8|5+8+D#$cot@ShUZuoW@IMjRmSHgN@kNt=4HO+lK^H~ z_GjW?9sBe&b#7>i7HE$~fO(c@f2*)%ZSD_yUTB@o2>E&FosH;brstPdNBg|!n*eC9 z;plbt=#vKNkT&Q6pr2%(pOmg;fV>En*6EHg>X9aBtZ-*phG?i}<(kHc)zN4sMath4^ZeF6*7{YL|9uspe*>MrEq5iHzP&bPnkLf6(fy;Oc~? z=%GeypH^m%80!<9$RVZHkwEI4{^-R{=#F@17G<)mZj+JT>%j2phE{68PT`;q%v#M% z!;Vww#0G4|UhAiR>c@s=tj6oferq=QXza?aizqdWnC-&0ZNgT<(I#!iPHgJv?T%)^ z>e%aLc5S{kh}yOYVpXHVWTzo$m{-%ovVro^Ea9Uhe(|@Bhwlj0l|o2OSSzEV9J(%@Idx5>M;S kjE()ia1G~g7B_E|Lx>I^?-0*V6Zg%`CUF#pjer0EJLT<2zW@LL