From 2ff12f7db124d6d66821e39c306972f3f5a221e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Tue, 13 Sep 2022 22:57:46 +0200
Subject: [PATCH] Revisar colisiones

---
 data/room/03.room           |   2 +-
 data/room/03.tmx            |   4 +--
 data/room/05.room           |   4 +--
 data/room/11.room           |  68 ++++++++++++++++++++++++++++++++++++
 data/room/11.tmx            |  24 +++++++++++++
 data/room/12.room           |  60 +++++++++++++++++++++++++++++++
 data/room/12.tmx            |  24 +++++++++++++
 media/enemies/bin.ani       |  10 ++++++
 media/enemies/bin.png       | Bin 0 -> 174 bytes
 media/enemies/qvoid.ani     |  10 ++++++
 media/enemies/qvoid.png     | Bin 0 -> 441 bytes
 media/items/items.png       | Bin 579 -> 603 bytes
 media/tilesets/standard.png | Bin 3191 -> 3206 bytes
 source/director.cpp         |   8 +++++
 14 files changed, 209 insertions(+), 5 deletions(-)
 create mode 100644 data/room/11.room
 create mode 100644 data/room/11.tmx
 create mode 100644 data/room/12.room
 create mode 100644 data/room/12.tmx
 create mode 100644 media/enemies/bin.ani
 create mode 100644 media/enemies/bin.png
 create mode 100644 media/enemies/qvoid.ani
 create mode 100644 media/enemies/qvoid.png

diff --git a/data/room/03.room b/data/room/03.room
index 77f6284..65b66de 100644
--- a/data/room/03.room
+++ b/data/room/03.room
@@ -5,7 +5,7 @@ tileset=standard.png
 roomUp=0
 roomDown=05.room
 roomLeft=02.room
-roomRight=0
+roomRight=11.room
 
 [tilemap]
 03.tmx
diff --git a/data/room/03.tmx b/data/room/03.tmx
index 07ba055..e2b00d3 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.0" 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="../../../jaildoctors_dilemma_resources/tilesets/standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
@@ -11,7 +11,7 @@
 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,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,
diff --git a/data/room/05.room b/data/room/05.room
index 1fcc375..b68d623 100644
--- a/data/room/05.room
+++ b/data/room/05.room
@@ -5,7 +5,7 @@ tileset=standard.png
 roomUp=03.room
 roomDown=0
 roomLeft=04.room
-roomRight=0
+roomRight=12.room
 
 [tilemap]
 05.tmx
@@ -24,7 +24,7 @@ x1=9
 y1=7
 x2=25
 y2=7
-color=bright_yellow
+color=bright_red
 [/enemy]
 
 [enemy]
