Fix: Algunas texturas desaparecen al bloquearse la pantalla

.gitignore

@@ -1,11 +1,13 @@
 .vscode
-bin
 *config.txt
-dll
+*stats.txt
-docs
+*.DS_Store
-icon
+thumbs.db
-releases
+*.exe
-resources
+*_macos
-scripts
+*_linux
-*.opk
+*.dmg
-*.DS_Store
+*.tar.gz
+*.zip
+*.app
+*_debug

Makefile

@@ -1,18 +1,141 @@
 executable = jaildoctors_dilemma
 source = source/*.cpp source/common/*.cpp
+appName = JailDoctor's Dilemma
+releaseFolder = jdd_release
+version = v1.04
+
+# Release names
+windowsRelease = $(executable)-$(version)-win32-x64.zip
+macosIntelRelease = $(executable)-$(version)-macos-intel.dmg
+macosAppleSiliconRelease = $(executable)-$(version)-macos-apple-silicon.dmg
+linuxRelease = $(executable)-$(version)-linux.tar.gz
 
 windows:
 	@echo off
-	if not exist bin\ (mkdir bin)
+	g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o $(executable).exe
-	if not exist data\config (mkdir data\config)
+	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
-	g++ $(source) -std=c++11 -Wall -O2 -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o bin/$(executable).exe
+
-	strip -s -R .comment -R .gnu.version bin/$(executable).exe --strip-unneeded
+windows_release:
+	@echo off
+
+# Remove data
+	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+
+# Create folders
+	powershell if (-not (Test-Path $(releaseFolder))) {New-Item $(releaseFolder) -ItemType Directory}
+
+# Copy data
+	powershell Copy-Item -Path "data" -Destination "$(releaseFolder)" -recurse -Force
+	powershell Copy-Item "LICENSE" -Destination "$(releaseFolder)"
+	powershell Copy-Item "README.md" -Destination "$(releaseFolder)"
+	powershell Copy-Item "release/SDL2.dll" -Destination "$(releaseFolder)"
+
+# Remove data
+	powershell if (Test-Path "$(releaseFolder)\data\room\map.world") {Remove-Item "$(releaseFolder)\data\room\map.world" -Recurse -Force}
+	powershell if (Test-Path "$(releaseFolder)\data\room\standard.tsx") {Remove-Item "$(releaseFolder)\data\room\standard.tsx" -Recurse -Force}
+	powershell if (Test-Path "$(releaseFolder)\data\config") {Remove-Item "$(releaseFolder)\data\config" -Recurse -Force}
+
+# Create data
+	powershell if (-not (Test-Path "$(releaseFolder)\data\config")) {New-Item "$(releaseFolder)\data\config" -ItemType Directory}
+
+# Build
+	g++ $(source) -std=c++11 -Wall -Os -lmingw32 -lSDL2main -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -static-libstdc++ -Wl,-subsystem,windows -o "$(releaseFolder)/$(executable).exe"
+	strip -s -R .comment -R .gnu.version "$(releaseFolder)/$(executable).exe" --strip-unneeded
+
+# Create ZIP
+	powershell if (Test-Path $(windowsRelease)) {Remove-Item $(windowsRelease)}
+	powershell Compress-Archive -Path "$(releaseFolder)"/* -DestinationPath $(windowsRelease)
+
+# Remove folder
+	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+
 macos:
-	mkdir -p bin
+	clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos
-	mkdir -p data/config
+
-	g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos
+macos_release:
+# Remove data and possible data
+	rm -rdf "$(releaseFolder)"
+	rm -rdf Frameworks
+	rm -f tmp.dmg
+	rm -f "$(macosIntelRelease)"
+	rm -f "$(macosAppleSiliconRelease)"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/MacOS"
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources"
+	mkdir -p Frameworks
+
+# Copy folders
+	cp -R data "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp -R release/SDL2.framework "$(releaseFolder)/$(appName).app/Contents/Frameworks"
+	cp -R release/SDL2.framework Frameworks
+
+# Delete data
+	rm -f "$(releaseFolder)/$(appName).app/Contents/Resources/data/room/map.world"
+	rm -f "$(releaseFolder)/$(appName).app/Contents/Resources/data/room/standard.tsx"
+	rm -rdf "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/$(appName).app/Contents/Resources/data/config"
+
+# Copy files
+	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
+	cp LICENSE "$(releaseFolder)"
+	cp README.md "$(releaseFolder)"
+
+# Build INTEL
+	clang++ $(source) -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target x86_64-apple-macos10.12
+
+# Build INTEL DMG
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosIntelRelease)"
+	rm -f tmp.dmg
+
+# Build APPLE SILICON	
+	clang++ $(source) -D MACOS_BUNDLE -std=c++11 -Wall -Os -framework SDL2 -F ./Frameworks -ffunction-sections -fdata-sections -o "$(releaseFolder)/$(appName).app/Contents/MacOS/$(executable)" -rpath @executable_path/../Frameworks/ -target arm64-apple-macos11
+
+# Build APPLE SILICON DMG
+	hdiutil create tmp.dmg -ov -volname "$(appName)" -fs HFS+ -srcfolder "$(releaseFolder)" 
+	hdiutil convert tmp.dmg -format UDZO -o "$(macosAppleSiliconRelease)"
+	rm -f tmp.dmg
+
+# Remove data
+	rm -rdf Frameworks
+	rm -rdf "$(releaseFolder)"
+
 linux:
-	mkdir -p bin
+	g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
-	mkdir -p data/config
+	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
-	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o bin/$(executable)_linux
+
-	strip -s -R .comment -R .gnu.version bin/$(executable)_linux --strip-unneeded
+linux_release:
+# Remove data
+	rm -rdf $(releaseFolder)
+
+# Create folders
+	mkdir -p $(releaseFolder)
+
+# Copy data
+	cp -R data $(releaseFolder)
+	cp LICENSE $(releaseFolder)
+	cp README.md $(releaseFolder)
+
+# Delete data
+	rm -f "$(releaseFolder)/data/room/map.world"
+	rm -f "$(releaseFolder)/data/room/standard.tsx"
+	rm -rdf "$(releaseFolder)/data/config"
+
+# Create folders
+	mkdir -p "$(releaseFolder)/data/config"
+
+# Build
+	g++ $(source) -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(releaseFolder)/$(executable)
+	strip -s -R .comment -R .gnu.version $(releaseFolder)/$(executable) --strip-unneeded
+
+# Pack files
+	rm -f $(linuxRelease)
+	cd $(releaseFolder) &&	tar -czvf ../$(linuxRelease) *
+
+# Remove data
+	rm -rdf $(releaseFolder)

README.md

@@ -1,4 +1,37 @@
 # JailDoctor's Dilemma
+JailDoc es un Jailer. A los Jailers les gusta empezar proyectos. A nadie le gusta terminarlos. Los Jailers viven en la Jail. A la Jail va uno a empezar proyectos. A la Jail va uno a enseñar sus proyectos. A la Jail va uno a aprender como empezar nuevos proyectos. A la Jail va uno a ayudar a sus compañeros a que empiecen nuevos proyectos.
 
-Nuevo JailGame de plataformas. Inspirado en juegos como Jet Set Willy
+![JailDoctor's Dilemma - Title screen](https://php.sustancia.synology.me/images/jdd_title.png)
-Plataformas pasapantalla donde hay que ir recogiendo objetos. Manejamos a JailDoc y cada una de las habitaciones por las que pasa tiene relación con alguno de sus proyectos acabados o no. Tambien se pueden tematizar las habitaciones con cualquier tematica jailer: molotov, maniac mansion, todo.txt, etc..
+
+JailDoc es un Jailer destacado entre los Jailers. Tiene más proyectos empezados que nadie y es el que más ayuda a que los demas empiecen los suyos.
+
+Un día, ocurrió algo. Alguien terminó un proyecto. Alguien liberó el *Puzzle Jail Facker*. Algún desaprensivo.
+
+Esto hizo que JailDoc decidiera terminar y entregar uno de sus proyectos, pero, ¿cual? ¿JailBattle? ¿Sigmasuá? ¿Calculín Doom? Menudo dilema. JailDoc se arremangó y decidió finalizar y entregar todos sus proyectos inacabados. ¿Lo logrará?
+
+## Jugabilidad
+Ayuda a JailDoc a recuperar las partes de su proyecto que estan desperdigadas por cualquier lugar del Universo Jailer. Hay mas de **150 piezas** desperdigadas por **60 pantallas**. Algunas son un paseo, pero en otras tendras que calcular muy bien tus movimientos si no quieres acabar como un arounder del montón.
+
+![JailDoctor's Dilemma - Gameplay](https://php.sustancia.synology.me/images/jdd_game1.png)
+
+Cuando consigas recuperar gran parte de las piezas desperdigadas, dirigete a la Jail a mostrar a los Jailers como se termina un proyecto. Ten en cuenta que Bry no te dejará entrar. Solo aquellos que han realizado un *Fire Effect* o un *Facedor de Tornejos* son dignos de tal privilegio.
+
+## Controles
+El juego permite tanto el uso del teclado como de un mando de control. Las teclas para manejar el juego son las siguientes:
+
+ - **Cursores**: Para mover a izquierda o derecha a JailDoc y para saltar
+ - **Tecla M**: Activa o desactiva la música
+ - **Tecla P**: Pone en pausa el juego
+ - **Tecla ESC**: Sale del juego si estas jugando. Sale del programa en cualquier otra circunstancia
+ - **Tecla F**: Cambia a modo de pantalla completa o de ventana
+ - **Teclas F1 a F4**: Cambian el tamaño de la ventana
+ - **Tecla B**: Activa o desactiva el borde de colores de la pantalla cuando el programa se ejecuta en modo de ventana
+
+![JailDoctor's Dilemma - Gameplay](https://php.sustancia.synology.me/images/jdd_game2.png)
+
+## Agradecimientos
+Agradecimientos como siempre a todos los Jailers por motivarme a hacer el juego y ayudarme en los momentos de duda a la hora de escribir el código. Y, como siempre, en especial a JailDoc por su unidad de Jail_Audio y cualquier otro código/ayuda/enseñanzas que haya necesitado para terminar el programa.
+
+Si no me he descontado, este es el cuarto juego que consigo crear.
+
+*13 de noviembre de 2022, JailDesigner*

data/credits/shine.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=6
+loop=-1
+frames=0,1,2,3,4,5,6,7
+[/animation]

data/enemies/abad_bell.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9
+[/animation]

data/enemies/batman_bell.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5
+[/animation]

data/enemies/batman_fire.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/bell.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9,10,11
+[/animation]

data/enemies/code.ani

@@ -3,7 +3,7 @@ frameHeight=16
 
 [animation]
 name=default
-speed=8
+speed=6
 loop=0
 frames=0,1,2,3
 [/animation]

data/enemies/congo.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/crosshair.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/dong.ani

@@ -0,0 +1,9 @@
+frameWidth=22
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5
+[/animation]

data/enemies/jeannine.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/lord_abad.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/spark.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/special/aerojailer.ani

@@ -0,0 +1,9 @@
+frameWidth=43
+frameHeight=44
+
+[animation]
+name=default
+speed=100
+loop=0
+frames=0
+[/animation]

data/enemies/special/arounder.ani

@@ -0,0 +1,9 @@
+frameWidth=79
+frameHeight=90
+
+[animation]
+name=default
+speed=100
+loop=0
+frames=0
+[/animation]

data/enemies/special/pepe_rosita_job.ani

@@ -0,0 +1,9 @@
+frameWidth=62
+frameHeight=47
+
+[animation]
+name=default
+speed=100
+loop=0
+frames=0
+[/animation]

data/enemies/special/shooting_star.ani

@@ -0,0 +1,9 @@
+frameWidth=64
+frameHeight=64
+
+[animation]
+name=default
+speed=6
+loop=-1
+frames=18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18
+[/animation]

data/enemies/tree_thing.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9,10,11,12
+[/animation]

data/enemies/tv.ani

@@ -1,9 +1,9 @@
 frameWidth=16
-frameHeight=16
+frameHeight=18
 
 [animation]
 name=default
-speed=6
+speed=5
 loop=0
 frames=0,1,2,3
 [/animation]

data/enemies/upv_student.ani

@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/enemies/z80.ani

@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=32
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]

data/music/desktop.ini

@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Generic

data/player/player_game_over.ani

@@ -0,0 +1,9 @@
+frameWidth=19
+frameHeight=18
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]

data/room/01.room

@@ -1,15 +1,15 @@
 name=THE JAIL
 bgColor=bright_blue
 border=blue
-tilemap=01.tmx
+tileMapFile=01.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=0
 roomRight=02.room
 
 [enemy]
-tileset=jailer.png
+tileSetFile=jailer.png
 animation=jailer.ani
 width=16
 height=16
@@ -25,7 +25,7 @@ color=white
 [/enemy]
 
 [enemy]
-tileset=jailer3.png
+tileSetFile=jailer3.png
 animation=jailer3.ani
 width=16
 height=16
@@ -41,7 +41,7 @@ color=white
 [/enemy]
 
 [enemy]
-tileset=jailer.png
+tileSetFile=jailer.png
 animation=jailer.ani
 width=16
 height=16
@@ -57,7 +57,7 @@ color=white
 [/enemy]
 
 [enemy]
-tileset=jailer2.png
+tileSetFile=jailer2.png
 animation=jailer2.ani
 width=16
 height=16
@@ -73,7 +73,7 @@ color=white
 [/enemy]
 
 [enemy]
-tileset=jailer.png
+tileSetFile=jailer.png
 animation=jailer.ani
 width=16
 height=16
@@ -89,55 +89,55 @@ color=white
 [/enemy]
 
 [enemy]
-tileset=printer.png
+tileSetFile=printer.png
 animation=printer.ani
 width=16
 height=16
-x=2
+x=3
 y=9
 vx=0
 vy=0
-x1=2
+x1=3
 y1=9
-x2=2
+x2=3
 y2=9
 color=white
 [/enemy]
 
 [enemy]
-tileset=printer.png
+tileSetFile=printer.png
 animation=printer.ani
 width=16
 height=16
-x=5
+x=6
 y=9
 vx=0
 vy=0
-x1=5
+x1=6
 y1=9
-x2=5
+x2=6
 y2=9
 color=white
 [/enemy]
 
 [enemy]
-tileset=lamp.png
+tileSetFile=lamp.png
 animation=lamp.ani
 width=16
 height=16
 x=23
-y=5
+y=6
 vx=0
 vy=0
 x1=23
-y1=5
+y1=6
 x2=23
-y2=5
+y2=6
 color=white
 [/enemy]
 
 [enemy]
-tileset=bry.png
+tileSetFile=bry.png
 animation=bry.ani
 width=8
 height=16
@@ -153,7 +153,7 @@ color=white
 [/enemy]
 
 #[enemy]
-#tileset=tv_panel.png
+#tileSetFile=tv_panel.png
 #animation=tv_panel.ani
 #width=24
 #height=16
@@ -169,7 +169,7 @@ color=white
 #[/enemy]
 #
 #[enemy]
-#tileset=tv_panel.png
+#tileSetFile=tv_panel.png
 #animation=tv_panel.ani
 #width=24
 #height=16
@@ -185,7 +185,7 @@ color=white
 #[/enemy]
 #
 #[enemy]
-#tileset=tv_panel.png
+#tileSetFile=tv_panel.png
 #animation=tv_panel.ani
 #width=24
 #height=16

data/room/01.tmx

@@ -3,18 +3,18 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,
+164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
-188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,
+164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,164,
-188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,188,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,
+164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,
+164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,164,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,
 43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,
-43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,34,34,34,0,0,0,0,0,0,0,0,0,0,34,34,34,
-43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,43,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,0,0,0,0,0,34,34,
-34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
-34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
-34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
-34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
+34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,34,138,139,0,0,0,0,0,0,0,0,0,0,0,0,34,
-34,34,34,34,34,34,34,34,34,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,34,
 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,

data/room/02.room

@@ -1,65 +1,52 @@
-name=road to the jail
+name=ROAD TO THE JAIL
 bgColor=black
 border=cyan
-tilemap=02.tmx
+tileMapFile=02.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=04.room
 roomLeft=01.room
 roomRight=03.room
+itemColor1=yellow
+itemColor2=bright_yellow
 
 [enemy]
-tileset=diskette.png
+tileSetFile=bin.png
-animation=diskette.ani
+animation=bin.ani
 width=16
-height=16
+height=8
-x=5
+x=4
-y=6
+y=7
-vx=0
+vx=0.6
-vy=0.4
+vy=0
-x1=5
+x1=4
-y1=4
+y1=7
-x2=5
+x2=25
-y2=10
+y2=7
-color=bright_red
+color=green
 [/enemy]
 
 [enemy]
-tileset=diskette.png
+tileSetFile=upv_student.png
-animation=diskette.ani
+animation=upv_student.ani
-width=16
-height=16
-x=13
-y=1
-vx=0
-vy=0.4
-x1=13
-y1=1
-x2=13
-y2=9
-color=red
-[/enemy]
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
 width=8
 height=16
-x=8
+x=4
 y=13
-vx=0.4
+vx=0.6
 vy=0
-x1=8
+x1=4
 y1=13
-x2=23
+x2=19
 y2=13
-color=yellow
+color=cyan
+flip=true
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=21
+tile=2
-x=1
+x=4
-y=9
+y=6
 counter=1
 [/item]

data/room/02.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,43,43,43,43,43,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,39,
+43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+43,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+43,43,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,135,0,0,0,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,417,417,417,417,417,417,417,505,39,39,39,39,39,
+43,43,43,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,39,39,39,
+34,34,304,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,39,39,39,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,303,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,39,39,39,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,417,417,417,505,0,0,0,0,0,0,0,39,39,
+34,34,0,413,413,413,413,0,0,0,0,413,413,413,413,413,0,0,0,0,413,413,413,413,413,413,413,0,0,0,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,39,39,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,0,39,39,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,25,25,
-39,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,0,0,0,39,39,
+34,34,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,
-39,417,417,417,417,0,0,417,417,417,417,417,417,0,0,417,417,417,417,0,0,0,0,0,0,0,0,0,0,0,39,39,
+34,34,389,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,25,25,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,513,190,189,190,537,0,0,0,0,
-39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,0,0,39,39,39,39,39,39,39,39,39,39
+34,34,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,191,0,0,189,190,189,190,189,190,189,190,25,25
 </data>
  </layer>
 </map>

data/room/03.room

@@ -1,8 +1,8 @@
-name=void main
+name=VOID MAIN
 bgColor=black
 border=magenta
-tilemap=03.tmx
+tileMapFile=03.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=02.room
@@ -12,7 +12,7 @@ itemColor1=bright_cyan
 itemColor2=yellow
 
 [enemy]
-tileset=code.png
+tileSetFile=code.png
 animation=code.ani
 width=16
 height=16
@@ -28,7 +28,7 @@ color=yellow
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
 tile=42
 x=21
 y=13

data/room/04.room

@@ -1,15 +1,17 @@
-name=no 04
+name=JUMP THROUGH
 bgColor=black
-border=red
+border=cyan
-tilemap=04.tmx
+tileMapFile=04.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=02.room
 roomDown=0
 roomLeft=07.room
 roomRight=05.room
+itemColor1=white
+itemColor2=green
 
 [enemy]
-tileset=chip.png
+tileSetFile=chip.png
 animation=chip.ani
 width=8
 height=16
@@ -22,4 +24,28 @@ y1=12
 x2=31
 y2=12
 color=magenta
-[/enemy]
+[/enemy]
+
+[enemy]
+tileSetFile=chip.png
+animation=chip.ani
+width=8
+height=16
+x=4
+y=2
+vx=0
+vy=0.4
+x1=4
+y1=2
+x2=4
+y2=12
+color=yellow
+[/enemy]
+
+[item]
+tileSetFile=items.png
+tile=51
+x=2
+y=3
+counter=1
+[/item]

data/room/04.tmx

@@ -3,21 +3,21 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,15,15,0,0,0,0,0,0,
+189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,190,189,191,0,0,0,528,189,190,189,190,189,190,189,190,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,15,15,0,0,0,0,0,0,
+15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,15,0,0,0,0,0,528,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,15,15,0,0,0,0,0,0,
+15,15,15,0,0,0,0,15,15,15,15,15,15,15,302,0,0,0,0,0,0,528,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,302,15,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,15,15,15,15,15,15,15,15,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,528,0,0,0,0,0,0,15,15,15,15,15,302,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,415,415,415,415,0,0,0,0,0,0,0,15,15,15,15,302,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,0,0,15,15,0,0,0,0,0,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,415,0,0,0,0,0,15,15,415,415,415,552,0,0,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+15,15,0,0,0,0,415,415,15,15,0,0,0,0,552,0,0,0,0,0,0,15,15,15,15,0,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,15,15,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-15,15,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,415,415,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,522,0,0,0,0,0,0,0,0,0,0,0,0,0,513,15,63,15,63,15,63,15,63,
+0,0,519,15,63,15,63,543,0,0,0,0,0,0,0,0,0,0,552,0,0,0,0,519,15,63,15,63,15,63,15,63,
 63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63,63
 </data>
  </layer>

data/room/05.room

@@ -1,41 +1,76 @@
-name=no 05
+name=BIG JUMP
 bgColor=black
 border=red
-tilemap=05.tmx
+tileMapFile=05.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=60.room
 roomLeft=04.room
 roomRight=06.room
+itemColor1=bright_green
+itemColor2=green
 
 [enemy]
-tileset=diskette.png
+tileSetFile=diskette.png
 animation=diskette.ani
 width=16
 height=16
 x=15
-y=1
+y=4
 vx=0
-vy=0.6
+vy=0.8
 x1=15
-y1=1
+y1=0
 x2=15
-y2=12
+y2=11
 color=magenta
 [/enemy]
 
+[enemy]
+tileSetFile=congo.png
+animation=congo.ani
+width=8
+height=16
+x=21
+y=12
+vx=0.4
+vy=0
+x1=21
+y1=12
+x2=28
+y2=12
+color=yellow
+flip=true
+[/enemy]
+
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=1
+tile=68
-x=2
+x=1
-y=6
+y=3
 counter=1
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=1
+tile=68
+x=2
+y=3
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=68
 x=29
 y=12
-counter=2
+counter=3
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=68
+x=30
+y=12
+counter=4
 [/item]

data/room/05.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+25,25,25,25,25,25,0,0,305,0,0,0,305,305,0,0,0,0,0,0,0,0,0,0,0,0,0,305,426,427,426,427,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+25,25,25,25,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,426,427,93,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,67,68,117,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,227,117,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
-28,0,0,0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+25,0,0,0,0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,141,
-28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,52,52,52,0,0,0,0,0,0,0,0,0,0,28,
+25,0,0,556,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,0,0,0,0,0,0,0,0,0,387,25,
-28,28,28,28,28,28,0,0,0,267,267,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,0,
+25,25,25,25,25,25,0,0,0,417,417,0,0,0,0,0,0,0,305,31,0,0,0,0,0,0,0,0,0,0,0,305,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,417,417,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,267,267,0,0,0,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,0,
+0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,28,28,28,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,0,0,0,0,417,417,417,0,0,25,25,25,
-0,0,0,0,0,0,0,267,267,267,267,267,267,0,0,0,0,0,0,28,0,0,0,0,267,267,0,0,0,0,0,28,
+0,0,0,0,0,0,0,0,0,417,417,0,0,0,0,0,0,0,0,31,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,267,0,0,0,0,0,0,0,0,0,0,0,0,0,28,0,0,0,0,0,0,0,0,0,0,0,28,
+0,0,0,0,0,417,0,0,0,0,0,0,0,0,0,0,0,0,0,31,532,0,0,0,0,0,0,0,0,0,0,89,
-28,28,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,52,52,52,52,52,52,52,52,52,52,52,28,
+31,31,532,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,31,49,49,49,49,49,49,49,49,89,90,89,90,
-28,28,28,28,28,28,28,28,28,28,28,28,28,28,267,0,0,267,28,28,28,28,28,28,28,28,28,28,28,28,28,28
+31,31,31,31,31,31,31,31,31,31,31,31,31,31,305,0,0,305,31,31,31,31,31,31,31,31,31,31,31,31,31,31
 </data>
  </layer>
 </map>

data/room/06.room

@@ -1,17 +1,17 @@
-name=welcome to my abbey
+name=WELCOME TO MY ABBEY
 bgColor=blue
 border=yellow
-tilemap=06.tmx
+tileMapFile=06.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=15.room
 roomDown=0
 roomLeft=05.room
 roomRight=25.room
-itemColor1=yellow
+itemColor1=green
-itemColor2=cyan
+itemColor2=bright_blue
 
 [enemy]
-tileset=abad.png
+tileSetFile=abad.png
 animation=abad.ani
 width=8
 height=16
@@ -21,16 +21,64 @@ vx=0.8
 vy=0
 x1=1
 y1=13
-x2=30
+x2=23
 y2=13
 color=yellow
 flip=true
 [/enemy]
 
+[enemy]
+tileSetFile=spider.png
+animation=spider.ani
+width=8
+height=8
+x=24
+y=4
+vx=0
+vy=0.8
+x1=24
+y1=2
+x2=24
+y2=7
+color=green
+[/enemy]
+
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=48
+tile=49
 x=7
 y=2
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=49
+x=1
+y=14
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=49
+x=18
+y=14
+counter=3
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=49
+x=30
+y=9
+counter=4
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=49
+x=30
+y=4
+counter=5
 [/item]

data/room/06.tmx

@@ -3,21 +3,21 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-32,32,32,32,0,0,0,0,32,32,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
+426,427,426,427,0,0,0,0,426,427,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,67,68,
-32,32,0,0,0,0,0,0,0,0,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,
+427,426,427,0,0,0,0,0,0,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,91,92,
 93,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,93,
-117,0,0,0,403,403,403,403,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
+117,0,0,0,426,427,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
 117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
-117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
+117,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,404,404,117,
-141,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
+141,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,117,
-32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,117,
+32,0,0,0,426,427,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,117,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,403,403,403,403,550,0,0,0,117,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,403,404,404,404,405,550,0,0,0,117,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,427,550,0,0,117,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,550,0,0,117,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,403,403,117,
+0,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,526,0,0,0,0,0,0,0,0,0,403,404,117,
-32,67,68,67,68,403,403,403,550,0,0,0,0,0,526,403,67,68,67,68,403,550,0,0,0,0,0,0,0,0,140,141,
+32,67,68,67,68,404,404,404,404,404,405,0,0,0,403,67,68,67,68,67,68,67,68,405,0,0,0,0,0,0,0,141,
-32,91,92,91,92,0,0,0,427,550,0,0,0,526,426,0,91,92,91,92,0,427,550,0,0,0,0,0,0,0,0,32,
+32,91,92,91,92,226,0,0,0,0,0,0,0,0,92,91,92,91,92,91,92,91,92,226,0,0,0,0,0,0,0,32,
-135,0,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,428,0,0,0,0,0,0,0,
-135,0,0,0,0,0,0,0,0,0,0,526,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+135,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,556,0,0,0,0,0,
 89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90,89,90
 </data>
  </layer>

data/room/07.room

@@ -1,15 +1,17 @@
-name=sigmasua
+name=SIGMASUA > TELEGRAM
 bgColor=black
-border=black
+border=blue
-tilemap=07.tmx
+tileMapFile=07.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=08.room
 roomRight=04.room
+itemColor1=magenta
+itemColor2=red
 
 [enemy]
-tileset=sigmasua.png
+tileSetFile=sigmasua.png
 animation=sigmasua.ani
 width=16
 height=16
@@ -17,15 +19,31 @@ x=15
 y=7
 vx=0.8
 vy=0
-x1=9
+x1=7
 y1=7
-x2=25
+x2=23
 y2=7
-color=bright_red
+color=cyan
 [/enemy]
 
 [enemy]
-tileset=sigmasua.png
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=15
+y=4
+vx=-0.5
+vy=0
+x1=7
+y1=4
+x2=23
+y2=4
+color=blue
+[/enemy]
+
+[enemy]
+tileSetFile=sigmasua.png
 animation=sigmasua.ani
 width=16
 height=16
@@ -36,12 +54,28 @@ vy=0.4
 x1=3
 y1=5
 x2=3
-y2=12
+y2=13
 color=bright_red
 [/enemy]
 
 [enemy]
-tileset=sigmasua.png
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=27
+y=8
+vx=0
+vy=-0.4
+x1=27
+y1=5
+x2=27
+y2=13
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=sigmasua.png
 animation=sigmasua.ani
 width=16
 height=16
@@ -57,7 +91,7 @@ color=bright_magenta
 [/enemy]
 
 [enemy]
-tileset=sigmasua.png
+tileSetFile=sigmasua.png
 animation=sigmasua.ani
 width=16
 height=16
@@ -73,32 +107,32 @@ color=bright_green
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=9
+tile=67
 x=15
-y=5
+y=6
 counter=1
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=9
+tile=67
 x=1
 y=8
 counter=2
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=9
+tile=67
 x=30
 y=8
 counter=3
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=9
+tile=67
 x=21
 y=13
 counter=4

data/room/07.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
-74,265,0,0,0,0,0,265,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,265,0,0,0,0,0,265,74,
+2,411,0,0,0,0,0,413,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,413,0,0,0,0,0,411,2,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,2,
-74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,0,0,0,0,0,74,
+2,0,0,0,0,0,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,411,411,0,0,0,0,0,0,
-74,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,74,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,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,0,0,0,74,265,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,413,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,413,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,
-74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74
+7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
 </data>
  </layer>
 </map>

data/room/08.room

@@ -1,15 +1,15 @@
 name=THE GARDEN
 bgColor=black
 border=cyan
-tilemap=08.tmx
+tileMapFile=08.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=09.room
 roomDown=0
 roomLeft=16.room
 roomRight=07.room
 
 [enemy]
-tileset=abad.png
+tileSetFile=abad.png
 animation=abad.ani
 width=8
 height=16
@@ -26,7 +26,7 @@ flip=true
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
 tile=18
 x=5
 y=5
@@ -34,7 +34,7 @@ counter=1
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
 tile=18
 x=25
 y=9
@@ -42,7 +42,7 @@ counter=2
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
 tile=18
 x=10
 y=5

data/room/08.tmx

@@ -13,7 +13,7 @@
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,306,0,0,0,82,
 82,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
-82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82,
+82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,306,306,0,0,0,0,0,0,0,306,0,0,0,0,0,82,
 82,0,0,306,0,0,0,0,0,0,0,0,0,306,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
 82,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,82,
 0,0,0,0,0,0,0,0,0,0,0,0,516,82,82,82,82,82,82,540,0,0,0,0,0,0,0,0,0,0,0,0,

data/room/09.room

@@ -1,33 +1,69 @@
-name=no 09
+name=THE BIG TREE
 bgColor=black
-border=red
+border=bright_blue
-tilemap=09.tmx
+tileMapFile=09.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=10.room
 roomDown=08.room
 roomLeft=0
 roomRight=0
+itemColor1=cyan
+itemColor2=green
 
 [enemy]
-tileset=diskette.png
+tileSetFile=congo.png
-animation=diskette.ani
+animation=congo.ani
-width=16
+width=8
 height=16
-x=2
+x=10
-y=2
+y=12
-vx=0
+vx=0.4
 vy=0
-x1=2
+x1=10
-y1=2
+y1=12
-x2=2
+x2=20
-y2=2
+y2=12
-color=magenta
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=congo.png
+animation=congo.ani
+width=8
+height=16
+x=12
+y=6
+vx=0.6
+vy=0
+x1=12
+y1=6
+x2=17
+y2=6
+color=white
+flip=true
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=1
+tile=52
-x=1
+x=5
-y=1
+y=7
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=52
+x=5
+y=1
+counter=2
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=52
+x=17
+y=4
+counter=2
 [/item]

data/room/09.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,
+0,0,0,0,0,0,0,0,0,0,0,305,305,41,41,41,41,305,305,0,0,0,0,0,0,0,0,0,0,518,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,
+0,0,0,0,0,0,0,0,0,0,305,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,17,17,17,17,17,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,17,17,17,17,17,17,
-17,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17,
+0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,305,17,17,17,17,17,17,17,
-17,0,0,0,0,0,0,0,305,305,529,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,305,305,531,0,0,0,0,0,0,0,0,0,0,305,0,0,0,0,0,0,17,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,17,17,
-17,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,0,0,0,0,0,305,0,0,0,0,0,0,17,17,
-17,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,305,0,0,0,41,41,41,41,0,0,0,305,305,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,305,305,529,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,305,305,531,0,0,0,0,0,0,41,41,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,529,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,531,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,529,0,0,0,0,0,0,0,0,0,17,
+0,0,0,0,0,0,0,0,0,0,349,349,349,349,349,349,349,349,349,349,349,538,0,0,0,0,0,0,0,0,0,17,
-17,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,349,349,349,349,349,349,349,349,349,349,0,0,349,349,349
 </data>
  </layer>
 </map>

data/room/10.room

@@ -1,17 +1,19 @@
-name=the hall
+name=TREE TOP
-bgColor=black
+bgColor=bright_black
-border=magenta
+border=blue
-tilemap=10.tmx
+tileMapFile=10.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=09.room
 roomLeft=0
 roomRight=11.room
+itemColor1=green
+itemColor2=red
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=22
+tile=16
-x=20
+x=21
 y=4
 counter=1
 [/item]

data/room/10.tmx

@@ -3,22 +3,22 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,305,0,0,305,0,0,0,86,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,305,0,305,0,305,305,0,305,0,305,134,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,305,0,305,305,305,305,0,305,0,134,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,87,39,39,39,39,39,39,39,39,39,39,39,
+0,0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,0,305,86,86,86,86,86,86,86,86,86,86,86,86,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,0,305,305,305,305,0,305,0,305,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,0,305,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,305,305,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,305,0,0,305,305,305,305,305,305,305,305,305,305,305,305,0,305,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,305,41,41,305,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,305,0,0,305,305,41,41,41,41,305,305,0,0,305,0,0,0,0,0,0,0,0,0,0,
-86,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,518,86,86,
+0,0,0,0,0,0,0,0,0,305,305,0,305,41,41,41,41,305,0,305,305,0,0,0,0,0,0,0,0,518,86,86,
-86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,0,0,86,86,86,86
+0,0,0,0,0,0,0,0,0,0,0,0,0,41,41,41,41,0,0,0,0,0,0,0,0,0,0,0,518,86,86,86
 </data>
  </layer>
 </map>

data/room/11.room

@@ -1,33 +1,89 @@
-name=no 11
+name=LAZY ROOM
 bgColor=black
-border=red
+border=blue
-tilemap=11.tmx
+tileMapFile=11.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=10.room
 roomRight=12.room
 
 [enemy]
-tileset=diskette.png
+tileSetFile=lamp.png
-animation=diskette.ani
+animation=lamp.ani
 width=16
 height=16
-x=2
+x=7
-y=2
+y=10
 vx=0
 vy=0
-x1=2
+x1=7
-y1=2
+y1=10
-x2=2
+x2=7
-y2=2
+y2=10
 color=magenta
 [/enemy]
 
-[item]
+[enemy]
-tileset=items.png
+tileSetFile=lamp.png
-tile=1
+animation=lamp.ani
-x=1
+width=16
-y=1
+height=16
-counter=1
+x=21
-[/item]
+y=10
+vx=0
+vy=0
+x1=21
+y1=10
+x2=21
+y2=10
+color=magenta
+[/enemy]
+
+[enemy]
+tileSetFile=bin.png
+animation=bin.ani
+width=16
+height=8
+x=12
+y=14
+vx=0.8
+vy=0
+x1=3
+y1=14
+x2=27
+y2=14
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=7
+y=6
+vx=0.5
+vy=0
+x1=0
+y1=6
+x2=14
+y2=6
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=23
+y=6
+vx=-0.5
+vy=0
+x1=16
+y1=6
+x2=31
+y2=6
+color=green
+[/enemy]

data/room/11.tmx

@@ -8,16 +8,16 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
-389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,365,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
+389,389,389,389,389,389,389,389,389,389,389,389,389,389,0,365,0,389,389,389,389,389,389,389,389,389,389,389,389,389,389,389,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,341,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,560,560,0,0,0,0,0,0,341,0,0,0,0,0,560,560,0,0,0,0,0,0,0,0,0,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-86,86,541,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+86,86,540,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,516,86,86,
 86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86,86
 </data>
  </layer>

data/room/12.room

@@ -1,33 +1,59 @@
 name=THE PASSAGE
 bgColor=black
 border=green
-tilemap=12.tmx
+tileMapFile=12.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=11.room
 roomRight=13.room
+itemColor1=red
+itemColor2=magenta
 
 [enemy]
-tileset=diskette.png
+tileSetFile=diskette.png
 animation=diskette.ani
 width=16
 height=16
-x=2
+x=9
-y=2
+y=10
-vx=0
+vx=0.6
 vy=0
-x1=2
+x1=4
-y1=2
+y1=10
-x2=2
+x2=22
-y2=2
+y2=10
-color=magenta
+color=green
+[/enemy]
+
+[enemy]
+tileSetFile=diskette.png
+animation=diskette.ani
+width=16
+height=16
+x=1
+y=0
+vx=0
+vy=0.5
+x1=1
+y1=0
+x2=1
+y2=7
+color=yellow
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=1
+tile=34
-x=1
+x=17
-y=1
+y=8
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=34
+x=3
+y=6
+counter=2
 [/item]

data/room/12.tmx

@@ -7,17 +7,17 @@
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-25,0,0,0,508,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,0,0,0,527,25,25,25,25,25,25,25,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,25,25,25,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,508,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,527,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,532,0,0,0,0,0,0,0,0,0,508,25,25,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,551,0,0,0,0,0,0,0,0,0,527,25,25,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,0,0,0,25,25,25,25,25,
-25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,251,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0,
+0,0,0,0,395,395,395,395,395,371,395,395,395,395,395,395,395,395,395,395,395,395,395,395,395,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,323,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+25,25,551,0,0,0,0,0,0,347,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25
 </data>
  </layer>

data/room/13.room

@@ -1,15 +1,17 @@
-name=matatunos
+name=TUNO KILLER
 bgColor=black
 border=blue
-tilemap=13.tmx
+tileMapFile=13.tmx
-tileset=standard.png
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=12.room
 roomRight=14.room
+itemColor1=yellow
+itemColor2=cyan
 
 [enemy]
-tileset=matatunos.png
+tileSetFile=matatunos.png
 animation=matatunos.ani
 width=16
 height=16
@@ -25,14 +27,14 @@ color=bright_blue
 [/enemy]
 
 [enemy]
-tileset=tuno.png
+tileSetFile=tuno.png
 animation=tuno.ani
 width=16
 height=16
 x=12
 y=4
 vx=0
-vy=0.9
+vy=1.1
 x1=12
 y1=1
 x2=12
@@ -41,23 +43,23 @@ color=red
 [/enemy]
 
 [enemy]
-tileset=tuno.png
+tileSetFile=tuno.png
 animation=tuno.ani
 width=16
 height=16
 x=19
 y=7
 vx=0
-vy=0.8
+vy=0.9
 x1=19
 y1=1
 x2=19
 y2=13
-color=red
+color=yellow
 [/enemy]
 
 [enemy]
-tileset=tuno.png
+tileSetFile=tuno.png
 animation=tuno.ani
 width=16
 height=16
@@ -69,29 +71,29 @@ x1=26
 y1=1
 x2=26
 y2=13
-color=red
+color=magenta
 [/enemy]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=0
+tile=53
 x=9
-y=5
+y=4
 counter=1
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=0
+tile=53
 x=16
-y=5
+y=4
 counter=2
 [/item]
 
 [item]
-tileset=items.png
+tileSetFile=items.png
-tile=0
+tile=53
 x=23
-y=5
+y=4
 counter=3
 [/item]

data/room/13.tmx

@@ -10,12 +10,12 @@
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,26,0,0,26,26,26,26,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,
+137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,30,0,0,30,66,30,66,
+137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,137,0,0,137,66,137,66,
-30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,30,0,0,30,30,30,30,
+137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,137,0,0,137,137,137,137,
-30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,30,0,0,30,30,0,30,
+137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,137,0,0,137,137,112,137,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26,26