3 Commits

Author SHA1 Message Date
4c595066bf Corregida la pantalla de Game Over 2026-03-25 21:45:33 +01:00
d829d5e5d8 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
2026-03-23 21:11:08 +01:00
0bdca831c7 Modificada la font (J i S). Intro en res X2. Arreglada la funció d'escriure en borde negre 2026-03-23 21:04:28 +01:00
6 changed files with 46 additions and 37 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

View File

@@ -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,

View File

@@ -4,7 +4,7 @@ function dead.start()
dead.count=0
dead.pos={}
dead.vel={}
for i=1,128 do
for i=1,128*o2aX do
dead.pos[i]=0
dead.vel[i]=(200+math.random(0,399))/400
end
@@ -12,30 +12,33 @@ function dead.start()
end
function dead.update()
font.current(font_sf)
dead.count=dead.count+1
for i=1,128 do
if dead.pos[i]<96 then
for i=1,128*o2aX do
if dead.pos[i]<96*o2aX then
dead.pos[i]=dead.pos[i]+dead.vel[i]
draw.vline(i-1,0,dead.pos[i],16)
end
end
local text_x = 44*o2aX
local text_y = 40*o2aX
if dead.count>50 then
if dead.count>130 then
draw.text("GAME OVER",44,40,2)
draw.text("GAME OVER",text_x,text_y,2)
elseif dead.count>120 then
draw.text("GAME OVE",44,40,2)
draw.text("GAME OVE",text_x,text_y,2)
elseif dead.count>110 then
draw.text("GAME OV",44,40,2)
draw.text("GAME OV",text_x,text_y,2)
elseif dead.count>100 then
draw.text("GAME O",44,40,2)
draw.text("GAME O",text_x,text_y,2)
elseif dead.count>90 then
draw.text("GAME",44,40,2)
draw.text("GAME",text_x,text_y,2)
elseif dead.count>80 then
draw.text("GAM",44,40,2)
draw.text("GAM",text_x,text_y,2)
elseif dead.count>70 then
draw.text("GA",44,40,2)
draw.text("GA",text_x,text_y,2)
elseif dead.count>60 then
draw.text("G",44,40,2)
draw.text("G",text_x,text_y,2)
end
end

View File

@@ -19,7 +19,6 @@ require "fireball"
require "switches"
require "logo"
local arcade_config = require("arcade_config")
o2aX = arcade_config.org2arc_escala
modes={playing=0,editing=1}

View File

@@ -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)

View File

@@ -1,3 +1,5 @@
arcade_config = require("arcade_config")
require "final"
require "fade"
require "audio"
@@ -27,7 +29,6 @@ require "abad"
require "intro"
require "game"
local arcade_config = require("arcade_config")
--require "fade"
--require "audio"
@@ -108,8 +109,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 +157,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)