From 100497a54b913aa22d758c1f712b659d21943a70 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Sat, 28 Sep 2024 14:17:32 +0200
Subject: [PATCH] =?UTF-8?q?-=20Zona=205=20acabada=20-=20M=C3=A9s=20gr?=
 =?UTF-8?q?=C3=A0fics?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/gifs.txt        |   1 +
 data/gifs_editor.txt |   1 +
 data/lordabad.gif    | Bin 0 -> 377 bytes
 data/rooms/41.txt    |  96 +++++++++++++++++++++++++++++++++----------
 data/rooms/42.txt    |  41 +++++++++++++++---
 data/rooms/43.txt    |  48 +++++++++++++++++++---
 data/rooms/47.txt    |   8 ++++
 7 files changed, 164 insertions(+), 31 deletions(-)
 create mode 100644 data/lordabad.gif
 create mode 100644 data/rooms/47.txt

diff --git a/data/gifs.txt b/data/gifs.txt
index 51a5656..5ee760f 100644
--- a/data/gifs.txt
+++ b/data/gifs.txt
@@ -9,6 +9,7 @@ font2.gif
 gat.gif
 gat2.gif
 jailgames.gif
+lordabad.gif
 mapa.gif
 objectes.gif
 obrer.gif
diff --git a/data/gifs_editor.txt b/data/gifs_editor.txt
index 9dd1c28..72f4bff 100644
--- a/data/gifs_editor.txt
+++ b/data/gifs_editor.txt
@@ -4,6 +4,7 @@ altres.gif
 caixes.gif
 gat.gif
 gat2.gif
+lordabad.gif
 objectes.gif
 obrer.gif
 piscina.gif
