Modificades les funcions draw de batman, caco, elalien, imp, premiere i zombie. El menú principal ja pareix que es veu be. Parametritzats els avatars que faltaven en scenes

data/arcade_config.lua

@@ -10,6 +10,8 @@ local arcade_config = {
   tiles_per_row_base2 = 4,
   tiles_width = 16,
   tiles_height = 16,
+  character_per_row = 8,
+  character_per_row_base2 = 3,
   character_width = 32,
   character_height = 32,
   fullscreen = false

data/batman.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
+
 batman={hab=5,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,stepscooldown=0,stepsremember=0,wait=0,step=0,anim={24,25,24,26},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
 
 function batman.init()
@@ -15,7 +22,8 @@ function batman.draw()
     if batman.update==batman.update_stairs then
         flip=(((batman.x>>1)+(batman.y>>1))%2)==0
     end
-    draw.surf((batman.frame&7)*16,(batman.frame>>3)*16,16,16,batman.x,batman.y,16,16,flip)
+    -- draw.surf((batman.frame&7)*16,(batman.frame>>3)*16,16,16,batman.x,batman.y,16,16,flip)
+	draw.surf((batman.frame&7)*cw,(batman.frame>>cxr2)*ch,cw,ch,batman.x*o2aX,batman.y*o2aX,cw,ch,flip)
 end
 
 function batman.hit()

data/caco.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
+
 caco={}
 
 function caco.new(_hab,_x,_y,_flip)
@@ -5,7 +12,8 @@ function caco.new(_hab,_x,_y,_flip)
 end
 
 function caco:draw()
-    if self.frame>0 then draw.surf((self.frame&7)*16,(self.frame>>3)*16,16,16,self.x,self.y,16,16,self.flip) end
+    -- if self.frame>0 then draw.surf((self.frame&7)*16,(self.frame>>3)*16,16,16,self.x,self.y,16,16,self.flip) end
+    if self.frame>0 then draw.surf((self.frame&7)*cw,(self.frame>>cxr2)*ch,cw,ch,self.x*o2aX,self.y*o2aX,cw,ch,self.flip) end
 end
 
 function caco:update_normal()

data/elalien.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
+
 elalien={hab=66,x=24,y=24,flip=true,goup=true,frame=8,stairscooldown=0,wait=0,step=0,anim={8,9,8,10},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
 
 function elalien.init()
@@ -19,7 +26,7 @@ function elalien.draw()
     if elalien.update==elalien.update_stairs then
         flip=(((elalien.x>>1)+(elalien.y>>1))%2)==0
     end
-    draw.surf((elalien.frame&7)*16,(elalien.frame>>3)*16,16,16,elalien.x,elalien.y,16,16,flip)
+    draw.surf((elalien.frame&7)*cw,(elalien.frame>>cxr2)*ch,cw,ch,elalien.x*o2aX,elalien.y*o2aX,cw,ch,flip)
 end
 
 function elalien.hit()

data/game.lua

@@ -18,6 +18,9 @@ require "cacau"
 require "fireball"
 require "switches"
 
+local arcade_config = require("arcade_config")
+o2aX = arcade_config.org2arc_escala
+
 modes={playing=0,editing=1}
 --mode=modes.editing
 mode=modes.playing
@@ -313,10 +316,10 @@ function update_game()
 end
 
 function redraw_menu_hab()
-    draw_hab(menu_room,16,41)
+    draw_hab(menu_room,16*o2aX,41*o2aX)
-    draw.rectf(0,0,15,97,16)
+    draw.rectf(0,0,15*o2aX,97*o2aX,16)
-    draw.rectf(114,0,78,97,16)
+    draw.rectf(114*o2aX,0,78*o2aX,97*o2aX,16)
-    draw.rect(15,40,99,50,2)
+    draw.rect(15*o2aX,40*o2aX,99*o2aX,50*o2aX,2)
     mapa_update(abad.hab,menu_room)
 
     for key,actor in pairs(actors) do
@@ -337,7 +340,7 @@ function update_menu()
     end
 
     surf.cls(16)
-    text("C A C A U S", 42, 8, 15)
+    text("C A C A U S", 42*o2aX, 8*o2aX, 15)
 
     menu_state()
 end
@@ -349,14 +352,14 @@ function update_options_menu()
         parpadeig=true
         if menu_count>40 then menu_count=0 end
     end
-    draw.rect(28,28+(10*menu_sel),73,9,14)
+    draw.rect(28*o2aX,(28+(10*menu_sel))*o2aX,73*o2aX,9*o2aX,14)
-    if (not parpadeig) then draw.rect(28,28+(10*menu_sel),73,9,13) end
+    if (not parpadeig) then draw.rect(28*o2aX,(28+(10*menu_sel))*o2aX,73*o2aX,9*o2aX,13) end
 
-    draw.text("MÚSICA", 30, 30, 14); draw.text(music.enabled() and "SI" or "NO",91,30,15)
+    draw.text("MÚSICA", 30*o2aX, 30*o2aX, 14); draw.text(music.enabled() and "SI" or "NO",91*o2aX,30*o2aX,15)
-    draw.text("SÓ", 30, 40, 14);     draw.text(sound.enabled() and "SI" or "NO",91,40,15)
+    draw.text("SÓ", 30*o2aX, 40*o2aX, 14);     draw.text(sound.enabled() and "SI" or "NO",91*o2aX,40*o2aX,15)
-    draw.text("REDEFINIR TECLAT", 30, 50, 14)
+    draw.text("REDEFINIR TECLAT", 30*o2aX, 50*o2aX, 14)
-    draw.text("REDEFINIR GAMEPAD", 30, 60, 14)
+    draw.text("REDEFINIR GAMEPAD", 30*o2aX, 60*o2aX, 14)
-    draw.text("TORNAR", 30, 70, 14)
+    draw.text("TORNAR", 30*o2aX, 70*o2aX, 14)
 
     if key.press(keyShoot) or key.press(key.SPACE) or pad.press(pad.A) or pad.press(btnShoot) then
         if menu_sel==0 then
@@ -395,10 +398,10 @@ function update_main_menu()
         parpadeig=true
         if menu_count>40 then menu_count=0 end
     end
-    draw.rect(28,18+(10*menu_sel),73,9,14)
+    draw.rect(28*o2aX,(18+(10*menu_sel))*o2aX,73*o2aX,9*o2aX,14)
-    if (not parpadeig) then draw.rect(28,18+(10*menu_sel),73,9,13) end
+    if (not parpadeig) then draw.rect(28*o2aX,(18+(10*menu_sel))*o2aX,73*o2aX,9*o2aX,13) end
-    text("JUGAR", 54, 20, 14)
+    text("JUGAR", 54*o2aX, 20*o2aX, 14)
-    text("OPCIONS", 50, 30, 14)
+    text("OPCIONS", 50*o2aX, 30*o2aX, 14)
     --if (not parpadeig or menu_sel~=2) then text("REDEFINIR GAMEPAD", 30, 32, 13) end
 
     redraw_menu_hab()

data/imp.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
+
 imp={hab=75,x=24,y=24,flip=true,enabled=false,counter=500,frame=28,wait=0,step=0,anim={28,29,28,30},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
 
 function imp.reset()
@@ -44,7 +51,8 @@ end
 
 function imp.draw()
     if imp.enabled then
-        draw.surf((imp.frame&7)*16,(imp.frame>>3)*16,16,16,imp.x,imp.y,16,16,imp.flip)
+        -- draw.surf((imp.frame&7)*16,(imp.frame>>3)*16,16,16,imp.x,imp.y,16,16,imp.flip)
+		draw.surf((imp.frame&7)*cw,(imp.frame>>cxr2)*ch,cw,ch,imp.x*o2aX,imp.y*o2aX,cw,ch,flip)
     end
 end
 

data/main.lua

@@ -111,19 +111,3 @@ function text(str,x,y,col)
 
     draw.text(str,x,y,col)
 end
-
-function arcade_intro()
-	surf.target(logo)
-    surf.cls(16)
-	draw.text("JAILGAMES",0,0,15)
-    surf.target(0)
-    surf.source(logo)
-	text("presenta",96,100,14)
-    intro_wait=intro_wait-1
-    if intro_wait==0 or key.press(key.ESCAPE) or key.press(keyShoot) or pad.press(btnShoot) or pad.press(btnPause) then
-        intro_wait=1
-        game_update = intro_update
-        fade.fadeoutin()
-    end
-	draw.surf(0,0,36,5,56,70,arcade_config.logo_sf.width,arcade_config.logo_sf.height)
-end

data/premiere.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
+
 premiere={hab=75,x=24,y=24,flip=true,frame=12,wait=0,step=0,anim={12,13,12,14},bb={x=4,y=0,w=8,h=16},scene_intro=false,scene_object=false}
 
 function premiere.init()
@@ -14,7 +21,8 @@ function premiere.init()
 end
 
 function premiere.draw()
-    draw.surf((premiere.frame&7)*16,(premiere.frame>>3)*16,16,16,premiere.x,premiere.y,16,16,premiere.flip)
+    -- draw.surf((premiere.frame&7)*16,(premiere.frame>>3)*16,16,16,premiere.x,premiere.y,16,16,premiere.flip)
+	draw.surf((premiere.frame&7)*cw,(premiere.frame>>cxr2)*ch,cw,ch,premiere.x*o2aX,premiere.y*o2aX,cw,ch,flip)
 end
 
 function premiere.hit()

data/scenes.lua

@@ -10,6 +10,10 @@ avatar_abad2_x = 4*o2aX
 avatar_abad_y = 0
 avatar_batman_x = 4*o2aX
 avatar_batman_y = 48*o2aX
+avatar_premiere_x = 69*o2aX
+avatar_premiere_y = 20*o2aX
+avatar_elalien_x = 3*o2aX
+avatar_elalien_y = 16*o2aX
 avatar_w = 10*o2aX
 avatar_h = 10*o2aX
 
@@ -60,26 +64,26 @@ scenes={
     },
     premiere_intro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pipistrello??","Això ques??",""}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Il batmano!!","Incontrame il gorro","per l'amore d'un porco!"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Il batmano!!","Incontrame il gorro","per l'amore d'un porco!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Tinc faena. A mi m'ha","furtat els cacaus i","he de trobarlos."}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Lei tenne in su quarto!","Io tengo micha clave!","Achudame i t'achudo!"}}
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Lei tenne in su quarto!","Io tengo micha clave!","Achudame i t'achudo!"}}
     },
     premiere_intro_gorro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Premiere??","Qué fas per ma casa?",""}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Porca miseria!!","l'uomo pipistrello!!","m'ha llevatto il gorro!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pipistrello??","Això... be, te igual","Ací el tens, atontat."}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Per fortuna!","Grazie mille!","Come podo achudarte?"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Per fortuna!","Grazie mille!","Come podo achudarte?"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Pos Batman m'ha furtat","els cacaus. Supose que","els te amagats."}},
-        {x=69,y=20,flip=true,audio="premiere",text={"In lo suo quarto!","Io tengo micha clave!","Tenne, tenne!!"}}
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"In lo suo quarto!","Io tengo micha clave!","Tenne, tenne!!"}}
     },
     premiere_gorro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_premiere,text={"Tin, el ditxos gorro.","",""}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Bravissimo!","Che giornatta","fantastica! Figo!"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Bravissimo!","Che giornatta","fantastica! Figo!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Tu si que eres un","figo. On està eixa","mitja clau?"}},
