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 0000000..bb3a80d Binary files /dev/null and b/data/tilesets/pyramid_1.gif differ diff --git a/data/tilesets/pyramid_2.gif b/data/tilesets/pyramid_2.gif new file mode 100644 index 0000000..0c98318 Binary files /dev/null and b/data/tilesets/pyramid_2.gif differ diff --git a/data/tilesets/pyramid_3.gif b/data/tilesets/pyramid_3.gif new file mode 100644 index 0000000..36270cc Binary files /dev/null and b/data/tilesets/pyramid_3.gif differ diff --git a/data/tilesets/pyramid_4.gif b/data/tilesets/pyramid_4.gif new file mode 100644 index 0000000..5b323c0 Binary files /dev/null and b/data/tilesets/pyramid_4.gif differ diff --git a/data/tilesets/pyramid_5.gif b/data/tilesets/pyramid_5.gif new file mode 100644 index 0000000..ed2f2bf Binary files /dev/null and b/data/tilesets/pyramid_5.gif differ 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