diff --git a/data/bol.lua b/data/bol.lua index 9f873a2..28992c0 100644 --- a/data/bol.lua +++ b/data/bol.lua @@ -2,7 +2,7 @@ local arcade_config = require("arcade_config") o2aX = arcade_config.org2arc_escala txr = arcade_config.tiles_per_row-1 txr2 = arcade_config.tiles_per_row_base2 -toff = tiles_offset +toff = arcade_config.tiles_offset tw = arcade_config.tiles_width th = arcade_config.tiles_height -- posició en el gif des de l'offset de tiles @@ -18,9 +18,9 @@ end function bol.draw() -- draw.surf(112,88,16,8,bol.x,bol.y,16,8) - local x = toff+bol_gif_col*tw - local y = bol_gif_row*th - draw.surf(x,y,tw*2,th,bol.x*o2aX,bol.y*o2aX,tw,th) + local x = bol_gif_col*tw + local y = toff+bol_gif_row*th + draw.surf(x,y,tw*2,th,bol.x*o2aX,bol.y*o2aX,tw*2,th) end function bol.update() diff --git a/data/final.lua b/data/final.lua index 797baf2..22ce92e 100644 --- a/data/final.lua +++ b/data/final.lua @@ -1,3 +1,10 @@ +local arcade_config = require("arcade_config") +o2aX = arcade_config.org2arc_escala +cxr = arcade_config.character_per_row-1 +cxr2 = arcade_config.character_per_row_base2 +cw = arcade_config.character_width +ch = arcade_config.character_height + final_rooms = {2,6,60,21,49,23,66,32,4,46,39,55,74} function final_init() @@ -19,17 +26,19 @@ go_next_actor=false function update_final() surf.cls(16) - view.origin(16,41) + view.origin(16*o2aX,41*o2aX) mapa_draw(final_room) draw_actor() view.origin(0,0) - draw.rectf(0,0,15,97,16) - draw.rectf(114,0,78,97,16) - draw.rect(15,40,99,50,2) + draw.rectf(0,0,15*o2aX,97*o2aX,16) + draw.rectf(114*o2aX,0,78*o2aX,97*o2aX,16) + draw.rect(15*o2aX,40*o2aX,99*o2aX,50*o2aX,2) - text("C A C A U S", 42, 12, 17) - text(actor.name, 64-(#actor.name*2), 28, 11) + -- text("C A C A U S", 42, 12, 17) + arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + -- text(actor.name, 64-(#actor.name*2), 28, 11) + arc_textB(actor.name, (64-(#actor.name*2))*o2aX, 28*o2aX, 11) mapa_update(abad.hab,final_room) @@ -83,7 +92,8 @@ function draw_actor() end end local tpl=128/actor.w - draw.surf((actor.frame%tpl)*actor.w,math.floor(actor.frame/tpl)*actor.h,actor.w,actor.h,actor.x,actor.y,actor.w,actor.h,actor.flip) + -- draw.surf((actor.frame%tpl)*actor.w,math.floor(actor.frame/tpl)*actor.h,actor.w,actor.h,actor.x,actor.y,actor.w,actor.h,actor.flip) + draw.surf((actor.frame%tpl)*actor.w*o2aX, math.floor(actor.frame/tpl)*actor.h*o2aX ,actor.w*o2aX, actor.h*o2aX, actor.x*o2aX ,actor.y*o2aX ,actor.w*o2aX ,actor.h*o2aX, actor.flip) end function next_actor() @@ -129,8 +139,10 @@ end function update_final2() surf.cls(16) - text("C A C A U S", 42, 12, 17) - text("GRACIES PER JUGAR", 30, 48, 10) + -- text("C A C A U S", 42, 12, 17) + arc_textB("C A C A U S", 42*o2aX, 12*o2aX, 17) + -- text("GRACIES PER JUGAR", 30, 48, 10) + arc_text("GRACIES PER JUGAR", 30*o2aX, 48*o2aX, 10) final_count=final_count+1 if final_count==200 or (key.press(keyShoot) or pad.press(btnShoot)) or key.press(key.RETURN) then diff --git a/data/game.lua b/data/game.lua index 3c7692c..e4459d7 100644 --- a/data/game.lua +++ b/data/game.lua @@ -252,7 +252,7 @@ function update_game() --text(abad.hab,1,1,2) draw_hab(cameras[current_camera].hab,0,48) -- text(camera_names[current_camera],2*o2aX,49*o2aX,8) - arc_text(camera_names[current_camera],2*o2aX,49*o2aX,8) + arc_textB(camera_names[current_camera],2*o2aX,49*o2aX,8) score.draw() surf.source(tiles) diff --git a/data/gota.lua b/data/gota.lua index 4edb6b5..538a069 100644 --- a/data/gota.lua +++ b/data/gota.lua @@ -61,14 +61,14 @@ function gota:hit() end function gota:draw_splash() - draw.circf( (self.cx+self.dx)*o2aX, self.y*o2aX, 2*o2aX, 16) - draw.circf( (self.cx+self.dx)*o2aX, self.y*o2aX, 1*o2aX, 11) - draw.circf( (self.cx-self.dx)*o2aX, self.y*o2aX, 2*o2aX, 16) - draw.circf( (self.cx-self.dx)*o2aX, self.y*o2aX, 1*o2aX, 11) - draw.circf( (self.cx-(self.dx/2))*o2aX, (self.y-4)*o2aX, 2*o2aX, 16) - draw.circf( (self.cx-(self.dx/2))*o2aX, (self.y-4)*o2aX, 1*o2aX, 11) - draw.circf( (self.cx+(self.dx/2))*o2aX, (self.y-4)*o2aX, 2*o2aX, 16) - draw.circf( (self.cx+(self.dx/2))*o2aX, (self.y-4)*o2aX, 1*o2aX, 11) + draw.circf( (self.cx+self.dx)*o2aX, self.y*o2aX, 2, 16) + draw.circf( (self.cx+self.dx)*o2aX, self.y*o2aX, 1, 11) + draw.circf( (self.cx-self.dx)*o2aX, self.y*o2aX, 2, 16) + draw.circf( (self.cx-self.dx)*o2aX, self.y*o2aX, 1, 11) + draw.circf( (self.cx-(self.dx/2))*o2aX, (self.y-4)*o2aX, 2, 16) + draw.circf( (self.cx-(self.dx/2))*o2aX, (self.y-4)*o2aX, 1, 11) + draw.circf( (self.cx+(self.dx/2))*o2aX, (self.y-4)*o2aX, 2, 16) + draw.circf( (self.cx+(self.dx/2))*o2aX, (self.y-4)*o2aX, 1, 11) end function gota:update_splash() diff --git a/data/main.lua b/data/main.lua index 19ba324..1483597 100644 --- a/data/main.lua +++ b/data/main.lua @@ -84,7 +84,7 @@ function mini.init() --game_init() intro_init() - --final_init() + -- final_init() end function mini.update() diff --git a/data/tiles.gif b/data/tiles.gif index 20deab4..494252a 100644 Binary files a/data/tiles.gif and b/data/tiles.gif differ