From 86b7b5e122113027b11daa9b26e96ef2e26cb51d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Sat, 24 Sep 2022 23:22:41 +0200
Subject: [PATCH] =?UTF-8?q?Cambiados=20dos=20ficheros=20de=20ubicaci=C3=B3?=
 =?UTF-8?q?n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/{ => config}/config.txt          |   0
 data/{ => input}/gamecontrollerdb.txt |   0
 data/room/03.tmx                      |   4 +-
 data/room_old/01.room                 |  60 -------
 data/room_old/01.tmx                  |  24 ---
 data/room_old/02.room                 |  35 ----
 data/room_old/02.tmx                  |  24 ---
 data/room_old/03.room                 |  67 --------
 data/room_old/03.tmx                  |  24 ---
 data/room_old/04.room                 |  82 ---------
 data/room_old/04.tmx                  |  24 ---
 data/room_old/05.room                 | 108 ------------
 data/room_old/05.tmx                  |  24 ---
 data/room_old/06.room                 |  11 --
 data/room_old/06.tmx                  |  24 ---
 data/room_old/07.room                 |  93 ----------
 data/room_old/07.tmx                  |  24 ---
 data/room_old/08.room                 |  11 --
 data/room_old/08.tmx                  |  24 ---
 data/room_old/09.room                 |  11 --
 data/room_old/09.tmx                  |  24 ---
 data/room_old/10.room                 |  11 --
 data/room_old/10.tmx                  |  24 ---
 data/room_old/11.room                 |  68 --------
 data/room_old/11.tmx                  |  24 ---
 data/room_old/12.room                 |  60 -------
 data/room_old/12.tmx                  |  24 ---
 data/room_old/13.room                 | 236 --------------------------
 data/room_old/13.tmx                  |  24 ---
 data/tilesets/standard.png            | Bin 4803 -> 5021 bytes
 source/director.cpp                   |   4 +-
 31 files changed, 4 insertions(+), 1169 deletions(-)
 rename data/{ => config}/config.txt (100%)
 rename data/{ => input}/gamecontrollerdb.txt (100%)
 delete mode 100644 data/room_old/01.room
 delete mode 100644 data/room_old/01.tmx
 delete mode 100644 data/room_old/02.room
 delete mode 100644 data/room_old/02.tmx
 delete mode 100644 data/room_old/03.room
 delete mode 100644 data/room_old/03.tmx
 delete mode 100644 data/room_old/04.room
 delete mode 100644 data/room_old/04.tmx
 delete mode 100644 data/room_old/05.room
 delete mode 100644 data/room_old/05.tmx
 delete mode 100644 data/room_old/06.room
 delete mode 100644 data/room_old/06.tmx
 delete mode 100644 data/room_old/07.room
 delete mode 100644 data/room_old/07.tmx
 delete mode 100644 data/room_old/08.room
 delete mode 100644 data/room_old/08.tmx
 delete mode 100644 data/room_old/09.room
 delete mode 100644 data/room_old/09.tmx
 delete mode 100644 data/room_old/10.room
 delete mode 100644 data/room_old/10.tmx
 delete mode 100644 data/room_old/11.room
 delete mode 100644 data/room_old/11.tmx
 delete mode 100644 data/room_old/12.room
 delete mode 100644 data/room_old/12.tmx
 delete mode 100644 data/room_old/13.room
 delete mode 100644 data/room_old/13.tmx

diff --git a/data/config.txt b/data/config/config.txt
similarity index 100%
rename from data/config.txt
rename to data/config/config.txt
diff --git a/data/gamecontrollerdb.txt b/data/input/gamecontrollerdb.txt
similarity index 100%
rename from data/gamecontrollerdb.txt
rename to data/input/gamecontrollerdb.txt
diff --git a/data/room/03.tmx b/data/room/03.tmx
index 9c0c32d..2908fb8 100644
--- a/data/room/03.tmx
+++ b/data/room/03.tmx
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.2" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
+<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
@@ -17,7 +17,7 @@
 21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,21,0,0,0,0,0,21,21,
 21,21,0,0,0,0,0,0,0,213,213,213,213,213,213,213,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,253,253,253,0,0,0,0,0,0,0,0,21,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,253,253,253,253,0,0,0,361,361,361,361,0,21,21,
 21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21
 </data>
  </layer>
