From 3d9746b5f5a3e2cf6340f5942c78967d271e1d92 Mon Sep 17 00:00:00 2001 From: JailGamer Date: Sun, 15 Mar 2026 16:37:10 +0100 Subject: [PATCH] =?UTF-8?q?Doblada=20la=20resoluci=C3=B3=20de=20la=20fines?= =?UTF-8?q?tra=20i=20modificada=20la=20intro=20a=202x?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/arcade_config.lua | 22 ++++++++++++++++++++++ data/game.ini | 6 +++--- data/intro.lua | 19 ++++++++++++++++--- data/main.lua | 26 ++++++++++++++++++++++++-- data/tiles.gif | Bin 4861 -> 4874 bytes 5 files changed, 65 insertions(+), 8 deletions(-) create mode 100644 data/arcade_config.lua diff --git a/data/arcade_config.lua b/data/arcade_config.lua new file mode 100644 index 0000000..52713c6 --- /dev/null +++ b/data/arcade_config.lua @@ -0,0 +1,22 @@ +local arcade_config = { + resolucion = { width = 256, height = 192 }, + surface = { width = 256, height = 192 }, + logo_sf = { width = 144, height = 20 }, + sprite_size = { w = 32, h = 32 }, + escala = 1.0, + org2arc_escala = 2.0, + fullscreen = false +} + +-- Proteger contra creación/modificación accidental de campos no declarados +-- setmetatable(config, { +-- __newindex = function(t, k, v) +-- if rawget(t, k) == nil then +-- error("Intento de crear campo nuevo en config: "..tostring(k), 2) +-- else +-- rawset(t, k, v) +-- end +-- end +-- }) + +return arcade_config diff --git a/data/game.ini b/data/game.ini index 96abb20..df70a58 100644 --- a/data/game.ini +++ b/data/game.ini @@ -1,5 +1,5 @@ title=Cacaus config=cacaus -width=128 -height=96 -zoom=5 +width=256 +height=192 +zoom=3 diff --git a/data/intro.lua b/data/intro.lua index d9fddbb..ef704d1 100644 --- a/data/intro.lua +++ b/data/intro.lua @@ -3,6 +3,8 @@ require "game" require "mapa" require "scenes" +local arcade_config = require("arcade_config") + intro_wait=40 intro_step=0 @@ -15,20 +17,31 @@ function intro_init() draw.text("JAILGAMES",0,0,15) surf.target(0) surf.source(logo) - 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.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*arcade_config.org2arc_escala, 5*arcade_config.org2arc_escala) + + -- 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) fade.fadein() end function intro_intro() - --text("JAILGAMES",40,30,15) - text("presenta",48,50,14) + -- text("presenta",48,50,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 + end function intro_update() diff --git a/data/main.lua b/data/main.lua index 6574ff7..185c8b5 100644 --- a/data/main.lua +++ b/data/main.lua @@ -27,6 +27,8 @@ require "abad" require "intro" require "game" +local arcade_config = require("arcade_config") + --require "fade" --require "audio" --require "intro" @@ -37,10 +39,13 @@ function mini.init() local paleta=pal.load("tiles.gif") pal.set(paleta) - logo=surf.new(36,5) - back=surf.new(128,96) + -- logo=surf.new(72,10) + logo=surf.new(arcade_config.logo_sf.width,arcade_config.logo_sf.height) + -- back=surf.new(128,96) + back=surf.new(arcade_config.surface.width,arcade_config.surface.height) fade.init() + -- Càrrega dels audios audio_text_abad = sound.load(audio_text_abad) audio_text_premiere = sound.load(audio_text_premiere) audio_text_elalien = sound.load(audio_text_elalien) @@ -57,6 +62,7 @@ function mini.init() audio_hit = sound.load(audio_hit) audio_low = sound.load(audio_low) + -- Configuració dels input keyUp = tonumber(config.key("keyup")) or key.UP keyDown = tonumber(config.key("keydown")) or key.DOWN keyLeft = tonumber(config.key("keyleft")) or key.LEFT @@ -105,3 +111,19 @@ 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 \ No newline at end of file diff --git a/data/tiles.gif b/data/tiles.gif index 06d17bca099c33c3d0affc66f6b91d268415855b..1a2178379472cedbd1e4abdf06daa0ecbb3fd892 100644 GIT binary patch delta 268 zcmV+n0rUR-C5k2tM@dFFIbnbRfB@$Pu?zwOApQ|Ua%Ew3Wn>_CX>@2HM@dak04x9i z004jhfB*mp{*xgC{sR6ZlOY8C1OBhMlOYBC1paXf?~@@0`vv~C%7_n>AqV;f{%i_J zN|Tcz2>A#8Eo?J#Sq+mR3HS*9aHTAi*s`{hAqw{i{V?1?&)S>p4h<9!0?@6BM%d^@J|*NE(Qh$9Uuk@HZU-7{GY7H{EtZ)NU{87 zUcVDav;JWzEG;cB+FP$YTG+mc!-YH5tg{_{pxDV_X!;3uJTt;3!zCGv&sn zZ9op!ch0Tu6MsqGId2Z+aew2={P?I^zWrj;J|LIpEBB6O{ql(HK#!1OAfNXOk0I*< z!&l9M!K@6MfdYJ=c~$0gU7U4Pa_$z%*)xG6{Ga&TrZCi%&5!F6^ORcV3ltLg$ZzuU r=6ddj>EbV%L|)6B0g4HJ5XkDkuT_3=cV%*T#TDzatG6cW3EcqzB7SWz