[adonthell-wastesedge-commits] Release_0-3-1 9d5c3db 072/237: Continued furniturizing

[Kai Sterker]

tag: Release_0-3-1
commit 9d5c3dbd82107ac498a5aee014b278c1c6855913
Author: adondev <adondev>
Commit: adondev <adondev>

    Continued furniturizing
---
 gfx/mapobjects/furnitures/Makefile.am      |    2 +-
 gfx/mapobjects/furnitures/dwarf_chest.mobj |  Bin 0 -> 1235 bytes
 gfx/mapobjects/furnitures/noble_bed.mobj   |  Bin 2896 -> 2894 bytes
 maps/test.map                              |  Bin 2273 -> 2321 bytes
 scripts/events/cellar_to_bath.py           |    4 ++--
 scripts/init.py                            |    4 ++--
 6 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/gfx/mapobjects/furnitures/Makefile.am 
b/gfx/mapobjects/furnitures/Makefile.am
index d86d459..7cc2144 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -8,6 +8,6 @@ pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj clock.mobj 
cupboard.mobj ove
        bed_wooden_h.mobj bed_wooden_v.mobj bed.mobj table_alchemy_h.mobj \
        draws_wooden.mobj noble_bed.mobj silverhair_cupboard.mobj \
        silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj 
\
-       crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj
+       crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj 
dwarf_chest.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/dwarf_chest.mobj 
b/gfx/mapobjects/furnitures/dwarf_chest.mobj
new file mode 100644
index 0000000..40283ed
Binary files /dev/null and b/gfx/mapobjects/furnitures/dwarf_chest.mobj differ
diff --git a/gfx/mapobjects/furnitures/noble_bed.mobj 
b/gfx/mapobjects/furnitures/noble_bed.mobj
index c7b13c3..12f10fc 100644
Binary files a/gfx/mapobjects/furnitures/noble_bed.mobj and 
b/gfx/mapobjects/furnitures/noble_bed.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 295c578..f6fd51f 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/cellar_to_bath.py b/scripts/events/cellar_to_bath.py
index c76585a..e77f371 100755
--- a/scripts/events/cellar_to_bath.py
+++ b/scripts/events/cellar_to_bath.py
@@ -1,7 +1,7 @@
 p = characters [name]
 
 if p.submap () == 4:
-  events.switch_submap (p, 5, 3, 6, STAND_NORTH)
+  events.switch_submap (p, 5, 4, 6, STAND_NORTH)
 else:
-  events.switch_submap (p, 4, 2, 6, STAND_SOUTH)
+  events.switch_submap (p, 4, 3, 6, STAND_SOUTH)
 
diff --git a/scripts/init.py b/scripts/init.py
index c2c75b1..2bf463b 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -249,7 +249,7 @@ if retval < 5:
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 4
-        ev.x = 2
+        ev.x = 3
         ev.y = 5
         ev.set_script ("cellar_to_bath")
         lm.add_event (ev)
@@ -257,7 +257,7 @@ if retval < 5:
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 5
-        ev.x = 3
+        ev.x = 4
         ev.y = 7
         ev.set_script ("cellar_to_bath")
         lm.add_event (ev)