[adonthell-wastesedge-commits] Release_0-3-1 39a6545 170/237: Fixed gate and added Kitchen's furnitures

[Kai Sterker]

tag: Release_0-3-1
commit 39a6545300550e1338146f80f9eaa4518b85cc57
Author: adondev <adondev>
Commit: adondev <adondev>

    Fixed gate and added Kitchen's furnitures
---
 gfx/mapobjects/exteriors/gate-fore.mobj             |  Bin 2915 -> 2919 bytes
 gfx/mapobjects/furnitures/Makefile.am               |    3 ++-
 gfx/mapobjects/furnitures/kitchen_smoke.mobj        |  Bin 0 -> 5125 bytes
 gfx/mapobjects/furnitures/kitchen_smoke_top.mobj    |  Bin 0 -> 1228 bytes
 gfx/mapobjects/furnitures/oven_flame.mobj           |  Bin 0 -> 1093 bytes
 gfx/mapobjects/walls/Makefile.am                    |    3 ++-
 gfx/mapobjects/walls/gate_back_wall.mobj            |  Bin 0 -> 1467 bytes
 maps/test.map                                       |  Bin 2987 -> 3048 bytes
 scripts/schedules/mapcharacters/intro.py            |    2 +-
 scripts/schedules/mapcharacters/keyboard_control.py |    2 +-
 10 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gfx/mapobjects/exteriors/gate-fore.mobj 
b/gfx/mapobjects/exteriors/gate-fore.mobj
index 186f611..ea8615b 100755
Binary files a/gfx/mapobjects/exteriors/gate-fore.mobj and 
b/gfx/mapobjects/exteriors/gate-fore.mobj differ
diff --git a/gfx/mapobjects/furnitures/Makefile.am 
b/gfx/mapobjects/furnitures/Makefile.am
index 9568581..e817d2c 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -10,6 +10,7 @@ pkgdata_DATA = bar.mobj barrel_wooden_with-tap.mobj 
clock.mobj cupboard.mobj ove
        silverhair_basin.mobj silverhair_chest.mobj stone_bed.mobj stone_v.mobj 
\
        crate.mobj barrel_wooden.mobj crate2.mobj barrel_wooden2.mobj 
dwarf_chest.mobj \
        normal-cupboard.mobj chest-wooden.mobj silverhair_rug-1.mobj 
silverhair_rug-2.mobj \
-       silverhair_rug-3.mobj silverhair_rug-4.mobj stove.mobj 
barn_loft_clutter.mobj
+       silverhair_rug-3.mobj silverhair_rug-4.mobj stove.mobj 
barn_loft_clutter.mobj \
+       oven_flame.mobj kitchen_smoke.mobj kitchen_smoke_top.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/kitchen_smoke.mobj 
b/gfx/mapobjects/furnitures/kitchen_smoke.mobj
new file mode 100644
index 0000000..c2dbe31
Binary files /dev/null and b/gfx/mapobjects/furnitures/kitchen_smoke.mobj differ
diff --git a/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj 
b/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj
new file mode 100644
index 0000000..9c98722
Binary files /dev/null and b/gfx/mapobjects/furnitures/kitchen_smoke_top.mobj 
differ
diff --git a/gfx/mapobjects/furnitures/oven_flame.mobj 
b/gfx/mapobjects/furnitures/oven_flame.mobj
new file mode 100644
index 0000000..28425f0
Binary files /dev/null and b/gfx/mapobjects/furnitures/oven_flame.mobj differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 81a4608..4abd6a4 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -5,6 +5,7 @@ pkgdatadir = $(gamedatadir)/gfx/mapobjects/walls
 pkgdata_DATA = painting1.mobj painting2.mobj painting3.mobj \
        window_right.mobj window_left.mobj window_front.mobj \
        window_round_front.mobj window_back.mobj barn_back.mobj \
-       barn_loft_main.mobj barn_loft_main_top.mobj barn_ground_back_top.mobj
+       barn_loft_main.mobj barn_loft_main_top.mobj \
+       barn_ground_back_top.mobj gate_back_wall.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/gate_back_wall.mobj 
b/gfx/mapobjects/walls/gate_back_wall.mobj
new file mode 100644
index 0000000..030edc0
Binary files /dev/null and b/gfx/mapobjects/walls/gate_back_wall.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 3394ae3..e354366 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/schedules/mapcharacters/intro.py 
b/scripts/schedules/mapcharacters/intro.py
index 385966e..9915267 100644
--- a/scripts/schedules/mapcharacters/intro.py
+++ b/scripts/schedules/mapcharacters/intro.py
@@ -85,7 +85,7 @@ class intro:
 
             # Update squares walkability
             sm = adonthell.gamedata_engine ().get_landmap ().get_submap (0)
-            sm.get_square (6, 17).set_walkable_south (1)
+            sm.get_square (6, 17).set_walkable (0)
             sm.get_square (7, 17).set_walkable_south (1)
             sm.get_square (6, 18).set_walkable_west (0)
             sm.get_square (6, 19).set_walkable_west (0)
diff --git a/scripts/schedules/mapcharacters/keyboard_control.py 
b/scripts/schedules/mapcharacters/keyboard_control.py
index 9be1a2d..65bd46b 100755
--- a/scripts/schedules/mapcharacters/keyboard_control.py
+++ b/scripts/schedules/mapcharacters/keyboard_control.py
@@ -54,7 +54,7 @@ class keyboard_control:
 
             # Update squares walkability
             sm = gamedata_engine ().get_landmap ().get_submap (0)
-            sm.get_square (6, 17).set_walkable_south (1)
+            sm.get_square (6, 17).set_walkable (0)
             sm.get_square (7, 17).set_walkable_south (1)
             sm.get_square (6, 18).set_walkable_west (0)
             sm.get_square (6, 19).set_walkable_west (0)