Merge branch 'master' of https://gitea.sustancia.synology.me/JailGamer/X2_cacaus

No se que estic fent entre pulls i pushos, sort que he fet copia de les
modificacions

data/arcade_config.lua

@@ -2,7 +2,7 @@ local arcade_config = {
   org_resolucion = { width = 128, height = 96 },
   resolucion = { width = 256, height = 192 },
   surface = { width = 256, height = 192 },
-  logo_sf = { width = 144, height = 20 },
+  logo_sf = { width = 180, height = 25 },
   sprite_size = { w = 32, h = 32 },
   escala = 1.0,
   org2arc_escala = 2.0,

data/intro.lua

@@ -15,20 +15,22 @@ function intro_init()
     intro_wait=400
     surf.cls(16)
 	
+    font.current(font_sf)
     surf.target(logo)
     surf.cls(16)
     draw.text("JAILGAMES",0,0,15)
     surf.target(0)
     surf.source(logo)
-    draw.surf(0,0,36,5,56,70,arcade_config.logo_sf.width,arcade_config.logo_sf.height)
+    draw.surf(0,0,72,10,48,70,arcade_config.logo_sf.width,arcade_config.logo_sf.height)
 	
-	surf.target(logo)
-    surf.cls(16)
-	text("presenta",0,0,14)
-    surf.target(0)
-    surf.source(logo)
-    draw.surf(0,0,36,5,96,100,36*o2aX, 5*o2aX)
+	-- surf.target(logo)
+    -- surf.cls(16)
+	-- text("presenta",0,0,14)
+    -- surf.target(0)
+    -- surf.source(logo)
+    -- draw.surf(0,0,36,5,96,100,36*o2aX, 5*o2aX)
 	
+    arc_textB("presenta",96,102,14)
 	-- draw.surf(0,0,36,5,28,35,72,10)
     -- draw.surf(0,0,36,5,56,70,arcade_config.logo_sf.width,arcade_config.logo_sf.height)
     surf.source(tiles)

data/main.lua

@@ -108,8 +108,10 @@ function text(str,x,y,col)
     draw.text(str, x-1, y-1, 16)
     draw.text(str, x  , y-1, 16)
     draw.text(str, x+1, y-1, 16)
+    
     draw.text(str, x-1, y, 16)
     draw.text(str, x+1, y, 16)
+    
     draw.text(str, x-1, y+1, 16)
     draw.text(str, x,   y+1, 16)
     draw.text(str, x+1, y+1, 16)
@@ -154,14 +156,16 @@ function arc_textB(str, x, y, col)
     font.current(font_sf)
     -- font.spacing(0)
     
-	draw.text(str,x+0,y+0,16)
-    draw.text(str,x+1,y+0,16)
-    draw.text(str,x+2,y+0,16)
-    draw.text(str,x+0,y+1,16)
-    draw.text(str,x+2,y+1,16)
-    draw.text(str,x+0,y+2,16)
-    draw.text(str,x+1,y+2,16)
-    draw.text(str,x+2,y+2,16)
+	draw.text(str, x-1, y-1, 16)
+    draw.text(str, x  , y-1, 16)
+    draw.text(str, x+1, y-1, 16)
+    
+    draw.text(str, x-1, y,   16)
+    draw.text(str, x+1, y,   16)
+    
+    draw.text(str, x-1, y+1, 16)
+    draw.text(str, x  , y+1, 16)
+    draw.text(str, x+1, y+1, 16)
 	
     -- draw.text(str,1,1,col)
     draw.text(str,x,y,col)