From 525ca12c9acad6d05627f5078b12e278f326e6d7 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Fri, 15 May 2026 21:07:50 +0200 Subject: [PATCH] DX: malos a cp 247-249 per a no pisar lletres X/Y/Z --- pepe_runner_dx.lua | 16 ++++++++-------- skins/custom.lua | 6 +++--- skins/native.lua | 6 +++--- skins/pintor.lua | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pepe_runner_dx.lua b/pepe_runner_dx.lua index b0e2328..569d48f 100644 --- a/pepe_runner_dx.lua +++ b/pepe_runner_dx.lua @@ -19,18 +19,19 @@ BLOC1 = 176 BLOC2 = 177 BLOC3 = 178 PEPE_C = 2 -MALO_C = 88 +MALO_C = 247 -- (fora del rang ASCII basic per a no pisar la lletra 'X') -- Code-points reservats addicionals (no venen del .map binari, son -- elements visuals introduits per la versio DX). Tots els skins els han -- de definir en estos mateixos cp per a ser intercanviables. +-- Tots fora del rang ASCII basic per a no pisar lletres / signes. PEPE_MORT_A = 226 -- sprite A de l'animacio de mort de Pepe PEPE_MORT_B = 227 -- sprite B (alterna amb A frame per frame) -MALO_C2 = 89 -- enemic 2 (cada malos[i] usa el seu propi sprite) -MALO_C3 = 90 -- enemic 3 +MALO_C2 = 248 -- enemic 2 (cada malos[i] usa el seu propi sprite) +MALO_C3 = 249 -- enemic 3 --- Glifs del marc del HUD. Codis triats per a no col·lidir amb cap glif --- de cap skin (la native usa 224, 233, 216-220, etc.). +-- Glifs del marc del HUD. Codis triats fora del rang ASCII basic per a +-- no pisar lletres ni signes quan s'imprimeix text. FRAME_H = 240 FRAME_V = 241 FRAME_TL = 242 @@ -99,11 +100,10 @@ NUM_FASES = 10 -- mapes 1..10 (el 0 esta reservat per al titol) -- VIDES_INI = nombre de reserves (convencio arcade: el HUD mostra reserves, -- no compta la vida actual). 2 reserves = 3 vides totals (1 actual + 2). -- L'original arrancava amb 0 (= 1 vida total). --- TEMPORAL DEBUG: posa'l a 0 per a provar la seqüencia de game over rapid. -VIDES_INI = 0 +VIDES_INI = 2 -- LEVEL_INI = fase per la que arranca la partida nova (1..NUM_FASES). -- Util per a depuracio i per a saltar al mapa que vols provar. -LEVEL_INI = 3 +LEVEL_INI = 1 -- Tots els temps i durations de les animacions del DX. Sobreescriuibles -- per config.lua (en frames a 60 fps; 60 = 1 segon). diff --git a/skins/custom.lua b/skins/custom.lua index b846963..6c144e1 100644 --- a/skins/custom.lua +++ b/skins/custom.lua @@ -23,9 +23,9 @@ return { pepe = { cp = 2, bitmap = {0x7E,0x81,0xA5,0x81,0xBD,0x99,0x81,0x7E}, color = COLOR_WHITE }, pepe_mort_a = { cp = 226, bitmap = {0x7E,0x81,0xA5,0x81,0x99,0xBD,0x81,0x7E}, color = COLOR_LIGHT_RED }, pepe_mort_b = { cp = 227, bitmap = {0x7E,0x81,0xA5,0x81,0x99,0xBD,0x81,0x7E}, color = COLOR_LIGHT_RED }, - malo1 = { cp = 88, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, - malo2 = { cp = 89, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, - malo3 = { cp = 90, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, + malo1 = { cp = 247, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, + malo2 = { cp = 248, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, + malo3 = { cp = 249, bitmap = {0x00,0xC3,0x66,0x3C,0x18,0x3C,0x66,0xC3}, color = COLOR_LIGHT_RED }, }, state_colors = { bg = COLOR_BLUE, diff --git a/skins/native.lua b/skins/native.lua index 50ee9c4..efb3b3e 100644 --- a/skins/native.lua +++ b/skins/native.lua @@ -24,9 +24,9 @@ return { pepe = { cp = 2, bitmap = {0x7E,0xFF,0x99,0xFF,0xBD,0xC3,0xFF,0x7E}, color = COLOR_WHITE }, pepe_mort_a = { cp = 226, bitmap = {0x7E,0xFF,0x99,0xFF,0xC3,0xBD,0xFF,0x7E}, color = COLOR_LIGHT_RED }, pepe_mort_b = { cp = 227, bitmap = {0x7E,0xFF,0x99,0xFF,0xC3,0xBD,0xFF,0x7E}, color = COLOR_LIGHT_RED }, - malo1 = { cp = 88, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, - malo2 = { cp = 89, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, - malo3 = { cp = 90, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, + malo1 = { cp = 247, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, + malo2 = { cp = 248, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, + malo3 = { cp = 249, bitmap = {0xC6,0x6C,0x38,0x38,0x6C,0xC6,0xC6,0x00}, color = COLOR_LIGHT_RED }, }, state_colors = { bg = COLOR_BLUE, diff --git a/skins/pintor.lua b/skins/pintor.lua index a5f0bcd..48be3df 100644 --- a/skins/pintor.lua +++ b/skins/pintor.lua @@ -27,9 +27,9 @@ return { pepe = { cp = 2, bitmap = {0x7E,0xFF,0xDB,0xDB,0xFF,0xC3,0xE7,0x7E}, color = COLOR_YELLOW }, pepe_mort_a = { cp = 226, bitmap = {0x7E,0xFF,0x93,0xFF,0xFF,0xAB,0xD7,0x7E}, color = COLOR_LIGHT_RED }, pepe_mort_b = { cp = 227, bitmap = {0x7E,0xFF,0xC9,0xFF,0xFF,0xD5,0xEB,0x7E}, color = COLOR_LIGHT_MAGENTA }, - malo1 = { cp = 88, bitmap = {0xC3,0x3C,0x7E,0x72,0x7E,0x72,0x3C,0xC3}, color = COLOR_LIGHT_RED }, - malo2 = { cp = 89, bitmap = {0xD8,0x33,0x7C,0xFC,0xFC,0x7C,0x33,0xD8}, color = COLOR_LIGHT_RED }, - malo3 = { cp = 90, bitmap = {0x07,0xEB,0x38,0x38,0x38,0x38,0xEB,0x07}, color = COLOR_LIGHT_RED }, + malo1 = { cp = 247, bitmap = {0xC3,0x3C,0x7E,0x72,0x7E,0x72,0x3C,0xC3}, color = COLOR_LIGHT_RED }, + malo2 = { cp = 248, bitmap = {0xD8,0x33,0x7C,0xFC,0xFC,0x7C,0x33,0xD8}, color = COLOR_LIGHT_RED }, + malo3 = { cp = 249, bitmap = {0x07,0xEB,0x38,0x38,0x38,0x38,0xEB,0x07}, color = COLOR_LIGHT_RED }, }, state_colors = { bg = COLOR_BLUE,