From 4739354875c973f26703b922128796f55d14fd46 Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Wed, 29 Apr 2026 13:30:39 +0200 Subject: [PATCH] =?UTF-8?q?feat(maps):=20tileset=20propi=20per=20pir=C3=A0?= =?UTF-8?q?mide=20+=20reload=20de=20tilemap=20a=20loadRoom?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/maps/p1/r1.yaml | 36 +++++++++++++++--------------- data/maps/p1/r2.yaml | 36 +++++++++++++++--------------- data/maps/p1/r3.yaml | 36 +++++++++++++++--------------- data/maps/p1/r4.yaml | 36 +++++++++++++++--------------- data/maps/p1/r5.yaml | 36 +++++++++++++++--------------- data/maps/p1/r6.yaml | 36 +++++++++++++++--------------- data/maps/p2/r1.yaml | 36 +++++++++++++++--------------- data/maps/p2/r2.yaml | 36 +++++++++++++++--------------- data/maps/p2/r3.yaml | 36 +++++++++++++++--------------- data/maps/p2/r4.yaml | 36 +++++++++++++++--------------- data/maps/p2/r5.yaml | 36 +++++++++++++++--------------- data/maps/p2/r6.yaml | 36 +++++++++++++++--------------- data/maps/p3/r1.yaml | 36 +++++++++++++++--------------- data/maps/p3/r2.yaml | 36 +++++++++++++++--------------- data/maps/p3/r3.yaml | 36 +++++++++++++++--------------- data/maps/p3/r4.yaml | 36 +++++++++++++++--------------- data/maps/p3/r5.yaml | 36 +++++++++++++++--------------- data/maps/p3/r6.yaml | 36 +++++++++++++++--------------- data/maps/p4/r1.yaml | 36 +++++++++++++++--------------- data/maps/p4/r2.yaml | 36 +++++++++++++++--------------- data/maps/p4/r3.yaml | 36 +++++++++++++++--------------- data/maps/p4/r4.yaml | 36 +++++++++++++++--------------- data/maps/p4/r5.yaml | 36 +++++++++++++++--------------- data/maps/p4/r6.yaml | 36 +++++++++++++++--------------- data/maps/p5/r1.yaml | 36 +++++++++++++++--------------- data/maps/p5/r2.yaml | 36 +++++++++++++++--------------- data/maps/p5/r3.yaml | 36 +++++++++++++++--------------- data/maps/p5/r4.yaml | 36 +++++++++++++++--------------- data/maps/p5/r5.yaml | 36 +++++++++++++++--------------- data/maps/p5/r6.yaml | 36 +++++++++++++++--------------- data/maps/pyramid.yaml | 2 +- data/tilesets/pyramid_1.gif | Bin 0 -> 2329 bytes data/tilesets/pyramid_2.gif | Bin 0 -> 2329 bytes data/tilesets/pyramid_3.gif | Bin 0 -> 2329 bytes data/tilesets/pyramid_4.gif | Bin 0 -> 2329 bytes data/tilesets/pyramid_5.gif | Bin 0 -> 2329 bytes source/game/scenes/game_scene.cpp | 8 ++++++- 37 files changed, 548 insertions(+), 542 deletions(-) create mode 100644 data/tilesets/pyramid_1.gif create mode 100644 data/tilesets/pyramid_2.gif create mode 100644 data/tilesets/pyramid_3.gif create mode 100644 data/tilesets/pyramid_4.gif create mode 100644 data/tilesets/pyramid_5.gif diff --git a/data/maps/p1/r1.yaml b/data/maps/p1/r1.yaml index 76b1506..eb123f1 100644 --- a/data/maps/p1/r1.yaml +++ b/data/maps/p1/r1.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 1 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p1/r2.yaml b/data/maps/p1/r2.yaml index c9f8a2b..9199ace 100644 --- a/data/maps/p1/r2.yaml +++ b/data/maps/p1/r2.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 2 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p1/r3.yaml b/data/maps/p1/r3.yaml index a9f9709..32c0655 100644 --- a/data/maps/p1/r3.yaml +++ b/data/maps/p1/r3.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 3 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p1/r4.yaml b/data/maps/p1/r4.yaml index f73b602..f75f32a 100644 --- a/data/maps/p1/r4.yaml +++ b/data/maps/p1/r4.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 4 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p1/r5.yaml b/data/maps/p1/r5.yaml index 02ac37a..bce33ee 100644 --- a/data/maps/p1/r5.yaml +++ b/data/maps/p1/r5.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 5 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p1/r6.yaml b/data/maps/p1/r6.yaml index 7d6d97b..b97836c 100644 --- a/data/maps/p1/r6.yaml +++ b/data/maps/p1/r6.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_1.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 1 room: 6 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_1.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r1.yaml b/data/maps/p2/r1.yaml index 8cb4456..567c8f7 100644 --- a/data/maps/p2/r1.yaml +++ b/data/maps/p2/r1.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 1 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r2.yaml b/data/maps/p2/r2.yaml index 3432cc8..1a9c71c 100644 --- a/data/maps/p2/r2.yaml +++ b/data/maps/p2/r2.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 2 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r3.yaml b/data/maps/p2/r3.yaml index c3f3fbf..2aa333d 100644 --- a/data/maps/p2/r3.yaml +++ b/data/maps/p2/r3.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 3 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r4.yaml b/data/maps/p2/r4.yaml index 9bd79c1..cc8d28b 100644 --- a/data/maps/p2/r4.yaml +++ b/data/maps/p2/r4.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 4 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r5.yaml b/data/maps/p2/r5.yaml index 5d3b4a9..c028fd9 100644 --- a/data/maps/p2/r5.yaml +++ b/data/maps/p2/r5.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 5 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p2/r6.yaml b/data/maps/p2/r6.yaml index 451af3e..1173fa8 100644 --- a/data/maps/p2/r6.yaml +++ b/data/maps/p2/r6.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_2.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 2 room: 6 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_2.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r1.yaml b/data/maps/p3/r1.yaml index b491c12..2e26bca 100644 --- a/data/maps/p3/r1.yaml +++ b/data/maps/p3/r1.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 1 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r2.yaml b/data/maps/p3/r2.yaml index c16ea92..dc002bb 100644 --- a/data/maps/p3/r2.yaml +++ b/data/maps/p3/r2.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 2 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r3.yaml b/data/maps/p3/r3.yaml index b8e2f1d..95dc0e2 100644 --- a/data/maps/p3/r3.yaml +++ b/data/maps/p3/r3.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 3 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r4.yaml b/data/maps/p3/r4.yaml index a45c987..4c8fcc4 100644 --- a/data/maps/p3/r4.yaml +++ b/data/maps/p3/r4.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 4 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r5.yaml b/data/maps/p3/r5.yaml index e66da3b..8dad574 100644 --- a/data/maps/p3/r5.yaml +++ b/data/maps/p3/r5.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 5 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p3/r6.yaml b/data/maps/p3/r6.yaml index 9d1d79b..09006c1 100644 --- a/data/maps/p3/r6.yaml +++ b/data/maps/p3/r6.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_3.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 3 room: 6 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_3.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r1.yaml b/data/maps/p4/r1.yaml index 32a80a9..6c75cc5 100644 --- a/data/maps/p4/r1.yaml +++ b/data/maps/p4/r1.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 1 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r2.yaml b/data/maps/p4/r2.yaml index ede3b94..a6577d8 100644 --- a/data/maps/p4/r2.yaml +++ b/data/maps/p4/r2.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 2 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r3.yaml b/data/maps/p4/r3.yaml index 780ef09..39189ba 100644 --- a/data/maps/p4/r3.yaml +++ b/data/maps/p4/r3.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 3 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r4.yaml b/data/maps/p4/r4.yaml index 09c8696..95e62dd 100644 --- a/data/maps/p4/r4.yaml +++ b/data/maps/p4/r4.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 4 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r5.yaml b/data/maps/p4/r5.yaml index 590e01a..b356412 100644 --- a/data/maps/p4/r5.yaml +++ b/data/maps/p4/r5.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 5 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p4/r6.yaml b/data/maps/p4/r6.yaml index f76058e..b098c80 100644 --- a/data/maps/p4/r6.yaml +++ b/data/maps/p4/r6.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_4.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 4 room: 6 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_4.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r1.yaml b/data/maps/p5/r1.yaml index e346bff..2410820 100644 --- a/data/maps/p5/r1.yaml +++ b/data/maps/p5/r1.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 1 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r2.yaml b/data/maps/p5/r2.yaml index d67f75f..c3664ec 100644 --- a/data/maps/p5/r2.yaml +++ b/data/maps/p5/r2.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 2 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r3.yaml b/data/maps/p5/r3.yaml index 8de253c..094fea7 100644 --- a/data/maps/p5/r3.yaml +++ b/data/maps/p5/r3.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 3 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r4.yaml b/data/maps/p5/r4.yaml index b8dd31e..e74ba8a 100644 --- a/data/maps/p5/r4.yaml +++ b/data/maps/p5/r4.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 4 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r5.yaml b/data/maps/p5/r5.yaml index ea6f183..6ea2795 100644 --- a/data/maps/p5/r5.yaml +++ b/data/maps/p5/r5.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 5 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/p5/r6.yaml b/data/maps/p5/r6.yaml index 864d24b..2f92c2f 100644 --- a/data/maps/p5/r6.yaml +++ b/data/maps/p5/r6.yaml @@ -1,4 +1,4 @@ -# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre tomb.gif. +# Mapa de la piràmide: graella 21×15 de tiles 16×16 sobre pyramid_5.gif. # Overscan horitzontal: 8 px per banda (les parets laterals ocupen 2 tiles # en el tilemap però només 1.5 visibles al canvas, així que la textura es # dibuixa amb un origen de x=-8). Vertical no cal overscan: 15·16 = 240. @@ -11,7 +11,7 @@ pyramid: 5 room: 6 -tileset: data/tilesets/tomb.gif +tileset: data/tilesets/pyramid_5.gif tile_size: 16 origin: [-8, 0] @@ -21,7 +21,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i @@ -52,21 +52,21 @@ geometry: door_col: 10 data: - - [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1] - - [ 1, 91,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105,105, 92, 1] - - [ 1, 98,113,113, 95,113, 94,113,113,113,113,113,113,113, 94,113,102,113,113, 96, 1] - - [ 1, 98, 8, 8, 6, 8, 17, 8, 10, 8, 17, 8, 8, 8, 17, 8, 8, 8, 8, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 9, 2, 8, 10, 8, 8, 8, 8, 10, 8, 8, 26, 8, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 8, 26, 8, 8, 9, 8, 8, 8, 8, 8, 10, 8, 6, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 6, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 17, 8, 10, 8, 8, 10, 2, 8, 8, 26, 8, 8, 8, 8, 10, 8, 17, 96, 1] - - [ 1, 98, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 96, 1] - - [ 1, 98, 8, 10, 6, 6, 17, 8, 8, 8, 17, 8, 9, 8, 17, 8, 2, 8, 8, 96, 1] - - [ 1, 99, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,100, 1] + - [11,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,12,13] + - [11,30,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,20,31,13] + - [11,13,27,28,15,22,28,28,28,28,28,28,28,28,28,28,15,28, 6,11,13] + - [11,13, 8, 8,16, 8,17, 8,10, 8,17, 8, 8, 8,17, 8, 8, 8, 8,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 9, 2, 8,10, 8, 8, 8, 8,10, 8, 8,26, 8, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 2, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8, 8,26, 8, 8, 9, 8, 8, 8, 8, 8,10, 8,16, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8, 8, 2, 8, 8, 8, 9, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2,16, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13,17, 8,10, 8, 8,10, 2, 8, 8,26, 8, 8, 8, 8,10, 8,17,11,13] + - [11,13, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8, 2, 2, 2, 8,11,13] + - [11,13, 8,10,16,16,17, 8, 8, 8,17, 8, 9, 8,17, 8, 2, 8, 8,11,13] + - [11,38, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,39,13] # Spawns d'entitats per a aquest nivell. Es llegeixen des de # EntityManager::loadFromLevel al GameScene. Convencions: diff --git a/data/maps/pyramid.yaml b/data/maps/pyramid.yaml index 602b4da..e8976f9 100644 --- a/data/maps/pyramid.yaml +++ b/data/maps/pyramid.yaml @@ -19,7 +19,7 @@ origin: [-8, 0] # estigui definit; canviar aquí l'índex és tot el que cal. Omet el camp # per desactivar el pintat per a aquest jugador. player1_paint_tile: 0 -player2_paint_tile: 4 +player2_paint_tile: 1 # Física del contacte entre jugadors. Quan un jugador està quiet i l'altre # el topa, el segon l'empenta a aquesta fracció de la velocitat normal (i diff --git a/data/tilesets/pyramid_1.gif b/data/tilesets/pyramid_1.gif new file mode 100644 index 0000000000000000000000000000000000000000..bb3a80d32cd52745e5fca4add4e8007d3bf670ce GIT binary patch literal 2329 zcmV+!3Fh`kNk%v~VSoTo0K@+eH#1B@JWN78W=lO;O-FK6M1N*ke{N=(gnEEjUYdD-S#p1RkC^}f00000 z000000000000000A^8Le3IG5AEC2ui0Du5c000I5U?PrWX`X000!GWW@C&u20x~Ar>3Q; zsI050YY`L!32p7oc82f(Glwnx&*2FLwfj z9FeF5$&X|BB3-D&&l$9Tog{=JGADq^lPFXFs$9v^G0~wviWn`)I7wee zO#VQ63P`G@(W5LE(lR9Tp|4xOYC$Ci^&ZbiK7VQnDs&9dl1RfMT{UZ6Q;7A_&a-;e zLRPI@yM`LjLag1REz~(!5NIa6y@2^T2)tLo;01fxUVZyBuF#Q1?@C4)tH%Pq-27;6 zU|_+4&zA*U{(KPL;7>>0=;ny08UylPsSY` zgM<12wd3R7`aA4@ zvPqIJZx=dg)1HCG*J-8Y@{VW&F2Kb96p~D_S|waKgT;57l;KGkA`ztqe|OzR+Hb*u zNZMKOfT+TWD5iMED9v#=)(^8_C!=+K(Nvv^IOaHlI(50&p8@JvG*J>o3{hkdB2-Yp z1WQif zzUgHGZMs>fn_kYgp_q7`M@unO4WkI5hfZY(o^#H5XP#BU`RJT`KFM5|fUX3cTAX%j zPos^B04k-Gj!LJWm}Z)iQWa5jWUE9fVFaV5#!2g&rA`WGu9vFX5_CDCd8V4e>Qw5e zqSjjFv7l<0s;@2yT4+>=2BWC|wZAYMsDUn!@PmxoL5`tGc*;%k5k} zlB-f)0~B^xVC$u4uY30@sO+-;dK)lgf699jnE?Kmpuz|;OyI4f>T0UQkxJ^U!ITLq z9C05G7ox|#iHO?3?CM!^mDIFoFmyAv>~eOHHcBz5GauXMco-insJ?s&f^WYLV7D*C zG|O3Q&5rh(^DgNy%!>e}E&Q2*5A~8@l2F>o-KmW?g5O;uegthf~i4wa6qw z`k@oW4*#fW3)>)N9wk=u(4S+`xn-oDK?SutFHri!T=BnPHIEuVZ!4 zgZc|$?)X=$1jND(YN$gSf`|tq*1?ECEJYDJvw+NOMl%L*m=pcL#Nx!Pc1v=gn-plP zD_ZOos@M$}!{`eCF^Um4V?0F^J63=(8h~R5SRVhh$VD7RFM)UTVHx)b3p4UjjnbJ8 zb*?iV>xj=zq_bZ6CUrynQSWBt5JfnyA<0N;!;+Ki!6m~n02uzdd!%geTTooae>B;GTekYI(lalR@710dHfiP=jnQLdf8ywaV} z(8^d2%az5-r%locEmU?61`Eo0ggP?aKs7CneN1==rJK1CTtrK?5aq+k@145s|7@E!6lr%i`v>uX{BOZdF1HL?q&rP%)w{gM5uH)z#Q~vh1!48%w0|4xjAFx3VghlUfRk~r_by%Xv zv_%W-YXAiRDWM}av55(aC<+VD6}|=NYOy$hi1vx9IF<)q&e4s{dKQ9pa_wtRgb z_sBzXaDH8U5Q4-Qr4PkplouO{BFFT~G}Wh)>1ow1Hj;-mUaAMZTICX-Sg1uMs#H>J z=7DxO%+O2eTNNl~xi)orQq6IW-;7nA!nK2TrmLW}3(DFS1_6jpGy=kETiS}(N2MB; zvY)Ry*Fb;pr*=gyE<>Z}L~lB|QhT(E4C_|JmRhlMZK-xC%iYHkfB=YwH31;YYPP-E zRA5F{kndAR?XvgRdh6$h9SYnm3i*-R#aE{h&FFoVRXxjIbkNi}>={S-XxhDHv_H*l zy$WF4Fzlyv5iGfJzw^N7&bF&zjR0BG`rVTiz^h~3?#8M!zJ3F?zG(!l5C8x>j0;gk literal 0 HcmV?d00001 diff --git a/data/tilesets/pyramid_2.gif b/data/tilesets/pyramid_2.gif new file mode 100644 index 0000000000000000000000000000000000000000..0c983188d5e275dd96d6134d68486400cfa41bbf GIT binary patch literal 2329 zcmV+!3Fh`kNk%v~VSoTo0K@X`X000!GWW@C&3Q; zsI050YY-L#3<(1X0tNxP1_B9+hPJ=J!oZJ{$dn6~nV1)wpV6RbKL!>J*A^BA*xlOP z+1T6O;^5xfLj&pq0=w?I0_*bg^y&-A$s*1B5+c&lp+>2p7oc82f(Glwnx&*2FLwfj z9FeF5$&X|BB4Mb+&l$9TohF1LGADq^lPFXFs$9v^G0~wviWn`)I7wee zO#VQ63P`G@(W5LE(lR9Tp|4xOYC$Ci^&ZbiK7VQnDs&9dl1RfMT{UZ6Q;7A_&a--z zLRPI@yM`LjLag1REz~(s5NIa6y@2^T2)tLoU<12wd3R7`aA4@ zvPqIJZx=dg)1HCG*J-8Y@{VW&D!|156p~D_S|waKgT;57l;KGkA`ztqe|OzR+Hb*u zNZMKOfT+TWD5iMED9v#=)(^8_C!=+K(Nvv^IOaHlI(50&p8@JvG*J>o3{hkdB4m(3 z1xr@ofn_kYgp_q7`M@unO4WkI5hfZY(o^#H5XP#BU`RJT`KFM5|fUX3cTAX%j zPos^B04k-Gj!LJWm}Z)iQWa5jWUE9fVFaV5#!2g&rA`WGu9vFX5_CDCd8V4e>Qw5e zqSjjFv7l<0s;@2yT4+>=2BWC|wZAYMsDUn!@PmxoL5`tGc*;%k5k} zlB-f)0~B^xVC$u4uY30@sO+-;dK)lgf699jnE?Kmpuz|;OyI4f>T0UQkxJ^U!ITLq z9C05G7ox|#iHO?3?CM!^mDIFoFmyAv>~eOHHcBz5GauXMco-insJ?s&f^WYLV7D*C zG|O3Q&5rh(^DgNy%!>e}E&Q2*5A~8@l2F>o-KmW?g5O;uegthf~i4wa6qw zuPLeg&W?$%Eq{mi4M zEV!@0GQfR2oiBpCv2*e+eFfI%Zhf-KqMozr?%P}UWEViENF`fv3IiC{l|bk*@Lyk9 zpQ`LeJOL(e9>`k@oW4*#fW3)>)N9wk=u(4S+`xn-oDK?SutFHri!T=BnPHIEuVZ!4 zgZc|$?)X=$1;oM)YN$gSf`|tq*1?ECEJYDJqkzn8Ml%L*m=pcL#Nx!Pc1v=gn-plP zD_ZOos@M$}!{`eCF^Um4V?0F^J4S#p8h~R5SRVhh$VD7RFM)UTVHx)b3p4UjjnbJ8 zb*?iV>xj=zq_bZ6CUrynQSWBt5JfnyA<0N;!;+Ki!6m~n02uzdd!%geTTooae>B;GTekYI(lalQ%y10dHfiP=jnQLdf8ywaV} z(8^d2%az5-r%locEmU?61`Eo0ggP?aKs7CneN1==rJK1CTtrK?5aq+k@145s|7@E!6lr%i`v>uX{BOZdF1HL?q&rP%)w{gM5uH)z#Q~vh1!48%w0|4xjAFx3VghlUfRk~r_by%Xv zv_%W-Yk&j*DWM}av55(aC<+VD6}|=NYOz>>i1vx9IF<)q&e4s{dKQ9pa_wtRgb z_sBzXaDH8U5Q4-Qr4PkplouO{BFFT~G}Wh)>1ow1Hj;-mUaAMZTICX-Sg1uMs#H>J z=7DxO%+O2eTNNl~xi)orQq6IW-;7nA!nK2TrmLW}3(DFS1_6jpGy=kETiS}(N2MB; zvY)Ry*Fb;pr*=gyE<>Z}L~lB|QhT(E4C_|JmRhlMZK-xC%iYHopa6)5bpasDYPP-E zRA5F{kndAR?XvgRdh6$h9SYnm3i*-R#aE{h&FFoVRXxjIbkNi}>={S-XxhDHv_H*l zy$WF4Fzlyv5iGfJzw^N7&bF&zjR0BG`rVTiz^h~3?#8M!zJ3F?zG(!l5C8x>^RiVj literal 0 HcmV?d00001 diff --git a/data/tilesets/pyramid_3.gif b/data/tilesets/pyramid_3.gif new file mode 100644 index 0000000000000000000000000000000000000000..36270cc57319d0a150d3838847f8c2ea7a433c39 GIT binary patch literal 2329 zcmV+!3Fh`kNk%v~VSoTo0K@_pCMzN-D3Q; zsI050YY`O#32p7oc82f(Glwnx&*2FLwfj z9FeF5$&X|BB4Mb+&l$9Tog{=JGADq^lPFXFs$9v^G0~wviWn`)I7wee zO#VQ63P`G@(W5LE(lR9Tp|4xOYC$Ci^&ZbiK7VQnDs&9dl1RfMT{UZ6Q;7A_&a-;e zLRPI@yM`LjLag1REz~(!5NIa6y@2^T2)tLo;01fxUVZyBuF#Q1?@C4)tH%Pq-27;6 zU|_+4&zA*U{(K<12wd3R7`aA4@ zvPqIJZx=dg)1HCG*J-8Y@{VW&F2Kb96p~D_S|waKgT;57l;KGkA`ztqe|OzR+Hb*u zNZMKOfT+TWD5iMED9v#=)(^8_C!=+K(Nvv^IOaHlI(50&p8@JvG*J>o3{hkdB3y96 z1WQif zzUgHGZMs>fn_kYgp_q7`M@unO4WkI5hfZY(o^#H5XP#BU`RJT`KFM5|fUX3cTAX%j zPos^B04k-Gj!LJWm}Z)iQWa5jWUE9fVFaV5#!2g&rA`WGu9vFX5_CDCd8V4e>Qw5e zqSjjFv7l<0s;@2yT4+>=2BWC|wZAYMsDUn!@PmxoL5`tGc*;%k5k} zlB-f)0~B^xVC$u4uY30@sO+-;dK)lgf699jnE?Kmpuz|;OyI4f>T0UQkxJ^U!ITLq z9C05G7ox|#iHO?3?CM!^mDIFoFmyAv>~eOHHcBz5GauXMco-insJ?s&f^WYLV7D*C zG|O3Q&5rh(^DgNy%!>e}E&Q2*5A~8@l2F>o-KmW?g5O;uegthf~i4wa6qw z`k@oW4*#fW3)>)N9wk=u(4S+`xn-oDK?SutFHri!T=BnPHIEuVZ!4 zgZc|$?)X=$1jND(YN$gSf`|tq*1?ECEJYDJvw+NOMl%L*m=pcL#Nx!Pc1v=gn-plP zD_ZOos@M$}!{`eCF^Um4V?0F^J4S#p8h~R5SRVhh$VD7RFM)UTVHx)b3p4UjjnbJ8 zb*?iV>xj=zq_bZ6CUrynQSWBt5JfnyA<0N;!;+Ki!6m~n02uzdd!%geTTooae>B;GTekYI(lalR@710dHfiP=jnQLdf8ywaV} z(8^d2%az5-r%locEmU?61`Eo0ggP?aKs7CneN1==rJK1CTtrK?5aq+k@145s|7@E!6lr%i`v>uX{BOZdF1HL?q&rP%)w{gM5uH)z#Q~vh1!48%w0|4xjAFx3VghlUfRk~r_by%Xv zv_%W-YXAiRDWM}av55(aC<+VD6}|=NYOy$hi1vx9IF<)q&e4s{dKQ9pa_wtRgb z_sBzXaDH8U5Q4-Qr4PkplouO{BFFT~G}Wh)>1ow1Hj;-mUaAMZTICX-Sg1uMs#H>J z=7DxO%+O2eTNNl~xi)orQq6IW-;7nA!nK2TrmLW}3(DFS1_6jpGy=kETiS}(N2MB; zvY)Ry*Fb;pr*=gyE<>Z}L~lB|QhT(E4C_|JmRhlMZK-xC%iYHopa6)5bpasDYPP-E zRA5F{kndAR?XvgRdh6$h9SYnm3i*-R#aE{h&FFoVRXxjIbkNi}>={S-XxhDHv_H*l zy$WF4Fzlyv5iGfJzw^N7&bF&zjR0BG`rVTiz^h~3?#8M!zJ3F?zG(!l5C8x>28vO+ literal 0 HcmV?d00001 diff --git a/data/tilesets/pyramid_4.gif b/data/tilesets/pyramid_4.gif new file mode 100644 index 0000000000000000000000000000000000000000..5b323c0d6980d3d695385360cdd75e08ddf71233 GIT binary patch literal 2329 zcmV+!3Fh`kNk%v~VSoTo0K@X`X000!GWW@C&3Q; zsI050YY`O#3<(1X0tNxP1_B9+hPJ=J!oZJ{$dn6~nV1%vpV6RbKL!;I*A*28*xlOP z+1T6O;^5xfLj&pq0=w?I0_*bg^y&-A$s*1B5+c&lp+>2p7oc82f(Glwnx&*2FLwfj z9FeF5$&X|BB4Mb+&l$9TohF1LGADq^lPFXFs$9v^G0~wviWn`)I7wee zO#VQ63P`G@(W5LE(lR9Tp|4xOYC$Ci^&ZbiK7VQnDs&9dl1RfMT{UZ6Q;7A_&a-;; zLRPI@yM`LjLag1REz~(s5NIa6y@2^T2)tLoUPL;7>>0=;ny08UylPsSY` zgM<12wd3R7`aA4@ zvPqIJZx=dg)1HCG*J-8Y@{VW&D!|156p~D_S|waKgT;57l;KGkA`ztqe|OzR+Hb*u zNZMKOfT+TWD5iMED9v#=)(^8_C!=+K(Nvv^IOaHlI(50&p8@JvG*J>o3{hkdB4m&O z1xr%kfn_kYgp_q7`M@unO4WkI5hfZY(o^#H5XP#BU`RJT`KFM5|fUX3cTAX%j zPos^B04k-Gj!LJWm}Z)iQWa5jWUE9fVFaV5#!2g&rA`WGu9vFX5_CDCd8V4e>Qw5e zqSjjFv7l<0s;@2yT4+>=2BWC|wZAYMsDUn!@PmxoL5`tGc*;%k5k} zlB-f)0~B^xVC$u4uY30@sO+-;dK)lgf699jnE?Kmpuz|;OyI4f>T0UQkxJ^U!ITLq z9C05G7ox|#iHO?3?CM!^mDIFoFmyAv>~eOHHcBz5GauXMco-insJ?s&f^WYLV7D*C zG|O3Q&5rh(^DgNy%!>e}E&Q2*5A~8@l2F>o-KmW?g5O;uegthf~i4wa6qw z`k@oW4*#fW3)>)N9wk=u(4S+`xn-oDK?SutFHri!T=BnPHIEuVZ!4 zgZc|$?)X=$1;oM)YN$gSf`|tq*1?ECEJYDJqkzn8Ml%L*m=pcL#Nx!Pc1v=gn-plP zD_ZOos@M$}!{`eCF^Um4V?0F^J63=(8h~R5SRVhh$VD7RFM)UTVHx)b3p4UjjnbJ8 zb*?iV>xj=zq_bZ6CUrynQSWBt5JfnyA<0N;!;+Ki!6m~n02uzdd!%geTTooae>B;GTekYI(lalR@710dHfiP=jnQLdf8ywaV} z(8^d2%az5-r%locEmU?61`Eo0ggP?aKs7CneN1==rJK1CTtrK?5aq+k@145s|7@E!6lr%i`v>uX{BOZdF1HL?q&rP%)w{gM5uH)z#Q~vh1!48%w0|4xjAFx3VghlUfRk~r_by%Xv zv_%W-Yk&j*DWM}av55(aC<+VD6}|=NYOzRxi1vx9IF<)q&e4s{dKQ9pa_wtRgb z_sBzXaDH8U5Q4-Qr4PkplouO{BFFT~G}Wh)>1ow1Hj;-mUaAMZTICX-Sg1uMs#H>J z=7DxO%+O2eTNNl~xi)orQq6IW-;7nA!nK2TrmLW}3(DFS1_6jpGy=kETiS}(N2MB; zvY)Ry*Fb;pr*=gyE<>Z}L~lB|QhT(E4C_|JmRhlMZK-xC%iYHkfB=YwH31;YYPP-E zRA5F{kndAR?XvgRdh6$h9SYnm3i*-R#aE{h&FFoVRXxjIbkNi}>={S-XxhDHv_H*l zy$WF4Fzlyv5iGfJzw^N7&bF&zjR0BG`rVTiz^h~3?#8M!zJ3F?zG(!l5C8x>&>m71 literal 0 HcmV?d00001 diff --git a/data/tilesets/pyramid_5.gif b/data/tilesets/pyramid_5.gif new file mode 100644 index 0000000000000000000000000000000000000000..ed2f2bf2e5594192bec0051b428cd4b8ba549aab GIT binary patch literal 2329 zcmV+!3Fh`kNk%v~VSoTo0K@V$>r<$gy000000000000000 z000000000000000A^8Le3IG5AEC2ui0Du5c000I5;3AG>X`X000!7QV@C&*BG-uaY9&D+5Ab6Q{)z^~Mxo(gv)Asn11^6z z;&%L;-DC6_0)c^O3<`#RgoX-;eu@iFQIV2QB3W9Om{=lWW1XI13j-5v1wW>9r>3Q; zsI050YYr0w3J3!T0tErO1p)|)hPJ=J!oZJ{$dn6~nV1xtpV6RbKLryE*Ao*3*xlOP z+1T6O;^5xfLj&pq0=w?I0_*bg^y&-A$s*1B5hBvkp+>2p7oc82f(Glwnx&*2FLwfj z9FeF5$&X|BB3-D&&l$9TogjoFGADq^lPFXFs$9v^G0~wviWn`)I7wee zO#VQ63P`G@(W5LE(lR9Tp|4xOYC$Ci^&ZbiK7VQnDs&9dl1RfMT{UZ6Q;7A_&a-;8 zLRPI@yM`LjLag1REz~tg5NIa6y@2`NNf21T;Js|GzWo_j=*XgXBcqJfBLQD-eljyC zkidXv%K|KWHUL_*XN){IF4L-M0Vj|mMM0J4s57c&#_yTyuG0kSYVMrPEW+pw2i~h5J$vfu?_|ffowfJZ z|6-FIPu}kH(WQ0v8DFN6mdiV#5tsn~6H`bsg=&>>;S3huZBm9OWr#$S8vWg6+i1Q4 z7vgAV!4skiD5j|58KW@Q;aES+a@~y8`9%|TE9R)<2b82@MlqQ;M4y%)? zq>gHSG^n9bB^u2CqSyY?tf<@8Stkj}e#>Gt(QX>!r|72DEwAh53U0S^ z`B<(>c@4ncVezden7-{Hwk)&%ejD&(fX;hTnE?W*pu!0@s$dI!bYv5CLq=|qGlt43|qAS%tudLdc+qqt&~(%BUmj|RmXFv0;4O9>ljbsercn+!->0} z`!U@#66&}OPd#VFBhSeK=l;c$Up!zk^bpYbJgPXWJ}42!(nOs?CaiYMms@ z=p#cILX@HZQ*q^7oJh;r&{Y-feqPKY`LrlP5JEB(v1DaF?J3iHGNPoKx*-Ec$ibH4 z&yoCF%0U&%Orj<3naH>`cO~3Lb z%Ci1!lz?dmUVH=tr0CSA&3ltqzY5n!hIMMXtYyM*S)je-1?)eGE|B8|05 zE9gR7fZqZjAV?!N@rh4t&_r2yc&_-Za6!CMiGqZpSIzM{@N$lBaQ3qiw9{+18Vdaa zn7>FS5`_2r;)4)G#=gU&KqH0HM%MLtelqe*w`|jWF1el<^_?SoDAA_U)p}IDg^5vI z)NHj`DkNSpiksY=rFJl?cD^%D^@qox>iExL?rH~lDrgT%RfLPAs#rleR`wj=(U3lt zK%+xR+n@!ytEED7rtR9(yXJDa0*ExEKb_pEk#|gog==C}z1SIXr@i- zZugZh+>W6?sjJ}0ksF=~MmKlcNb3XGTGsH6H38cFZrrSMzJDXOzH1b%5C8x>$4yQ- literal 0 HcmV?d00001 diff --git a/source/game/scenes/game_scene.cpp b/source/game/scenes/game_scene.cpp index 167d3c3..8134fd8 100644 --- a/source/game/scenes/game_scene.cpp +++ b/source/game/scenes/game_scene.cpp @@ -512,12 +512,18 @@ void GameScene::loadRoom(const std::string& yaml_path) { // CLOSED amb visited buit, momies i altres actors a la posició inicial. config_.map_yaml = yaml_path; Map::loadFrom(yaml_path); + // Tilemap pre-blita els tiles a un buffer ARGB intern al ctor — sense + // reconstruir-lo, la imatge de la sala anterior es queda fixada per a + // sempre. PaintLayer captura `tileset_path_`/`tileset_cols_` per valor + // del Tilemap a la seua construcció, així que també cal recrear-lo + // perquè el rastre del jugador faça servir el tileset nou. + tilemap_ = Tilemap(yaml_path); + paint_layer_ = std::make_unique(tilemap_, &entity_manager_.getBus()); entity_manager_.reload(yaml_path); // Tornem a fixar el comptador de "esperats" amb només els slots // actius — un slot DISABLED permanent (single-player) no compta. const int ACTIVE_COUNT = std::ranges::count(players_starts_active_, true); entity_manager_.setExpectedPlayerCount(ACTIVE_COUNT); - if (paint_layer_) { paint_layer_->clear(); } // Tornem tots els slots a DISABLED. Els actius els reactivarà el // trigger d'spawn aeri dins de `updateRoomTransition` quan torni a