From 6b4c089683cdeffcb0d21592af4739e7447ef5c2 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Sat, 12 Nov 2022 10:00:27 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adiendo=20habitaciones?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/enemies/crosshair.ani  |   9 ++++
 data/enemies/crosshair.png  | Bin 0 -> 288 bytes
 data/enemies/tree_thing.ani |   9 ++++
 data/enemies/tree_thing.png | Bin 0 -> 516 bytes
 data/items/items.png        | Bin 1478 -> 1516 bytes
 data/room/07.room           |  56 +++++++++++++++++-----
 data/room/07.tmx            |  32 ++++++-------
 data/room/16.tmx            |   2 +-
 data/room/26.room           |  32 ++++++++-----
 data/room/28.tmx            |   6 +--
 data/room/32.room           |   8 ++--
 data/room/32.tmx            |  10 ++--
 data/room/34.room           |  91 +++++++++++++++++++++++++++++++-----
 data/room/34.tmx            |  14 +++---
 data/room/44.room           |  45 ++++++++++++------
 data/room/44.tmx            |  28 +++++------
 data/room/60.tmx            |  32 ++++++-------
 source/director.cpp         |  30 +++++++++++-
 source/ending2.cpp          |   2 +
 source/player.cpp           |  18 +++----
 source/scoreboard.cpp       |   6 +--
 21 files changed, 302 insertions(+), 128 deletions(-)
 create mode 100644 data/enemies/crosshair.ani
 create mode 100644 data/enemies/crosshair.png
 create mode 100644 data/enemies/tree_thing.ani
 create mode 100644 data/enemies/tree_thing.png

diff --git a/data/enemies/crosshair.ani b/data/enemies/crosshair.ani
new file mode 100644
index 0000000..1facc66
--- /dev/null
+++ b/data/enemies/crosshair.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/crosshair.png b/data/enemies/crosshair.png
new file mode 100644
index 0000000000000000000000000000000000000000..e2425ddc13cc0eed74e01e788dd358c11244d66d
GIT binary patch
literal 288
zcmV+*0pI?KP)<h;3K|Lk000e1NJLTq002M$000mO1^@s6rssJn00001b5ch_0Itp)
z=>Px#+DSw~R9J=OS3wTLFbE6N{{LlmSR-|*0S6Q{+kB}?aP6jmQfZ5zs(QW`5&0&5
z8hU_@@5a9nW{9joX3f%H$^Rg-ar(hQZjUkgEBF^<Gdt)BdWMjBXbkWoe&oMjpO(lt
zG*HYlS>aca()V^T%0bWZ_-H*UTg&Un_o@ixKD=Z(z?9~0d=};g{0ra=XzhJ)=sTb3
z-MjfIMEw}8S@%&6)4yIWGY703SOKW-X1+p|UqwmZo4m|~Wi_lAqrZX=O`bu#*KZt!
mtH@T+UHoNzIg0K2JNyEi+vULr46T6x0000<MNUMnLSTZ)mVYJy

literal 0
HcmV?d00001

diff --git a/data/enemies/tree_thing.ani b/data/enemies/tree_thing.ani
new file mode 100644
index 0000000..1e61f47
--- /dev/null
+++ b/data/enemies/tree_thing.ani
@@ -0,0 +1,9 @@
+frameWidth=16
+frameHeight=16
+
+[animation]
+name=default
+speed=6
+loop=0
+frames=0,1,2,3,4,5,6,7,8,9,10,11,12
+[/animation]
\ No newline at end of file
diff --git a/data/enemies/tree_thing.png b/data/enemies/tree_thing.png
new file mode 100644
index 0000000000000000000000000000000000000000..3d71fcece71450a93430416b8bd282ddd71b4a46
GIT binary patch
literal 516
zcmV+f0{i`mP)<h;3K|Lk000e1NJLTq007Vc000mO1^@s6XH4<H00001b5ch_0Itp)
z=>Px$zDYzuRA_<in%lC%FbGAh<NyD1e32Q7+)0}1u%Bv@MJ_;!p7VILTCG;AwL^#0
zF~%6DfyW_^mG~&rYOPQv7QONR)kr~rq1{@DG;xN<W4*j)x02Ai`77tz$#Z^|V#32m
zUj&$!a^duugE@JUNaDRoWG&c}MA{gSW2^kHOWI@P0?hJO@_?-Pk&-9ETe$$wPp-2P
zBs+O<o^=2oK0AMgyHeRT&N|oX{2BHV9yT^UlAdv!B|L5>?_oLK%e89Co;&B`NUY4}
zwP)a5uS%_tTL|r^eDo$bEjV$DjPd`a*WHvo^NO#vIOF0{WARw6Z)yTnHo)1a1brvX
zeN^>DBqp*KcsBmOz60R_@Y=!?dNY_#?x{h!gUXa%c+Fk9?GyHW){nr`Hc2?nq)S_}
zLF1f@e{;dK=EH5)2Dq^mUb1QJL2JwKk$y`n6MFU9BK?*hJiHYP9^SI);b~4_=A~^&
zGM>>+9^Zh~U)ZW;;mWdd#@Z_ToO#Y!UCpb%*K@|AH7K=FtzkWm8RK{Vkhn^__vGaz
zUwac%inlBejKnYdR~~BXZUNQ$Z_P+}{JG<|)oQg`_tG2tR7VNGZNuvT0000<MNUMn
GLSTa6+5&d~

