From 39c7fbc3b9feec3bedcea7956b595a730659f199 Mon Sep 17 00:00:00 2001
From: Sergio Valor <jaildesigner@gmail.com>
Date: Sat, 22 Oct 2022 09:56:34 +0200
Subject: [PATCH] =?UTF-8?q?A=C3=B1adidas=20las=20pantallas=20de=20P.A.C.O.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/items/items.png | Bin 960 -> 1017 bytes
 data/room/42.room    |  53 +++++++++++++++++++-------
 data/room/42.tmx     |  32 ++++++++--------
 data/room/53.room    |  88 +++++++++++++++++++++++++++++++++++++------
 data/room/53.tmx     |  32 ++++++++--------
 source/game.cpp      |   2 +-
 6 files changed, 150 insertions(+), 57 deletions(-)

diff --git a/data/items/items.png b/data/items/items.png
index 18764e4a09a08074b8ed0486e0ae54d68fa25d74..7b454bed44df189ec8950f02fc5c5eefbf91796a 100644
GIT binary patch
delta 955
zcmV;s14R752l)q(F@Lj3L_t(|ob6dlcH=M%i~D^4D{D4&hQR<J<+O`wfsHNkPmz?<
z9*<9~wbrBHIF5tuGoDWVIF5tSFB<Bod&&nVr`C7;XMQl+lK~Z}b>&?Gs8`W<>@z=<
zywivNEB&2+Cu43iEqL)=1@G**lm8B^^|uSEKea>9&lf(GtbgkCJ3+DbMZJz*17!9)
z{Zn}sKhjttPo`8Ey8|bCIfwJ|jvZG36CaRgT7f4DF{6_TWG#&ED(J2n6jaib{KS`C
zd{pC;xup!(YMLbPl0iL8rdwAXE_wA?_nAIy;X2n}W@Ken3RD8BL#!g59yVXF1Kf;s
zEsJz@psM4Tet*>S<eM-}9CYhW_XIB4ot&fZ__CG2$~c)DcV_04KDEyh?2_%OTy<op
z^Pdk*H5co?dNO{dPw^`nlk47@{m$Qse<u<yu#=et<En+Vz;&9e0u+t;$S$v!RvT1d
zT{C~{`l8ccBD+w@-kC3sx4UpAU<Wj@)%wknr*1IjkbkR?j_wko_LwioKTWpNS7n`l
zA1H*3)e)Q_7wyiiiZ)dB*3p2iRb{Sym9Q$q<QRXAPx(iG<1tKHfSvrLg54hKReP=i
zRZP{^G(M!!56kJiPyxB%+@5lBLYvB}m?m@<-#;zv9K-Twe2nf|fZ1Vf#afuj;(PUh
zy(@m^Z+{&TPhYzVR1PD59kyLN?a;aw{0cZ9uC*FZTeqAus+^kexI`kI?K%D3A$4mk
z4Ai^T!dDBay?3EnxEle?{<Y_Pt0MvRt1*K(CoPPQuz-|-Nt@#7s$dn5nqj*K%i?!q
zX|1(hzVE6K+j9=19P&7MW}E4D@|}*(|B3IF_J8D=CeQ`Pj8J1Dps8+UkIA?=n7v7Y
z+57lI7nQn;X6F)ew%kRu+nz5$Z^*g>dOSY=8iO+p_tp|uxJWKbh`U9Vea6f7cIk|t
z`8~mj$v`9cWP4L%&OvoaR9lQ+9pWy!15u#=)^q{lty%fI6Ld~>0VvsS20DMg0^8q#
zcYn&f>QMu_>SGnBWT&X(;*NcVmjqs?#f-Bg?n3Fm;F45jr`5E3$afCuoXi+E2Qi?!
zW^>gAHVs%EGP8wn7s{O~eET!z-QoSN{+%jQm(-5GQgKzpO1WGAR*Wu@$3y?AKlsD~
zAgz1<t=Jm!-}No^KV$nlus(xQfs<QMT@(Mm9^Ea>X5yWX&L0bwh;A>*3zLxp7n6_!
d4H$kB{s4Z0E>}5@RsH|~002ovPDHLkV1lu1<B<RW

delta 890
zcmV-=1BLwg2fzoAF@JhVL_t(|ob6dlcHA%w8|V4{S9UkiltuuM@}!$SU^BM(11XVm
z+T-<&>$<L2!Eqc1TW30*{c#)zlP?+isB4OYvs3R+_%j|%_Etbg>b>e-0_a!Ccj7Z1
z%HH`y{>p#H?_|ntrG+j&tK?lAxAXr3*Y&pxDxcaR$n&PBihor}f07hyU-awbH9;1?
z^FOs``J;>#@?=g`uqSY~iyY3&Cvn^Xm~cRy=?Og1hy|UTK-R+etdj0dgMuoWvY&9-
z#a9hJnOiDwJx!D1EgSU1Y`XXA!xgXo)^+9&Te!~k+l;Kr%7H3CCB#mo^TXx~c7U6a
zu4PfKHdJ*S^M8+i-g*<I2|@SX`JTWPyR&oh9WGl1tcsJl@nmLB<<t1Az^>Ttl&g;H
zeE#^*RCBSet6!$i{3(4UV|Lv$i{J5`@H<hkz;<Smj5{r?1=en|6QE>_BfGqAtu{D?
z^_}sp?@Lbq64`|+_Rf59y4{5{0o$NStd=(`p1Q#pA%Ay5I=L%|T4P*Le_Cwkui83(
zUucAil?cv|C3|wKVhnY9>uA8%sy1s~6|CAYJEmXrQ~c=Pcnp&kU^_oK!EO!xsx@~4
zRZcb5G(VKl56kJiPzkx@+?paekxgw?P7^uH??($eVtD+S9+SHkU~yPmu@+{w_*^-#
zXQj{h)_)Q4=GvV=MHuz#u<hDuN7l9AZ@_U_?`k}4-EuCdA~n%*g+w`9bN;(c>fZ5S
zpx><)UM-~7K80%GZUnISYt3=1BLV%ZF@rcKEsR81LMp(dO>uWsvPwtIu-%Pi`Ma@n
zUDtK{zN<!T%@IaB)N%GKHuLT5J0BhY3HK^{>wioO=#pbWXfTn`)VGSqY+N2J-lV|n
zdHkV^PTfVba|yXv?jqW4&s)+Pwr+!7ukU}2!I_3@*CnoSQCwCKcZ;g{OqZ?g%9%dn
zJ;8~^z##a`)~3N6L3K&gSWI7S;x4)kQK0{==@P_Sv+8#{=ty-5DBErZI=;Vw?eD-R
z$5OodQ3JaAV<%48PEp6jllTg^0<PU+!C4V^q5LnnB30YzY1-Z7C!2ImW{jJIm{5IZ
zbJZm_O;~L*i-m9(%9B(0@n_7Z!~0YJJEu%tQagNulfeTZlg|SS82Eqi2i{Mznz<UW
QtpET307*qoM6N<$g10Zup#T5?

diff --git a/data/room/42.room b/data/room/42.room
index 7d9e7bf..594ecab 100644
--- a/data/room/42.room
+++ b/data/room/42.room
@@ -1,33 +1,60 @@
-name=no 42
+name=P.A.C.O. on the go
 bgColor=black
-border=red
+border=black
 tilemap=42.tmx
 tileset=standard.png
 roomUp=0
 roomDown=43.room
 roomLeft=53.room
 roomRight=41.room
+itemColor1=magenta
+itemColor2=red
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=paco.png
+animation=paco.ani
 width=16
 height=16
-x=2
+x=10
 y=2
 vx=0
-vy=0
-x1=2
+vy=0.5
+x1=10
 y1=2
-x2=2
-y2=2
-color=magenta
+x2=10
+y2=11
+color=green
+[/enemy]
+
+[enemy]
+tileset=abad.png
+animation=abad.ani
+width=8
+height=16
+x=15
+y=13
+vx=0.8
+vy=0
+x1=4
+y1=13
+x2=19
+y2=13
+color=bright_cyan
+flip=true
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
-x=1
-y=1
+tile=41
+x=2
+y=9
 counter=1
+[/item]
+
+[item]
+tileset=items.png
+tile=41
+x=29
+y=3
+counter=2
 [/item]
\ No newline at end of file
diff --git a/data/room/42.tmx b/data/room/42.tmx
index 4d00ee7..ab109a5 100644
--- a/data/room/42.tmx
+++ b/data/room/42.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,0,0,0,0,0,0,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
+36,36,36,0,0,0,0,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,
+36,36,0,0,0,0,0,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,
+36,0,0,0,0,0,0,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,
+36,0,0,0,0,0,0,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,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,0,0,0,0,0,62,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,421,62,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,62,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,421,415,0,0,0,0,0,0,0,0,0,0,62,
+36,0,0,0,0,0,0,0,305,0,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+36,0,0,0,305,0,0,0,0,0,0,0,0,0,0,0,0,421,0,0,0,0,0,0,0,0,0,0,0,0,0,62,
+36,0,0,0,0,0,0,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,
+36,0,415,421,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,415,415,415,421,415,415,0,0,0,0,0,62,
+36,0,0,0,0,0,0,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,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,415,421,548,0,0,0,0,0,0,0,
+0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,524,0,0,0,0,548,0,0,0,0,0,0,
+415,415,415,415,415,415,415,421,415,415,415,415,415,415,415,415,415,415,421,421,0,0,421,421,0,0,415,415,415,415,415,415
 </data>
  </layer>
 </map>
diff --git a/data/room/53.room b/data/room/53.room
index b2162bb..40b1d38 100644
--- a/data/room/53.room
+++ b/data/room/53.room
@@ -1,33 +1,99 @@
-name=no 53
+name=P.A.C.O workshop
 bgColor=black
-border=red
+border=yellow
 tilemap=53.tmx
 tileset=standard.png
 roomUp=0
 roomDown=51.room
 roomLeft=0
 roomRight=42.room
+itemColor1=magenta
+itemColor2=red
 
 [enemy]
-tileset=diskette.png
-animation=diskette.ani
+tileset=paco.png
+animation=paco.ani
 width=16
 height=16
-x=2
+x=6
+y=6
+vx=0.3
+vy=0
+x1=6
+y1=6
+x2=13
+y2=6
+color=yellow
+[/enemy]
+
+[enemy]
+tileset=paco.png
+animation=paco.ani
+width=16
+height=16
+x=16
+y=2
+vx=0
+vy=0.8
+x1=16
+y1=2
+x2=16
+y2=13
+color=bright_red
+[/enemy]
+
+[enemy]
+tileset=wave.png
+animation=wave.ani
+width=8
+height=8
+x=1
+y=10
+vx=0.4
+vy=0
+x1=1
+y1=10
+x2=14
+y2=10
+color=bright_yellow
+[/enemy]
+
+[enemy]
+tileset=lamp.png
+animation=lamp.ani
+width=16
+height=16
+x=22
 y=2
 vx=0
 vy=0
-x1=2
+x1=22
 y1=2
-x2=2
+x2=22
 y2=2
-color=magenta
+color=bright_yellow
 [/enemy]
 
 [item]
 tileset=items.png
-tile=1
+tile=40
 x=1
-y=1
+y=6
 counter=1
-[/item]
\ No newline at end of file
+[/item]
+
+[item]
+tileset=items.png
+tile=40
+x=1
+y=9
+counter=2
+[/item]
+
+[item]
+tileset=items.png
+tile=40
+x=30
+y=5
+counter=3
+[/item]
diff --git a/data/room/53.tmx b/data/room/53.tmx
index 686390e..34c7733 100644
--- a/data/room/53.tmx
+++ b/data/room/53.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,0,0,25,25,25,25,25,25
+36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,
+36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,
+36,36,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,36,
+36,36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,411,0,0,0,0,411,411,411,411,411,411,411,411,411,0,0,0,0,453,453,453,453,453,453,453,453,0,0,0,0,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,387,36,
+36,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,411,411,411,411,411,411,363,411,411,411,411,411,411,411,0,0,0,0,453,453,453,453,453,453,453,453,0,0,0,0,36,
+36,0,0,0,0,0,0,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,36,
+36,0,0,0,0,0,0,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+135,0,0,0,0,0,0,315,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,36,0,0,36,36,36,36,36,36
 </data>
  </layer>
 </map>
diff --git a/source/game.cpp b/source/game.cpp
index c26614a..531706e 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 = "01.room";
+	currentRoom = "53.room";
 	const int x = 30;
 	const int y = 13;
 	spawnPoint = {x * 8, y * 8, 0, 0, 0, s_standing, SDL_FLIP_HORIZONTAL};