diff --git a/data/room/11.room b/data/room/11.room
new file mode 100644
index 0000000..6049df6
--- /dev/null
+++ b/data/room/11.room
@@ -0,0 +1,68 @@
+name=qvoid
+bgColor=bright_blue
+border=white
+tileset=standard.png
+roomUp=0
+roomDown=0
+roomLeft=03.room
+roomRight=0
+
+[tilemap]
+11.tmx
+[/tilemap]
+
+[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.6
+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/11.tmx b/data/room/11.tmx
new file mode 100644
index 0000000..02d80b5
--- /dev/null
+++ b/data/room/11.tmx
@@ -0,0 +1,24 @@
+<?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="../../../jaildoctors_dilemma_resources/tilesets/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,183,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,183,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,0,183,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,163,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,163,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,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,0,0,
+113,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,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/12.room b/data/room/12.room
new file mode 100644
index 0000000..8d51499
--- /dev/null
+++ b/data/room/12.room
@@ -0,0 +1,60 @@
+name=no name
+bgColor=black
+border=red
+tileset=standard.png
+roomUp=0
+roomDown=0
+roomLeft=05.room
+roomRight=0
+
+[tilemap]
+01.tmx
+[/tilemap]
+
+[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/12.tmx b/data/room/12.tmx
new file mode 100644
index 0000000..b50e781
--- /dev/null
+++ b/data/room/12.tmx
@@ -0,0 +1,24 @@
+<?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="../../../jaildoctors_dilemma_resources/tilesets/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/media/enemies/bin.ani b/media/enemies/bin.ani
new file mode 100644
index 0000000..e2fe6bb
--- /dev/null
+++ b/media/enemies/bin.ani
@@ -0,0 +1,10 @@
+frames_per_row=5
+frame_width=16
+frame_height=8
+
+[animation]
+name=default
+speed=10
+loop=0
+frames=0,1,2,3,4
+[/animation]
\ No newline at end of file
diff --git a/media/enemies/bin.png b/media/enemies/bin.png
new file mode 100644
index 0000000000000000000000000000000000000000..592229ef664bfac40d71a8a23b952b84724e017f
GIT binary patch
literal 174
zcmeAS@N?(olHy`uVBq!ia0vp^0YJ>b!3HGr&QzEKDaPU;cPEB*=VV?2IT@ZVjv*eM
zZ>JvQI-tPgJbB~)|EcAH0xPF3+Yx-<HBwmTy%B@M>jlQ|UYlz#E_*ifQsn&*t84!f
z<>Ly%d*&>kdC9VK_ulVwDg%~iG<td^OcI*0ghj2=v*=H#$0e>x$*sv}|GldC?Ot2+
XNYLKsx_hk#&`t(VS3j3^P6<r_`AkCZ

literal 0
HcmV?d00001

diff --git a/media/enemies/qvoid.ani b/media/enemies/qvoid.ani
new file mode 100644
index 0000000..d7b2d89
--- /dev/null
+++ b/media/enemies/qvoid.ani
@@ -0,0 +1,10 @@
+frames_per_row=8
+frame_width=16
+frame_height=16
+
+[animation]
+name=default
+speed=8
+loop=0
+frames=0,1,2,3,4,5,6,7
+[/animation]
\ No newline at end of file
diff --git a/media/enemies/qvoid.png b/media/enemies/qvoid.png
new file mode 100644
index 0000000000000000000000000000000000000000..8192c3fea20e3eba16ebd97710007299cb6ecde7
GIT binary patch
literal 441
zcmV;q0Y?6bP)<h;3K|Lk000e1NJLTq004jh000mO1^@s6-dJ~t00001b5ch_0Itp)
z=>Px$b4f%&RA_<SSj!T_APAIB|NocirRh+Lx;$cP_LPb4@(?42T5FA&xdlK(gv^ur
zXL2fRd2omLDH^<GWTr(#AA3FLbO2~TQWx<9^?8Qf<A01MqTn~Y9Ir-iJYqY$@L9co
ziT|kwkLo~0Gl`6F^$uEXzf$Au_-AvNnI9HGKO>+wJe;0w1l7BEB_es!oLT(nT27Au
zO}4}`g(Er90?HQO74Z0*&Cdwa0$^q)0d&_@6~&#g@{6fC$MaVYa4h!mEZ>iWEnZJ+
z#Md0pm1(Dfi8O6ieh`kFYrXqv0;A`u#q(%MC#&q=36cCDYf^Fz%wnhAdj-zSPxlt!
zaVG1a^$CwONxLC)#Lc+qc((@_IWuxlkE4yFwjJpKb~y&nb6mp8k7vF$-r5O0fOTK>
zYGmy1fK`1CGXJLlywE$(<D{peE4fl5TR0hwe~3R_0MeQ0;-eb9PnvfTs(Xf=<4^rh
j_ngryI2E=$xI_Fe=4TWRg_bt}00000NkvXXu0mjfRCvd(

literal 0
HcmV?d00001

diff --git a/media/items/items.png b/media/items/items.png
index 18ed56318a60786c0284048be6ee113cbafffdbc..658528952a6c11dcdcdd5c2ecc32f42269c30842 100644
GIT binary patch
delta 551
zcmV+?0@(e-1lt6VFn<CSNkl<Zc%1E*%XY&s2nC}Y|Nk$mn<^#bUWDy-)tOBq@esm*
zlkxaw&N&}}F~(5)N@r(3#u!SzWZ6gDb1_tQZha+w6^D|&6tW|?j=Iy3{W|%X^Hm(q
zzVesjcm8+r9ZGqdX``FJyUSPSR8RgdnDeI#Vmz@!a-45^E`M1u=sTBE?VJ5p@_0dY
z{?32bUfn;-R3Z=M)E#z(%60{p=jD}issiZ5kafBhcw{4WXr}^I3+M0d(z|MKxTHDz
zPAq46#=|>v%N-o6sgt~All>^0-8%ZHk{3VYzVeq_IL`IA85xzG1DAjpkgCYakD4#J
z1F9KWwQQEV2Y>21PWjJ%UV0s+PJq>V=et9d?44aDKNHKT1V+Wq+_*9`yYlY&D#2B<
zt15RLx%2t)L(|R0xbHrdzVhevolM#7zN_<h@pj@nvS6W}Oy@FHwWt<YPg7NZlc^Zh
z%j>Px8dVtAD&DwWa`{i>EH2q+=1Zl!d*O6Y52$n2Hh*rFJog4u0aX>UlUE6Gdn%T!
z-%WPqFWOe|J+o0(jDh4CvSe4@s`(68y>T?;)`~W3-z6;CC_AMe@8{x^|M3)^7En*V
zQ^D0<_Urbl3UqghXLawFW%7rm+5^o;3&S}`;BS%#EbO5IZ^BFDCRE@}NFV?J00000
p000000FxX750fAQ2pIe;z5wh^14tv(0-^u_002ovPDHLkV1mpb6QKYA

delta 511
zcmV<b0RaBn1j7W7Fn<C4Nkl<Zc%1E*%W}dn3`H@M|NrH5Q-e_Nm6UWk)5SR(u=TVe
zIj|nzoacEy0&A_M_LWX&zt&nxzGc}*+;cfpc5Zzqf0c)ly%e$|w~o4}A^UamEAdqx
z&c5=O^LPHc{0^nuR@&(1@9ywboa)K{1?Tymf|yU7keug-o_{M=O!_y6QsbNbR`Pg2
z6~FU8wO8lQGF8Y!Id#GAP}%O}@_l(HPSpUD9J0=|1CMN^f=)V6jd1?%4&8Nw!xhch
zPjb1+GX|gBTP|?yrb+R(P4=T~x^?tX6)%3qedRBYaJ<()?#QU@9Jm6+gj7dXe$@Sv
zC!o3`tC7ue_kTd$#3}#T&r5HjG)b^pcfKc7#qR7X`ITHQ6)-AJ?u|Ql=2Sk7uL@ih
zyXtZ`k)6*UKQ!IF828<$(pUbRzLP1t?z@WL<vYpm$byY}GLyqp-J(WdKTXvEPNs5H
zFRzbL8+2h@t9;{n%jG|jtGHrcxnC;X?u9c!J)lXfHdk*|Jog4u2~{1^$*Y36J(Ww=
zpBB6F7j3Kjp4liX#zgWRvSoMPsyT-1-gq_S(TX;E-xVy{C_AMe&*$=!|M3))5l~Nl
z(!teU_Urbl4s>UVv8Ly9GLs<!B9kxz1sM3hd;#UO>opUo=63)9002ovPDHLkV1j4p
B4Q&7b

diff --git a/media/tilesets/standard.png b/media/tilesets/standard.png
index 316e2fada5d152cfa21ac84562bbcdec9843eae0..6a3670b07a4826677f3c2096092eb216240d1d20 100644
GIT binary patch
delta 3116
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%0DU4eJQbnbt+
z_;0=Kh523ZhBKF7CVP#=H`DHezV1O{t3L0Xg+F_Sj3F543J?(ZTv#tae>~z1onHMj
z?Oy+H^9ItZ;>zSo_C0?C$oC$oLohSP)=u45AFQ?0H?`ktCtdgKR{NICYTvU1C*xg_
zZ!fv5`g?xJ1>}1#vIzLj$frd>`S7*-9Ub|ke`&WOG;jjm9r=DrF01~YpR)4W2hPDS
zqCSyNMi?#feJ2<D&TO`If6rDwy}ujSiC&TKyX3N@^?9}bh=85YdpV=`a?IYp4>$nt
zih^g@k01~T*bl#m=KO6>Bsp`<uk`z_UCZ^pV+Y=dvm(h}l3DeCI_v#O|A6C>tplDB
z3B8%+kuzS+Zq0hj{&{~N@FpA`34c2CeWm_SXTN*;2OJ0WyWk@uf1wruwTN?OB=m@D
z^~<^ka59dHgg;$td!@ejIijDyc^HVi|H<}#dv=aAc-#FaXFI+3MumZ$BNc83obC9|
zD;aol{(k5FlXL&OzdsN=qCWs*<99-y01)s4Fo{?6KADU_2QYJtL@^Srd8;h<?%&x!
z4%j&dq+yGIV+d9Gf9^RT&>3aalhH6bFAV^I-Oz?!Ny6U!I~xe^o#92f;pWfi3prr#
zbwJyG_cwQ78Ri2p-kf9>K)?@x48l()BhUfNBqkm6N0xi{?+r*fU`s|*ruPfBWOO7i
z_i4$v+@~ceJ*1Y5j!ZMnmW<Jqi6ku<qaz!{OJxFpGf@&we?~*B0|KW*i+YlTz591I
zZoS5I1w4Hn@E3BxzB%B;Y<?aBkkFJTl5qaIZQqXWiv#2{<;fASCfwr)NCXo0kARYR
zdHMDL`Am6o1Z)%UF$5$63HwICoN#6N_5k@z*&zbvBzy!wLQ|efLUum42gqm2vuDA?
z(fZIc01}$=f6N?^I1<y73E280OY)V-$ye1bNLJM@$XD0T$ye7e$X7RzlT2w~_G|q8
zCHboQIr-}9Wv*9N*CSv_M)ltJ14yXXKc9q&bdq>k`ThX;^!o3KfKB2pW%b_o14yXX
ze@_I=2q&Up^Y6MBFaa^;+3SE>)RQE920%hno=HM>e?IpI$Y;vazX<^dBm@aN0uvCu
z{+njO01-$C5_Sa0r`HGh-UyITuMZNw0U)1VALM%@KtjDfNO(4OA9`+)FX4q(B=75k
zw^$qQeX#rSkOb7qaSoHs&jB5%qo8&TxGyXc#$p&Q<v|^2lMuK!ya-6tCf_L}EX%<C
z@i7t5f4c_U4<8u;H66GwJ~9FV&%nn-z`Ro+<VAqritGG4A;a+ObxQn90{{R300000
z00000z*~TIK&%7y2F?VV5@&+n0g%v?AmM4i5R4%h000000001bfnz=)DfM)cQrDR%
zmK##bO{vk)foG!oEcouf2oAgqL_h!l9tI4-e*geH8hyV91^@u~5HQE)%NhaT1iXAM
zSZ*D{HX`6CYy^~%Pm~kc(zc-(Da!J@ItttqZUh_#8sr8_jfep7Q_KX^@;>F7BqIPE
zftPYXNxW1>^aGB-;LdtOPzeVT0!QG>bFdE3fP}za{2yeTvd*5v_$UAX002ovPDHLk
G0$_p?h66hQ

delta 3100
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%0Dp9|{&h(|o3)2n}`-E04Co<Mq4e_WYd$-d`1
zfPC+P+66OnY(4ht)f;O)HY}aLb)IzGvs>r4Y}WZbJ8&}I75Vm(%c{TUMJ^!Udyz%J
zcSb%f0?M1OUGM0~C;dyi6`_F>@b1X>Q*v4L_q@u=J3nv^ei8MFd@{mlk?%XX*mp*=
zt!uX0>3wftCwfJ`?~==sf7a*K_9FszLhtE}-qSIAzaMY_-W3JUupdDn5U?M95zYDA
zo=9@$oL}kpUAva+ea8;G5obk`y(F{h|8&&*llB3}Bbx_2BNBQe%Ogj;n%x@pmhJPt
zAMhp|9SMIr@_nWLPe;Fd+6Np5^|#<7BcT=nwTN?OB=m@DwadB&e{eF6iiAI%YkQ@>
z_c@}Sz<C&my#Hi-y*)cy8ocHHle3)Od!oX?&Xx+d0nT!K=aCFNIp5#8{^VT$>MtYo
zfECdnfKhp2;!^+uegG!kqTrLs2y_55$4C?-(VDl)a_{z?4dj5Gb3hul2snmNmG7Pd
z0-aGtJsAz7^UweQf7lJJ>y;$z-M+Jd@ZK3-lpAh-kG_xt_MQi{?RS522c}^@0OQR`
zW&s5J0LUQxWHJIBz)WJ$F@I#acl+LelmoV8G-Z0eU`s|v@^YP)jLUUelG06T$>_*5
z(rn2XO_@m2k}*26LA+EZ05}sR;bb(#JRop7w5TUZ*t>maf8*A3Ojp3u=K+5q2ke^z
zPR!=#Api+Yc_IntpWF7W=)O2WK2x3?0c*lNj(|iUVgCpyiI<me50KB4Cr7|G@g74!
zB9O3e1k4FnmTwP`&y*b^U{1nE03<Z!sU&3Qb9;b%raXHTOdPEbJp&-2DbLISi6b#R
znSiY?S(2|re@?!tc0sbLc0s<neonr+enGza1Ubo+6U=^%?_ZLys-Kguu3qMPWpzCQ
zmSj|~eLsMNdj0cBm`EpymzD1ikWa7wo(R|^-cnYteLsMNdj0oAz>IJr8aBVzy?_CT
zDbJn<)S{jw;WGddn(|B%vh%q=Kt5BR{!0izAR$QDe-Rjf==I+;3I>QkLXfZ{Kt8=b
z$oEEognE6D@C^X@^!gy*8vzpP^+Ce3v3t{Vi+l+$JR*5t8@$QdaPN)XkB20nR*rL+
zY<>=CKph3OW59i3kuVnBa48RJK%0cXz2QYbqBi+XAz@ht?vIa&fZj3Se)z};sOi9c
z@sSY_e|QEyCIaS-0wFH~yeqErdqRfc+4GcmO#=V`00000000000Ki*-c|gnq_6GI@
zn-Y71-vN-&lpx`0Ko^WI7ytkO00000dVym;ASv~<lTz22D3%LS%SEZt(1B;7`zZMC
zZv+Qk1|lE;01pGYU;qFfjlRDF0{{Sg2$*B@a$$`CZ~|W57c7?!VHpu{6gC3N$S2B)
zY-!n0j1*=0T@3~92{!@`0}XNkrA9;m_$g)rYI&b>Op*}*j=)Pfpd?-@Bl-bHU~osh
qA*h4{34tT<<vCazXh1?>Fa8fy`Kb%Tl^d)80000<MNUMnLSTZq`}ITs

diff --git a/source/director.cpp b/source/director.cpp
index 0a0e1cd..4c2eb4c 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -360,6 +360,8 @@ bool Director::setFileList()
 	asset->add("/data/room/08.room", room);
 	asset->add("/data/room/09.room", room);
 	asset->add("/data/room/10.room", room);
+	asset->add("/data/room/11.room", room);
+	asset->add("/data/room/12.room", room);
 	asset->add("/data/room/01.tmx", room);
 	asset->add("/data/room/02.tmx", room);
 	asset->add("/data/room/03.tmx", room);
@@ -370,6 +372,8 @@ bool Director::setFileList()
 	asset->add("/data/room/08.tmx", room);
 	asset->add("/data/room/09.tmx", room);
 	asset->add("/data/room/10.tmx", room);
+	asset->add("/data/room/11.tmx", room);
+	asset->add("/data/room/12.tmx", room);
 
 	asset->add("/media/tilesets/standard.png", bitmap);
 
@@ -385,6 +389,10 @@ bool Director::setFileList()
 	asset->add("/media/enemies/diskette.ani", data);
 	asset->add("/media/enemies/bird.png", bitmap);
 	asset->add("/media/enemies/bird.ani", data);
+	asset->add("/media/enemies/bin.png", bitmap);
+	asset->add("/media/enemies/bin.ani", data);
+	asset->add("/media/enemies/qvoid.png", bitmap);
+	asset->add("/media/enemies/qvoid.ani", data);
 
 	asset->add("/media/player/player.png", bitmap);
 	asset->add("/media/player/player.ani", data);