From 753a0c4b3abb305031909694bdbc807c10ccc5ec Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Sat, 22 Jun 2024 18:30:09 +0200
Subject: [PATCH] =?UTF-8?q?-=20Gr=C3=A0fics=20del=20barril=20i=20del=20yon?=
 =?UTF-8?q?ki?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/caixes.gif    | Bin 2455 -> 2930 bytes
 data/rooms/02.txt  |   4 +--
 data/rooms/04.txt  |  60 ++++++++++++++++++++++-----------------------
 data/rooms/05.txt  |   2 ++
 data/rooms/06.txt  |  35 ++++++++++++++++++++++++++
 data/templates.txt |  20 ++++++++++-----
 todo.txt           |   6 ++---
 7 files changed, 86 insertions(+), 41 deletions(-)
 create mode 100644 data/rooms/06.txt

diff --git a/data/caixes.gif b/data/caixes.gif
index b0919caa3bddfabf4c98691317fe9a8250507106..2ddbcf4beaaa880ac94c56ed5d77e03df4b9e9d5 100644
GIT binary patch
delta 1400
zcmV-;1&8{V6Y>_Y3<iJYxKIuJ=%FuQnnN<#wJuqC(Lo%-rZ$O`O;=pA2y<A~G`%v0
zE@(3m+_};rFEOFXT?s#BECi{>$*nJ<3Mr-7=8F85zTipjA2=vs0O@Hfd*PEDj}cxv
zqA@uJ0#jjHAgBxiR!y<A&^-F_4TnOR!50PpRGzD82Y+a(pD2Gq>xrJ^5G$RjLPBr{
zgZ^Zvu{KGmiJJ6+;Zma=;aM`B(&426)f<?M#7qBitfT&!=MupvvTv!=c5(oXfnGX5
z;XJjcMA}92sJ2mJDYciR$X@fp@-*iNkRz`+D<TSbpp;H%ptHN$`<MjR5(MA_V6)p@
zrMENopw%>5>uY}|rFf;`*vx6rR9a<v$sWp$m3=HiU7m1;z(RsY4Q~ypr92i@-g#A=
zA~*tGNBe;p`r-ql-K*$u*B&8R5K?Keijt6EID{^hXX|58>)?un)Z(>rqTTCn$wwj9
zElDQvDQ*vI!UVOtEuNd>Su~VGyX}!cwg045tpk~m-QR!ywvE~lr1DIqr=<K2OHFF&
zB@-*%xxiL=#3O-sg*&`2_%^tRiQPdI>zcf3Bx@0a%v|60mIvi&gw`DaYJ<CA`l5Eh
zsl9827p!01BKJc4%}?qecolGPkbfbX$(nZL8R&}kz6_QyeN)`v7)|y_FTQMylN!Aa
z_iu_Io?CzCVCy`#lz_Akp0I==%-|r8767fvQ)oK}pe2tO3Qp$na{OqaqcV?kkttne
zIvii|Ot`_mMe&1EoSGNA&CF#kQfwa;CGvtcYkcHy?QR$*1P@8RD)#PtgN)rhr<O^e
z1N7i_8)!oRx5nUst}AN`D)XeI&Lt-Q#EPRp<Vt@Jx3}8OFxM`uVY+&Fx0XRAI-m>Z
z?txE@S|l<0x|LlA8~N2MCNhlGEMr>JxYK*_;*&LMMjV3>XU^+#Xd~?46N7ousYNoA
zU!&|NyCKTCZnl))N@I&|$<d@1ka9C)XV)os%zjpFk+C~uyw(~*=WbD&BfIVkp=y7`
z#DaedEoxN1s3|;SF7_D2jM^wKrO-0VilGG_@Mi-!Mo-Wqrxe=S6&(B6eeUyhD~w@I
zZ+gQQ_w>6Pi^ro~8)Z1Hhzly++u?>eNwc;vk3a3Fl$Yn=6ioPfF-hEPI~?4UE_Vu&
z++=A-o9E01`pcW8+@hYf<KZN((f>t|Z!mxNdj+>PCdmAB-S^%T$yTRhc9Lg2T&5-n
zEtW70{(Y~i=Z3MEKs#94wv~JavR$!ML6Gx8+fvp2ICqD7-mP6mq)YVgfDgRj2T%CI
z8~*T!PrTw6&-lhW{_&8HJV8$?`O544RuQ$l=CQu=v~M2roqyEl8z1#kU48V0U-^G$
zp^SRNQ`dINX?^Nx-EwBjKJb(Y{jyJg`^nRu%{}k^-)S6h>Ixt5r3W>xjxW)6Q%XC`
zZ@z(_4=UbAA78nl{=ctJPZ1Xpc(&*MG1aqe<V-~T)AWw+m5lym;!Q*Tv3~oh^?vHJ
ze*WV>v;E7Cf9$6_+Wpsk$>(|R0XTnr#FBXh=z0j4fDG7x4)}l&7=aQvffQJQ7I=Xe
zn1LF&fgIR@9{7PE7=j`=f+SdiCU}A<n1U*}f-KmAF8G2l7=to6gEUx!Hh6<Ln1edF
zgPFyH!Ndzb_)4-9gbOEEM7UXqb%aQTF>x1zgo9N+_=If3gF>@4HfMvM!-R0E6NPRR
zHEy+o>J?%um4hUrH>bgcSL0V_NQDCe5KE_mUGp|?n1XQ_FhN*{FLQ@4V~1!+5q!vo
z&GCm|xQBVzhwC7SI_QQ;c!xX^I7)a`hU7Po2#I8*Ig?0<zjKL52!xv0FQ(LqDDy5M
G002AcrMjH}

delta 922
zcmV;L17-a37MByS3<iHPmpQF<G4q+s3>P$~DK4@(lbYCU2g0(+%|!(4n%%@Ee`u+n
zC_*co#2{w<YGtb@84{f6ECw$ubt_WQ^MHu(TRb^QH4e3IoGIX3_L_IEeKI0tKTO?2
z0QLc}*)0GKHE1y3mau#<DS#!wjJnRV2Z{dwilRn~j7%z1uZDk`^aC^W#Rp6Z(Smvu
zWjt%innt=%5+H%44XxY}aEgSNCNHKD$`kFjXVaXXw53rI!%>ZjDxcOMb9U<-i_kHW
z5-^penbZPLA?j3F=_X(zt;|(YIf9k$6rxu}t68zS)}4N!t4|#pSZA`P9eJjVB5-R<
zbGlcw_VuhsZ7P3U@0S&X_T)i%8X-~3s@9dVwXsM&sbft#*hM8ur`nM!qwY$Gzd9DM
zer2m!`&wC~z)oqP65tKPq}U;mV5xfD>t~I6Rmzt3XqUW_^5o#TdJ;-SMMY{9+Dcr$
z-n6B+#jUlNH$^%mR(FXAEKVm&UE=EXt^dhwTW(cLu-<<T&w0cPE?>7gS<sFbx!Ju-
z_w>j}sDTK5-70Twg)7_0Ha5LnaiLh!p|_`L?z4S0?r=T3Qv5!Fy|Y6dTUIby>7F&T
zZZ+`twuH&{Rm26>jctIjE8zog7pA4eD~4w~;K_D)35xvbSb6!{2Gf?qC+?N;aG9DQ
zj5fkCJ}7^S2Np{em^jBk4ziGkOynXP`N&94vXYm~<R%08oKEKEg0v9jXZlvCf~|74
zAf=%!YnfU8p%fs#94#(i6hLHliE@@gEX$->n?({Ua^8#$%9weVP@pq0kaOoSds)wS
z2=hPNY)n9Vv(H!Vg`vF(9x=1%&x^kQ0$m+VK}df`x(c~*G@CDthe=Pl&6ei$5Y$5<
zP)|hEXz<RR_k!wFW9d|OZndi?MQJz4I@NBgwM%bph15_w)V!ubqUi$cVE39>R5rGn
zldbG#JNwztj<&R?P3>x1``Xyfwzjv;?QVPf+u#njxW`TIa+~|y=uWq~*Uj#ByZhbn
zj<<ij=S}Z=!?DNh_MW}tCcAongWiP0H@69=PjeHzpW#0E)eH{R5Q#Y9Uya%!A<iC&
zOL5#PG^`!TO(MOWrrbQLTP7GjFM#ZL+Fg6w$)%n0fRUUcE(iI`V$SiIzwG7fpgG2E
w-W;5Z?B*cPS;|+AavlXv-Jx0dyA%~tvUw6ax8DHwqvoPs<9!$6T_FGfJJN^L4gdfE

diff --git a/data/rooms/02.txt b/data/rooms/02.txt
index d5d73f1..74d754e 100644
--- a/data/rooms/02.txt
+++ b/data/rooms/02.txt
@@ -12,9 +12,9 @@ exit-yp: 4
 exit-zp: 0
 
 actor{
-    name: BOX
+    name: BARREL
     bmp: caixes.gif
-    bmp-rect: 32 0 32 32
+    bmp-rect: 96 64 32 32
     bmp-offset: 0 32
     pos: 32 32 0
     size: 8 8 8
diff --git a/data/rooms/04.txt b/data/rooms/04.txt
index 6989325..bde0443 100644
--- a/data/rooms/04.txt
+++ b/data/rooms/04.txt
@@ -19,26 +19,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX02
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 16 0 0
-    size: 8 8 8
-    movement: CW
-}
-
-actor{
-    name: BOX03
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 24 0 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX20
     bmp: caixes.gif
@@ -109,6 +89,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX02
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 16 0 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX15
     bmp: caixes.gif
@@ -119,6 +109,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX03
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 24 0 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX16
     bmp: caixes.gif
@@ -189,6 +189,16 @@ actor{
     movement: CW
 }
 
+actor{
+    name: BOX18
+    bmp: caixes.gif
+    bmp-rect: 64 64 32 32
+    bmp-offset: 0 32
+    pos: 40 56 0
+    size: 8 8 8
+    movement: CW
+}
+
 actor{
     name: BOX08
     bmp: caixes.gif
@@ -229,16 +239,6 @@ actor{
     movement: CW
 }
 
-actor{
-    name: BOX18
-    bmp: caixes.gif
-    bmp-rect: 64 64 32 32
-    bmp-offset: 0 32
-    pos: 40 56 0
-    size: 8 8 8
-    movement: CW
-}
-
 actor{
     name: BOX23
     bmp: caixes.gif
diff --git a/data/rooms/05.txt b/data/rooms/05.txt
index c765d43..721933c 100644
--- a/data/rooms/05.txt
+++ b/data/rooms/05.txt
@@ -1,9 +1,11 @@
 width: 2
 height: 2
+door-height-xp: 0
 door-height-xn: 0
 color: YELLOW
 floor-texture: 8
 wall-texture: 8
 door-texture: 5
 under-door-texture: 0
+exit-xp: 6
 exit-xn: 0
diff --git a/data/rooms/06.txt b/data/rooms/06.txt
new file mode 100644
index 0000000..7a2b159
--- /dev/null
+++ b/data/rooms/06.txt
@@ -0,0 +1,35 @@
+width: 3
+height: 3
+door-height-xn: 0
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-xn: 5
+
+actor{
+    name: YONKI
+    bmp: caixes.gif
+    bmp-rect: 168 64 19 32
+    bmp-offset: -7 37
+    pos: 18 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE GRAVITY 
+    movement: CW
+}
+
+actor{
+    name: BARREL
+    bmp: caixes.gif
+    bmp-rect: 96 64 18 32
+    bmp-offset: -7 37
+    pos: 25 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE ANIMATED GRAVITY 
+    movement: CW
+}
diff --git a/data/templates.txt b/data/templates.txt
index 0f720e1..3730407 100644
--- a/data/templates.txt
+++ b/data/templates.txt
@@ -1,3 +1,4 @@
+
 actor{
     name: BOX
     bmp: test.gif
@@ -5,11 +6,18 @@ actor{
     bmp-offset: 0 32
     pos: 32 32 8
     size: 8 8 8
-    orient: NONE
     movement: CW
-    anim-cycle: WALK
-    anim-wait: 0
-    flags: PUSH GRAV
-    react-mask: NONE
-    react-push: NONE
+}
+
+actor{
+    name: BARREL
+    bmp: caixes.gif
+    bmp-rect: 96 64 18 32
+    bmp-offset: -7 37
+    pos: 25 9 0
+    size: 6 6 12
+    anim-cycle: SEQ
+    anim-wait: 1
+    flags: PUSHABLE ANIMATED GRAVITY 
+    movement: CW
 }
diff --git a/todo.txt b/todo.txt
index 8c42367..ec9028f 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,9 +1,9 @@
 x Gràfics per a la roomba
-- Fer la roomba mes xicoteta
+x Fer la roomba mes xicoteta
 x Més gràfics de caixes
 x Gràfics de piso, per a quan no hi ha piso
-- Gràfics de barril, en foc
-- Gràfics de yonki
+x Gràfics de barril, en foc
+x Gràfics de yonki
 x Gràfics de tele
 x Gràfics de armari
 x Gràfics de taula