literal 0
HcmV?d00001

diff --git a/data/items/items.png b/data/items/items.png
index 2027a854686575e76e5fafe6cd4614f9e0f4e9dd..ebbbc48c94bd695204bc3ce613ada25e1410dc25 100644
GIT binary patch
delta 1417
zcmV;41$O$z3+xM!F@L5>L_t(|ob6i6lH)iGi&OspU)Ek)Sr`p~l%3w%gK$YK@c~jK
z<w?)+`oS1uya2~>9BN(3RQktp9BO~=u?<{v9Fm@UzQbSfP<tN%HsqdBb{Mc-x4+_F
z@o@Ud9`kqhD}L{;V+VCAc=E}P+D|9%o}XZhf4czrVAss`<9`PiIh6n=*$K))wJ+OE
z`;$2HQGq6X$KT1I-!vLdWz;#lgQ^1Osp7MewR6Ypb4OJiR44GBO618(%4w$pT~(}9
zV5*p;&z#aBR9sf^M&~QDj~(-js0dFTwxe{qGZ3rU@#KBSky{vNA3odGai#5usftW?
z)O_I%NHa3EEPwC219csz?6aMZTt}!wFg;hcJ4nf{^wRzcm!$-vU}tXJnVH@Fu78!_
zl<ZXHt|Kd(zg{%mT*P(vspOSCC-3%@UiDr1ulRQOoxCxjPNow~sutA(^E6cjxIM*D
zU0#<~Yg8dVE57(V_s=RZ9k^t#%$FovT{s=61M2uHd4H?qxf@IoN)=M=r-ZmQ#f9a&
z$xilAH}QM35(^>`o*{GZ&aKKmT=n8;;MPK&x$Y8%I!aH;V|<RE{5PILrv=o>cPcoo
zv0b;8D$vD*zPj=8o_w+F&I=b%3NEcVlAXP-u8XO&uj2dF!igA{zmik?sRfiD)mEy7
zl`elr4u9&qlUICkM0~hb73c`FJPzBcomTd$7W@VhhxzQr)6y-MoH|k+nUqN0S8K_B
zbx74S7Y5s1YT?;JZtW>t3s)mR`JZcv8;%6F@5T({?6fcwQ2{vzoi^pub-_9rH^WvB
zR>hyj(imf0-tSOJttG;&$1+J@`Bt`*er2QL-+$qbdmou@0#k6xiF9TH>e_bxlun96
z`RgQDeQ&?$ve9(WtXx9LSGtH++w&6if^IsX*X!rk7@ldoHio&vO>$L2(k<%zD_OO+
zy07FF?+#8*20P(Twbpf(2)auGeJOc&h^wd$#6kX9GX==ECdyYQm`GItINdaYD!$*q
z@{=qBM}Izkjd?n}pW0ukGIvR>@U@1~kSgWQb83M>cuaZ`)8`ZaO4t5Xj*)Ifl}sgH
zRlD=qnQyLwyWo+e?5q9Di!_pOb0W>Y<PdG*vm&c(RKX|C9sO#?tNC~w@N*UmpaTxv
zRTAEmQw~Y79FGn4UBO)<cUlvZ)4fDcXZbzQ1%J@B!QYXv`o4lRCMq4~rxL4dU;cYr
z`kva5E6fp9-x1Y-$I4A}bEOiwZTT7H@N?pgi<pR1b!@ClxSOEvI_{%w6+Fgqr`=um
zwQe1?ruI>egG;2U{U_+m)6`vTOD3=)a5s<@T@Lgc$-84e$*FkWBS0CgP89W15-OW+
z{(r2F4U|<QN`Xg)8a?y*Tn$o{Jj<fYOk|ZL=id$VI~A&8=-PDceWoDXd{DDNIdNnw
zf^0|GXCBH2?pHkc(34%nsYv`9lp-KSPMvUd0LtcSg}ES|9aYVI=uU@oQN9OustQ}p
z5m!}H1*SMuhny}4o^2`?E{25TX#URxMSq5grQqh8TW1+ghO2n?kDtni;+QIreU!<q
zGCu&F^%V@lik|vh`R;TT4_>qHIQZ-WN<-Y8=3nhQq{CR5v(^SXQMXk!SD0*)|BHQ<
zr0VdKpA~$5P<6x9kxbQ>=FGSEove~cHt(WrVgBU3i?RQprCqhD!*_hXQF#-WUw&iK
zK<=QDPy4Cb|Id)WNUP`9tG=ZxeDmZH*slDFgP+LZTZeS}k4kF4Q-R-3qDt6Y=QZ{G
z6rTik1~r38R?kTv6RT!!()p{(-q_gK*x1<E*x1<E*x1<E*x1<E*x1<E*x1<E*x2|7
XD!kFQ)WBA&00000NkvXXu0mjfCHmyo

delta 1378
zcmV-o1)cir3&snOF@JzbL_t(|ob6iMlG{2Ai!=WJUshjMIWQIgDQ9!G(-B@0OT2&-
zNx9h`k1vcd#shF1$D!7hOr?Ju$D#J;9^1e*$06yt=R5or54HCaU_<U1WrqRVb^9y+
z6%VJM>@k05zvB1oI(AT}f+wHssQq;E?)e>z@n07pAMBdBet&%7BBv6-Bs)PlsP<*M
zX@3%DJ}S_p@Ax|z^qWS*sf;>jcTiQ}JXL&FvUcv6eeS4=gX#p{Q;9rTNjdFQpsR|N
z3QQG~^qEsSgo?{5p6GmK_OWB05f$O7!*-NTcLriLJD$AnIC2Z)?89f<I<B-GF;$Vt
zj+!sr0cl32mVf1acc8B0lzq1IlIsX{2&U)Cb_Xfhm0sFk;j)xK6zt56J2SJp-}SE&
zoRXcY+;wDS^V^H2n~S*aK9#((=j7d<(yP8J{}ta3zmqp6)X8*$N!6lSV4kL`0Jo<&
zs>|!rYK<zyXT=wv=l)qGrURGkmHCons|%+CbwC|oC4X;~Ja>aBLa9Qk{ge>5rns<t
zH`&P^>Lz|qR$@UU!ZT#<-MLlShpS#34cuC&GuK_hP)F%0d5q8TlmEt3=(K=3`A!9=
zHMZ;4QU$u0&{sD;-jgqu-Fe{xO2MTyN3yfm)pap-_Emh}S~wBo@>g<dKed4JquNTf
zu+ru4$bUh7ck+raj))i6ssbHhmd9aRwbRO8)q+2P#9=<W@w9ZyC8v&5M<ykb_tjdm
zUma5Q%!R>rms)tXkXw5fu7#@+p#0CZ#0^IR+jnDzadujmiKu{_gHD_B>AGN@jGJMr
z2dm;wV`+>rF7J1!q}CE))?=BZuY4=pNx!mD@qh1d$Gw+KH-RZQ<wQC&0d;LVe@Z9C
zq5O3ctiHEjblGUSXjU$v<SSi7tL=FSdO<fG(Btv-YYfjcUK_();U>8%A?X%%{*|m+
zTisXkigyPmCxe~vr&{YeO9b5|fxeWyJH%B~2jU?AteFDjTNCB06HKJ40Gw_bK^5Ph
zz>_KiNPoWl8uRY(e%Jm=mAOl5g|9V?hEyqco>L19!rP=5F@3({U+LPv$}!TdsFJDV
zt7>;XJM+y|a2Gt1lzp{-d67mEZce1xmmH!^d{$(YjVk!Wxuajrcr_o71Afk80d&BD
zyGp{Fa>^komgBLZzALy(<W6g1a=MoY>MXwpx_<z=HuyUdR^L~U#zdvV{8VC<?aO~}
zOW#u)a)mjf>N}zu@L0KNZmv`!w=F-T9DYtbaS;=ds*a6y33n6JUB`X2t%Aom?zFq>
zzSgay*3>@Aad3%Lwf_z}^E7oA+mZ>a2;2>1MVABpiR9g}pX5|L&k>-ERws)3DG8NL
zH-CRt#|Fx(5v9N*LyeyKe69wmN}gp=W+t*qlJoBd`ke|@F?4OZ_C8Y(Za%2lpqx0e
z6+yP6>@yGL1NSQ)eCWw8;#4HQ4N4J^BBxHcIsj#JwZdGG&W@^PK6IzUxhUTQJ5`0P
z=7_7RsRC0RszXkf1J5=U3l~GeaWwyDf`1~z#8Pl`&8@QxC&N`d`^Qh^Lvc)%$3DvB
zR+%4w&iV=lVMR}Uu6%d8iU+URcN~0n0i_}CPV-ayzlGMVS<MxEuH-+t{~LJypz4O{
zd`?MKEsZjt-v3RMEzF<1cQN)qwDjNB%9meb(m?K@l27}o+W%(AU!>LZ<5Azz6<2<{
zT0Vi>e^gTYoeKQdlK4ts8r0Qmj2rsh*C0-;nz@zE#>U3R#>U3R#>U3R#>U3R#>U3R
k#>U3R#>U3R#>OY`2O2_w%A&AR1^@s607*qoM6N<$f>k}nWdHyG

diff --git a/data/room/07.room b/data/room/07.room
index aeda556..4feb190 100644
--- a/data/room/07.room
+++ b/data/room/07.room
@@ -1,12 +1,14 @@
-name=SIGMASUA
+name=SIGMASUA > TELEGRAM
 bgColor=black
-border=black
+border=blue
 tileMapFile=07.tmx
 tileSetFile=standard.png
 roomUp=0
 roomDown=0
 roomLeft=08.room
 roomRight=04.room
+itemColor1=magenta
+itemColor2=red
 
 [enemy]
 tileSetFile=sigmasua.png
@@ -17,11 +19,27 @@ x=15
 y=7
 vx=0.8
 vy=0
-x1=9
+x1=7
 y1=7
-x2=25
+x2=23
 y2=7
-color=bright_red
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=15
+y=4
+vx=-0.5
+vy=0
+x1=7
+y1=4
+x2=23
+y2=4
+color=blue
 [/enemy]
 
 [enemy]
@@ -36,10 +54,26 @@ vy=0.4
 x1=3
 y1=5
 x2=3
-y2=12
+y2=13
 color=bright_red
 [/enemy]
 
+[enemy]
+tileSetFile=sigmasua.png
+animation=sigmasua.ani
+width=16
+height=16
+x=27
+y=8
+vx=0
+vy=-0.4
+x1=27
+y1=5
+x2=27
+y2=13
+color=yellow
+[/enemy]
+
 [enemy]
 tileSetFile=sigmasua.png
 animation=sigmasua.ani
@@ -74,15 +108,15 @@ color=bright_green
 
 [item]
 tileSetFile=items.png
-tile=9
+tile=67
 x=15
-y=5
+y=6
 counter=1
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=9
+tile=67
 x=1
 y=8
 counter=2
@@ -90,7 +124,7 @@ counter=2
 
 [item]
 tileSetFile=items.png
-tile=9
+tile=67
 x=30
 y=8
 counter=3
@@ -98,7 +132,7 @@ counter=3
 
 [item]
 tileSetFile=items.png
-tile=9
+tile=67
 x=21
 y=13
 counter=4
diff --git a/data/room/07.tmx b/data/room/07.tmx
index 57023c8..cd6524f 100644
--- a/data/room/07.tmx
+++ b/data/room/07.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">
-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,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,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,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,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,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,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,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,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,74,
-74,265,0,0,0,0,0,265,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,74,265,0,0,0,0,0,265,74,
-74,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,74,
-74,0,0,0,0,0,265,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,265,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,74,0,0,0,0,0,0,0,0,
-0,0,0,0,0,0,0,265,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,74,265,0,0,0,0,0,0,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,
-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,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,
+2,411,0,0,0,0,0,413,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,413,0,0,0,0,0,411,2,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,0,0,0,0,0,0,0,2,
+2,0,0,0,0,0,411,411,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,411,411,0,0,0,0,0,0,
+2,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,7,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,7,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,7,0,0,0,0,0,0,0,0,
+7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7,7
 </data>
  </layer>
 </map>
diff --git a/data/room/16.tmx b/data/room/16.tmx
index 39c62b3..2227a5e 100644
--- a/data/room/16.tmx
+++ b/data/room/16.tmx
@@ -3,7 +3,7 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-29,297,297,297,297,297,297,297,297,297,297,297,297,297,0,0,0,0,297,297,297,297,297,297,297,297,297,297,297,297,297,29,
+29,297,297,297,297,297,297,297,297,297,297,297,297,297,417,0,0,417,297,297,297,297,297,297,297,297,297,297,297,297,297,29,
 29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
 29,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,273,273,273,273,0,0,0,0,0,0,0,0,0,0,0,0,0,29,
diff --git a/data/room/26.room b/data/room/26.room
index c3e49a3..c036056 100644
--- a/data/room/26.room
+++ b/data/room/26.room
@@ -7,8 +7,8 @@ roomUp=0
 roomDown=0
 roomLeft=25.room
 roomRight=27.room
-itemColor1=yellow
-itemColor2=cyan
+itemColor1=magenta
+itemColor2=red
 
 [enemy]
 tileSetFile=batman_bell.png
@@ -146,32 +146,40 @@ color=yellow
 
 [item]
 tileSetFile=items.png
-tile=37
-x=15
+tile=60
+x=26
 y=3
 counter=1
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=37
-x=15
-y=7
+tile=60
+x=5
+y=6
 counter=2
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=37
-x=15
-y=10
+tile=60
+x=26
+y=9
 counter=3
 [/item]
 
 [item]
 tileSetFile=items.png
-tile=37
-x=15
+tile=60
+x=4
 y=13
 counter=4
+[/item]
+
+[item]
+tileSetFile=items.png
+tile=60
+x=27
+y=13
+counter=5
 [/item]
\ No newline at end of file
diff --git a/data/room/28.tmx b/data/room/28.tmx
index 691bbca..aa4dfd9 100644
--- a/data/room/28.tmx
+++ b/data/room/28.tmx
@@ -3,10 +3,10 @@
  <tileset firstgid="1" source="standard.tsx"/>
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
-90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,94,
-89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
+90,89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,41,235,235,0,0,235,235,41,89,90,89,
+89,94,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,90,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,89,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,0,0,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,0,0,0,235,0,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
diff --git a/data/room/32.room b/data/room/32.room
index e173bfd..5c37fa0 100644
--- a/data/room/32.room
+++ b/data/room/32.room
@@ -9,16 +9,16 @@ roomLeft=0
 roomRight=33.room
 
 [enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
+tileSetFile=tree_thing.png
+animation=tree_thing.ani
 width=16
 height=16
 x=23
-y=3
+y=4
 vx=0
 vy=0.4
 x1=23
-y1=3
+y1=4
 x2=23
 y2=13
 color=yellow
diff --git a/data/room/32.tmx b/data/room/32.tmx
index 6a24a28..64f2446 100644
--- a/data/room/32.tmx
+++ b/data/room/32.tmx
@@ -3,10 +3,10 @@
  <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,41,235,235,0,0,235,235,41,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,41,0,235,235,0,0,0,143,0,235,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,235,235,0,41,235,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,142,0,0,0,0,0,0,0,41,0,0,0,0,0,0,143,0,235,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,235,235,235,235,0,41,235,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,0,143,0,0,0,0,0,0,41,0,0,0,
 0,0,0,0,0,142,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,235,41,0,142,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,235,235,0,41,0,0,0,
@@ -15,9 +15,9 @@
 0,0,0,71,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,235,235,41,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,143,0,0,0,0,0,0,143,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,0,143,0,0,0,235,235,0,41,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,41,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,41,0,0,0,0,0,0,356,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,143,235,0,0,0,0,0,356,0,0,0,
-0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,0,41,0,0,0,0,0,0,356,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,381,0,41,0,0,0,0,0,0,41,0,0,0,
 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,235,235,235,41,235,235,0,0,235,235,41,235,188,188
 </data>
  </layer>
diff --git a/data/room/34.room b/data/room/34.room
index b75f84a..ebf99b3 100644
--- a/data/room/34.room
+++ b/data/room/34.room
@@ -1,33 +1,100 @@
-name=no 34
+name=ULA HOP!
 bgColor=black
-border=red
+border=cyan
 tileMapFile=34.tmx
 tileSetFile=standard.png
 roomUp=0
 roomDown=32.room
 roomLeft=35.room
 roomRight=0
+itemColor1=green
+itemColor2=red
 
 [enemy]
 tileSetFile=diskette.png
 animation=diskette.ani
 width=16
 height=16
-x=2
-y=2
+x=20
+y=1
 vx=0
+vy=0.8
+x1=20
+y1=1
+x2=20
+y2=13
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=spark.png
+animation=spark.ani
+width=8
+height=16
+x=11
+y=4
+vx=0.5
 vy=0
-x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+x1=11
+y1=4
+x2=18
+y2=4
+color=cyan
+[/enemy]
+
+[enemy]
+tileSetFile=spark.png
+animation=spark.ani
+width=8
+height=16
+x=1
+y=1
+vx=1
+vy=0
+x1=1
+y1=1
+x2=29
+y2=1
+color=yellow
+mirror=true
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=1
+y=6
+vx=0.5
+vy=0
+x1=1
+y1=6
+x2=10
+y2=6
+color=yellow
+[/enemy]
+
+[enemy]
+tileSetFile=wave.png
+animation=wave.ani
+width=8
+height=8
+x=17
+y=8
+vx=0.9
+vy=0
+x1=17
+y1=8
+x2=29
+y2=8
+color=yellow
 [/enemy]
 
 [item]
 tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=66
+x=29
+y=3
 counter=1
 [/item]
\ No newline at end of file
diff --git a/data/room/34.tmx b/data/room/34.tmx
index c1a9000..ac8b2fb 100644
--- a/data/room/34.tmx
+++ b/data/room/34.tmx
@@ -9,14 +9,14 @@
 116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
 140,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
 116,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,114,115,114,115,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,116,140,
+140,0,0,0,0,0,0,0,0,0,0,114,115,114,115,114,115,114,115,0,0,0,0,0,0,0,0,0,0,377,116,140,
 116,0,0,0,0,0,0,0,377,0,0,114,115,114,115,114,115,114,115,0,0,0,0,377,377,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
-116,0,0,0,377,377,377,0,0,0,0,0,0,115,114,115,114,0,0,377,0,0,0,0,0,0,0,0,0,0,140,116,
-140,0,0,0,0,0,0,0,0,0,0,377,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
-116,0,0,0,0,0,0,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,0,0,0,0,114,115,114,115,140,116,
-140,0,0,0,0,0,0,0,0,377,0,0,0,114,115,114,115,0,0,0,0,0,0,114,115,114,115,114,115,0,116,140,
-0,0,0,0,0,0,0,0,0,0,0,0,377,115,114,115,114,0,0,0,0,0,0,0,0,0,0,0,0,0,140,116,
+140,0,0,0,0,0,0,0,0,377,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
+116,0,0,0,377,377,377,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,377,377,377,377,0,0,0,0,140,116,
+140,0,0,0,0,0,0,0,0,0,0,377,0,114,115,114,115,0,0,377,0,0,0,0,0,0,0,0,0,0,116,140,
+116,0,0,0,0,0,0,0,0,0,0,0,0,115,114,115,114,0,0,0,0,0,0,0,0,0,431,432,114,115,140,116,
+140,0,0,0,0,0,0,0,377,0,0,0,0,114,115,114,115,0,0,0,0,0,0,431,432,431,432,431,432,0,116,140,
+0,0,0,0,0,0,0,0,0,0,0,0,377,115,114,115,114,0,0,377,0,0,0,0,0,0,0,0,0,0,140,116,
 0,0,0,0,0,0,0,0,0,0,0,0,0,114,115,114,115,0,0,0,0,0,0,0,0,0,0,0,0,0,116,140,
 114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,114,115,0,0,114,115,114,115,114,115
 </data>
diff --git a/data/room/44.room b/data/room/44.room
index 818f583..4db0b86 100644
--- a/data/room/44.room
+++ b/data/room/44.room
@@ -1,4 +1,4 @@
-name=THE KITCHEN
+name=SANDWITCH AND COUNTER
 bgColor=black
 border=cyan
 tileMapFile=44.tmx
@@ -7,27 +7,46 @@ roomUp=43.room
 roomDown=16.room
 roomLeft=0
 roomRight=0
+itemColor1=white
+itemColor2=red
 
 [enemy]
-tileSetFile=diskette.png
-animation=diskette.ani
-width=16
+tileSetFile=congo.png
+animation=congo.ani
+width=8
 height=16
 x=2
-y=2
-vx=0
+y=4
+vx=0.5
 vy=0
 x1=2
-y1=2
-x2=2
-y2=2
-color=magenta
+y1=4
+x2=14
+y2=4
+color=green
+flip=true
+[/enemy]
+
+[enemy]
+tileSetFile=crosshair.png
+animation=crosshair.ani
+width=16
+height=16
+x=23
+y=4
+vx=0
+vy=0.8
+x1=23
+y1=4
+x2=23
+y2=13
+color=yellow
 [/enemy]
 
 [item]
 tileSetFile=items.png
-tile=1
-x=1
-y=1
+tile=8
+x=2
+y=2
 counter=1
 [/item]
\ No newline at end of file
diff --git a/data/room/44.tmx b/data/room/44.tmx
index 834f028..6de24f6 100644
--- a/data/room/44.tmx
+++ b/data/room/44.tmx
@@ -4,20 +4,20 @@
  <layer id="1" name="Capa de patrones 1" width="32" height="16">
   <data encoding="csv">
 44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,44,26,0,0,0,0,0,0,26,44,44,44,44,44,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,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,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,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,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,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,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,413,413,413,0,0,37,37,
-37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,343,343,343,343,343,343,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,343,0,0,0,0,0,37,37,37,37,
+37,37,465,465,465,465,465,465,465,465,465,465,465,465,465,0,0,345,37,37,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,37,37,0,0,0,0,0,0,0,343,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,343,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,345,0,345,0,0,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,343,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,345,0,0,345,0,0,0,0,0,0,0,0,343,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,0,0,0,0,0,0,37,37,37,37,
+37,37,37,0,0,0,0,0,0,0,0,0,0,0,0,0,0,345,0,0,0,0,343,0,0,0,0,0,37,37,37,37,
 38,38,38,38,38,38,38,38,38,38,38,38,38,38,417,0,0,417,38,38,38,38,38,38,38,38,38,38,38,38,38,38
 </data>
  </layer>
diff --git a/data/room/60.tmx b/data/room/60.tmx
index 888686c..1df006c 100644
--- a/data/room/60.tmx
+++ b/data/room/60.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,0,0,0,0,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,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,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,
-25,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,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,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,0,0,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,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,25
+28,28,28,28,28,28,28,28,28,28,28,28,28,28,0,0,0,0,28,28,28,28,28,28,28,28,28,28,28,28,28,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,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,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,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,28,
+28,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,28,
+28,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,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,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,28,
+28,0,0,0,308,0,0,0,0,308,0,0,0,0,0,0,0,0,0,0,0,0,308,0,0,0,0,308,0,0,0,28,
+28,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,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,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,28,
+28,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,28,
+28,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,28
 </data>
  </layer>
 </map>
diff --git a/source/director.cpp b/source/director.cpp
index 0edbb01..cf691b7 100644
--- a/source/director.cpp
+++ b/source/director.cpp
@@ -366,6 +366,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("chip.png");
 		textureList.push_back("code.png");
 		textureList.push_back("congo.png");
+		textureList.push_back("crosshair.png");
 		textureList.push_back("demon.png");
 		textureList.push_back("heavy.png");
 		textureList.push_back("dimallas.png");
@@ -390,6 +391,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("sigmasua.png");
 		textureList.push_back("spider.png");
 		textureList.push_back("spark.png");
+		textureList.push_back("tree_thing.png");
 		textureList.push_back("tuno.png");
 		textureList.push_back("tv_panel.png");
 		textureList.push_back("tv.png");
@@ -426,6 +428,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("chip.ani");
 		animationList.push_back("code.ani");
 		animationList.push_back("congo.ani");
+		animationList.push_back("crosshair.ani");
 		animationList.push_back("demon.ani");
 		animationList.push_back("heavy.ani");
 		animationList.push_back("dimallas.ani");
@@ -450,6 +453,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("sigmasua.ani");
 		animationList.push_back("spider.ani");
 		animationList.push_back("spark.ani");
+		animationList.push_back("tree_thing.ani");
 		animationList.push_back("tuno.ani");
 		animationList.push_back("tv_panel.ani");
 		animationList.push_back("tv.ani");
@@ -499,7 +503,14 @@ void Director::loadResources(section_t section)
 		std::vector<std::string> textureList;
 
 		// Jugador
-		textureList.push_back("player.png");
+		if (options->cheat.altSkin)
+		{
+			textureList.push_back("player2.png");
+		}
+		else
+		{
+			textureList.push_back("player.png");
+		}
 
 		// Tilesets
 		textureList.push_back("standard.png");
@@ -526,6 +537,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("chip.png");
 		textureList.push_back("code.png");
 		textureList.push_back("congo.png");
+		textureList.push_back("crosshair.png");
 		textureList.push_back("demon.png");
 		textureList.push_back("heavy.png");
 		textureList.push_back("dimallas.png");
@@ -550,6 +562,7 @@ void Director::loadResources(section_t section)
 		textureList.push_back("sigmasua.png");
 		textureList.push_back("spark.png");
 		textureList.push_back("spider.png");
+		textureList.push_back("tree_thing.png");
 		textureList.push_back("tuno.png");
 		textureList.push_back("tv_panel.png");
 		textureList.push_back("tv.png");
@@ -570,7 +583,14 @@ void Director::loadResources(section_t section)
 		std::vector<std::string> animationList;
 
 		// Jugador
-		animationList.push_back("player.ani");
+		if (options->cheat.altSkin)
+		{
+			animationList.push_back("player2.ani");
+		}
+		else
+		{
+			animationList.push_back("player.ani");
+		}
 
 		// Enemigos
 		animationList.push_back("abad.ani");
@@ -593,6 +613,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("chip.ani");
 		animationList.push_back("code.ani");
 		animationList.push_back("congo.ani");
+		animationList.push_back("crosshair.ani");
 		animationList.push_back("demon.ani");
 		animationList.push_back("heavy.ani");
 		animationList.push_back("dimallas.ani");
@@ -617,6 +638,7 @@ void Director::loadResources(section_t section)
 		animationList.push_back("sigmasua.ani");
 		animationList.push_back("spark.ani");
 		animationList.push_back("spider.ani");
+		animationList.push_back("tree_thing.ani");
 		animationList.push_back("tuno.ani");
 		animationList.push_back("tv_panel.ani");
 		animationList.push_back("tv.ani");
@@ -1175,6 +1197,8 @@ bool Director::setFileList()
 	asset->add(prefix + "/data/enemies/code.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/congo.ani", t_data);
 	asset->add(prefix + "/data/enemies/congo.png", t_bitmap);
+	asset->add(prefix + "/data/enemies/crosshair.ani", t_data);
+	asset->add(prefix + "/data/enemies/crosshair.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/demon.ani", t_data);
 	asset->add(prefix + "/data/enemies/demon.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/heavy.ani", t_data);
@@ -1223,6 +1247,8 @@ bool Director::setFileList()
 	asset->add(prefix + "/data/enemies/spark.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/spider.ani", t_data);
 	asset->add(prefix + "/data/enemies/spider.png", t_bitmap);
+	asset->add(prefix + "/data/enemies/tree_thing.ani", t_data);
+	asset->add(prefix + "/data/enemies/tree_thing.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/tuno.ani", t_data);
 	asset->add(prefix + "/data/enemies/tuno.png", t_bitmap);
 	asset->add(prefix + "/data/enemies/tv_panel.ani", t_data);
diff --git a/source/ending2.cpp b/source/ending2.cpp
index 13001ba..7536079 100644
--- a/source/ending2.cpp
+++ b/source/ending2.cpp
@@ -332,6 +332,8 @@ void Ending2::iniSpriteList()
     spriteList.push_back("lamp");
     spriteList.push_back("macaronni_ted");
     spriteList.push_back("congo");
+    spriteList.push_back("crosshair");
+    spriteList.push_back("tree_thing");
 
     spriteList.push_back("matatunos");
     spriteList.push_back("tuno");
diff --git a/source/player.cpp b/source/player.cpp
index f87ea55..3f8ca36 100644
--- a/source/player.cpp
+++ b/source/player.cpp
@@ -18,15 +18,7 @@ Player::Player(player_t player)
     sprite = new AnimatedSprite(renderer, resource->getAnimation(player.animation));
 
     // Inicializa variables
-    color = stringToColor(options->palette, "white");
-    if (options->cheat.infiniteLives)
-    {
-        color = stringToColor(options->palette, "yellow");
-    }
-    if (options->cheat.invincible)
-    {
-        color = stringToColor(options->palette, "cyan");
-    }
+    reLoadPalette();
     onBorder = false;
     border = BORDER_TOP;
     autoMovement = false;
@@ -708,6 +700,14 @@ void Player::reLoadTexture()
 void Player::reLoadPalette()
 {
     color = stringToColor(options->palette, "white");
+    if (options->cheat.infiniteLives)
+    {
+        color = stringToColor(options->palette, "yellow");
+    }
+    if (options->cheat.invincible)
+    {
+        color = stringToColor(options->palette, "cyan");
+    }
 }
 
 // Establece el valor de la variable
diff --git a/source/scoreboard.cpp b/source/scoreboard.cpp
index 18f4b81..043d5b5 100644
--- a/source/scoreboard.cpp
+++ b/source/scoreboard.cpp
@@ -13,9 +13,9 @@ ScoreBoard::ScoreBoard(SDL_Renderer *renderer, Resource *resource, Asset *asset,
     this->options = options;
 
     // Reserva memoria para los objetos
-    // playerTexture = resource->getTexture("player.png");
     itemTexture = resource->getTexture("items.png");
-    sprite = new AnimatedSprite(renderer, resource->getAnimation("player.ani"));
+    const std::string playerANI = options->cheat.altSkin ? "player2.ani" : "player.ani";
+    sprite = new AnimatedSprite(renderer, resource->getAnimation(playerANI));
     sprite->setCurrentAnimation("walk_menu");
     text = new Text(resource->getOffset("smb2.txt"), resource->getTexture("smb2.png"), renderer);
 
@@ -161,7 +161,7 @@ void ScoreBoard::updateItemsColor()
         return;
     }
 
-    if (counter % 20 <10)
+    if (counter % 20 < 10)
     {
         itemsColor = stringToColor(options->palette, "white");
     }