From f6a233546eafd143b970a9d93d504d2fd9db7ce9 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Mon, 10 Oct 2022 22:14:25 +0200
Subject: [PATCH] Creando tiles y escenarios

---
 data/enemies/dimallas_v.ani |   9 ++++
 data/enemies/dimallas_v.png | Bin 0 -> 285 bytes
 data/items/items.png        | Bin 707 -> 892 bytes
 data/room/03.room           |   2 +
 data/room/03.tmx            |   2 +-
 data/room/55.room           |  13 +++--
 data/room/55.tmx            |  24 ++++-----
 data/room/56.room           |  73 ++++++++++++++++++++------
 data/room/56.tmx            |  24 ++++-----
 data/room/57.room           |  99 ++++++++++++++++++++++++++++++------
 data/room/57.tmx            |  30 +++++------
 data/tilesets/standard.png  | Bin 5771 -> 5996 bytes
 source/director.cpp         |  10 ++++
 source/game.cpp             |  10 ++--
 14 files changed, 215 insertions(+), 81 deletions(-)
 create mode 100644 data/enemies/dimallas_v.ani
 create mode 100644 data/enemies/dimallas_v.png

diff --git a/data/enemies/dimallas_v.ani b/data/enemies/dimallas_v.ani
new file mode 100644
index 0000000..2f2df91
--- /dev/null
+++ b/data/enemies/dimallas_v.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/dimallas_v.png b/data/enemies/dimallas_v.png
new file mode 100644
index 0000000000000000000000000000000000000000..073597f5d8607569ffbd1c3fb07b4bf8eddba3a4
GIT binary patch
literal 285
zcmV+&0pk9NP)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn00001b5ch_0Itp)
z=>Px#*GWV{R9J=GSIZK_AP6h||39-Q9X7*DrQ5YRbtD0#z_i!331;TXGtHLet(-N>
zc_x8=j&>p<)Dsb9v@@uPKZufGCFOBW)zi)!cmtZO3bu&`<e#n|2J8d|pbZ_Ls&DA1
z6R=X*QPFlvf1Vk)**CkY|0;l%JUa0%p>13A5$SjBR*sf!6d-#+$(5+mXAs4=>}q#f
zNzMd6S+DK@B;GlLf2q%G*-HKDmamBKem!|}jWf5Rm-G5qeCb3IP^8(t){68Ip4O-T
j#$Kua^$v)9+*yDR9zFkE%IJ;_00000NkvXXu0mjfg=~Gu

literal 0
HcmV?d00001

diff --git a/data/items/items.png b/data/items/items.png
index 618b337590b758432e8e995a745f1a4da23eeaa9..d45757ec814ffa91bef6fb8f7c1f9c5e02c56b8f 100644
GIT binary patch
delta 857
zcmV-f1E&1L1^fn(Fn<F!Nkl<Zc%1E5%aYqL42yUC|G(^Bs+7S3AeCfiHXYy+TYNzj
zNh`<gFRtslZUx729BiHGboR$_98A7s=%cPF4$e-!Kf|B#V6wXcI#Tad_Yy$AO1=}H
z@lf{8AM#iJJANlqZZj=(@mX!&#c?P96S%H_T~PVd4ndv|dVeZemGmo{V(p85oxE<4
z#qa!2?b-fO#u9llrz+SpaJGva&dX=wxB{4PK%Hp?o@m5^PAZVKFg~kIch#VvlBVn@
zTz2tQgHPs`3S6sclDuVuewa=7UVXUa)!(|#{9y~%x&AOCtFm&S5>N@TigbS1e8CQI
zGt#vz%GH6Yj(=nR(a&9PqBJ4s-aFqDxMX*BPQJrsD}hyUGB=)?nN#^RK1;AmwySd0
zk)6+P7fm%6>$>`7`plowS2AYTJ+t^7-wD4H1q<wCCYy29!dhURCaVA?V;tGX>!H;K
zRaoB{-}=7f^q<HsRI+#Gi_`5sI1{h~n#5{(v*f8S7=I(=Dx{OUgs3&f1@))NcK)iZ
z<M)L|s91^M3|X>gzN#2QRc{>)*jm+Qt*eAp8)nD!>;4o!`X7&B(gN({Cl&10(63r^
z6{z-9V@>ymGJ3I`&I`36w>h__NKRx^TeYW&obB&h3p-+1{!EX_T??={tgToJGh2MF
z9N4qcXMcR_h`4j@Do_zd{W@&BcG{73E%**N4(nZwr>(D?3#v#>bX+1)&eoj&?vT27
zEDZF!)xxWV)Y_|1E!>R&7JscdZgnJ}e>G+h=cI*^2-}bfFlkdfUA0-Iqh{Fd!Lt3k
zv2<P6^>DwdMr_RyMmyAT_AEB@?d&@r9sddUDu27{OcUrf$AZvcVnb8kDju_O`(W`V
z31-jZi!M5KADW$ykc;)M+4`fHR1V9&s#tdF(+YI@zZ#PkaY>vekR1-j{J7-ZZhnKR
zGT3HS0{-U;+`b3a=iOi~!S0&$oAHo9btz`I@MnT`m+nt&;d7ln634$V^_N{NtF5Zi
zu2OnG;;RdI`5N<T#q3;@f*=TjAP9mW2!bF8f*=TjAP9mW2!bF8f*=TjAP9mW2!bF8
jf*=TjAP9mW2;PZ5LYJAQ(y(r&00000NkvXXu0mjf+pDe2

delta 671
zcmV;Q0$~082EzrAFn<DlNkl<Zc%1E*+it@^2nFNH|NqPGOE)Ft9KfzB#nQ}6;^nd|
z1~%CqKODz#JObOcZE9WVboSe}ZA!jm*+*P+F;sT$`AYmM4kddkWJm5f>K=yd*U8W9
zui|j_mA@Rn^WVj{E9ExRMmK+Vhp+aj-u!=X9KT%<<B1)T<9~e7bIFQ9|K(7seY4+6
z9uKJY@BB~g)%mkbC306z-DX#)Y*%o3US8R!Du780S!Y^-dp1&=PAX8faQ^NN-Bp9b
zCC%ASVmZrK+<Y>(+{Uq*Cdpei*^jd6o}-T{dGRx@D}T9#<6M84kx|(>a0!S3sfw)p
zsQHpRpqi0Y%YSCMd!er5l>hAKsW(xY1Xw+Hz9&@4?(8c0nOIIGFe*;w#+8{ll~4Cq
z39gb|Rk`cP&ga_?O*a?gy8Bf6%AeDBGG*6&SNnJIPU73MV4>d3<S<pWs1{gnQ&oVI
zsTkGe_0npCDvZx6-uS%a@}J0AT(Zy1mrA$0a3-i1G=JHvjawzp-C!!9szN$>l@Pb4
zV#)f`WLN&8Z57{FHp+@IkUT?{?8>d0_i)u4M?-F{XtUN`!lI3`Q~L3IE<X7mPcdl$
z_2wrPT&-olZmp_7cc!@4^n7o!Tvd6k3m`jJ!MHc<{7m=!1m0R$;mTj>DS6cbYM*Yd
zeiCg0-G2>hXF_w?xb~Wikx%5*E%##B%osJ>oQ_KBT@rb!h1V_U*8a*JTX>Iws;W}0
zsb-qnpsKDVt8VL$r@MvYn)>d1RX1@byG!*w9_gP*Re^E6`VFXNrMh+V+HETk00000
z0000000000000000000000000000000000002lyn#Wzhf63cC}nw9_n002ovPDHLk
FV1nq~Q;z@u

diff --git a/data/room/03.room b/data/room/03.room
index e917178..531f0dd 100644
--- a/data/room/03.room
+++ b/data/room/03.room
@@ -8,6 +8,8 @@ roomDown=0
 roomLeft=02.room
 roomRight=0
 autoSurface=left
+itemColor1=bright_cyan
+itemColor2=yellow
 
 [enemy]
 tileset=bin.png
diff --git a/data/room/03.tmx b/data/room/03.tmx
index 84fd1ca..60253ec 100644
--- a/data/room/03.tmx
+++ b/data/room/03.tmx
@@ -17,7 +17,7 @@
 25,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,505,0,0,0,0,0,0,0,25,0,0,0,0,0,25,25,
 25,25,0,0,0,0,0,0,0,253,253,253,253,253,253,253,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,473,473,473,473,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,441,441,441,441,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,25,25
 </data>
  </layer>
diff --git a/data/room/55.room b/data/room/55.room
index 4df796d..925a696 100644
--- a/data/room/55.room
+++ b/data/room/55.room
@@ -1,16 +1,19 @@
-name=no 55
+name=that's a guitar
 bgColor=black
-border=red
+border=black
 tilemap=55.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=54.room
 roomRight=56.room
+itemColor1=yellow
+itemColor2=red
+autoSurface=left
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=heavy.png
+animation=heavy.ani
 width=16
 height=16
 x=2
@@ -26,7 +29,7 @@ color=magenta
 
 [item]
 tileset=items.png
-tile=1
+tile=33
 x=1
 y=1
 counter=1
diff --git a/data/room/55.tmx b/data/room/55.tmx
index ee220e2..fadc9a0 100644
--- a/data/room/55.tmx
+++ b/data/room/55.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
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,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,0,0,0,0,0,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,0,0,0,0,0,0,0,0,134,
+0,0,0,523,302,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+0,0,523,0,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,302,0,0,0,0,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,0,0,0,0,0,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,0,0,0,0,433,0,0,0,134,
+0,0,0,0,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,326,0,0,0,0,0,0,0,134,
+16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,134,
+16,16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+16,16,16,16,16,16,538,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+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
 </data>
  </layer>
 </map>
diff --git a/data/room/56.room b/data/room/56.room
index 665f2be..53a5766 100644
--- a/data/room/56.room
+++ b/data/room/56.room
@@ -1,33 +1,76 @@
-name=no 56
+name=heavy demons on leggins
 bgColor=black
-border=red
+border=black
 tilemap=56.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=55.room
 roomRight=57.room
+itemColor1=bright_red
+itemColor2=green
+autoSurface=left
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=demon.png
+animation=demon.ani
 width=16
 height=16
-x=2
-y=2
+x=12
+y=3
 vx=0
-vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+vy=0.5
+x1=12
+y1=3
+x2=12
+y2=12
+color=red
+[/enemy]
+
+[enemy]
+tileset=demon.png
+animation=demon.ani
+width=16
+height=16
+x=18
+y=5
+vx=0
+vy=0.5
+x1=18
+y1=3
+x2=18
+y2=12
+color=red
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=28
+x=15
+y=10
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=28
+x=16
+y=10
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=28
+x=15
+y=5
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=28
+x=16
+y=5
+counter=4
 [/item]
\ No newline at end of file
diff --git a/data/room/56.tmx b/data/room/56.tmx
index ee220e2..a9adc3d 100644
--- a/data/room/56.tmx
+++ b/data/room/56.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
+18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,469,469,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,0,411,411,411,0,0,0,0,0,0,0,0,0,0,411,411,411,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,
+18,0,0,0,18,18,18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,18,18,0,0,0,18,
+18,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,0,520,411,411,0,0,0,0,469,469,0,0,0,0,411,411,544,0,0,0,0,0,0,0,18,
+18,0,0,0,0,0,0,520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,0,0,0,0,0,18,
+0,0,0,0,0,0,520,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,544,0,0,0,0,0,0,
+0,0,0,0,0,520,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,555,544,0,0,0,0,0,
+18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18,18
 </data>
  </layer>
 </map>
diff --git a/data/room/57.room b/data/room/57.room
index ef4785e..a2ddfd7 100644
--- a/data/room/57.room
+++ b/data/room/57.room
@@ -1,33 +1,100 @@
-name=no 57
-bgColor=black
-border=red
+name=jailgames go to hell
+bgColor=red
+border=bright_red
 tilemap=57.tmx
 tileset=standard.png
 roomUp=0
 roomDown=0
 roomLeft=56.room
 roomRight=58.room
+itemColor1=yellow
+itemColor2=green
+autoSurface=left
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=dimallas.png
+animation=dimallas.ani
 width=16
 height=16
-x=2
-y=2
-vx=0
+x=13
+y=13
+vx=0.5
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=6
+y1=13
+x2=20
+y2=13
+color=green
+[/enemy]
+
+[enemy]
+tileset=dimallas_v.png
+animation=dimallas_v.ani
+width=16
+height=16
+x=17
+y=5
+vx=0
+vy=0.5
+x1=17
+y1=5
+x2=17
+y2=11
+color=white
+[/enemy]
+
+[enemy]
+tileset=dimallas_v.png
+animation=dimallas_v.ani
+width=16
+height=16
+x=10
+y=8
+vx=0
+vy=0.5
+x1=10
+y1=5
+x2=10
+y2=11
+color=yellow
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=32
+x=7
+y=8
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=32
+x=14
+y=8
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=32
+x=21
+y=8
+counter=3
+[/item]
+
+[item]
+tileset=items.png
+tile=32
+x=9
+y=14
+counter=4
+[/item]
+
+[item]
+tileset=items.png
+tile=32
+x=19
+y=14
+counter=5
 [/item]
\ No newline at end of file
diff --git a/data/room/57.tmx b/data/room/57.tmx
index ee220e2..bfbc1ce 100644
--- a/data/room/57.tmx
+++ b/data/room/57.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,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,0,0,
+19,0,0,0,0,0,19,19,19,0,0,0,0,19,19,19,0,0,0,0,19,19,19,0,0,0,0,0,0,0,0,0,
+19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,19,0,0,0,0,0,0,0,0,525,19,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,19,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,525,308,308,308,0,0,0,0,308,308,308,0,0,0,0,308,308,308,0,0,0,525,308,308,549,0,19,
+19,0,0,0,525,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,0,0,0,0,308,19,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
+19,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,19,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,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,525,19,549,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,525,19,549,0,0,0,0,0,0,
+19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19,19
 </data>
  </layer>
 </map>
diff --git a/data/tilesets/standard.png b/data/tilesets/standard.png
index 7f479f4967dda00e6599afe92771dc93e3573a7f..ec8cbcb961a0a848d29fb623392a1c7e062469b2 100644
GIT binary patch
delta 5763
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
NdEHpI{F;5p{{i5|Ooadd

delta 5556
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
E0D+U5lK=n!

diff --git a/source/director.cpp b/source/director.cpp
index 695eb0e..0ce35ed 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -519,6 +519,16 @@ bool Director::setFileList()
 	asset->add("/data/enemies/jailer3.ani", data);
 	asset->add("/data/enemies/printer.png", bitmap);
 	asset->add("/data/enemies/printer.ani", data);
+	asset->add("/data/enemies/code.png", bitmap);
+	asset->add("/data/enemies/code.ani", data);
+	asset->add("/data/enemies/demon.png", bitmap);
+	asset->add("/data/enemies/demon.ani", data);
+	asset->add("/data/enemies/dimallas.png", bitmap);
+	asset->add("/data/enemies/dimallas.ani", data);
+	asset->add("/data/enemies/dimallas_v.png", bitmap);
+	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/player/player.png", bitmap);
 	asset->add("/data/player/player.ani", data);
diff --git a/source/game.cpp b/source/game.cpp
index 4dd8aec..ba61360 100644
--- a/source/game.cpp
+++ b/source/game.cpp
@@ -24,10 +24,10 @@ Game::Game(SDL_Renderer *renderer, Screen *screen, Asset *asset, Input *input, D
 	// currentRoom = "06.room";
 	// spawnPoint = {14 * 8, 9 * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 
-	// currentRoom = "60.room";
-	// const int x = 16;
-	// const int y = 13;
-	// spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
+	 currentRoom = "57.room";
+	 const int x = 30;
+	 const int y = 13;
+	 spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};
 	//   ****
 
 	// Crea los objetos
@@ -390,7 +390,7 @@ void Game::killPlayer()
 		return;
 	}
 
-	board.lives--;
+	//board.lives--;
 
 	// Destruye la habitacion y el jugador
 	delete room;