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 4f585f2..a00ebc9 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