From b1411b04f5a1f60b50f780d7e204501c74cf6c36 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Tue, 11 Oct 2022 19:56:36 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20mas=20contenido?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/enemies/macaronni_ted.ani |   9 +++
 data/enemies/macaronni_ted.png | Bin 0 -> 414 bytes
 data/enemies/spider.ani        |   9 +++
 data/enemies/spider.png        | Bin 0 -> 177 bytes
 data/items/items.png           | Bin 892 -> 911 bytes
 data/room/17.room              |   4 +-
 data/room/18.room              | 129 +++++++++++++++++++++++++++++----
 data/room/18.tmx               |  32 ++++----
 data/room/48.tmx               |   2 +-
 data/room/49.room              |  35 ++++-----
 data/room/49.tmx               |  32 ++++----
 data/room/50.room              |  58 ++++++++++++---
 data/room/50.tmx               |  32 ++++----
 data/room/54.room              |  78 ++++++++++++++++----
 data/room/54.tmx               |  32 ++++----
 data/room/60.tmx               |   4 +-
 source/director.cpp            |   8 +-
 source/game.cpp                |   9 +--
 18 files changed, 335 insertions(+), 138 deletions(-)
 create mode 100644 data/enemies/macaronni_ted.ani
 create mode 100644 data/enemies/macaronni_ted.png
 create mode 100644 data/enemies/spider.ani
 create mode 100644 data/enemies/spider.png

diff --git a/data/enemies/macaronni_ted.ani b/data/enemies/macaronni_ted.ani
new file mode 100644
index 0000000..b05294e
--- /dev/null
+++ b/data/enemies/macaronni_ted.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=32
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/macaronni_ted.png b/data/enemies/macaronni_ted.png
new file mode 100644
index 0000000000000000000000000000000000000000..e8aa16fe665af072e8014f8dddfe739fdd27d188
GIT binary patch
literal 414
zcmV;P0b%}$P)<h;3K|Lk000e1NJLTq002M$001Be1^@s6qMd$(00001b5ch_0Itp)
z=>Px$SV=@dRA_<iSW6beAPB6!-2cjSQ}Yr90Z}k**_bp8gN`3;dJzTyaD7iHCCYaN
z-piV#>ckrW(-AA4inB_9+mBrGTrewM5@WUix#wH}#W-IpUNV3^pAmefKJ-ACuN6<(
zY5|%VfH_LZ$#rH_f29CNov1}E0DwA%22bUn5dh=s;co-rv5EEY5dxe`fSbN`OZiD+
z^g7V{F5%J&z@7pnVBKm=f{hYjt3oKE4iP8gRSJ6xpsoa0ZGchu^F>>naO77X$!v(?
zza4|p03PPW&z=I`ZaG5Toh(!3qtxJI7W^o7hUHQ|js~#Y)CxXQfNV*AhD8g2Zi3BO
zsU*<g(el)h|9=Xs3T(MNdGeD3V7>j7&24m(^WsMb;7J{@^8fs0NE}3}!Xxq5VnX_i
z1=qybhJR#zVWdyRlmGc~Etk;hb{7AzO$)RG|I9V0dESBl4JdMYd}LL%$^ZZW07*qo
IM6N<$f^IRj%>V!Z

literal 0
HcmV?d00001

diff --git a/data/enemies/spider.ani b/data/enemies/spider.ani
new file mode 100644
index 0000000..83547c7
--- /dev/null
+++ b/data/enemies/spider.ani
@@ -0,0 +1,9 @@
+frameWidth=8
+frameHeight=8
+
+[animation]
+name=default
+speed=4
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/spider.png b/data/enemies/spider.png
new file mode 100644
index 0000000000000000000000000000000000000000..7ca50d483ff98a5ba315bfdb85764c45b9458cc0
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^3P8-k!3HE}wEkTWq!^2X+?^QKos)S9<YargIEGmC
zuALOf*I>Zm9KQK?yySj^tuJS+_@i?nobB|n3Q0l1{Tuln%z8ER_07a}cNk-;Z)H5a
z&ubdY(jda%V4ifhaB6(}?w@y-+_~~H=6QFxb9n7C=CYl6*B^%3%LKIA{Z8Nan{)TS
bxzAbpFFtSRZu30^w3fls)z4*}Q$iB}9M4Bu

