From cf3116bc4636fcddbca9c837acd7cc009d8edbc1 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Wed, 12 Oct 2022 10:51:58 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adiendo=20contenido?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/enemies/mummy.ani     |   2 +-
 data/enemies/mummy.png     | Bin 229 -> 228 bytes
 data/enemies/sam.ani       |   9 ++++
 data/enemies/sam.png       | Bin 0 -> 205 bytes
 data/room/17.tmx           |   2 +-
 data/room/18.room          |  28 ++++++------
 data/room/18.tmx           |  30 ++++++------
 data/room/19.room          |  91 ++++++++++++++++++++++++++++++-------
 data/room/19.tmx           |  20 ++++----
 data/room/20.room          |  52 +++++++++++++++------
 data/room/20.tmx           |  32 ++++++-------
 data/room/21.room          |  66 ++++++++++++++++++++-------
 data/room/21.tmx           |  28 ++++++------
 data/room/22.room          |  56 +++++++++++++++++------
 data/room/22.tmx           |  32 ++++++-------
 data/room/23.room          |  72 ++++++++++++++++++++++-------
 data/room/23.tmx           |  32 ++++++-------
 data/room/24.room          |  78 ++++++++++++++++++++++++++-----
 data/room/24.tmx           |  32 ++++++-------
 data/tilesets/standard.png | Bin 6155 -> 6328 bytes
 source/director.cpp        |   4 ++
 source/game.cpp            |   2 +-
 22 files changed, 461 insertions(+), 207 deletions(-)
 create mode 100644 data/enemies/sam.ani
 create mode 100644 data/enemies/sam.png

diff --git a/data/enemies/mummy.ani b/data/enemies/mummy.ani
index 2202435..8a1282a 100644
--- a/data/enemies/mummy.ani
+++ b/data/enemies/mummy.ani
@@ -3,7 +3,7 @@ frameHeight=16
 
 [animation]
 name=default
-speed=10
+speed=12
 loop=0
 frames=0,1,2,3
 [/animation]
