Actualizado Makefile

Cambiado el color del borde de la habitación 45
Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma
2022-11-15 09:03:04 +01:00 · 2022-11-15 08:54:57 +01:00 · 2022-11-15 08:53:47 +01:00 · 2022-11-15 08:53:38 +01:00 · 2022-11-14 23:05:34 +01:00 · 2022-11-14 23:00:18 +01:00
325 changed files with 53228 additions and 2958 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,12 @@
 .vscode
-bin
 *config.txt
-dll
-docs
-icon
-releases
-resources
-scripts
-*.opk
-*.DS_Store
+*.DS_Store
+thumbs.db
+*.exe
+*_macos
+*_linux
+*.dmg
+*.tar.gz
+*.zip
+*.app
+*_debug
--- a/138
+++ b/138
@@ -1,18 +1,138 @@
 executable = jaildoctors_dilemma
 source = source/*.cpp source/common/*.cpp
+appName = JailDoctor's Dilemma
+releaseFolder = jdd_release
+version = v1.01
+
+# 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)
-	if not exist data\config (mkdir data\config)
-	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
+	powershell if (Test-Path data\config) {Remove-Item data\config -Recurse -Force}
+	powershell if (-not (Test-Path data\config)) {New-Item data\config -ItemType Directory}
+	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
+	strip -s -R .comment -R .gnu.version $(executable).exe --strip-unneeded
+
+windows_release:
+	@echo off
+
+# Remove data
+	powershell if (Test-Path data\config) {Remove-Item data\config -Recurse -Force}
+	powershell if (Test-Path $(releaseFolder)) {Remove-Item $(releaseFolder) -Recurse -Force}
+
+# Create folders
+	powershell if (-not (Test-Path data\config)) {New-Item data\config -ItemType Directory}
+	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}
+
+# 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 $(executable)_win_$(version).zip) {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
+	rm -rdf data/config
 	mkdir -p data/config
-	g++ $(source) -std=c++11 -Wall -O2 -lSDL2 -ffunction-sections -fdata-sections -o bin/$(executable)_macos
+	clang++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -o $(executable)_macos
+
+macos_release:
+# Remove data
+	rm -rdf data/config
+	rm -rdf "$(releaseFolder)"
+	rm -rdf Frameworks
+
+# Create folders
+	mkdir -p data/config
+	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"
+
+# Copy files
+	cp release/*.icns "$(releaseFolder)/$(appName).app/Contents/Resources"
+	cp release/Info.plist "$(releaseFolder)/$(appName).app/Contents"
+
+# 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
+	rm -f "$(macosIntelRelease)"
+	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
+	rm -f "$(macosAppleSiliconRelease)"
+	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
+	rm -rdf data/config
 	mkdir -p data/config
-	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
+	g++ $(source) -D DEBUG -std=c++11 -Wall -Os -lSDL2 -ffunction-sections -fdata-sections -Wl,--gc-sections -o $(executable)_linux
+	strip -s -R .comment -R .gnu.version $(executable)_linux --strip-unneeded
+
+linux_release:
+# Remove data
+	rm -rdf data/config
+	rm -rdf $(releaseFolder)
+
+# Create folders
+	mkdir -p data/config
+	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"
+
+# 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)
--- a/README.md
+++ b/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
-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..
+![JailDoctor's Dilemma - Title screen](https://php.sustancia.synology.me/images/jdd_title.png)
+
+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*
--- a/data/credits/shine.ani
+++ b/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]
--- a/data/credits/shine.png
+++ b/data/credits/shine.png
--- a/data/ending/ending1.png
+++ b/data/ending/ending1.png
--- a/data/ending/ending1_zxarne.png
+++ b/data/ending/ending1_zxarne.png
--- a/data/ending/ending2.png
+++ b/data/ending/ending2.png
--- a/data/ending/ending2_zxarne.png
+++ b/data/ending/ending2_zxarne.png
--- a/data/ending/ending3.png
+++ b/data/ending/ending3.png
--- a/data/ending/ending3_zxarne.png
+++ b/data/ending/ending3_zxarne.png
--- a/data/ending/ending4.png
+++ b/data/ending/ending4.png
--- a/data/ending/ending4_zxarne.png
+++ b/data/ending/ending4_zxarne.png
--- a/data/ending/ending5.png
+++ b/data/ending/ending5.png
--- a/data/ending/ending5_zxarne.png
+++ b/data/ending/ending5_zxarne.png
--- a/data/enemies/abad_bell.ani
+++ b/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]
--- a/data/enemies/abad_bell.png
+++ b/data/enemies/abad_bell.png
--- a/data/enemies/amstrad_character_set.ani
+++ b/data/enemies/amstrad_character_set.ani
--- a/data/enemies/amstrad_character_set.png
+++ b/data/enemies/amstrad_character_set.png
--- a/data/enemies/batman_bell.ani
+++ b/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]
--- a/data/enemies/batman_bell.png
+++ b/data/enemies/batman_bell.png
--- a/data/enemies/batman_fire.ani
+++ b/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]
--- a/data/enemies/batman_fire.png
+++ b/data/enemies/batman_fire.png
--- a/data/enemies/bell.ani
+++ b/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]
--- a/data/enemies/bell.png
+++ b/data/enemies/bell.png
--- a/data/enemies/code.ani
+++ b/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]
--- a/data/enemies/congo.ani
+++ b/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]
--- a/data/enemies/congo.png
+++ b/data/enemies/congo.png
--- a/data/enemies/crosshair.ani
+++ b/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]
--- a/data/enemies/crosshair.png
+++ b/data/enemies/crosshair.png
--- a/data/enemies/dimallas_v.png
+++ b/data/enemies/dimallas_v.png
--- a/data/enemies/dong.ani
+++ b/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]
--- a/data/enemies/dong.png
+++ b/data/enemies/dong.png
--- a/data/enemies/dimallas_v.ani
+++ b/data/enemies/dimallas_v.ani
--- a/data/enemies/guitar.png
+++ b/data/enemies/guitar.png
--- a/data/enemies/heavy.png
+++ b/data/enemies/heavy.png
--- a/data/enemies/jailbattle_alien.ani
+++ b/data/enemies/jailbattle_alien.ani
--- a/data/enemies/jailbattle_alien.png
+++ b/data/enemies/jailbattle_alien.png
--- a/data/enemies/jailbattle_human.ani
+++ b/data/enemies/jailbattle_human.ani
--- a/data/enemies/jailbattle_human.png
+++ b/data/enemies/jailbattle_human.png
--- a/data/enemies/jeannine.ani
+++ b/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]
--- a/data/enemies/jeannine.png
+++ b/data/enemies/jeannine.png
--- a/data/enemies/lord_abad.ani
+++ b/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]
--- a/data/enemies/lord_abad.png
+++ b/data/enemies/lord_abad.png
--- a/data/enemies/macaronni_ted.ani
+++ b/data/enemies/macaronni_ted.ani
--- a/data/enemies/macaronni_ted.png
+++ b/data/enemies/macaronni_ted.png
--- a/data/enemies/wave_v.ani
+++ b/data/enemies/wave_v.ani
--- a/data/enemies/wave_v.png
+++ b/data/enemies/wave_v.png
--- a/data/enemies/spark.ani
+++ b/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]
--- a/data/enemies/spark.png
+++ b/data/enemies/spark.png
--- a/data/enemies/special/aerojailer.ani
+++ b/data/enemies/special/aerojailer.ani
@@ -0,0 +1,9 @@
+frameWidth=43
+frameHeight=44
+
+[animation]
+name=default
+speed=100
+loop=0
+frames=0
+[/animation]
--- a/data/enemies/special/aerojailer.png
+++ b/data/enemies/special/aerojailer.png
--- a/data/enemies/special/arounder.ani
+++ b/data/enemies/special/arounder.ani
@@ -0,0 +1,9 @@
+frameWidth=79
+frameHeight=90
+
+[animation]
+name=default
+speed=100
+loop=0
+frames=0
+[/animation]
--- a/data/enemies/special/arounder.png
+++ b/data/enemies/special/arounder.png
--- a/data/enemies/special/pepe_rosita_job.ani
+++ b/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]
--- a/data/enemies/special/pepe_rosita_job.png
+++ b/data/enemies/special/pepe_rosita_job.png
--- a/data/enemies/special/shooting_star.ani
+++ b/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]
--- a/data/enemies/special/shooting_star.png
+++ b/data/enemies/special/shooting_star.png
--- a/data/enemies/tree_thing.ani
+++ b/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]
--- a/data/enemies/tree_thing.png
+++ b/data/enemies/tree_thing.png
--- a/data/enemies/tv.ani
+++ b/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]
--- a/data/enemies/tv.png
+++ b/data/enemies/tv.png
--- a/data/enemies/upv_student.ani
+++ b/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]
--- a/data/enemies/upv_student.png
+++ b/data/enemies/upv_student.png
--- a/data/enemies/z80.ani
+++ b/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]
--- a/data/enemies/z80.png
+++ b/data/enemies/z80.png
--- a/data/font/smb2.png
+++ b/data/font/smb2.png
--- a/data/items/items.png
+++ b/data/items/items.png
--- a/data/logo/seagull.png
+++ b/data/logo/seagull.png
--- a/data/music/desktop.ini
+++ b/data/music/desktop.ini
@@ -0,0 +1,4 @@
+[ViewState]
+Mode=
+Vid=
+FolderType=Generic
--- a/data/music/ending1.ogg
+++ b/data/music/ending1.ogg
--- a/data/music/ending2.ogg
+++ b/data/music/ending2.ogg
--- a/data/music/game_over.ogg
+++ b/data/music/game_over.ogg
--- a/data/player/player_game_over.ani
+++ b/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]
--- a/data/player/player_game_over.png
+++ b/data/player/player_game_over.png
--- a/data/room/01.room
+++ b/data/room/01.room
@@ -1,15 +1,15 @@
 name=THE JAIL
 bgColor=bright_blue
 border=blue
-tilemap=01.tmx
-tileset=standard.png
+tileMapFile=01.tmx
+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
--- a/data/room/01.tmx
+++ b/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,
-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,
-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,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,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,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,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,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,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,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,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,
+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,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,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,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,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,
--- a/data/room/02.room
+++ b/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
-tileset=standard.png
+tileMapFile=02.tmx
+tileSetFile=standard.png
 roomUp=0
 roomDown=04.room
 roomLeft=01.room
 roomRight=03.room
+itemColor1=yellow
+itemColor2=bright_yellow

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileSetFile=bin.png
+animation=bin.ani
 width=16
-height=16
-x=5
-y=6
-vx=0
-vy=0.4
-x1=5
-y1=4
-x2=5
-y2=10
-color=bright_red
+height=8
+x=4
+y=7
+vx=0.6
+vy=0
+x1=4
+y1=7
+x2=25
+y2=7
+color=green
 [/enemy]

 [enemy]
-tileset=diskette.png
-animation=diskette.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
+tileSetFile=upv_student.png
+animation=upv_student.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
-tile=21
-x=1
-y=9
+tileSetFile=items.png
+tile=2
+x=4
+y=6
 counter=1
 [/item]
--- a/data/room/02.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
+0,0,0,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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
-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
+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,
+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>
--- a/data/room/03.room
+++ b/data/room/03.room
@@ -1,8 +1,8 @@
-name=void main
+name=VOID MAIN
 bgColor=black
 border=magenta
-tilemap=03.tmx
-tileset=standard.png
+tileMapFile=03.tmx
+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
--- a/data/room/04.room
+++ b/data/room/04.room
@@ -1,15 +1,17 @@
-name=no 04
+name=JUMP THROUGH
 bgColor=black
-border=red
-tilemap=04.tmx
-tileset=standard.png
+border=cyan
+tileMapFile=04.tmx
+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]
--- a/data/room/04.tmx
+++ b/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,
-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,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,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,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,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,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,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,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,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,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,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,
-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,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,522,0,0,0,0,0,0,0,0,0,0,0,0,0,513,15,63,15,63,15,63,15,63,
+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,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,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,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,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,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,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,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,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,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,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,
+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,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,0,0,0,0,0,0,0,552,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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>
--- a/data/room/05.room
+++ b/data/room/05.room
@@ -1,41 +1,76 @@
-name=no 05
+name=BIG JUMP
 bgColor=black
 border=red
-tilemap=05.tmx
-tileset=standard.png
+tileMapFile=05.tmx
+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
-tile=1
-x=2
-y=6
+tileSetFile=items.png
+tile=68
+x=1
+y=3
 counter=1
 [/item]

 [item]
-tileset=items.png
-tile=1
+tileSetFile=items.png
+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]
--- a/data/room/05.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,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,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,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,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,
-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,
-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
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,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,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,31,0,0,0,0,417,417,417,0,0,25,25,25,
+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,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,
+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,
+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>
--- a/data/room/06.room
+++ b/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
-tileset=standard.png
+tileMapFile=06.tmx
+tileSetFile=standard.png
 roomUp=15.room
 roomDown=0
 roomLeft=05.room
 roomRight=25.room
-itemColor1=yellow
-itemColor2=cyan
+itemColor1=green
+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
-tile=48
+tileSetFile=items.png
+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]
--- a/data/room/06.tmx
+++ b/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,
-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,
+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,
+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,
-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,
-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,
-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,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,526,426,0,0,0,0,0,0,0,0,403,403,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,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,
-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,526,426,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,526,403,404,404,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,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,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,0,0,0,0,0,0,0,550,0,0,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,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,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,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,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>
--- a/data/room/07.room
+++ b/data/room/07.room
@@ -1,15 +1,17 @@
-name=sigmasua
+name=SIGMASUA > TELEGRAM
 bgColor=black
-border=black
-tilemap=07.tmx
-tileset=standard.png
+border=blue
+tileMapFile=07.tmx
+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
-tile=9
+tileSetFile=items.png
+tile=67
 x=15
-y=5
+y=6
 counter=1
 [/item]

 [item]
-tileset=items.png
-tile=9
+tileSetFile=items.png
+tile=67
 x=1
 y=8
 counter=2
 [/item]

 [item]
-tileset=items.png
-tile=9
+tileSetFile=items.png
+tile=67
 x=30
 y=8
 counter=3
 [/item]

 [item]
-tileset=items.png
-tile=9
+tileSetFile=items.png
+tile=67
 x=21
 y=13
 counter=4
--- a/data/room/07.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,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,
-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
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,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,0,0,0,0,0,0,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,
+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,
+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,
+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,
+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,
+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,
+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,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,7,0,0,0,0,0,0,0,0,
+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>
--- a/data/room/08.room
+++ b/data/room/08.room
@@ -1,15 +1,15 @@
 name=THE GARDEN
 bgColor=black
 border=cyan
-tilemap=08.tmx
-tileset=standard.png
+tileMapFile=08.tmx
+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
--- a/data/room/08.tmx
+++ b/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,
--- a/data/room/09.room
+++ b/data/room/09.room
@@ -1,33 +1,69 @@
-name=no 09
+name=THE BIG TREE
 bgColor=black
-border=red
-tilemap=09.tmx
-tileset=standard.png
+border=bright_blue
+tileMapFile=09.tmx
+tileSetFile=standard.png
 roomUp=10.room
 roomDown=08.room
 roomLeft=0
 roomRight=0
+itemColor1=cyan
+itemColor2=green

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileSetFile=congo.png
+animation=congo.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=10
+y=12
+vx=0.4
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=10
+y1=12
+x2=20
+y2=12
+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
-tile=1
-x=1
-y=1
+tileSetFile=items.png
+tile=52
+x=5
+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]
--- a/data/room/09.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,305,305,41,41,41,41,305,305,0,0,0,0,0,0,0,0,0,0,518,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,
+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,
+0,0,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,
+0,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,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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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>
--- a/data/room/10.room
+++ b/data/room/10.room
@@ -1,17 +1,19 @@
-name=the hall
-bgColor=black
-border=magenta
-tilemap=10.tmx
-tileset=standard.png
+name=TREE TOP
+bgColor=bright_black
+border=blue
+tileMapFile=10.tmx
+tileSetFile=standard.png
 roomUp=0
 roomDown=09.room
 roomLeft=0
 roomRight=11.room
+itemColor1=green
+itemColor2=red

 [item]
-tileset=items.png
-tile=22
-x=20
+tileSetFile=items.png
+tile=16
+x=21
 y=4
 counter=1
 [/item]
--- a/data/room/10.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,
-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,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,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,305,0,0,305,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,305,0,305,0,305,305,0,305,0,305,134,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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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,
+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>
--- a/data/room/11.room
+++ b/data/room/11.room
@@ -1,33 +1,89 @@
-name=no 11
+name=LAZY ROOM
 bgColor=black
-border=red
-tilemap=11.tmx
-tileset=standard.png
+border=blue
+tileMapFile=11.tmx
+tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=10.room
 roomRight=12.room

 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileSetFile=lamp.png
+animation=lamp.ani
 width=16
 height=16
-x=2
-y=2
+x=7
+y=10
 vx=0
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+x1=7
+y1=10
+x2=7
+y2=10
 color=magenta
 [/enemy]

-[item]
-tileset=items.png
-tile=1
-x=1
-y=1
-counter=1
-[/item]
+[enemy]
+tileSetFile=lamp.png
+animation=lamp.ani
+width=16
+height=16
+x=21
+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]
--- a/data/room/11.tmx
+++ b/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,
-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,
+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,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>
--- a/data/room/12.room
+++ b/data/room/12.room
@@ -1,33 +1,59 @@
 name=THE PASSAGE
 bgColor=black
 border=green
-tilemap=12.tmx
-tileset=standard.png
+tileMapFile=12.tmx
+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
-y=2
-vx=0
+x=9
+y=10
+vx=0.6
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=4
+y1=10
+x2=22
+y2=10
+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
-tile=1
-x=1
-y=1
+tileSetFile=items.png
+tile=34
+x=17
+y=8
 counter=1
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=34
+x=3
+y=6
+counter=2
 [/item]
--- a/data/room/12.tmx
+++ b/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,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,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,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>
--- a/data/room/13.room
+++ b/data/room/13.room
@@ -1,15 +1,17 @@
-name=matatunos
+name=TUNO KILLER
 bgColor=black
 border=blue
-tilemap=13.tmx
-tileset=standard.png
+tileMapFile=13.tmx
+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
-tile=0
+tileSetFile=items.png
+tile=53
 x=9
-y=5
+y=4
 counter=1
 [/item]

 [item]
-tileset=items.png
-tile=0
+tileSetFile=items.png
+tile=53
 x=16
-y=5
+y=4
 counter=2
 [/item]

 [item]
-tileset=items.png
-tile=0
+tileSetFile=items.png
+tile=53
 x=23
-y=5
+y=4
 counter=3
 [/item]
--- a/data/room/13.tmx
+++ b/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,
-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,
-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,
-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,
-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,
-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,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,
+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,
+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,
+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,
+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,
+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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Sergio Valor Martínez	1bae289150	Actualizado Makefile	2022-11-15 09:03:04 +01:00
Sergio Valor Martínez	d0ec2848f9	Cambiado el color del borde de la habitación 45	2022-11-15 08:54:57 +01:00
Sergio Valor Martínez	79c7856786	Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma	2022-11-15 08:53:47 +01:00
Sergio Valor Martínez	edb24e92e6	Añadido SDL2.framework para poder hacer la build releaase de macos	2022-11-15 08:53:38 +01:00
Sergio Valor	75e5ea50b5	Redecorada la batcueva	2022-11-14 23:05:34 +01:00
Sergio Valor	d0a1a67da2	Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma	2022-11-14 23:00:18 +01:00
Sergio Valor	e5ec5bd627	Vuelto a poner el bloque de la fase 15	2022-11-14 22:59:32 +01:00
Sergio Valor Martínez	d88b42a516	Fix: El jugador ya no puede moverse hacia un lateral nada mas subir a la pantalla superior	2022-11-14 22:58:13 +01:00
Sergio Valor Martínez	e2846023da	Cambiados los ifndef RELEASE por ifdef DEBUG	2022-11-14 22:35:05 +01:00
Sergio Valor Martínez	6cac55a54f	FIx: Al saltar sin parar contra el techo al el jugador moria por caer de muy alto	2022-11-14 22:28:14 +01:00
Sergio Valor	a97449adc5	Recalibrada la habitación THE CHAPPEL	2022-11-14 21:42:37 +01:00
Sergio	bcb6dcd1a5	Actualizar 'README.md'	2022-11-14 12:36:09 +01:00
Sergio Valor Martinez	bc66956524	Actualizado Makefile	2022-11-14 07:52:56 +01:00
Sergio	9cd916ccd3	Actualizar 'README.md'	2022-11-13 22:21:35 +01:00
Sergio Valor	eea7849f54	Eliminado todo.txt	2022-11-13 21:29:11 +01:00
Sergio Valor	aa4647192c	Corregido un bug que hacía que el modo demo mostraba los items restantes con el efecto que indica que ya se han recogido los necesarios para acabar el juego	2022-11-13 20:57:09 +01:00
Sergio Valor	f223cc63f0	Actualizado Makefile a version 1.0	2022-11-13 18:41:20 +01:00
Sergio Valor	b688dc6d02	Añadida la opcion de que los enemigos puedan decidir el frame de inicio	2022-11-13 18:28:02 +01:00
Sergio Valor	924e37b32b	Añadidos los graficos de los enemigos especiales	2022-11-13 18:16:15 +01:00
Sergio Valor Martínez	512daa68b9	Añadiendo los enemigos de la habitación secreta	2022-11-13 17:23:36 +01:00
Sergio Valor Martínez	7cf8451ba6	Actualizado Makefile linux_release	2022-11-13 10:17:56 +01:00
Sergio	889a4f84c8	Actualizar 'README.md'	2022-11-13 10:00:32 +01:00
Sergio	ae83028600	Actualizar 'README.md'	2022-11-13 09:49:07 +01:00
Sergio	3e09edb9e3	Actualizar 'README.md'	2022-11-13 09:25:05 +01:00
Sergio Valor Martínez	0be08d8d19	Añadido icono	2022-11-12 23:44:47 +01:00
Sergio Valor	8e778ce47e	Últimos retoques	2022-11-12 18:50:02 +01:00
Sergio Valor	274a96c89f	Añadida Road to the Jail	2022-11-12 15:04:21 +01:00
Sergio Valor	1a6ac567a3	Retocando pantallas y añadiendo sprites	2022-11-12 14:49:53 +01:00
Sergio Valor	b5f460571d	Retocando pantallas	2022-11-12 13:51:49 +01:00
Sergio Valor	be872971f5	Corregido bug en el movimiento de los enemigos	2022-11-12 10:31:29 +01:00
Sergio Valor	6b4c089683	Añadiendo habitaciones	2022-11-12 10:00:27 +01:00
Sergio Valor	763126580f	Añadidos colores para el jugador segun los trucos. Añadida skin alternativa para el jugador	2022-11-12 07:28:08 +01:00
Sergio Valor Martínez	1df1bc463c	Makefile macos_release ya compila para intel y apple silicon	2022-11-11 18:00:16 +01:00
Sergio Valor	456f7b9e77	Actualizado Makefile de windows_release	2022-11-11 17:32:20 +01:00
Sergio Valor Martinez	1fd6f8174b	Creado el Makefile para el windows_release	2022-11-11 14:05:25 +01:00
Sergio Valor Martinez	44ff0fed91	Actualizado Makefile macos_release	2022-11-11 13:50:25 +01:00
Sergio Valor Martinez	f2869049e0	Creado linux_release en el makefile	2022-11-11 12:57:57 +01:00
Sergio Valor Martínez	7d5e1aa67b	Añadido macos_release al Makefile	2022-11-11 09:43:17 +01:00
Sergio Valor	9325fe9f14	Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma	2022-11-11 07:23:09 +01:00
Sergio Valor	ff86510bf5	Modificado 34.tmx	2022-11-11 07:22:59 +01:00
Sergio Valor	dc7514b7b3	Añadidas fases y enemigos	2022-11-10 21:58:33 +01:00
Sergio Valor	aef4102e51	Nuevas fases	2022-11-10 10:05:25 +01:00
Sergio Valor	1a95abc2f5	Añadidos enemigos volteados verticalmente	2022-11-09 22:49:51 +01:00
Sergio Valor	41c765619d	Creando habitaciones	2022-11-09 21:24:33 +01:00
Sergio Valor Martinez	164dfe1e54	Actualizado Jail_Audio	2022-11-08 18:45:45 +01:00
Sergio Valor Martinez	d32170f7cf	Añadidos defines para RELEASE y MACOS_BUNDLE	2022-11-08 18:22:06 +01:00
Sergio Valor Martinez	9de1b8ad6e	Resuelto un bug cuando el jugador salta fuera de la pantalla por arriba y no hay cambio de habitación	2022-11-08 16:47:15 +01:00
Sergio Valor Martinez	0404b184e7	Faltaba el cambio de borde en el titulo	2022-11-08 16:26:59 +01:00
Sergio Valor Martínez	d2e5dc6164	Actualizado Makefile	2022-11-09 09:01:37 +01:00
Sergio Valor Martínez	64481cd9cc	Actualizado Makefile	2022-11-09 08:49:53 +01:00
Sergio Valor	9605aa61c8	Retocando habitaciones	2022-11-08 20:27:55 +01:00
Sergio Valor	db56185be2	Corregido bug en el calculo del color del marcador	2022-11-08 19:32:28 +01:00
Sergio Valor	977e134172	Calibrando habitaciones	2022-11-08 19:18:48 +01:00
Sergio Valor Martinez	3ef2ce3c0d	Implementado cambio de paleta en el game over	2022-11-08 10:19:27 +01:00
Sergio Valor Martinez	2f3c8cada9	Cambio de paleta en los finales	2022-11-08 10:17:55 +01:00
Sergio Valor Martínez	8cb7f5bce5	Completada la recarga de recursos	2022-11-07 22:52:40 +01:00
Sergio Valor Martínez	a28a93e791	Ya funciona la recarga de recursos	2022-11-07 20:14:19 +01:00
Sergio Valor	a36378f98c	Trabajando en la recarga de recursos	2022-11-07 19:13:58 +01:00
Sergio Valor Martínez	8ae821733c	Resuelto un bug con la detección de superficies	2022-11-07 17:00:48 +01:00
Sergio Valor Martínez	50309fd30e	Merge branch 'master' of https://gitea.sustancia.synology.me/JailDesigner/jaildoctors_dilemma	2022-11-07 16:45:06 +01:00
Sergio Valor Martínez	07b950724a	Retocado un poco el game over	2022-11-07 16:45:02 +01:00
Sergio Valor Martinez	61b19a5699	Añadido movimiento por las habitaciones con WASD	2022-11-07 13:59:06 +01:00
Sergio Valor Martínez	81eeb1776a	Añadida musica a la pantalla de game over	2022-11-06 20:11:50 +01:00
Sergio Valor Martínez	20d51a113a	Pantalla de game over completada (faltaria añadir un sonido o musica)	2022-11-06 19:58:16 +01:00
Sergio Valor	232842d876	Trabajando en la pantalla de game over	2022-11-06 19:32:10 +01:00
Sergio Valor Martínez	6fe596bf48	Trabajando en la pantalla de game over	2022-11-06 19:28:12 +01:00
Sergio Valor Martínez	6dfc7e135c	Añadidos nuevos trucos	2022-11-06 15:05:17 +01:00
Sergio Valor Martínez	bf59cc01e4	Añadidos nuevos trucos	2022-11-06 15:00:03 +01:00
Sergio Valor Martínez	0cb83657be	Añadida pantalla de game over funcional	2022-11-06 14:48:02 +01:00
Sergio Valor Martínez	ec5da9ae3e	Calculados los items totales del mapeado	2022-11-06 14:04:59 +01:00
Sergio Valor Martínez	3d0400fe88	Ya se puede entrar a la Jail	2022-11-06 08:28:55 +01:00
Sergio Valor Martínez	45fc923be9	Trabajando en hacer que puedas entrar a la jail	2022-11-05 20:56:09 +01:00
Sergio Valor Martínez	1bcdadb6c0	Trabajando en el ending2	2022-11-05 13:12:32 +01:00
Sergio Valor Martínez	4c464e8ded	Trabajando en el ending2	2022-11-05 10:40:30 +01:00
Sergio Valor Martínez	0d9fd5eea1	Trabajando en el ending2	2022-11-05 07:27:38 +01:00
Sergio Valor Martínez	0b55d8558f	Trabajando en el ending2	2022-11-04 23:22:10 +01:00
Sergio Valor	73ec66d228	Trabajando en el ending2	2022-11-04 19:21:59 +01:00
Sergio Valor	6257c0b1e8	Preparado para empezar con el ending2	2022-11-04 18:55:36 +01:00
Sergio Valor	d37b21fc3b	Retocado el final del ending con fade de audio	2022-11-04 18:36:08 +01:00
Sergio Valor Martínez	332b3f5286	Finalizada la primera parte del ending	2022-11-04 11:44:20 +01:00
Sergio Valor Martínez	f647ebb33f	Trabajando en el ending	2022-11-04 09:37:32 +01:00
Sergio Valor Martínez	958edd4ac8	Trabajando en el ending	2022-11-04 07:51:06 +01:00
Sergio Valor Martínez	9b66c7e275	Trabajando en el ending	2022-11-03 22:32:30 +01:00
Sergio Valor Martínez	0b1b9f2d15	Trabajando en el ending	2022-11-03 21:25:39 +01:00
Sergio Valor Martínez	a2d8312bb7	Añadidas las escenas del final	2022-11-03 14:27:29 +01:00
Sergio Valor	c6779bfd77	Trabajando en el ending	2022-11-03 12:42:11 +01:00
Sergio Valor	d514ed451f	Añadidos los recursos para el ending	2022-11-03 10:52:46 +01:00
Sergio Valor Martínez	a510742984	Añadido el esqueleto para dos secciones nuevas: ending y game_over	2022-11-02 22:50:25 +01:00
Sergio Valor	bb992b7d90	Nuevo: deshabilita input por un periodo de tiempo	2022-11-02 18:04:32 +01:00
Sergio Valor	5302e16064	Arreglado el color del marcador al cambiar de paleta	2022-11-02 17:25:42 +01:00
Sergio Valor	c3a82b938f	Añadido el parametro --invincible	2022-11-02 16:34:31 +01:00
Sergio Valor	88f419e963	Mensajes de consola opcionales	2022-11-02 09:52:06 +01:00
Sergio Valor	8232055d22	Añadidos parametros al programa	2022-11-02 08:36:00 +01:00
Sergio Valor	12255750f6	Arreglado el color del marcador	2022-11-02 00:17:25 +01:00
Sergio Valor	b4df851bd3	Resuelto bug al cambiar de paleta con los tiles animados	2022-11-02 00:03:32 +01:00
Sergio Valor	4901635bb7	Retocando la abadía	2022-11-01 22:36:12 +01:00
Sergio Valor Martínez	cb62cb8eb0	Resuelto: los enemigos se crean con la paleta por defecto	2022-11-01 09:48:35 +01:00
Sergio Valor	008cce9f8b	Nuevas fases y enemigos	2022-11-01 09:41:03 +01:00
Sergio Valor	9784d730a5	Añadiendo pantallas	2022-10-31 20:55:33 +01:00
Sergio Valor Martínez	83977ed22c	Arreglado un bug a la hora de buscar por nombre los recursos	2022-10-31 20:07:41 +01:00
Sergio Valor	a354104c8c	Trabajando en la carga de recursos por nombre	2022-10-31 18:37:48 +01:00
Sergio Valor Martínez	deb820015f	Resueltos muchos bugs de vector out of range en la busqueda de superficies	2022-10-31 10:07:35 +01:00
Sergio Valor Martínez	aa3c7a4b80	Cambiado el constructor de la clase Player	2022-10-31 07:38:48 +01:00
Sergio Valor Martínez	cb6050183b	Cambiado el último printf por std::cout	2022-10-30 23:33:34 +01:00
Sergio Valor Martínez	2e0b0f32b5	Quitados todos los printf menos uno	2022-10-30 22:48:50 +01:00
Sergio Valor Martínez	531ac94bc0	Cambiando printf a std::cout	2022-10-30 22:23:24 +01:00
Sergio Valor Martínez	995b3516e6	Solucionado un bug nuevo con los colores de los items	2022-10-30 14:35:05 +01:00
Sergio Valor Martínez	c79c25d59d	Solucionados bugs en la detección de superficies	2022-10-30 14:25:50 +01:00
Sergio Valor Martínez	c11f5d2622	Trabajando en la precarga de habitaciones	2022-10-30 13:27:30 +01:00
Sergio Valor Martínez	d1c27c4639	Mejorada la marquesina del titulo. Las letras salen a la distancia correcta entre ellas	2022-10-29 14:05:32 +02:00
Sergio Valor Martínez	da00f75093	Optimizada la textura que cubre los creditos	2022-10-29 11:36:42 +02:00
Sergio Valor Martínez	0758cf9de1	Precarga de los ficheros .txt con los offsets del texto	2022-10-29 11:17:33 +02:00
Sergio Valor Martínez	c1f0f90b16	Arreglado un bug en el cambio de paleta durante el juego	2022-10-27 19:24:41 +02:00
Sergio Valor Martínez	1934f790f7	Animaciones precacheadas	2022-10-27 18:42:07 +02:00
Sergio Valor Martínez	35b4d19188	Trabajando en la cache de animaciones	2022-10-27 18:13:22 +02:00
Sergio Valor Martinez	6186d1fac1	Trabajando en la precarga de animaciones	2022-10-27 14:04:30 +02:00
Sergio Valor Martinez	9d9d9d92f2	Las clases text y menu ya acceden a resource	2022-10-27 12:43:28 +02:00
Sergio Valor Martinez	4133dfd7c9	Añadido el cambio de borde, tamaño de ventana y paleta a todas las secciones del juego	2022-10-27 11:49:47 +02:00
Sergio Valor	abbff605c0	Añadiendo el cambio de tamaño de pantalla a la sección logo	2022-10-27 09:47:21 +02:00
Sergio Valor Martinez	a0e8853870	Comprobando reloadtextures en el ordenador donde pierde el contexto	2022-10-27 09:23:37 +02:00
Sergio Valor Martínez	32dd85525b	Trabajando en la recarga de texturas	2022-10-27 07:25:59 +02:00
Sergio Valor Martínez	02cc3b3527	Añadido el objeto resource a todas las secciones	2022-10-26 22:36:46 +02:00
Sergio Valor Martínez	bd24db6f47	Movida la carga de recursos al objeto director	2022-10-26 22:08:52 +02:00
Sergio Valor Martínez	397e1e89e3	Ya carga las imagenes del juego y la demo desde la cache de rescursos	2022-10-26 20:29:07 +02:00
Sergio Valor Martinez	c6e8050f95	Empezando a trabajar en la precarga de recursos para el juego	2022-10-26 14:13:33 +02:00
Sergio Valor Martinez	db5d2901ee	Ya cambia el color de los enemigos al cambiar la paleta	2022-10-26 10:32:16 +02:00
Sergio Valor Martinez	bdce205006	Ya cambia la paleta de color de casi toda la habitación. Faltan los enemigos	2022-10-26 10:09:48 +02:00
Sergio Valor Martinez	674fdd1d05	Modificado el texto de los creditos	2022-10-26 09:45:47 +02:00
Sergio Valor Martinez	57e8c0cb56	Arreglado el cambio de paleta en el titulo	2022-10-26 09:19:46 +02:00
Sergio Valor	0f443b38bc	Trabajando para que el cambio de paleta sea en tiempo real	2022-10-25 22:25:14 +02:00
Sergio Valor	dc84ed79d6	Implementado el cambio de paleta durante el juego	2022-10-25 21:51:30 +02:00
Sergio Valor Martínez	bcb56e17f2	Añadido brillo a los creditos y cambiada la malla	2022-10-25 18:32:00 +02:00
Sergio Valor	40368386e0	Trabajando con el brillo de los creditos	2022-10-25 18:11:36 +02:00
Sergio Valor	7d4a5f343e	Movido el ejecutable a la raíz	2022-10-25 18:02:48 +02:00
Sergio Valor Martinez	b241013ae6	Aumentada la velocidad de la marquesina del titulo	2022-10-25 13:19:15 +02:00
Sergio Valor	284a99e6e9	Ya sed puede saltar la sección de credits/instrucciones con cualquier tecla	2022-10-25 13:11:39 +02:00