literal 0
HcmV?d00001

diff --git a/data/items/items.png b/data/items/items.png
index d45757ec814ffa91bef6fb8f7c1f9c5e02c56b8f..bfb65cf822b05274134e04d18f2ea9a84e5aa1ed 100644
GIT binary patch
delta 875
zcmV-x1C;#y29F1jF@H%(L_t(|ob6Z3lG`v0TkrV)f7!iMS%wRMP?Ap48Q>CId_fdR
zE63MgT-SAd6&%NLpmn4(*&oMoAo-GYA9am!P<HJ75&nn=lHC-#Blcc(FM{ru$#>!-
z9?V|(>-?GjiQkEo$4nF5{>(P7;;57V7r3sUE~tEJhjgBIdVefgmGm>4LhalADtX-?
zia+^x?a}_b3?=eJPFb)=pllbpJ})1MqYA*`&~@AjJi8GJ>Qo?V;r`4vJyin(OB%Cx
zxa{J)26yHb3tX$oN#3&Qevr-dUVW(K)!({~{Ph;DbNy~cR%PaZC7=>Q6{-B7`O-T;
z%}CX<UCs`ab$=Z4-~HV593_XKdY^ndP|2R`lzfNFRsyS{GdCWYnXcT8j}okst*V@L
z<mB_$MU&0Ny3T%)KJv%(nGD%Y&nW)H*Wq_|!2&uNXEUl=Pz$WnL>0hfh$H%V-L;xg
zh4mfrt?x??|B38^C3|PSDBbCU;{Y9y6Kmv+lE=Pah<}i(kV&o*!qyO%uJ0yW`Kz{y
z-*-3aij_#8AxrkiSGC7r)mukHZ>?&x)>*=;4YEV}b$^T>{Evs=v;aDJr-Id5_siB)
z1+qQWSnmG13|=hVdBHZMHmBAYNk`_|vOPI+w7*|1tcdmUM|w!ES^&jCZG~DG+4kqk
z0X;K)#DBMrh#S|b0vX}1Ux)3~PCK%x1z!QhVZF2QwDpx!K^ZAWM<ue$(VFr<9n$pP
z3#0qpYT?yFZ0%XF7M?}`ioezrw>lEKe>P@1PN#)C5wsx|z-iNdx@@ydht06vgGKvS
zW9hoC>+XJ6jnJAR-0ixKvPZFzZ)HFEnD{%~tAFgK<0epT4h4b1$c9|sEFQ8^`#|xW
z1fysBqT8LS56#X;NX1egqF2q`r{Po%%08=Dbn0#eIx@BPHaIP!lISK79ZrwQlBW*%
z?NA$JmBBXaR*PGKDoLM^!0mfreclbG60ELC%J$v3OCY-xqg(hR!KO>MN)o!ne*(^R
z`edC{{|i%p(Z#abvMQab*RAT0`2v5v;2QI6H9YJ8lad((K@bE%5ClOG1VIo4K@bE%
z5ClOG1VIo4K@bE%5ClOG1VIo4K@bE%5Cp;hg+Ck>)qZN**5v>I002ovPDHLkV1h&!
ByF35@

delta 856
zcmV-e1E>6t2mA(*F@H8mL_t(|ob6Z3lG`v0i+BA0zwBPBl)(ZZm1Ji&9pDmMd_fdR
zE643GuIsvP1;=q5Y@O+J_Q!D?Oul63qpm3q&Q85Q!=LeBvbzF0Qtwsw5<tI7z7wDE
zQ1;Fr@>l*lekW6IGc9!SS#93MaVP&1xUPR)Q2EpjL7oqKDt}p(^edZU?Tdb$yl#-i
z@BB~g+5S<+5_vMGD%dk{wu>Cj%V*-a0+?_>ooNN0XvBg}Dv-4>KC4Z4)u5n~rtBwN
zcJWn%Pv({iT&ro4yk&!am`(RyeYoV+-@4BHVGGx}{xBn}vT~pjPzkY$bbi=;!47aU
z(zPtg)q$#xV}Jh9&s}e#G$H8TJKqzyWOsH>zQbiJfmLxbH=dc9Q~5MLOR!6}t8&$m
zozHI<O*I$my831M%%9R%GG^C3v-lm~3BMBs3+!Yjn{m~`T40?fs{kcq9NEX~q16Ue
zSl=1n`o84!pU5s$vUlc-)9pSu6R-oC#A<o7<f$(hBY)&7q?5aZs5Qm~^{2^p{;I9x
z_k~8NSc%{aS+Zxosu)96ZygQTTGeK)tAte>X2<mF{uDp@ACF<u0_@}`73|i~uUc~z
zsP<H2P4|Z~da<0&3$-D)Ik%=rPGnPCwWo=k?eAL)J7QS=OpnQ33$Qq>tyl{)TYRn@
z*t61Se1GeRxO43)P!UG`I&8ak+L3iF_zpM@>s^hft*@L5sz^<ATq04<)|~(Dkh*s)
z4D`Fz!mEYU+N)44+>HPhf2}!gbtIsFHD(a!q=k_P+mH${X;VC1wOOU3X4vk*vi-ZU
zbY0i=aKEcYY|RlyJJfOZEH?A)>^mPF{|WahyMOCU6X-U_g3w@MLsQ=>9<y=#VDTmi
zX3yh`E;@A|nw^i3i}kMA`lFas4$Ho(Sa#~u3UvCv8j}`rNt`B-9S+9)xa8e#euJtq
z*k)A%{^ttZz6aLl-C!=k?wa(Q@sL1uDQ36uXM%N??oVvtbDcgC$G<T3mt8EYt*X+l
zdQm^(s|$Gf8uMz!>|B$AAP9mW2!bF8f*=TjAP9mW2!bF8f*=TjAP9mW2!bF8f*=Tj
iAP9mW2!bF8-ibd#mzk#0ux_OQ0000<MNUMnLSTX_4y~5}

diff --git a/data/room/17.room b/data/room/17.room
index 7391a4a..6e1787c 100644
--- a/data/room/17.room
+++ b/data/room/17.room
@@ -1,6 +1,6 @@
-name=no 17
+name=i remember this one too
 bgColor=black
-border=red
+border=magenta
 tilemap=17.tmx
 tileset=standard.png
 roomUp=0
diff --git a/data/room/18.room b/data/room/18.room
index f59a859..d0cfc88 100644
--- a/data/room/18.room
+++ b/data/room/18.room
@@ -1,33 +1,132 @@
-name=no 18
+name=make money
 bgColor=black
-border=red
+border=magenta
 tilemap=18.tmx
 tileset=standard.png
 roomUp=17.room
 roomDown=54.room
 roomLeft=19.room
 roomRight=0
+itemColor1=green
+itemColor2=magenta
+autoSurface=left
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=code.png
+animation=code.ani
 width=16
 height=16
-x=2
-y=2
-vx=0
+x=19
+y=6
+vx=0.4
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=19
+y1=6
+x2=29
+y2=6
+color=yellow
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=14
+x=19
+y=5
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=19
+y=5
+counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=20
+y=5
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=21
+y=5
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=22
+y=5
+counter=4
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=23
+y=5
+counter=5
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=24
+y=5
+counter=6
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=25
+y=5
+counter=7
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=26
+y=5
+counter=8
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=27
+y=5
+counter=9
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=28
+y=5
+counter=10
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=29
+y=5
+counter=11
+[/item]
+
+[item]
+tileset=items.png
+tile=14
+x=30
+y=5
+counter=12
 [/item]
\ No newline at end of file
diff --git a/data/room/18.tmx b/data/room/18.tmx
index bdbb052..566353e 100644
--- a/data/room/18.tmx
+++ b/data/room/18.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,
-0,0,0,0,0,0,0,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
+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,62,62,62,0,0,62,62,62,62,62,62,62,62,62,62,62,62
 </data>
  </layer>
 </map>
diff --git a/data/room/48.tmx b/data/room/48.tmx
index 59a36f6..eabbce6 100644
--- a/data/room/48.tmx
+++ b/data/room/48.tmx
@@ -18,7 +18,7 @@
 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,25
+25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,25,0,0,25,25,25,25,25,25,25,25,25,25,25
 </data>
  </layer>
 </map>
diff --git a/data/room/49.room b/data/room/49.room
index ba1240e..d761d15 100644
--- a/data/room/49.room
+++ b/data/room/49.room
@@ -1,4 +1,4 @@
-name=no 49
+name=bamba
 bgColor=black
 border=red
 tilemap=49.tmx
@@ -9,25 +9,18 @@ roomLeft=50.room
 roomRight=17.room
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=macaronni_ted.png
+animation=macaronni_ted.ani
 width=16
-height=16
-x=2
-y=2
-vx=0
+height=32
+x=10
+y=8
+vx=0.6
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
-[/enemy]
-
-[item]
-tileset=items.png
-tile=1
-x=1
-y=1
-counter=1
-[/item]
\ No newline at end of file
+x1=1
+y1=8
+x2=29
+y2=8
+color=yellow
+flip=true
+[/enemy]
\ No newline at end of file
diff --git a/data/room/49.tmx b/data/room/49.tmx
index e6a4309..b757a52 100644
--- a/data/room/49.tmx
+++ b/data/room/49.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,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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
+39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,39,0,0,0,0,523,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,523,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,523,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,523,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,523,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,523,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,269,269,269,269,269,269,547,0,0,0,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,39,
+39,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,0,0,0,0,0,0,0,0,0,0,0,547,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,39,
+39,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,269,0,0,523,269,269,269,269,269,269,269,269,39,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,0,0,0,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,523,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,39,39,39,39,39,39,39,39,39,39,39,39
 </data>
  </layer>
 </map>
diff --git a/data/room/50.room b/data/room/50.room
index a9492ef..e5a5f01 100644
--- a/data/room/50.room
+++ b/data/room/50.room
@@ -1,6 +1,6 @@
-name=no 50
+name=stored jailgames
 bgColor=black
-border=red
+border=blue
 tilemap=50.tmx
 tileset=standard.png
 roomUp=0
@@ -13,21 +13,61 @@ tileset=diskette.png
 animation=diskette.ani
 width=16
 height=16
-x=2
+x=7
 y=2
 vx=0
-vy=0
-x1=2
+vy=0.5
+x1=7
 y1=2
-x2=2
-y2=2
+x2=7
+y2=12
 color=magenta
 [/enemy]
 
+[enemy]
+tileset=diskette.png
+animation=diskette.ani
+width=16
+height=16
+x=20
+y=6
+vx=0
+vy=0.5
+x1=20
+y1=2
+x2=20
+y2=12
+color=yellow
+[/enemy]
+
 [item]
 tileset=items.png
 tile=1
-x=1
-y=1
+x=4
+y=11
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=25
+y=11
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=2
+y=5
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=1
+x=1
+y=14
+counter=4
 [/item]
\ No newline at end of file
diff --git a/data/room/50.tmx b/data/room/50.tmx
index 67c84f6..8851baa 100644
--- a/data/room/50.tmx
+++ b/data/room/50.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
+42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+42,64,64,64,64,64,0,0,0,0,445,445,445,0,0,0,445,445,445,0,0,0,0,64,64,64,64,64,64,64,64,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,42,
+42,0,0,389,389,389,0,0,0,0,389,389,389,389,365,389,389,389,389,0,0,0,0,389,389,389,389,0,0,0,0,42,
+42,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,
+42,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,
+42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42,42
 </data>
  </layer>
 </map>
diff --git a/data/room/54.room b/data/room/54.room
index d5627fd..bedd21c 100644
--- a/data/room/54.room
+++ b/data/room/54.room
@@ -1,33 +1,83 @@
-name=no 54
+name=the basement
 bgColor=black
-border=red
+border=green
 tilemap=54.tmx
 tileset=standard.png
 roomUp=18.room
 roomDown=0
 roomLeft=0
 roomRight=55.room
+itemColor1=yellow
+itemColor2=blue
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
-width=16
-height=16
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
 x=2
-y=2
-vx=0
+y=14
+vx=0.5
 vy=0
 x1=2
-y1=2
-x2=2
-y2=2
+y1=14
+x2=18
+y2=14
 color=magenta
 [/enemy]
 
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=10
+y=1
+vx=0
+vy=0.4
+x1=10
+y1=1
+x2=10
+y2=6
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=spider.png
+animation=spider.ani
+width=8
+height=8
+x=7
+y=11
+vx=0.3
+vy=0
+x1=7
+y1=11
+x2=14
+y2=11
+color=cyan
+[/enemy]
+
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=35
+x=15
+y=9
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=35
+x=1
+y=14
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=35
+x=1
+y=9
+counter=3
 [/item]
\ No newline at end of file
diff --git a/data/room/54.tmx b/data/room/54.tmx
index ba1144e..4a61b56 100644
--- a/data/room/54.tmx
+++ b/data/room/54.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,
-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
+32,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,349,0,0,0,0,519,349,349,349,16,16,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,32,32,0,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,16,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,0,0,0,0,0,0,0,519,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,0,506,32,32,32,32,32,32,32,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,0,0,0,0,0,506,0,0,0,0,0,0,0,0,0,530,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+32,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,
+32,32,32,32,32,0,0,0,0,0,0,0,0,0,0,409,409,409,409,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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,0,
+32,0,0,0,0,0,0,409,409,409,409,409,409,409,409,0,0,0,0,0,0,0,0,519,16,16,16,16,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,337,0,0,0,0,0,0,0,0,0,0,0,519,32,16,134,16,134,16,16,16,16,
+32,0,0,0,0,0,0,0,0,0,337,0,0,0,0,0,0,0,0,0,0,519,32,32,16,134,16,134,16,16,16,16,
+32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,349,349,349,349,349,349,349,349,349,349,349
 </data>
  </layer>
 </map>
diff --git a/data/room/60.tmx b/data/room/60.tmx
index 07fb7f2..888686c 100644
--- a/data/room/60.tmx
+++ b/data/room/60.tmx
@@ -8,8 +8,8 @@
 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,411,411,411,411,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,308,0,0,0,0,0,0,0,411,0,0,0,0,411,0,0,0,0,0,0,0,308,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,411,0,0,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,25,
+25,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,25,
 25,0,0,0,0,0,0,0,0,0,411,411,411,411,0,0,0,0,411,411,411,411,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,411,0,0,411,0,0,0,0,0,0,0,0,0,0,0,0,0,25,
diff --git a/source/director.cpp b/source/director.cpp
index a97da6e..666e23d 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -6,10 +6,10 @@
 // Constructor
 Director::Director(std::string path)
 {
-	section.name = SECTION_PROG_GAME;
+	section.name = SECTION_PROG_LOGO;
 	section.subsection = 0;
 
-	section.name = SECTION_PROG_TITLE;
+	section.name = SECTION_PROG_GAME;
 
 	// Crea el objeto que controla los ficheros de recursos
 	asset = new Asset(path.substr(0, path.find_last_of("\\/")));
@@ -531,6 +531,10 @@ bool Director::setFileList()
 	asset->add("/data/enemies/dimallas_v.ani", data);
 	asset->add("/data/enemies/heavy.png", bitmap);
 	asset->add("/data/enemies/heavy.ani", data);
+	asset->add("/data/enemies/spider.png", bitmap);
+	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/player/player.png", bitmap);
 	asset->add("/data/player/player.ani", data);
diff --git a/source/game.cpp b/source/game.cpp
index cfa46c0..e78bea1 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -17,14 +17,7 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 
 	// ****
 	// this->debug->setEnabled(true);
-
-	// currentRoom = "11.room";
-	// spawnPoint = {2 * 8, 5 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
-
-	// currentRoom = "06.room";
-	// spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
-
-	currentRoom = "55.room";
+	currentRoom = "50.room";
 	const int x = 30;
 	const int y = 13;
 	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};