diff --git a/data/room_old/01.room b/data/room_old/01.room
deleted file mode 100644
index 87a4482..0000000
--- a/data/room_old/01.room
+++ /dev/null
@@ -1,60 +0,0 @@
-name=void main
-bgColor=black
-border=yellow
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=06.room
-roomRight=02.room
-
-
-01.tmx
-
-
-[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=1
-y=0
-vx=0
-vy=0.3
-x1=1
-y1=0
-x2=1
-y2=5
-color=magenta
-[/enemy]
-
-[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=5
-y=9
-vx=0.6
-vy=0
-x1=5
-y1=9
-x2=22
-y2=9
-color=white
-[/enemy]
-
-[item]
-tileset=items.png
-tile=1
-x=1
-y=7
-counter=1
-[/item]
-
-[item]
-tileset=items.png
-tile=1
-x=17
-y=8
-counter=2
-[/item]
diff --git a/data/room_old/01.tmx b/data/room_old/01.tmx
deleted file mode 100644
index 6426a6c..0000000
--- a/data/room_old/01.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,21,21,21,21,21,21,21,21,21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,21,21,21,0,0,0,0,0,0,0,0,0,0,0,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,21,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,21,21,21,21,0,0,0,0,0,21,21,21,21,21,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,211,0,0,0,0,0,0,0,
-21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,0,0,0,0,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,211,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,211,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,
-21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21
-</data>
- </layer>
-</map>
diff --git a/data/room_old/02.room b/data/room_old/02.room
deleted file mode 100644
index 5196bde..0000000
--- a/data/room_old/02.room
+++ /dev/null
@@ -1,35 +0,0 @@
-name=case switch
-bgColor=black
-border=cyan
-tileset=standard.png
-roomUp=0
-roomDown=04.room
-roomLeft=01.room
-roomRight=03.room
-
-
-02.tmx
-
-
-[enemy]
-tileset=paco.png
-animation=paco.ani
-width=16
-height=16
-x=14
-y=0
-vx=0
-vy=1
-x1=14
-y1=0
-x2=14
-y2=12
-color=cyan
-[/enemy]
-
-[item]
-tileset=items.png
-tile=7
-x=19
-y=5
-[/item]
\ No newline at end of file
diff --git a/data/room_old/02.tmx b/data/room_old/02.tmx
deleted file mode 100644
index b732af4..0000000
--- a/data/room_old/02.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,203,203,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,24,24,24,24,0,0,0,0,0,0,0,0,0,24,
-24,24,24,24,24,24,0,0,0,203,0,0,0,0,0,0,0,0,0,24,0,0,0,0,203,203,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,24,0,0,0,0,203,203,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,203,203,24,
-0,0,0,0,0,0,0,203,203,203,203,203,203,0,0,0,0,0,0,24,0,0,0,0,203,203,0,0,0,0,0,24,
-0,0,0,0,0,203,0,0,0,0,0,0,0,0,0,0,0,0,0,24,0,0,0,0,0,0,0,0,0,0,0,24,
-44,24,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,24,84,84,84,84,84,84,84,84,84,84,84,84,
-44,44,44,44,44,44,44,44,44,44,44,44,44,44,223,0,0,223,44,44,44,44,44,44,44,44,44,44,44,44,44,44
-</data>
- </layer>
-</map>
diff --git a/data/room_old/03.room b/data/room_old/03.room
deleted file mode 100644
index 17b8e01..0000000
--- a/data/room_old/03.room
+++ /dev/null
@@ -1,67 +0,0 @@
-name=the edge
-bgColor=red
-border=black
-tileset=standard.png
-roomUp=0
-roomDown=05.room
-roomLeft=02.room
-roomRight=11.room
-
-
-03.tmx
-
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=4
-y=5
-vx=0
-vy=1
-x1=4
-y1=2
-x2=4
-y2=13
-color=green
-[/enemy]
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=10
-y=4
-vx=0
-vy=1
-x1=10
-y1=2
-x2=10
-y2=13
-color=bright_blue
-[/enemy]
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=16
-y=3
-vx=0
-vy=1
-x1=16
-y1=2
-x2=16
-y2=13
-color=magenta
-[/enemy]
-
-[item]
-tileset=items.png
-tile=5
-x=12
-y=2
-[/item]
\ No newline at end of file
diff --git a/data/room_old/03.tmx b/data/room_old/03.tmx
deleted file mode 100644
index eadf78e..0000000
--- a/data/room_old/03.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-26,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-26,0,0,0,0,0,0,0,0,271,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-26,0,0,0,0,0,271,0,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,0,0,271,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,271,0,232,0,0,0,232,232,232,232,232,232,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,232,0,0,0,0,0,0,0,0,0,
-26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,26,26,26,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-</data>
- </layer>
-</map>
diff --git a/data/room_old/04.room b/data/room_old/04.room
deleted file mode 100644
index 57ba90b..0000000
--- a/data/room_old/04.room
+++ /dev/null
@@ -1,82 +0,0 @@
-name=The Fridge
-bgColor=blue
-border=blue
-tileset=standard.png
-roomUp=02.room
-roomDown=0
-roomLeft=07.room
-roomRight=05.room
-
-
-04.tmx
-
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=1
-y=3
-vx=1
-vy=0
-x1=1
-y1=3
-x2=14
-y2=3
-color=magenta
-[/enemy]
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=30
-y=7
-vx=-0.8
-vy=0
-x1=10
-y1=7
-x2=30
-y2=7
-color=bright_white
-[/enemy]
-
-[enemy]
-tileset=wave.png
-animation=wave.ani
-width=8
-height=8
-x=15
-y=12
-vx=0.5
-vy=0
-x1=15
-y1=12
-x2=30
-y2=12
-color=bright_magenta
-[/enemy]
-
-[item]
-tileset=items.png
-tile=6
-x=2
-y=2
-[/item]
-
-[item]
-tileset=items.png
-tile=6
-x=29
-y=5
-[/item]
-
-
-[item]
-tileset=items.png
-tile=6
-x=21
-y=12
-[/item]
\ No newline at end of file
diff --git a/data/room_old/04.tmx b/data/room_old/04.tmx
deleted file mode 100644
index 7c48981..0000000
--- a/data/room_old/04.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-25,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,249,249,249,249,249,249,249,249,249,249,249,249,249,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,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,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,230,230,230,230,0,0,0,0,0,0,0,0,0,0,0,0,0,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,25,
-25,25,25,25,0,25,25,25,25,25,0,25,25,25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,270,270,270,270,270,270,270,270,270,0,0,270,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,290,0,0,0,0,0,0,0,0,25,
-25,0,0,0,0,0,0,0,0,0,0,25,25,25,25,0,0,25,25,25,25,25,25,25,0,0,0,0,0,0,0,25,
-25,0,0,0,0,229,229,229,229,229,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,25,
-25,249,249,249,249,249,249,249,249,249,249,249,249,249,249,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
-0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,289,0,0,0,0,0,0,0,0,0,0,0,381,0,0,0,0,0,0,381,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>
-</map>
diff --git a/data/room_old/05.room b/data/room_old/05.room
deleted file mode 100644
index 81dc960..0000000
--- a/data/room_old/05.room
+++ /dev/null
@@ -1,108 +0,0 @@
-name=sigmasua
-bgColor=black
-border=black
-tileset=standard.png
-roomUp=03.room
-roomDown=0
-roomLeft=04.room
-roomRight=12.room
-
-
-05.tmx
-
-
-[enemy]
-tileset=sigmasua.png
-animation=sigmasua.ani
-width=16
-height=16
-x=15
-y=7
-vx=0.8
-vy=0
-x1=9
-y1=7
-x2=25
-y2=7
-color=bright_red
-[/enemy]
-
-[enemy]
-tileset=sigmasua.png
-animation=sigmasua.ani
-width=16
-height=16
-x=3
-y=8
-vx=0
-vy=0.4
-x1=3
-y1=5
-x2=3
-y2=12
-color=bright_red
-[/enemy]
-
-[enemy]
-tileset=sigmasua.png
-animation=sigmasua.ani
-width=16
-height=16
-x=10
-y=10
-vx=0
-vy=0.3
-x1=10
-y1=10
-x2=10
-y2=13
-color=bright_magenta
-[/enemy]
-
-[enemy]
-tileset=sigmasua.png
-animation=sigmasua.ani
-width=16
-height=16
-x=23
-y=13
-vx=0
-vy=-0.3
-x1=23
-y1=10
-x2=23
-y2=13
-color=bright_green
-[/enemy]
-
-[item]
-tileset=items.png
-tile=9
-counter=1
-x=21
-y=3
-[/item]
-
-[item]
-tileset=items.png
-tile=9
-counter=2
-x=1
-y=8
-[/item]
-
-[item]
-tileset=items.png
-tile=9
-counter=3
-x=26
-y=14
-[/item]
-
-[item]
-tileset=items.png
-tile=9
-counter=4
-x=18
-y=5
-[/item]
\ No newline at end of file
diff --git a/data/room_old/05.tmx b/data/room_old/05.tmx
deleted file mode 100644
index 2f6639d..0000000
--- a/data/room_old/05.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,68,0,0,68,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-62,222,0,0,0,0,0,222,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,222,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,0,0,
-62,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,0,0,0,
-62,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,0,0,
-0,0,0,0,0,0,0,222,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,222,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,68,0,0,0,0,
-68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68,68
-</data>
- </layer>
-</map>
diff --git a/data/room_old/06.room b/data/room_old/06.room
deleted file mode 100644
index 59fb0b1..0000000
--- a/data/room_old/06.room
+++ /dev/null
@@ -1,11 +0,0 @@
-name=the test room
-bgColor=black
-border=blue
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=13.room
-roomRight=01.room
-
-
-06.tmx
diff --git a/data/room_old/06.tmx b/data/room_old/06.tmx
deleted file mode 100644
index 2390f97..0000000
--- a/data/room_old/06.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-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,
-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,
-26,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,0,26,
-26,0,0,0,0,0,86,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,0,26,
-26,0,0,0,86,86,86,0,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,0,26,
-26,0,0,0,86,0,86,0,0,0,0,0,0,0,0,168,66,66,66,66,187,0,0,0,0,164,66,66,0,0,0,26,
-26,0,0,0,86,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,26,
-26,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,162,26,26,26,26,26,26,26,26,183,0,0,0,0,0,0,0,0,0,0,0,26,
-0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,183,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,0,0,183,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,
-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
-</data>
- </layer>
-</map>
diff --git a/data/room_old/07.room b/data/room_old/07.room
deleted file mode 100644
index 4f15f3b..0000000
--- a/data/room_old/07.room
+++ /dev/null
@@ -1,93 +0,0 @@
-name=chirping
-bgColor=black
-border=magenta
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=08.room
-roomRight=04.room
-
-
-07.tmx
-
-
-[enemy]
-tileset=bird.png
-animation=bird.ani
-width=16
-height=16
-x=4
-y=2
-vx=0
-vy=0.5
-x1=4
-y1=2
-x2=4
-y2=12
-color=yellow
-flip=true
-[/enemy]
-
-[enemy]
-tileset=bird.png
-animation=bird.ani
-width=16
-height=16
-x=9
-y=11
-vx=0
-vy=-0.5
-x1=9
-y1=2
-x2=9
-y2=12
-color=green
-[/enemy]
-
-[enemy]
-tileset=bird.png
-animation=bird.ani
-width=16
-height=16
-x=26
-y=5
-vx=0
-vy=-0.5
-x1=26
-y1=2
-x2=26
-y2=12
-color=white
-[/enemy]
-
-[item]
-tileset=items.png
-tile=10
-x=2
-y=8
-counter=1
-[/item]
-
-[item]
-tileset=items.png
-tile=10
-x=2
-y=3
-counter=2
-[/item]
-
-[item]
-tileset=items.png
-tile=10
-x=29
-y=8
-counter=3
-[/item]
-
-[item]
-tileset=items.png
-tile=10
-x=29
-y=3
-counter=4
-[/item]
\ No newline at end of file
diff --git a/data/room_old/07.tmx b/data/room_old/07.tmx
deleted file mode 100644
index 088008c..0000000
--- a/data/room_old/07.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-73,345,345,345,0,0,345,345,345,0,0,345,345,345,345,345,345,345,345,345,345,0,0,162,345,345,0,0,345,345,345,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,0,0,73,
-73,345,345,345,0,0,345,345,345,0,0,345,345,345,182,0,0,345,345,345,345,345,345,345,345,345,0,0,345,345,345,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-73,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,73,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,182,0,0,0,0,0,0,0,0,0,0,0,0,0,
-73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73,73
-</data>
- </layer>
-</map>
diff --git a/data/room_old/08.room b/data/room_old/08.room
deleted file mode 100644
index e23f46d..0000000
--- a/data/room_old/08.room
+++ /dev/null
@@ -1,11 +0,0 @@
-name=still thinking
-bgColor=black
-border=blue
-tileset=standard.png
-roomUp=0
-roomDown=09.room
-roomLeft=10.room
-roomRight=07.room
-
-
-08.tmx
diff --git a/data/room_old/08.tmx b/data/room_old/08.tmx
deleted file mode 100644
index af9ccf4..0000000
--- a/data/room_old/08.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
-33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,341,341,341,0,0,0,0,0,0,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,33,33,33,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,33,33,
-33,33,341,341,341,0,0,341,341,341,341,341,0,0,341,341,341,341,341,341,341,341,341,162,0,0,0,0,0,0,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,33,33,
-33,33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,162,0,0,0,0,0,0,0,0,0,33,33,
-33,33,351,351,351,0,0,351,351,351,351,351,0,0,351,351,351,351,351,351,0,0,0,0,0,0,0,0,0,0,33,33,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,351,0,0,351,351,351,351,351,351,351,351,351,351,351,351
-</data>
- </layer>
-</map>
diff --git a/data/room_old/09.room b/data/room_old/09.room
deleted file mode 100644
index c427dbe..0000000
--- a/data/room_old/09.room
+++ /dev/null
@@ -1,11 +0,0 @@
-name=slope test
-bgColor=blue
-border=blue
-tileset=standard.png
-roomUp=08.room
-roomDown=0
-roomLeft=0
-roomRight=0
-
-
-09.tmx
diff --git a/data/room_old/09.tmx b/data/room_old/09.tmx
deleted file mode 100644
index 7b7defe..0000000
--- a/data/room_old/09.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,0,0,0,163,54,54,54,54,54,54,54,54,54,54,54,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,0,0,0,0,163,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,54,
-54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54,54
-</data>
- </layer>
-</map>
diff --git a/data/room_old/10.room b/data/room_old/10.room
deleted file mode 100644
index b33119c..0000000
--- a/data/room_old/10.room
+++ /dev/null
@@ -1,11 +0,0 @@
-name=welcome to the jail
-bgColor=black
-border=bright_magenta
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=0
-roomRight=08.room
-
-
-10.tmx
diff --git a/data/room_old/10.tmx b/data/room_old/10.tmx
deleted file mode 100644
index acf5b97..0000000
--- a/data/room_old/10.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,127,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,127,0,127,0,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,127,0,127,0,127,127,127,0,127,0,127,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,127,127,127,0,127,0,127,0,127,0,127,127,127,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,94,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,27,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94,94
-</data>
- </layer>
-</map>
diff --git a/data/room_old/11.room b/data/room_old/11.room
deleted file mode 100644
index 8a74a6c..0000000
--- a/data/room_old/11.room
+++ /dev/null
@@ -1,68 +0,0 @@
-name=qvoid
-bgColor=bright_blue
-border=white
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=03.room
-roomRight=0
-
-
-11.tmx
-
-
-[enemy]
-tileset=qvoid.png
-animation=qvoid.ani
-width=16
-height=16
-x=13
-y=3
-vx=0
-vy=0.3
-x1=13
-y1=3
-x2=13
-y2=11
-color=white
-[/enemy]
-
-[enemy]
-tileset=qvoid.png
-animation=qvoid.ani
-width=16
-height=16
-x=19
-y=7
-vx=0
-vy=0.3
-x1=19
-y1=3
-x2=19
-y2=11
-color=bright_red
-[/enemy]
-
-[item]
-tileset=items.png
-tile=20
-x=1
-y=12
-counter=1
-[/item]
-
-[item]
-tileset=items.png
-tile=20
-x=16
-y=5
-counter=2
-[/item]
-
-[item]
-tileset=items.png
-tile=20
-x=25
-y=11
-counter=3
-[/item]
\ No newline at end of file
diff --git a/data/room_old/11.tmx b/data/room_old/11.tmx
deleted file mode 100644
index a76bc61..0000000
--- a/data/room_old/11.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,113,113,113,182,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
-113,113,113,113,113,0,182,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
-113,113,0,0,0,0,0,182,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
-113,0,0,0,0,0,162,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
-113,0,0,0,0,162,0,113,113,113,113,113,0,0,0,0,113,113,0,0,0,0,113,113,0,0,0,0,113,113,113,113,
-113,0,0,0,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-113,0,0,162,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-113,113,113,113,101,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,103,113,113,113,113,113,
-113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113,113
-</data>
- </layer>
-</map>
diff --git a/data/room_old/12.room b/data/room_old/12.room
deleted file mode 100644
index e4431b7..0000000
--- a/data/room_old/12.room
+++ /dev/null
@@ -1,60 +0,0 @@
-name=no name
-bgColor=black
-border=red
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=05.room
-roomRight=0
-
-
-01.tmx
-
-
-[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=1
-y=0
-vx=0
-vy=0.3
-x1=1
-y1=0
-x2=1
-y2=5
-color=magenta
-[/enemy]
-
-[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=5
-y=9
-vx=0.6
-vy=0
-x1=5
-y1=9
-x2=22
-y2=9
-color=white
-[/enemy]
-
-[item]
-tileset=items.png
-tile=1
-x=1
-y=7
-counter=1
-[/item]
-
-[item]
-tileset=items.png
-tile=1
-x=17
-y=8
-counter=2
-[/item]
diff --git a/data/room_old/12.tmx b/data/room_old/12.tmx
deleted file mode 100644
index 5465e22..0000000
--- a/data/room_old/12.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-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,
-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,
-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,
-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,
-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,
-326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,286,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,326,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,286,0,0,0,0,0,0,0,0,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,
-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
-</data>
- </layer>
-</map>
diff --git a/data/room_old/13.room b/data/room_old/13.room
deleted file mode 100644
index f732620..0000000
--- a/data/room_old/13.room
+++ /dev/null
@@ -1,236 +0,0 @@
-name=know your enemy
-bgColor=black
-border=red
-tileset=standard.png
-roomUp=0
-roomDown=0
-roomLeft=0
-roomRight=06.room
-
-
-13.tmx
-
-
-[enemy]
-tileset=batman.png
-animation=batman.ani
-width=8
-height=16
-x=2
-y=2
-vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=bin.png
-animation=bin.ani
-width=16
-height=8
-x=5
-y=2
-vx=0
-vy=0
-x1=5
-y1=2
-x2=5
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=bird.png
-animation=bird.ani
-width=16
-height=16
-x=8
-y=2
-vx=0
-vy=0
-x1=8
-y1=2
-x2=8
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=chip.png
-animation=chip.ani
-width=8
-height=16
-x=11
-y=2
-vx=0
-vy=0
-x1=11
-y1=2
-x2=11
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=14
-y=2
-vx=0
-vy=0
-x1=14
-y1=2
-x2=14
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=matatunos.png
-animation=matatunos.ani
-width=16
-height=16
-x=17
-y=2
-vx=0
-vy=0
-x1=17
-y1=2
-x2=17
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=paco.png
-animation=paco.ani
-width=16
-height=16
-x=20
-y=2
-vx=0
-vy=0
-x1=20
-y1=2
-x2=20
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=qvoid.png
-animation=qvoid.ani
-width=16
-height=16
-x=23
-y=2
-vx=0
-vy=0
-x1=23
-y1=2
-x2=23
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=sigmasua.png
-animation=sigmasua.ani
-width=16
-height=16
-x=26
-y=2
-vx=0
-vy=0
-x1=26
-y1=2
-x2=26
-y2=2
-color=red
-[/enemy]
-
-[enemy]
-tileset=tuno.png
-animation=tuno.ani
-width=16
-height=16
-x=2
-y=5
-vx=0
-vy=0
-x1=2
-y1=5
-x2=2
-y2=5
-color=red
-[/enemy]
-
-[enemy]
-tileset=wave.png
-animation=wave.ani
-width=8
-height=8
-x=5
-y=5
-vx=0
-vy=0
-x1=5
-y1=5
-x2=5
-y2=5
-color=red
-[/enemy]
-
-[enemy]
-tileset=abad.png
-animation=abad.ani
-width=8
-height=16
-x=8
-y=5
-vx=0
-vy=0
-x1=8
-y1=5
-x2=8
-y2=5
-color=red
-[/enemy]
-
-[enemy]
-tileset=jailbattle_human.png
-animation=jailbattle_human.ani
-width=11
-height=13
-x=11
-y=5
-vx=0
-vy=0
-x1=11
-y1=5
-x2=11
-y2=5
-color=red
-[/enemy]
-
-[enemy]
-tileset=jailbattle_alien.png
-animation=jailbattle_alien.ani
-width=13
-height=15
-x=14
-y=5
-vx=0
-vy=0
-x1=14
-y1=5
-x2=14
-y2=5
-color=red
-[/enemy]
\ No newline at end of file
diff --git a/data/room_old/13.tmx b/data/room_old/13.tmx
deleted file mode 100644
index 3f01706..0000000
--- a/data/room_old/13.tmx
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map version="1.9" tiledversion="1.9.1" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="8" tileheight="8" infinite="0" nextlayerid="2" nextobjectid="1">
- <tileset firstgid="1" source="standard.tsx"/>
- <layer id="1" name="Capa de patrones 1" width="32" height="16">
-  <data encoding="csv">
-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,
-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,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,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,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,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,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,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,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,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,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,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,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,
-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,169,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,25
-</data>
- </layer>
-</map>
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 717f2651d444929182e8de6d3fbb34c0ca24f131..6e7b7cd52a10784b3b785e3aee67743db80fecaf 100644
GIT binary patch
literal 5021
zcmXw7X*d*I*dB}+Vl1zbb;x8F30bmaX$)DDnCxXuM2VNNjeQ@|5R;{Z%9<rv#vVhm
z8&S3y*%C&WvCZfGuJ8MCKliz>^PF=%=f0jF&vlY4&EXtuf@}Z)fCFJ{Xnn>-|AF<~
zSxg!BR5&AsC)RL%K-D+lH2{G3F2eAJO$ct&(X4S-n)Ag5>S)z<T5l+H?!&6R!UvCr
zWG911dID1>tI-_T*a)0@`m5_dgHd`A7vFg);5p?xQK2kRLSHdEjCV9lml}ZUY{5<4
zk2GXRZ|4Aif}>`$5Iq}}A?pInfRRL|n?CJP=qQEF*RBEbGv7t~tgowPk5w^8J$z~;
z9$@4=5W-no6KF7^$+0p}-&WMOlMlz|KWXeUXfVSIQOPm03f4#DZc7o!Le{XxEGaYe
zv+$CMB;<A0-PlBCF4K%0w4><N=ze*>S<PUsQZ`ElUs1EV8FQ;LJ;$8en%reht>5a|
zo|nzJFf--tCHR(bZ6UreFohoaNO#`j)DWu>xwPORCk^ULJ?w;VbzE~hw9mX~Gi&=e
zo%(x*2uxU4iu3IGTX)f@gj4@<*Ud(c9l<qGAGFM32|PgQBM5KF`$NADgmwS>RNb!A
zqSIf8)}d~?R6HXN)$6FT6seW7PLM%ERLr^Gy})EzKUoIKghMeNrOF!c{Do_Wk$~?&
zf7yjqNxMxHW@H`p6;gj5@;G)v{Cv=O-oiDEQvL$FTBpk2W8EkPog#M-f1|g~ywFJp
zh+#bqw=ksG0hIoh_>VfXk3;@Ft|3LhE#ukST$^%$IVlT{15p1g<6L}D=CtPM^-7h8
zfv%L}bmQ=aZx1@OBCVEs#UWHuJAIu}7<nQ=rdO6$X+%wbXJ!t7DJ^3ENN-2JMl)mV
zj3w`n)*Xa(TuKwgGPZ;gc=e&4R@@xCdJEfbBSI;f4=<bu#jk_Qb;WVQX_qAm4Ns1N
zX}-4QJeV)sw<tGmNNXi{PXy@6Zjho3r@k<}3>9W6`KZZh{NRx=X5gS@htk}tX4ZVk
zSFNNRTa!(DJw~adw7s%aSZt4^g8^Pxe=Pm@sL%k^KVYpOzS^@9K&F@Io3m5bAY9u&
zB%78SDx6ygG4czF0Ak!dt`gSCMlkEbQIya`6?i%{`NQE2C>JA?3kBsm!?wS<x*FGX
zzZ8eCgh{r`iIh(dNtx<psEW8i24f)GzYn3l44wt*Iz_+VedsMZ#W}e$>~(s|vdHK+
zC{u4O7dT%FiWdBXrPueT0W6N9xTsOR2Mly-c;mBDFqL1J&Aib{jX*rRX;7hPid_<N
z#m9BeoYfyqY?j4~C6a9wrz=iVLOVSeo!j=&W(|e9mIqEXai^+1dQ`CB)&9GE{H$!O
ztoZRB;3Rmf-PjKd+UMT>r2Udt5l!RpyZMCUfqEH-{xcEbuAAHXr{xvMKK_fK5H+tl
zIW2KO3KSWSfo&toG3jyn>*Wp`MlQhY%J0+7%rg3WKVKy5+w@0=qSRwj@$$2`#aY&C
zsKp=yJAxVt=rkY(Ns5Ot$fO9LIP6O8VUUyiaQ9zMjmpl(T{=SNTyV?=M-_g_mf_Al
z`Le;11n<i!!sYP7FwE?rLbLCyEp2#vZh1(HQw=n`+9+FQ@UF3!YFo^Ux65sq*l@L5
zq}1%btNNUiyN^vJUS$)msovq7xZmfGA=E@mj*BxJaZb4Ibm!(}Gn^~5I7A1!;ArST
zR_3@LvPK2~$Nk4#AgN|qb9UN$^-CommTZFDOP-70<134OdItyDPe6y-%_yN&-!OGd
zDUf2TG^GnFldl@gyt@#7!zazgc|;ryQ*4>%xRAwRi(1L!2A1;`A;kex8a}bCe6qRX
zj8klr=NW4C8w?D~8_*(M!k_d3xDB_s8-l=!sAsEdTqBjU!mq>rY9d*vizpGYxCR(-
z8m%r`Bb?YNhD^<XvZPKDt0D`B?l0JWQQVcMkC_i)Hp4(Hj0fL5zOzq(ys7nb)u;sP
zn>dtxw$yTqv7&qH5k;j~E*MCPK6vY<f@?QaS+UT}QM`cG5QNSHN!HF%!19Qu?E7&+
z2+z360wilxgRN5c+<C=el=|a;ooso3&fk|~>g)E7A0~?e0P?<WC2y2<<KEn&bDjG)
zg8fBi`hcMW0sbJbI5VA4k59g}@nL{$@!UR~@8y*7bMN?@nzC2*t&}f|w~KO$hv!Iu
zqBG63zAZT#97aL^FqtdWvVRp}U*bIn{V>h~G=`3B)AHoQ+Z#kl`GVp4HGTA|1@=;K
z2m{n|=g7`MctWavUd}tccZ8i|o}kLN#^lt&l8uM%fK=x*4rAw9MEZk`pj=GQZ3)Sz
z&Fd*d=m_1IG5t0FqYNhOh^Y>LxLWGdpp!U6vhaKVs;|Fh<pPT${3O}<VqRX}vAMuX
z?!$M-7upNZ{swe>cn;R{H3u$m4;yp8PZLnmj#lk;e?Egt8oQyxrt~>!>O8g*^jhGu
zD>J-^6>2e}DM4friZ2%S*#%LR;<M14_siE!CgeZ~accmayPIosaeUHK;GTf&UxP?f
z)}MA_YyZCIeXwe3%Tr?(Ee*<fsFYq_$Db{Ex69P>i_j5pkXV$?G{)?As4j>oPJ44@
zFW32}_=`(+IUU|4ucvW8RMHI-38DjXmlS!HM_9IBUY3<GW(>M3yHxlt_99<Bq-?ar
z4-MX>!E_?TkP>1E^JH%zN-V62*L!+F7P9@_yuU0HEJlpQr8|;IbG?0M0z_q|wtD0&
z-JM3uK!1te-WuAHK;{T>c*c@Kw1^yVRl71`j37jsm(f=1*nz?zozH7kp{RT2&mQm<
zF3|U_RFl6|K5TtM{XABUK6EkQFTtj2=gO`Sb45$uI<wft`f3qd>RP`fbxC?Kk6rHg
zDU5-)>>?;voe$BGA`#xv^N#uqy3Mb5eInr4GPOFR(S<$1ZQuM|@<0X!ejATgn86FQ
zf2-=S=!2N<57};OePKu&T~HI4$opr8VjnZ~Hf>x0QsEyalntHSl6rGb@B2X7*7dXc
zw)7Qv6B&UUjC<S4%ceOLOvH3DhogOI#z4mU!R<~>@oP0{-%I}~KJ-9#Yjh5&1=k9)
z6&<++AY9kkn+xaIAmf65GP>{QEe!Y3yk+PheI5KYVX95$-cE&(-t{Zuvby1T?pIL}
z<1OMw<>@@Yv`9?&)?mincB4AvekQ$a>8#RmO1S(O%Pm~8s~M{!23S-H;+7%jVQx6a
zA&*`5ERSC`d<rz{r^ZaqC|~)gW;;9Jbb2fuH;sQ*@8lMQarndDPx0!$`uhj}dC9FC
z$TP2u870k){%|}AJQ<!V-12RjN8c6J06sbBvvX68m5bRo_Y6S9YK1N8wj|)p9xvIP
znN5sqVe+goSec__OeJWg#vc$PYI;ZZIdl}X8==XyJoQjqt?cTl<yS0+bOtJ-Eq!?D
zIbrf|*dOt4LYwA-t;b^RraDpE%c2N;Y4Eu3*XsQau3BW>qgkVauU{T5-y;@Z`?dB)
z)5qJ(Y4ea$oKD1mZOQyS&$alCmpG27h^2m~kEmLMlis}-PK^f<5+|hx8Fq!DE|EFQ
zbz^N8+xHDF-{Y><e7KUfp$M#(cabRaW)O;&XP;VkpQ8tcU!r4Ib}kPR$&2muS6B-t
zi<T>9?USLS$4Dn+ya$b{sxp|+V6Qhs5!ah<F{(p7%E<W~(n}Ga@MBONgv+OS(71|C
z*e}@YvR8-D^DjTPIrVbfkfVg@x;HeOHZo^pEly3iKcTWPV-yaEB~k}r>`jY5TESZI
zP-JxqTW#rEy4{q~kpa`adzCqN((mwZhCWo!Hk5}>1yuI=&^&ks8f4spKLiY~O;Q$f
z3+;7msx0K^1)cg<gy!b$v5NZ*jVlM~m3yBymJ_hc_Y8hgg4n(6@uGs*YU1rrsD~jU
zgJn)nf|(gxml%FehIua?b!#3*8iwuc;Ojt5pskN+`0BxFjPGYWTrX;LUTE(IjbC(k
z_Ae@!?5X{=-vSWwgTFqs^`k?z@79b}#M;J5Pe8lI&)o=@@!@45Z_#ZgGhugx=-z=S
zf$m#<P<yzhJzv$fJw2a0^~tv2534D4LRzEanW@(v%KhJe@?Lzbu*;rb-}7m6YfEkD
zldBr*qbDm@XQk5{L=}n8ciQJj?x3li_Nm=vzTc$C%D%zLjP_ZDklynCUn#A!^g8W%
z1zO?eiH@!A2dP$LekfD@p96uDI;>?nvVOOZ27E27SWmfmKX~|8*<RW5Dwazx{iOEj
zUW8=l$5_*3LVc`VcCBuKbNUI#+mu>eEBbhNS2@&W=?+$j?SPz-es^NLF>2_wW0<^B
z^Oon|45WVL9fO|tR5hMcRM>f}isAUlR_D`0FL)d%CbGPSvGeJ%i|M&mmIJ5*UDQGM
z^ir*t2_0`lvpQ`f4hxL(cPO|CWP6L8X6}6M9@o@X)=6-e)mF$D?(LY+(pKhFY5`QP
zWe4Qu)21c{slwPKzxN0dqJw?Gym3{8V0`lJiusAT!WmTmk1zelezf12^nwsxu3FnD
zBt!GO3F(KCAgO-*O|N$uJngowRm$xw>40@lp8yRvanc%7!EdIndSu5v83UAG6%s70
zm$LhB!hPH~EgO>WTrrQ7Hd4WSMdU2|aJyf=w5Jnen}O`sv{*UxVb4_;K#rRt)XPkG
zBsujZ@`F%Xv@w?J;ld-toTYZr&*87IUEL*$sXuU$TYFC~{9<g1o9(_ej`9kKT8<Sg
z?DozJMT#a|V&q-jp(#I6Q_vy0<zefU@v!{T0&L&&D1LxymxMr>w_n;G)lf}fa*6lW
zZAVJ^4oI>*<>lDYxXKO3s&_qQpwedY=$SGLBHZugm15*JF1xSeg}Njh1*tAc8((@s
zwj#Z#&qU&~43q9=!Oz|=u(KKy7Sz3Jfa2&{H3;7XBf;HZnks7y_~fKm$W?{gC7k=F
z7gu#J?JAMvtk>0JkBNOVRkLp%Xpp72<K|_Xk@Xny0(MI{=BC;P^%*7UB_3(FF>@qn
zpvh~;E~objhuP#Qiskd!B6y4EBP!zfrV0umV=uq_m&I$-6~NCZ`c3<WRx17+>Il_=
zEkAU9X4v}J0$wr{QtSCNtdLYQ;Hgm9-pCpEYJ94A<O#(-aplbrzI3G`=sN5c<?~`^
zn@iebQWhgUzXq<q`EsDi^eiSe!MmPisALB$pL-rFkBVU~=^^c$lf&b#^nWV2dWH$Y
zS>Mga9?85yZG48!FZUA*>ddbXF<PfWFy4IZ{d>vGWROFbHw5zmex?vzrkKYtT<W#{
zoc`qig^$_pp;iU3QL(|ludiq7%oJk!5jxkdcQOX@j0G2y#;?KAu*H|Ko`sR^JF)*2
zIojrudjPIar)kW>a{=$e^r$QR+)iQuD%q4LlpK}>Zc6Q?0ZWE)x{);b<z1127pMq|
zegBHYmi-U<s`d8KL)bVTE${l^*N5U2vQVHLIDQ#I7TP6kFN8$gz}H6YbS5+Ydiv$W
zl)^#NpndsGN?H6K#4b&kzFmju)8@JS$tSA@Brm+g2_m$4!5p&kU=A4A#4gmL>r@rZ
zmC@_%qdMnjBsCxUO$@5>?hDcMJ^9VS>s|yFRw(ac9$dw&l9W(nr)Q<#&X@N14Kq2k
zmoXVgw!SPL)RhLYd|<)j6dlX7n5arVxU|vXPD_Q`m+~(YG&w)sQXJr2J5$4)tWxv#
zq^P{fH?Rl84hef;{QAl9FI_Jp3lU6t2(c7Htj5E$xMB=??{X^>R^s9J^uo7aigt|K
z2Ug;89SX`kqGc45%>H$Ry&Vh^IH)575c=1yXU7UMKsDZnsl2v_+vrK;1)VKedipsN
z3+QHTE{Vp|rsv7kHBnPESaAWJ59Vv;XV|gTQ%#d>cr`dnLlP^+q<`%`)z!obQS&h3
z*S1x~??>PzAAD7uicMucQzi_)X8jl_Ef2G^|2+?LMa!92*<))3L|_9HooC_^Z4DmA
zS3c2e31;?Y*gN+3jweJTshh@>HQM|p(@og*cQH*ZIqe{XzBXMeTyKa+=P!>g&u86*
z??+7Lqs@-Gk#yD9%i3cnh3|fx+UM&kET0aW93+$m9!ce$|9nz6cJk(IBPn0Et-l>T
zYw938ip<y+s;Qr|PRDbzJT!`*y6<Zi$Th<OKIP&08EMzf9C(P$o}I3_1TH)+amdj%
zy-9BWeR)|;rE>7hu468q2<a@8Uq}GO=%EQ((S7GZ;%c?M=0>8<)Q~Yx^I|W8x@dgX
zuZwlA`-|g+&Mj%M#q@*_HIS}=24@IGec_A$Tj!MHm+^)dGmT+9N&iQm#QGS9MOm`j
z`F})^Vh85aj@g#t{ipM~IU>(x#royKuAl!7bbbfI4*6^4{Qo%=_m{Ri6>YXEA}<Oj
z8Ej!EQPzNwRes|$N%THig3ZO%68AjB7RJe$A*DFj!si9Bb5(qfx?v$?TZ+U3*}es1
z7&bB|Sm2UjF8@1Y{Ws7yagoz+CiQeq`!cM_o;r*chVa=k4z&G*sC;bTJ8r0I!Ao)T
zhH)c1yz?S`04}h3i+S6Nwa}{!s_hmUa6+zeD`P%N&!iP%v5^zPTv|iCmu%7mb6w(N
k4JI7ye>CNh++U*mFTZ{MsC`)I?7t0wFfuo+(sx1s4{Y?a`2YX_

delta 4799
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
Z{txU=ty5*j<6Qs%002ovPDHLkV1ljXY#IOn

diff --git a/source/director.cpp b/source/director.cpp
index 7c3b05d..64ad387 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -357,8 +357,8 @@ bool Director::setFileList()
 	asset->add("/data/font/debug.png", font);
 	asset->add("/data/font/debug.txt", font);
 
-	asset->add("/data/gamecontrollerdb.txt", data);
-	asset->add("/data/config.txt", data, false);
+	asset->add("/data/input/gamecontrollerdb.txt", data);
+	asset->add("/data/config/config.txt", data, false);
 
 	asset->add("/data/room/01.room", room);
 	asset->add("/data/room/02.room", room);