-        {x=69,y=20,flip=true,audio="premiere",text={"Giusto! Aquí tenne!","Buona fortuna per","la tua avventura!"}},
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"Giusto! Aquí tenne!","Buona fortuna per","la tua avventura!"}},
-        {x=69,y=20,flip=true,audio="premiere",text={"E NON TOCARE il","Batmano! Sei molto","poderoso!"}}
+        {x=avatar_premiere_x,y=avatar_premiere_y,flip=true,audio="premiere",text={"E NON TOCARE il","Batmano! Sei molto","poderoso!"}}
     },
     gorro_trobat_nointro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Mira, el gorro","de Premiere.","Millor l'agafe."}}
@@ -89,28 +93,28 @@ scenes={
     },
     elalien_intro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
-        {x=3,y=16,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Es...taves podant","a un gos...?",""}},
-        {x=3,y=16,flip=true,audio="elalien",text={"EN JUPITER NO POTS","DEIXAR QUE LI CREIXEN","MES DE 12 PATES!!"}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"EN JUPITER NO POTS","DEIXAR QUE LI CREIXEN","MES DE 12 PATES!!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Uh... clar...","A mi m'ha furtat","els cacaus."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"ELS TÉ EN LA SEUA","HABITACIÓ SEGUR.","TROBA EL BERENAR..."}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"ELS TÉ EN LA SEUA","HABITACIÓ SEGUR.","TROBA EL BERENAR..."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"...I JO ET DONARÉ","LA MEITAT DE LA CLAU","PER A ENTRAR."}}
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"...I JO ET DONARÉ","LA MEITAT DE LA CLAU","PER A ENTRAR."}}
     },
     elalien_intro_peu={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Que passa alien?","A tu també t'ha","putejat el Batman?"}},
-        {x=3,y=16,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"CAGUEN L'OU!!","ESTAVA JO TAN TRANQUIL","PODANT AL MEU GOS..."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"...I QUAN NO MIRABA","M'HA FURTAT EL","MARANÀ!!!"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Podant...? be, te","igual. Açò deu ser","el teu berenar."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"OSTI QUE BÓ!!!","GRACIES AUELO!","A TU QUE T'HA FET?"}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"OSTI QUE BÓ!!!","GRACIES AUELO!","A TU QUE T'HA FET?"}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"M'ha furtat els cacaus.","Segur que els té","al seu quarto."}},
-        {x=3,y=16,flip=true,audio="elalien",text={"SEGUR! PERO JO TINC","LA MEITAT DE LA CLAU.","TIN, I SORT!"}}
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"SEGUR! PERO JO TINC","LA MEITAT DE LA CLAU.","TIN, I SORT!"}}
     },
     elalien_peu={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",musica=audio_song_elalien,text={"Ací tens...","Uff, que peste fa...",""}},
-        {x=3,y=16,flip=true,audio="elalien",text={"GRACIES!!!","SÍ, EH? QUE","SUCOSET I BÓ."}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"GRACIES!!!","SÍ, EH? QUE","SUCOSET I BÓ."}},
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Clar...","Be, i eixa","mitja clau?"}},
-        {x=3,y=16,flip=true,audio="elalien",text={"TIN! QUAN TINGUES","ELS CACAUS, PEGA-LI","CACAUÀ A BATMAN!"}},
+        {x=avatar_elalien_x,y=avatar_elalien_y,flip=true,audio="elalien",text={"TIN! QUAN TINGUES","ELS CACAUS, PEGA-LI","CACAUÀ A BATMAN!"}},
     },
     peu_trobat_nointro={
         {x=avatar_abad2_x,y=avatar_abad_y,flip=false,audio="abad",text={"Un peu podrit??","Qué asco!! Segur","que és d'el alien."}}

data/zombie.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
+
 zombie={}
 
 function zombie.new(_hab,_x,_y,_flip)
@@ -5,7 +12,8 @@ function zombie.new(_hab,_x,_y,_flip)
 end
 
 function zombie:draw()
-    if self.frame>0 then draw.surf((self.frame&7)*16,(self.frame>>3)*16,16,16,self.x,self.y,16,16,self.flip) end
+    -- if self.frame>0 then draw.surf((self.frame&7)*16,(self.frame>>3)*16,16,16,self.x,self.y,16,16,self.flip) end
+	if self.frame>0 then draw.surf((self.frame&7)*cw,(self.frame>>cxr2)*ch,cw,ch,self.x*o2aX,self.y*o2aX,cw,ch,self.flip) end
 end
 
 function zombie:update_normal()