Implementado el cambio de pantalla
This commit is contained in:
@@ -4,8 +4,8 @@ bg_img=bg_surface.png
|
|||||||
room_up=0
|
room_up=0
|
||||||
room_down=0
|
room_down=0
|
||||||
room_left=0
|
room_left=0
|
||||||
room_right=0
|
room_right=02.map
|
||||||
|
|
||||||
[tilemap]
|
[tilemap]
|
||||||
01_8.tmx
|
01.tmx
|
||||||
[tilemap-end]
|
[tilemap-end]
|
||||||
@@ -1,21 +1,34 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="20" height="13" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="1">
|
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
|
||||||
<tileset firstgid="1" source="../../../volcano_2022_resources/media_work/map_work/tiles_surface.tsx"/>
|
<tileset firstgid="1" source="surface.tsx"/>
|
||||||
<layer id="1" name="tiles" width="20" height="13">
|
<layer id="1" name="Capa de patrones 1" width="40" height="26">
|
||||||
<data encoding="csv">
|
<data encoding="csv">
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,68,68,0,0,0,0,0,65,65,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,49,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,68,68,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
0,0,0,0,65,65,0,0,0,68,0,0,0,0,68,68,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,159,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
||||||
0,0,0,0,0,0,0,31,0,0,0,0,0,49,0,0,0,0,0,0,
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,191,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
||||||
0,49,0,0,0,0,0,47,0,0,0,0,68,68,68,68,0,0,0,0,
|
0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,257,258,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,259,0,0,0,
|
||||||
68,68,68,68,68,68,68,68,68,68,68,68,68,69,78,68,68,68,68,68
|
0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,0,0,0,0,0,0,259,0,0,0,
|
||||||
|
0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
||||||
|
0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,0,239,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,265,266,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,257,258,257,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,289,290,289,290,0,0,0,0,577,578,579,580,581,582,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
263,264,0,0,0,0,0,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,277,278,279,280,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
295,296,0,0,0,0,0,225,226,0,0,0,0,0,0,0,0,281,275,275,275,275,313,314,309,310,311,312,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
265,264,263,264,263,264,263,264,263,0,263,264,263,264,263,264,263,264,263,266,266,266,283,284,266,265,266,264,263,264,263,264,263,264,263,264,263,264,263,264,
|
||||||
|
295,296,295,296,295,296,295,296,295,0,295,296,295,296,295,296,295,296,295,296,295,296,315,316,298,297,298,296,295,296,295,296,295,296,295,296,295,296,295,296
|
||||||
</data>
|
</data>
|
||||||
</layer>
|
</layer>
|
||||||
</map>
|
</map>
|
||||||
|
|||||||
@@ -1,34 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
|
|
||||||
<tileset firstgid="1" source="../../../volcano_2022_resources/media_work/map_work/tiles_surface.tsx"/>
|
|
||||||
<layer id="1" name="Capa de patrones 1" width="40" height="26">
|
|
||||||
<data encoding="csv">
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,159,160,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,191,192,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,0,0,257,258,0,0,0,0,0,0,0,0,0,263,264,0,0,0,0,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,266,0,0,0,0,0,0,259,0,0,0,
|
|
||||||
0,263,264,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,259,0,0,0,
|
|
||||||
0,295,296,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,239,240,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,265,266,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,257,258,257,258,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,289,290,289,290,0,0,0,0,577,578,579,580,581,582,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,259,0,0,259,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
263,264,0,0,0,0,0,193,194,0,0,0,0,0,0,0,0,0,0,0,0,0,281,282,277,278,279,280,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
295,296,0,0,0,0,0,225,226,0,0,0,0,0,0,0,0,281,275,275,275,275,313,314,309,310,311,312,0,0,0,0,0,0,0,0,0,0,0,0,
|
|
||||||
265,264,263,264,263,264,263,264,263,0,263,264,263,264,263,264,263,264,263,266,266,266,283,284,266,265,266,264,263,264,263,264,263,264,263,264,263,264,263,264,
|
|
||||||
295,296,295,296,295,296,295,296,295,0,295,296,295,296,295,296,295,296,295,296,295,296,315,316,298,297,298,296,295,296,295,296,295,296,295,296,295,296,295,296
|
|
||||||
</data>
|
|
||||||
</layer>
|
|
||||||
</map>
|
|
||||||
11
data/map/02.map
Normal file
11
data/map/02.map
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
tileset_img=tiles_surface.png
|
||||||
|
bg_img=bg_surface.png
|
||||||
|
|
||||||
|
room_up=0
|
||||||
|
room_down=03.map
|
||||||
|
room_left=01.map
|
||||||
|
room_right=0
|
||||||
|
|
||||||
|
[tilemap]
|
||||||
|
02.tmx
|
||||||
|
[tilemap-end]
|
||||||
34
data/map/02.tmx
Normal file
34
data/map/02.tmx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
|
||||||
|
<tileset firstgid="1" source="surface.tsx"/>
|
||||||
|
<layer id="1" name="Capa de patrones 1" width="40" height="26">
|
||||||
|
<data encoding="csv">
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,266,266,266,266,266,266,266,266,266,266,266,266,266,266,0,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,266,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,297,297,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
|
||||||
|
263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,263,264,264,264,264,264,0,0,0,0,264,264,264,264,264,264,264,264,264,264,
|
||||||
|
295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,295,296,296,296,296,296,0,0,0,0,296,296,296,296,296,296,296,296,296,296
|
||||||
|
</data>
|
||||||
|
</layer>
|
||||||
|
</map>
|
||||||
11
data/map/03.map
Normal file
11
data/map/03.map
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
tileset_img=tiles_surface.png
|
||||||
|
bg_img=bg_surface.png
|
||||||
|
|
||||||
|
room_up=02.map
|
||||||
|
room_down=0
|
||||||
|
room_left=0
|
||||||
|
room_right=0
|
||||||
|
|
||||||
|
[tilemap]
|
||||||
|
03.tmx
|
||||||
|
[tilemap-end]
|
||||||
34
data/map/03.tmx
Normal file
34
data/map/03.tmx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="40" height="26" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
|
||||||
|
<tileset firstgid="1" source="surface.tsx"/>
|
||||||
|
<layer id="1" name="Capa de patrones 1" width="40" height="26">
|
||||||
|
<data encoding="csv">
|
||||||
|
265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,0,0,0,0,265,265,265,265,265,265,265,265,265,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,577,578,579,580,581,582,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,189,190,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,189,190,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,257,257,257,257,258,257,258,258,258,257,257,257,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,265,
|
||||||
|
265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265,265
|
||||||
|
</data>
|
||||||
|
</layer>
|
||||||
|
</map>
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<tileset version="1.9" tiledversion="1.9.1" name="tiles_surface" tilewidth="8" tileheight="8" tilecount="1024" columns="32">
|
<tileset version="1.9" tiledversion="1.9.1" name="tiles_surface" tilewidth="8" tileheight="8" tilecount="1024" columns="32">
|
||||||
<image source="../../media/gfx/tiles_surface.png" width="256" height="256"/>
|
<image source="../../../volcano_2022/media/gfx/tiles_surface.png" width="256" height="256"/>
|
||||||
</tileset>
|
</tileset>
|
||||||
27
data/map/surface.world
Normal file
27
data/map/surface.world
Normal file
@@ -0,0 +1,27 @@
|
|||||||
|
{
|
||||||
|
"maps": [
|
||||||
|
{
|
||||||
|
"fileName": "02.tmx",
|
||||||
|
"height": 208,
|
||||||
|
"width": 320,
|
||||||
|
"x": 256,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fileName": "01.tmx",
|
||||||
|
"height": 208,
|
||||||
|
"width": 320,
|
||||||
|
"x": -64,
|
||||||
|
"y": 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"fileName": "03.tmx",
|
||||||
|
"height": 208,
|
||||||
|
"width": 320,
|
||||||
|
"x": 256,
|
||||||
|
"y": 208
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"onlyShowAdjacentMaps": false,
|
||||||
|
"type": "world"
|
||||||
|
}
|
||||||
@@ -10,7 +10,7 @@ Game::Game(SDL_Renderer *renderer, Asset *asset, Screen *screen, Input *input)
|
|||||||
this->input = input;
|
this->input = input;
|
||||||
|
|
||||||
eventHandler = new SDL_Event();
|
eventHandler = new SDL_Event();
|
||||||
map = new Map(asset->get("01.map"), renderer, asset);
|
map = new Map(asset->get("02.map"), renderer, asset);
|
||||||
player = new Player(renderer, asset, input, map);
|
player = new Player(renderer, asset, input, map);
|
||||||
debugText = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer);
|
debugText = new Text(asset->get("debug.png"), asset->get("debug.txt"), renderer);
|
||||||
}
|
}
|
||||||
@@ -75,6 +75,7 @@ void Game::update()
|
|||||||
}
|
}
|
||||||
|
|
||||||
player->update();
|
player->update();
|
||||||
|
checkScreenBorders();
|
||||||
checkInput();
|
checkInput();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -105,6 +106,8 @@ void Game::checkInput()
|
|||||||
|
|
||||||
if (input->checkInput(INPUT_BUTTON_3, REPEAT_FALSE))
|
if (input->checkInput(INPUT_BUTTON_3, REPEAT_FALSE))
|
||||||
{
|
{
|
||||||
|
delete map;
|
||||||
|
map = new Map(asset->get("01.map"),renderer, asset);
|
||||||
delete player;
|
delete player;
|
||||||
player = new Player(renderer, asset, input, map);
|
player = new Player(renderer, asset, input, map);
|
||||||
}
|
}
|
||||||
@@ -156,4 +159,40 @@ void Game::renderDebugInfo()
|
|||||||
|
|
||||||
text = "state " + std::to_string(player->state);
|
text = "state " + std::to_string(player->state);
|
||||||
debugText->write(0, line += 6, text, -1);
|
debugText->write(0, line += 6, text, -1);
|
||||||
|
|
||||||
|
text = map->getRoomFileName(b_top) + " " +map->getRoomFileName(b_right) + " " +map->getRoomFileName(b_bottom) + " " +map->getRoomFileName(b_left);
|
||||||
|
debugText->write(0, line += 6, text, -1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cambia el mapa
|
||||||
|
bool Game::changeMap(std::string file)
|
||||||
|
{
|
||||||
|
bool success = false;
|
||||||
|
// En las habitaciones los limites tienen la cadena del fichero o un 0 en caso de no limitar con nada
|
||||||
|
if (file != "0")
|
||||||
|
// Verifica que exista el fichero que se va a cargar
|
||||||
|
if (asset->get(file) != "")
|
||||||
|
{
|
||||||
|
// Elimina la habitación actual
|
||||||
|
delete map;
|
||||||
|
|
||||||
|
// Crea un objeto habitación nuevo a partir del fichero
|
||||||
|
map = new Map(asset->get(file), renderer, asset);
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Comprueba si el jugador está en el borde y se ha de cambiar el mapa
|
||||||
|
void Game::checkScreenBorders()
|
||||||
|
{
|
||||||
|
if (player->isOnScreenBorder())
|
||||||
|
{
|
||||||
|
if (changeMap(map->getRoomFileName(player->getBorder())))
|
||||||
|
{
|
||||||
|
player->setMap(map);
|
||||||
|
player->switchBorders();
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -42,6 +42,12 @@ private:
|
|||||||
// Muestra información de depuración
|
// Muestra información de depuración
|
||||||
void renderDebugInfo();
|
void renderDebugInfo();
|
||||||
|
|
||||||
|
// Cambia el mapa
|
||||||
|
bool changeMap(std::string file);
|
||||||
|
|
||||||
|
// Comprueba si el jugador está en el borde y se ha de cambiar el mapa
|
||||||
|
void checkScreenBorders();
|
||||||
|
|
||||||
public:
|
public:
|
||||||
// Constructor
|
// Constructor
|
||||||
Game(SDL_Renderer *renderer, Asset *asset, Screen *screen, Input *input);
|
Game(SDL_Renderer *renderer, Asset *asset, Screen *screen, Input *input);
|
||||||
|
|||||||
@@ -223,9 +223,11 @@ void Map::render()
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Devuelve el tipo de tile que hay en un punto
|
// Devuelve el tipo de tile que hay en un punto
|
||||||
t_tile_map Map::getTile(SDL_Point p)
|
e_tile_map Map::getTile(SDL_Point p)
|
||||||
{
|
{
|
||||||
const int tile = tilemap[((p.y / tile_size) * map_width) + (p.x / tile_size)];
|
const int x = std::max(getPlayArea(b_left), (std::min(p.x, getPlayArea(b_right))));
|
||||||
|
const int y = std::max(getPlayArea(b_top), (std::min(p.y, getPlayArea(b_bottom))));
|
||||||
|
const int tile = tilemap[((y / tile_size) * map_width) + (x / tile_size)];
|
||||||
const int png_width = 32;
|
const int png_width = 32;
|
||||||
|
|
||||||
if (tile >= 0 && tile < 8 * png_width)
|
if (tile >= 0 && tile < 8 * png_width)
|
||||||
@@ -240,6 +242,8 @@ t_tile_map Map::getTile(SDL_Point p)
|
|||||||
{
|
{
|
||||||
return passable;
|
return passable;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return nothing;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Devuelve el valor de la variable
|
// Devuelve el valor de la variable
|
||||||
@@ -253,3 +257,59 @@ int Map::getTileIndex(SDL_Point p)
|
|||||||
{
|
{
|
||||||
return tilemap[((p.y / tile_size) * map_width) + (p.x / tile_size)];
|
return tilemap[((p.y / tile_size) * map_width) + (p.x / tile_size)];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Devuelve el valor de los bordes de la zona de juego
|
||||||
|
int Map::getPlayArea(e_border border)
|
||||||
|
{
|
||||||
|
switch (border)
|
||||||
|
{
|
||||||
|
case b_top:
|
||||||
|
return 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_left:
|
||||||
|
return 0;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_right:
|
||||||
|
return tile_size * map_width;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_bottom:
|
||||||
|
return tile_size * map_height;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Devuelve el nombre del fichero de la habitación en funcion del borde
|
||||||
|
std::string Map::getRoomFileName(e_border border)
|
||||||
|
{
|
||||||
|
switch (border)
|
||||||
|
{
|
||||||
|
case b_top:
|
||||||
|
return room_up;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_left:
|
||||||
|
return room_left;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_right:
|
||||||
|
return room_right;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_bottom:
|
||||||
|
return room_down;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return "";
|
||||||
|
}
|
||||||
19
source/map.h
19
source/map.h
@@ -12,13 +12,22 @@
|
|||||||
#ifndef MAP_H
|
#ifndef MAP_H
|
||||||
#define MAP_H
|
#define MAP_H
|
||||||
|
|
||||||
enum t_tile_map
|
enum e_tile_map
|
||||||
{
|
{
|
||||||
nothing,
|
nothing,
|
||||||
wall,
|
wall,
|
||||||
passable
|
passable
|
||||||
};
|
};
|
||||||
|
|
||||||
|
enum e_border
|
||||||
|
{
|
||||||
|
b_none,
|
||||||
|
b_top,
|
||||||
|
b_bottom,
|
||||||
|
b_left,
|
||||||
|
b_right
|
||||||
|
};
|
||||||
|
|
||||||
// The player
|
// The player
|
||||||
class Map
|
class Map
|
||||||
{
|
{
|
||||||
@@ -64,13 +73,19 @@ public:
|
|||||||
void render();
|
void render();
|
||||||
|
|
||||||
// Devuelve el tipo de tile que hay en un punto
|
// Devuelve el tipo de tile que hay en un punto
|
||||||
t_tile_map getTile(SDL_Point p);
|
e_tile_map getTile(SDL_Point p);
|
||||||
|
|
||||||
// Devuelve el valor de la variable
|
// Devuelve el valor de la variable
|
||||||
int getTileSize();
|
int getTileSize();
|
||||||
|
|
||||||
// Devuelve el indice del tile correspondiente a un punto del mapa
|
// Devuelve el indice del tile correspondiente a un punto del mapa
|
||||||
int getTileIndex(SDL_Point p);
|
int getTileIndex(SDL_Point p);
|
||||||
|
|
||||||
|
// Devuelve el valor de los bordes de la zona de juego
|
||||||
|
int getPlayArea(e_border border);
|
||||||
|
|
||||||
|
// Devuelve el nombre del fichero de la habitación en funcion del borde
|
||||||
|
std::string getRoomFileName(e_border border);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -303,3 +303,73 @@ bool Player::isOnFloor()
|
|||||||
}
|
}
|
||||||
return onFloor;
|
return onFloor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Comprueba si está situado en alguno de los cuatro bordes de la habitación
|
||||||
|
bool Player::isOnScreenBorder()
|
||||||
|
{
|
||||||
|
bool success = false;
|
||||||
|
border = b_none;
|
||||||
|
|
||||||
|
if (x < map->getPlayArea(b_left))
|
||||||
|
{
|
||||||
|
border = b_left;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
else if (x > map->getPlayArea(b_right) - w)
|
||||||
|
{
|
||||||
|
border = b_right;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
else if (y < map->getPlayArea(b_top))
|
||||||
|
{
|
||||||
|
border = b_top;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
else if (y > map->getPlayArea(b_bottom) - h)
|
||||||
|
{
|
||||||
|
border = b_bottom;
|
||||||
|
success = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return success;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Devuelve el valor de la variable
|
||||||
|
e_border Player::getBorder()
|
||||||
|
{
|
||||||
|
return border;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cambia al jugador de un borde al opuesto. Util para el cambio de pantalla
|
||||||
|
void Player::switchBorders()
|
||||||
|
{
|
||||||
|
switch (border)
|
||||||
|
{
|
||||||
|
case b_top:
|
||||||
|
y = map->getPlayArea(b_bottom) - h;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_bottom:
|
||||||
|
y = map->getPlayArea(b_top);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_right:
|
||||||
|
x = map->getPlayArea(b_left);
|
||||||
|
break;
|
||||||
|
|
||||||
|
case b_left:
|
||||||
|
x = map->getPlayArea(b_right) - w;
|
||||||
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
border = b_none;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pasa la referencia del mapa
|
||||||
|
void Player::setMap(Map *map)
|
||||||
|
{
|
||||||
|
this->map = map;
|
||||||
|
}
|
||||||
@@ -10,7 +10,7 @@
|
|||||||
#ifndef PLAYER_H
|
#ifndef PLAYER_H
|
||||||
#define PLAYER_H
|
#define PLAYER_H
|
||||||
|
|
||||||
enum t_player_state
|
enum e_state
|
||||||
{
|
{
|
||||||
standing,
|
standing,
|
||||||
jumping,
|
jumping,
|
||||||
@@ -40,7 +40,8 @@ public:
|
|||||||
int lives; // Cantidad de vidas
|
int lives; // Cantidad de vidas
|
||||||
int w; // Ancho del jugador
|
int w; // Ancho del jugador
|
||||||
int h; // ALto del jugador
|
int h; // ALto del jugador
|
||||||
t_player_state state; // Estado actual del jugador
|
e_state state; // Estado actual del jugador
|
||||||
|
e_border border; // Indica en qué borde de la pantalla está el jugador
|
||||||
SDL_Point lastPosition; // Posición anterior
|
SDL_Point lastPosition; // Posición anterior
|
||||||
|
|
||||||
// Variables que afectan a la inercia del movimiento
|
// Variables que afectan a la inercia del movimiento
|
||||||
@@ -93,6 +94,18 @@ public:
|
|||||||
|
|
||||||
// Dibuja el objeto
|
// Dibuja el objeto
|
||||||
void render();
|
void render();
|
||||||
|
|
||||||
|
// Comprueba si está situado en alguno de los cuatro bordes de la habitación
|
||||||
|
bool isOnScreenBorder();
|
||||||
|
|
||||||
|
// Devuelve el valor de la variable
|
||||||
|
e_border getBorder();
|
||||||
|
|
||||||
|
// Cambia al jugador de un borde al opuesto. Util para el cambio de pantalla
|
||||||
|
void switchBorders();
|
||||||
|
|
||||||
|
// Pasa la referencia del mapa
|
||||||
|
void setMap(Map *map);
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -140,7 +140,10 @@ bool Prog::setFileList()
|
|||||||
// Ficheros binarios
|
// Ficheros binarios
|
||||||
asset->add("/data/map/01.map", data);
|
asset->add("/data/map/01.map", data);
|
||||||
asset->add("/data/map/01.tmx", data);
|
asset->add("/data/map/01.tmx", data);
|
||||||
asset->add("/data/map/01_8.tmx", data);
|
asset->add("/data/map/02.map", data);
|
||||||
|
asset->add("/data/map/02.tmx", data);
|
||||||
|
asset->add("/data/map/03.map", data);
|
||||||
|
asset->add("/data/map/03.tmx", data);
|
||||||
asset->add("/data/config.bin", data, false);
|
asset->add("/data/config.bin", data, false);
|
||||||
asset->add("/data/gamecontrollerdb.txt", data);
|
asset->add("/data/gamecontrollerdb.txt", data);
|
||||||
asset->add("/data/animations/player.ani", data);
|
asset->add("/data/animations/player.ani", data);
|
||||||
|
|||||||
Reference in New Issue
Block a user