diff --git a/data/lordabad.gif b/data/lordabad.gif
new file mode 100644
index 0000000000000000000000000000000000000000..e84ee5f79def3df8004607788e5e8565067084ab
GIT binary patch
literal 377
zcmV-<0fzoZNk%v~VLSjK0FeLy{{a90|Nj6000000A^8Le3IG5AEC2ui06YL800092
zgbyLh=%Sbu&Z!V(t#@Iy8BjNZA>?@&6$0t^u?Ts=CimL%(`C{5V*EIXm2c5PsYW}V
zu+}`JmaA4qGTdB+$k2A`RWeawU*u*HugJI{HhSEm4e`nRiq9VKSUvsy)U`K3m@-pH
zi1t-@vxo@s_m~(di4_@B8IYjjXnD3KsVT=d2D-#mItsWZYR75Xx(egzS^~R?I4gw9
zi0Q$b=nDy)<Eu%GqVtPfW4xDVyGsYHJ6zNkz5IEqHkgWPy*<`VX?yGadR}gWcNmJ1
z_I`|>3-3O~HBT>Rz3-}Dj**s3149)|v@9ONe)Lv_SqQM<l!yT*KCDF%nUai3i_Tnh
zco1Y8j2|b3G&xdWN<=3MwIp;<SQUjb=kTf-rO1~UT1;`uDePwp7u5u9$krf9(VPf`
X4wX`ZX$7ZGp-KgE^{7z<1poj$BfF;x

literal 0
HcmV?d00001

diff --git a/data/rooms/41.txt b/data/rooms/41.txt
index a1fcdb6..beb8d64 100644
--- a/data/rooms/41.txt
+++ b/data/rooms/41.txt
@@ -1,34 +1,88 @@
 width: 2
 height: 2
-door-height-xp: 0
-door-height-yp: 0
+door-height-xp: 5
+door-height-yp: 5
 color: CYAN
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
+floor-texture: 11
+wall-texture: 5
+door-texture: 5
 under-door-texture: 0
 exit-xp: 42
 exit-yp: 40
 
 actor{
-    name: BLOCMATA
-    bmp: altres.gif
-    bmp-rect: 0 133 32 27
-    bmp-offset: 0 27
-    pos: 24 8 0
-    size: 8 8 6
-    flags: REACTIVE DEADLY 
-    react-mask: XP XN YP YN ZP ZN 
-    movement: CW
-}
-
-actor{
-    name: PLATF
+    name: PLATH-00
     bmp: caixes.gif
-    bmp-rect: 96 160 32 32
+    bmp-rect: 160 128 32 32
     bmp-offset: 0 32
-    pos: 16 8 0
-    size: 8 8 8
+    pos: 26 34 10
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-00
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 48 32 16
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-01
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 16 16 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-01
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 36 28 12
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-02
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 48 24 16
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-03
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 32 48 16
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: PLATH-04
+    bmp: caixes.gif
+    bmp-rect: 160 128 32 32
+    bmp-offset: 0 32
+    pos: 24 48 16
+    size: 8 8 4
     orient: ZP 
     movement: Z
 }
diff --git a/data/rooms/42.txt b/data/rooms/42.txt
index 4b72b96..ec9c037 100644
--- a/data/rooms/42.txt
+++ b/data/rooms/42.txt
@@ -1,11 +1,42 @@
-width: 2
-height: 2
+width: 3
+height: 0
 door-height-xn: 0
 door-height-yp: 0
 color: GREEN
-floor-texture: 0
-wall-texture: 0
-door-texture: 0
+floor-texture: 7
+wall-texture: 5
+door-texture: 4
 under-door-texture: 0
 exit-xn: 41
 exit-yp: 43
+
+actor{
+    name: ARBUST-00
+    bmp: doors.gif
+    bmp-rect: 160 7 16 40
+    bmp-offset: -8 47
+    pos: 56 24 0
+    size: 6 6 14
+    movement: CW
+}
+
+actor{
+    name: ARBUST-01
+    bmp: doors.gif
+    bmp-rect: 160 7 16 40
+    bmp-offset: -8 47
+    pos: 56 32 0
+    size: 6 6 14
+    movement: CW
+}
+
+actor{
+    name: WC
+    bmp: altres.gif
+    bmp-rect: 105 0 21 33
+    bmp-offset: -4 36
+    pos: 40 24 0
+    size: 8 8 8
+    flags: PUSHABLE 
+    movement: CW
+}
diff --git a/data/rooms/43.txt b/data/rooms/43.txt
index 778bb96..8eb1ded 100644
--- a/data/rooms/43.txt
+++ b/data/rooms/43.txt
@@ -1,9 +1,47 @@
-width: 2
-height: 2
-door-height-yn: 0
+width: 3
+height: 3
+door-height-yn: 1
 color: WHITE
 floor-texture: 0
-wall-texture: 0
-door-texture: 0
+wall-texture: 15
+door-texture: 8
 under-door-texture: 0
 exit-yn: 42
+exit-zn: 47
+
+actor{
+    name: ABAD
+    bmp: lordabad.gif
+    bmp-rect: 0 0 20 33
+    bmp-offset: -6 38
+    pos: 2 28 4
+    size: 8 8 8
+    orient: XP 
+    anim-cycle: MIN
+    anim-wait: 1
+    flags: ANIMATED ORIENTABLE 
+    react-mask: XP XN YP YN ZP ZN 
+    movement: CCW
+}
+
+actor{
+    name: LIFT-00
+    bmp: caixes.gif
+    bmp-rect: 32 32 32 24
+    bmp-offset: 0 24
+    pos: 0 24 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
+
+actor{
+    name: LIFT-01
+    bmp: caixes.gif
+    bmp-rect: 32 32 32 24
+    bmp-offset: 0 24
+    pos: 0 32 0
+    size: 8 8 4
+    orient: ZP 
+    movement: Z
+}
diff --git a/data/rooms/47.txt b/data/rooms/47.txt
new file mode 100644
index 0000000..14a2fb8
--- /dev/null
+++ b/data/rooms/47.txt
@@ -0,0 +1,8 @@
+width: 2
+height: 2
+color: CYAN
+floor-texture: 0
+wall-texture: 0
+door-texture: 0
+under-door-texture: 0
+exit-zp: 43