\ No newline at end of file
diff --git a/data/enemies/mummy.png b/data/enemies/mummy.png
index a7a769a8d49e4a2c56818d3895e9426953fa6751..b6d2c36012c379415355b2049cea6a54c2f93aec 100644
GIT binary patch
delta 187
zcmV;s07U=g0ptOYF@K&(L_t(YiLI4U4!|G?L+P^nUzvSOj8O(k$KOI9t;9Hph^VSc
zD*%wgqIhlP4VyJlugYIL0Y%=E0f0Az;qNGU#ptv!r`#Dl>lhx9(8Q4e%l8eKa1@Q-
znL(BBLKAp5cI<hlX89$=+{_GU{wv{$0mCm%4~`62J{^)7&@_Byg@5tsQ*3bMC$+;b
p0kTy`CKWDyioM~P?(3=c_y@4mw$t*^x>NuF002ovPDHLkV1g2bSaSdX

delta 188
zcmV;t07L)e0p$UZF@K*)L_t(YiM5nT4uCKSMaA^~SH?{-^~+E||Hd}(7=)A#5Hqu!
ziHOi1sl~4_Pia1$Ez6(T0%-~pR{7y|QBjsxXCy&zhFWlK&MDri*ju1AL6;xsEOT1F
zQGzc2+Dtra)oUAH;qN8H&6YcMVRhBz!w#|AzxdF}`n8|&J2e$X2|9dOVPym!pL&W#
q;UXpYM**Fn)i|xE*s@!%pvGT^iH9m}Lb>w*0000<MNUMnLSTZ|N?57@

diff --git a/data/enemies/sam.ani b/data/enemies/sam.ani
new file mode 100644
index 0000000..fd52e28
--- /dev/null
+++ b/data/enemies/sam.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=5
+loop=0
+frames=0,1
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/sam.png b/data/enemies/sam.png
new file mode 100644
index 0000000000000000000000000000000000000000..3af3e524701a249bb3755770f882ef279aed66dc
GIT binary patch
literal 205
zcmeAS@N?(olHy`uVBq!ia0vp^3P3Et!3HGD8EPYe6k~CayA#8@b22Z1oOVwa#}JRs
zr&AsI8Wea~R{sD0xhgAX!y}Vr4;9o^`XZN$<TNOH+L;?G^Q88lV&C-q>hBiU`ps7z
zu760-WxRLF<X9^6>nSSjt5iGR^s0Z@<M#dF<jxa|g<KS(R;>8;^Gq`H=DJmO$&aIU
zvP?Bod9%&zPkKYn<wtre<PJ{BH+67Y%&=PeopwFb^2i2e&Tl!+KqoPHy85}Sb4q9e
E07Y(3qyPW_

literal 0
HcmV?d00001

diff --git a/data/room/17.tmx b/data/room/17.tmx
index ccbd80f..fc4bba2 100644
--- a/data/room/17.tmx
+++ b/data/room/17.tmx
@@ -18,7 +18,7 @@
 88,88,411,411,411,0,0,411,411,411,411,411,0,0,411,411,411,411,411,411,0,0,0,0,0,0,0,0,0,0,88,88,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,411,411,411
+411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,411,0,0,411,411,411,411,411,411,411,411,411,411,411,411,411,411
 </data>
  </layer>
 </map>
diff --git a/data/room/18.room b/data/room/18.room
index d0cfc88..4e73ec3 100644
--- a/data/room/18.room
+++ b/data/room/18.room
@@ -24,14 +24,14 @@ x1=19
 y1=6
 x2=29
 y2=6
-color=yellow
+color=magenta
 [/enemy]
 
 [item]
 tileset=items.png
 tile=14
 x=19
-y=5
+y=3
 counter=1
 [/item]
 
@@ -39,7 +39,7 @@ counter=1
 tileset=items.png
 tile=14
 x=19
-y=5
+y=3
 counter=1
 [/item]
 
@@ -47,7 +47,7 @@ counter=1
 tileset=items.png
 tile=14
 x=20
-y=5
+y=3
 counter=2
 [/item]
 
@@ -55,7 +55,7 @@ counter=2
 tileset=items.png
 tile=14
 x=21
-y=5
+y=3
 counter=3
 [/item]
 
@@ -63,7 +63,7 @@ counter=3
 tileset=items.png
 tile=14
 x=22
-y=5
+y=3
 counter=4
 [/item]
 
@@ -71,7 +71,7 @@ counter=4
 tileset=items.png
 tile=14
 x=23
-y=5
+y=3
 counter=5
 [/item]
 
@@ -79,7 +79,7 @@ counter=5
 tileset=items.png
 tile=14
 x=24
-y=5
+y=3
 counter=6
 [/item]
 
@@ -87,7 +87,7 @@ counter=6
 tileset=items.png
 tile=14
 x=25
-y=5
+y=3
 counter=7
 [/item]
 
@@ -95,7 +95,7 @@ counter=7
 tileset=items.png
 tile=14
 x=26
-y=5
+y=3
 counter=8
 [/item]
 
@@ -103,7 +103,7 @@ counter=8
 tileset=items.png
 tile=14
 x=27
-y=5
+y=3
 counter=9
 [/item]
 
@@ -111,7 +111,7 @@ counter=9
 tileset=items.png
 tile=14
 x=28
-y=5
+y=3
 counter=10
 [/item]
 
@@ -119,7 +119,7 @@ counter=10
 tileset=items.png
 tile=14
 x=29
-y=5
+y=3
 counter=11
 [/item]
 
@@ -127,6 +127,6 @@ counter=11
 tileset=items.png
 tile=14
 x=30
-y=5
+y=3
 counter=12
 [/item]
\ No newline at end of file
diff --git a/data/room/18.tmx b/data/room/18.tmx
index 566353e..3594063 100644
--- a/data/room/18.tmx
+++ b/data/room/18.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">
-62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,0,0,521,62,62,62,62,62,62,62,62,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,521,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,521,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,521,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,521,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,521,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,521,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,521,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,521,0,0,0,0,461,461,461,461,461,461,461,461,461,461,461,461,62,
-0,0,0,0,0,0,0,0,0,0,0,0,0,521,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,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,516,325,62,
-0,0,0,0,0,0,0,0,0,0,0,521,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,62,
-0,0,0,0,0,0,0,0,0,0,521,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,521,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,521,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,62,62,62,62,62,62,62,62,62,62,62,62,62,62,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,522,0,62,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,522,0,0,62,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,522,0,0,0,62,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,522,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,522,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,522,0,0,0,0,0,0,449,449,449,449,449,449,449,449,449,449,449,449,449,62,
+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,62,
+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,516,325,62,
+0,0,0,0,0,0,0,0,522,0,0,0,0,0,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,325,62,
+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,62,62,
+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,62,
+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,62,
 62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,62,0,0,62,62,62,62,62,62,62,62,62,62,62,62
 </data>
  </layer>
diff --git a/data/room/19.room b/data/room/19.room
index 9cdf30c..e822cb6 100644
--- a/data/room/19.room
+++ b/data/room/19.room
@@ -1,33 +1,92 @@
-name=no 19
+name=this can't be the batcave
 bgColor=black
-border=red
+border=cyan
 tilemap=19.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=20.room
 roomRight=18.room
+itemColor1=cyan
+itemColor2=blue
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileset=batman.png
+animation=batman.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=10
+y=13
+vx=0.8
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=5
+y1=13
+x2=26
+y2=13
+color=bright_blue
+flip=true
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=14
+y=4
+vx=0.6
+vy=0
+x1=14
+y1=4
+x2=17
+y2=4
+color=cyan
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=34
+x=14
+y=6
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=15
+y=6
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=16
+y=6
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=17
+y=6
+counter=4
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=5
+y=12
+counter=5
+[/item]
+
+[item]
+tileset=items.png
+tile=34
+x=26
+y=12
+counter=6
 [/item]
\ No newline at end of file
diff --git a/data/room/19.tmx b/data/room/19.tmx
index ee220e2..5ddbd88 100644
--- a/data/room/19.tmx
+++ b/data/room/19.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">
-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,
+349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,38,38,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,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,38,38,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,38,38,0,0,0,0,0,0,
+0,0,0,0,0,38,38,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,38,38,0,0,0,0,0,
+0,0,0,241,38,38,0,0,0,0,0,0,0,0,241,241,241,241,0,0,0,0,0,0,0,0,38,38,241,0,0,0,
+0,0,0,0,38,0,0,0,0,0,0,241,241,0,0,0,0,0,0,241,241,0,0,0,0,0,0,38,0,0,0,0,
+0,0,0,241,38,0,0,0,241,241,0,0,0,0,0,0,0,0,0,0,0,0,241,241,0,0,0,38,241,0,0,0,
+0,0,0,0,38,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,38,0,0,0,0,
+38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38,38
 </data>
  </layer>
 </map>
diff --git a/data/room/20.room b/data/room/20.room
index 333cf37..acbb3e5 100644
--- a/data/room/20.room
+++ b/data/room/20.room
@@ -1,33 +1,59 @@
-name=no 20
+name=ENTRANCE TO THE VALLEY
 bgColor=black
-border=red
+border=blue
 tilemap=20.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=21.room
 roomRight=19.room
+itemColor1=magenta
+itemColor2=blue
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=bin.png
+animation=bin.ani
+width=16
+height=8
+x=8
+y=12
+vx=0.5
+vy=0
+x1=8
+y1=12
+x2=24
+y2=12
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=code.png
+animation=code.ani
 width=16
 height=16
-x=2
+x=13
 y=2
 vx=0
-vy=0
-x1=2
+vy=0.5
+x1=13
 y1=2
-x2=2
-y2=2
-color=magenta
+x2=13
+y2=9
+color=yellow
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=11
+x=7
+y=3
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=11
+x=29
+y=10
+counter=2
 [/item]
\ No newline at end of file
diff --git a/data/room/20.tmx b/data/room/20.tmx
index ee220e2..a78d918 100644
--- a/data/room/20.tmx
+++ b/data/room/20.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">
-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,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,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
+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,0,0,0,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,413,413,413,413,413,0,0,0,0,413,413,413,413,413,413,413,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,413,413,413,413,413,413,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,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,413,413,413,413,0,0,0,413,413,413,0,0,0,
+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,0,0,0,0,0,0,
+21,21,21,0,0,0,0,0,0,0,413,413,413,413,413,413,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,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,0,0,0,413,413,413,413,413,413,413,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,556,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,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413,413
 </data>
  </layer>
 </map>
diff --git a/data/room/21.room b/data/room/21.room
index 8540c51..1cd1da5 100644
--- a/data/room/21.room
+++ b/data/room/21.room
@@ -1,6 +1,6 @@
-name=no 21
+name=ENTER PAKU SIMBEL
 bgColor=black
-border=red
+border=yellow
 tilemap=21.tmx
 tileset=standard.png
 roomUp=23.room
@@ -9,25 +9,59 @@ roomLeft=22.room
 roomRight=20.room
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileset=mummy.png
+animation=mummy.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=13
+y=13
+vx=0.3
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=3
+y1=13
+x2=24
+y2=13
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=13
+y=9
+vx=0.6
+vy=0
+x1=4
+y1=9
+x2=21
+y2=9
+color=bright_green
+flip=true
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=36
+x=8
+y=11
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=36
+x=19
+y=11
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=36
+x=14
+y=3
+counter=3
 [/item]
\ No newline at end of file
diff --git a/data/room/21.tmx b/data/room/21.tmx
index e6a4309..2a47ad6 100644
--- a/data/room/21.tmx
+++ b/data/room/21.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">
-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,
+21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,21,530,0,0,0,0,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,530,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,530,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,530,0,0,0,0,0,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,23,24,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,0,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,47,48,0,0,0,0,0,0,0,0,0,0,0,0,530,0,0,0,21,
+398,398,398,398,398,0,0,0,0,397,397,397,397,398,400,400,0,0,0,0,0,0,0,0,0,0,0,519,21,21,21,21,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,0,0,0,0,0,0,0,0,0,519,299,21,23,24,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,519,299,299,21,47,48,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,519,299,299,299,21,21,21,21,
+419,397,419,419,399,399,419,419,0,397,397,397,419,419,419,399,419,397,419,0,419,399,419,419,419,397,419,419,419,419,419,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,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,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,556,0,0,0,0,0,0,0,0,0,0,556,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
 </data>
  </layer>
 </map>
diff --git a/data/room/22.room b/data/room/22.room
index 98dea82..be33f14 100644
--- a/data/room/22.room
+++ b/data/room/22.room
@@ -1,6 +1,6 @@
-name=no 22
+name=AEE2 never came out
 bgColor=black
-border=red
+border=yellow
 tilemap=22.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,51 @@ roomLeft=0
 roomRight=21.room
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
+tileset=mummy.png
+animation=mummy.ani
+width=8
 height=16
-x=2
-y=2
-vx=0
+x=13
+y=13
+vx=0.3
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=3
+y1=13
+x2=24
+y2=13
+color=yellow
+flip=true
+[/enemy]
+
+[enemy]
+tileset=mummy.png
+animation=mummy.ani
+width=8
+height=16
+x=13
+y=8
+vx=0.3
+vy=0
+x1=10
+y1=8
+x2=25
+y2=8
+color=bright_yellow
+flip=true
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=37
 x=1
-y=1
+y=2
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=37
+x=19
+y=5
+counter=2
 [/item]
\ No newline at end of file
diff --git a/data/room/22.tmx b/data/room/22.tmx
index 67c84f6..7f403b8 100644
--- a/data/room/22.tmx
+++ b/data/room/22.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">
-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,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,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
+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,23,24,21,23,24,21,23,24,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+21,0,0,21,47,48,21,47,48,21,47,48,21,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+21,0,0,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,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,400,0,0,0,0,0,0,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,400,400,400,400,400,0,0,0,398,398,398,398,0,0,398,398,398,
+21,400,400,0,0,0,0,0,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,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+21,0,0,399,0,0,0,0,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,399,0,0,506,419,397,397,397,419,419,398,419,419,419,419,419,0,397,397,397,419,398,397,397,419,419,419,419,
+21,0,0,0,0,0,506,0,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,506,0,0,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,506,0,0,0,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,506,0,0,0,0,0,0,0,556,0,0,0,0,0,0,0,0,0,0,556,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
 </data>
  </layer>
 </map>
diff --git a/data/room/23.room b/data/room/23.room
index 6df3587..dfad92a 100644
--- a/data/room/23.room
+++ b/data/room/23.room
@@ -1,6 +1,6 @@
-name=no 23
+name=inner chamber
 bgColor=black
-border=red
+border=bright_yellow
 tilemap=23.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,65 @@ roomLeft=24.room
 roomRight=0
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
-x=2
-y=2
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=7
+y=7
 vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
+vy=0.8
+x1=7
+y1=3
+x2=7
+y2=14
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=20
+y=10
+vx=0
+vy=0.8
+x1=20
+y1=3
+x2=20
+y2=14
+color=magenta
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=27
+y=10
+vx=0
+vy=-0.8
+x1=27
+y1=3
+x2=27
+y2=14
 color=magenta
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=38
+x=29
+y=5
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=38
+x=2
+y=4
+counter=2
 [/item]
\ No newline at end of file
diff --git a/data/room/23.tmx b/data/room/23.tmx
index 341bbd4..daad1a5 100644
--- a/data/room/23.tmx
+++ b/data/room/23.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">
-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,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,
-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
+21,21,21,21,21,23,24,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,47,48,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,0,0,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,0,0,0,0,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,0,0,0,0,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,400,0,0,0,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,0,0,0,0,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,0,0,400,400,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,400,0,0,0,0,0,400,21,21,
+21,21,0,400,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,400,400,0,0,0,21,21,
+21,21,0,0,0,0,0,0,400,400,400,0,0,0,0,0,0,400,400,400,0,0,0,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,0,0,0,21,23,24,21,
+21,21,0,0,0,0,0,0,0,0,0,519,21,21,21,21,543,0,0,0,0,0,0,0,0,0,0,0,21,47,48,21,
+0,0,0,0,0,0,0,0,0,0,519,21,21,23,24,21,21,543,0,0,0,0,0,0,0,0,0,0,21,23,24,21,
+0,0,0,0,0,556,0,0,0,519,21,21,21,47,48,21,21,21,543,0,0,0,0,0,0,0,0,0,21,47,48,21,
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,0,0,22,22,22,22,22
 </data>
  </layer>
 </map>
diff --git a/data/room/24.room b/data/room/24.room
index 13f9f33..205b341 100644
--- a/data/room/24.room
+++ b/data/room/24.room
@@ -1,6 +1,6 @@
-name=no 24
+name=PLAY IT AGAIN, SAM
 bgColor=black
-border=red
+border=bright_yellow
 tilemap=24.tmx
 tileset=standard.png
 roomUp=0
@@ -9,25 +9,81 @@ roomLeft=0
 roomRight=23.room
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=sam.png
+animation=sam.ani
 width=16
 height=16
-x=2
+x=4
 y=2
 vx=0
 vy=0
-x1=2
+x1=4
 y1=2
-x2=2
+x2=4
 y2=2
-color=magenta
+color=white
+[/enemy]
+
+[enemy]
+tileset=wave_v.png
+animation=wave_v.ani
+width=8
+height=8
+x=5
+y=11
+vx=0
+vy=0.5
+x1=5
+y1=11
+x2=5
+y2=14
+color=bright_green
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=25
+y=1
+vx=0
+vy=0.5
+x1=25
+y1=1
+x2=25
+y2=10
+color=bright_green
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=31
+x=2
+y=6
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=31
+x=2
+y=14
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=31
+x=15
+y=7
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=31
+x=29
+y=5
+counter=4
 [/item]
\ No newline at end of file
diff --git a/data/room/24.tmx b/data/room/24.tmx
index 67c84f6..4a32158 100644
--- a/data/room/24.tmx
+++ b/data/room/24.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">
-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,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,0,0,0,0,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,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
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,
+20,20,20,20,20,20,20,0,0,0,0,307,0,0,0,0,0,0,0,0,0,0,0,307,0,0,0,0,21,21,21,21,
+20,20,20,0,0,0,134,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,307,21,21,21,
+20,20,20,0,0,0,134,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,
+20,20,20,20,20,20,20,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,
+20,20,307,307,0,0,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,
+20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,45,46,
+20,20,20,20,20,20,20,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,69,70,
+45,46,45,46,45,46,134,400,0,0,0,0,0,519,20,20,543,0,0,0,0,0,0,0,0,0,0,0,400,400,21,21,
+69,70,69,70,69,70,134,0,400,0,0,0,519,20,23,24,20,543,0,0,0,0,0,400,400,0,400,400,0,0,21,21,
+20,20,20,20,20,20,20,0,0,0,0,519,20,20,47,48,20,20,543,0,0,0,400,0,0,0,0,0,0,0,21,21,
+20,20,20,307,0,0,0,0,0,0,519,20,20,45,46,23,24,20,20,543,0,0,0,0,0,400,0,0,0,0,21,21,
+20,20,307,0,0,0,0,0,0,519,20,20,20,69,70,47,48,20,20,20,543,0,0,0,0,0,0,0,0,0,21,21,
+20,20,0,0,0,0,0,0,519,20,20,20,23,24,23,24,23,24,20,20,20,543,0,0,0,0,0,0,0,0,0,0,
+20,20,0,0,0,0,0,519,20,20,20,20,47,48,47,48,47,48,20,20,20,20,543,0,0,556,0,0,0,0,0,0,
+22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22,22
 </data>
  </layer>
 </map>
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index d4726087833711d535ce17609bb17c9a2cfab3e5..8e3c42e7ffff1d6f24e9e377eda149463bc09fb1 100644
GIT binary patch
literal 6328
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
a^dG~!&HrMQ%r3qnfV=+~=~in$3;$oxv_%mB

literal 6155
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
LYr|^&+j0K`cYxVF

diff --git a/source/director.cpp b/source/director.cpp
index 666e23d..5f6a47e 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -535,6 +535,10 @@ bool Director::setFileList()
 	asset->add("/data/enemies/spider.ani", data);
 	asset->add("/data/enemies/macaronni_ted.png", bitmap);
 	asset->add("/data/enemies/macaronni_ted.ani", data);
+	asset->add("/data/enemies/mummy.png", bitmap);
+	asset->add("/data/enemies/mummy.ani", data);
+	asset->add("/data/enemies/sam.png", bitmap);
+	asset->add("/data/enemies/sam.ani", data);
 
 	asset->add("/data/player/player.png", bitmap);
 	asset->add("/data/player/player.ani", data);
diff --git a/source/game.cpp b/source/game.cpp
index e78bea1..88332ab 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -17,7 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 
 	// ****
 	// this->debug->setEnabled(true);
-	currentRoom = "50.room";
+	currentRoom = "20.room";
 	const int x = 30;
 	const int y = 13;
 	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};