From c37ca60235c46ed442e2e802724b8c9c2a311901 Mon Sep 17 00:00:00 2001
From: Raimon Zamora <jaildoctor@gmail.com>
Date: Tue, 9 Jul 2024 10:52:24 +0200
Subject: [PATCH] =?UTF-8?q?-=20[NEW]=20Gr=C3=A0fics=20de=20llit=20i=20sof?=
 =?UTF-8?q?=C3=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 data/altres.gif    | Bin 0 -> 2080 bytes
 data/gifs.txt      |   1 +
 data/rooms/06.txt  |  81 ++++++++++++++++++++++++---------------------
 data/templates.txt |  20 +++++++++++
 todo.txt           |  10 +++---
 5 files changed, 70 insertions(+), 42 deletions(-)
 create mode 100644 data/altres.gif

diff --git a/data/altres.gif b/data/altres.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2816e689cba38779bbc90c5668d16ebb64ecd5e5
GIT binary patch
literal 2080
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
AqW}N^

literal 0
HcmV?d00001

diff --git a/data/gifs.txt b/data/gifs.txt
index 285767b..7676400 100644
--- a/data/gifs.txt
+++ b/data/gifs.txt
@@ -1,4 +1,5 @@
 abad.gif
+altres.gif
 caixes.gif
 doors.gif
 floor.gif
diff --git a/data/rooms/06.txt b/data/rooms/06.txt
index 26b4cf3..0877039 100644
--- a/data/rooms/06.txt
+++ b/data/rooms/06.txt
@@ -10,15 +10,22 @@ exit-xn: 5
 exit-zp: 7
 
 actor{
-    name: B1-00
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
+    name: SOFA
+    bmp: altres.gif
+    bmp-rect: 0 0 48 40
+    bmp-offset: 0 32
     pos: 0 0 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
+    size: 16 8 6
+    movement: CW
+}
+
+actor{
+    name: LLIT
+    bmp: altres.gif
+    bmp-rect: 48 0 57 47
+    bmp-offset: 12 33
+    pos: 16 0 0
+    size: 16 16 6
     movement: CW
 }
 
@@ -35,24 +42,11 @@ actor{
 }
 
 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: B2-01
+    name: B4-02
     bmp: objectes.gif
     bmp-rect: 114 78 15 18
     bmp-offset: -8 22
-    pos: 16 32 0
+    pos: 0 40 0
     size: 4 4 4
     anim-cycle: SEQ
     anim-wait: 2
@@ -60,12 +54,38 @@ actor{
     movement: CW
 }
 
+actor{
+    name: B1-00
+    bmp: objectes.gif
+    bmp-rect: 114 78 15 18
+    bmp-offset: -8 22
+    pos: 0 48 0
+    size: 4 4 4
+    anim-cycle: SEQ
+    anim-wait: 2
+    flags: ANIMATED SPECIAL 
+    movement: CW
+}
+
+actor{
+    name: YONKI
+    bmp: caixes.gif
+    bmp-rect: 168 64 19 32
+    bmp-offset: -7 37
+    pos: 18 56 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
+    pos: 25 57 0
     size: 6 6 12
     anim-cycle: SEQ
     anim-wait: 1
@@ -92,16 +112,3 @@ actor{
     size: 8 8 8
     movement: CW
 }
-
-actor{
-    name: B4-02
-    bmp: objectes.gif
-    bmp-rect: 114 78 15 18
-    bmp-offset: -8 22
-    pos: 0 40 0
-    size: 4 4 4
-    anim-cycle: SEQ
-    anim-wait: 2
-    flags: ANIMATED SPECIAL 
-    movement: CW
-}
diff --git a/data/templates.txt b/data/templates.txt
index 891bb87..8dbced7 100644
--- a/data/templates.txt
+++ b/data/templates.txt
@@ -157,3 +157,23 @@ actor{
     flags: SPECIAL 
     movement: CW
 }
+
+actor{
+    name: SOFA
+    bmp: altres.gif
+    bmp-rect: 0 0 48 40
+    bmp-offset: 0 32
+    pos: 0 0 0
+    size: 16 8 6
+    movement: CW
+}
+
+actor{
+    name: LLIT
+    bmp: altres.gif
+    bmp-rect: 48 0 57 47
+    bmp-offset: 12 33
+    pos: 16 0 0
+    size: 16 16 6
+    movement: CW
+}
diff --git a/todo.txt b/todo.txt
index 88bb52f..54d5fb1 100644
--- a/todo.txt
+++ b/todo.txt
@@ -12,9 +12,9 @@ x Gràfics de conveyor belt
 x Gràfics de consoles i comps
 x Gràfics de nevera
 x Gràfics de bancada de cuina
-- Gràfics de sofà?
+x Gràfics de sofà
 - Gràfics de Plantes, arbres...
-- Gràfics de llit
+x Gràfics de llit
 - Gràfics de lampara
 - Grafics de mancuerna
 - Gràfics de recreativa
@@ -46,8 +46,8 @@ x Implementar eixides per baix
 x Implementar pickar objectes
 x Implementar inventari
 
-- Menus
-    - Molt bàsics, com els del Batman de Spectrum
-    - Menu intern del joc mostrarà peces que duguem recollides de l'excavadora
+x Menus
+    x Molt bàsics, com els del Batman de Spectrum
+    x Menu intern del joc mostrarà peces que duguem recollides de l'excavadora
 
 - Intros??