[adonthell-wastesedge-commits] Release_0-3-1 8fdfd66 165/237: Added Barn interior

[Kai Sterker]

tag: Release_0-3-1
commit 8fdfd66c319545cf1506f008318aca33e7ea6f5a
Author: adondev <adondev>
Commit: adondev <adondev>

    Added Barn interior
---
 gfx/mapobjects/floorings/Makefile.am             |    3 +-
 gfx/mapobjects/floorings/barn_ground_inside.mobj |  Bin 0 -> 6943 bytes
 gfx/mapobjects/floorings/barn_loft_front.mobj    |  Bin 0 -> 3795 bytes
 gfx/mapobjects/floorings/barn_loft_main.mobj     |  Bin 0 -> 4705 bytes
 gfx/mapobjects/furnitures/Makefile.am            |    2 +-
 gfx/mapobjects/furnitures/barn_loft_clutter.mobj |  Bin 0 -> 10177 bytes
 gfx/mapobjects/stairs/Makefile.am                |    3 +-
 gfx/mapobjects/stairs/barn_ground-cellar.mobj    |  Bin 0 -> 1968 bytes
 gfx/mapobjects/stairs/barn_ground-loft.mobj      |  Bin 0 -> 2209 bytes
 gfx/mapobjects/stairs/barn_loft-ground.mobj      |  Bin 0 -> 1184 bytes
 gfx/mapobjects/stairs/barn_loft_ground.mobj      |  Bin 0 -> 48 bytes
 gfx/mapobjects/walls/Makefile.am                 |    3 +-
 gfx/mapobjects/walls/barn_back.mobj              |  Bin 0 -> 8464 bytes
 gfx/mapobjects/walls/barn_ground_back_top.mobj   |  Bin 0 -> 560 bytes
 gfx/mapobjects/walls/barn_loft_main.mobj         |  Bin 0 -> 4248 bytes
 gfx/mapobjects/walls/barn_loft_main_top.mobj     |  Bin 0 -> 619 bytes
 maps/test.map                                    |  Bin 2859 -> 2987 bytes
 scripts/init.py                                  |  168 +++++++++++++++++++---
 18 files changed, 157 insertions(+), 22 deletions(-)

diff --git a/gfx/mapobjects/floorings/Makefile.am 
b/gfx/mapobjects/floorings/Makefile.am
index 9d269cb..76e5853 100755
--- a/gfx/mapobjects/floorings/Makefile.am
+++ b/gfx/mapobjects/floorings/Makefile.am
@@ -5,6 +5,7 @@ pkgdata_DATA = woodenplanks.mobj bath-floor2b.mobj 
bath-floor2a.mobj \
        terracotta-tiles-2.mobj terracotta-tiles-3.mobj woodenplanks_2_1.mobj \
        woodenplanks_2_2.mobj terracotta-trans.mobj \
        woodenplanks_2_trans_1.mobj woodenplanks_2_trans_2.mobj 
woodenplanks_trans.mobj \
-       behind-window.mobj
+       behind-window.mobj barn_ground_inside.mobj barn_loft_main.mobj 
barn_loft_front.mobj \
+
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/floorings/barn_ground_inside.mobj 
b/gfx/mapobjects/floorings/barn_ground_inside.mobj
new file mode 100644
index 0000000..b1610f2
Binary files /dev/null and b/gfx/mapobjects/floorings/barn_ground_inside.mobj 
differ
diff --git a/gfx/mapobjects/floorings/barn_loft_front.mobj 
b/gfx/mapobjects/floorings/barn_loft_front.mobj
new file mode 100644
index 0000000..bde51ba
Binary files /dev/null and b/gfx/mapobjects/floorings/barn_loft_front.mobj 
differ
diff --git a/gfx/mapobjects/floorings/barn_loft_main.mobj 
b/gfx/mapobjects/floorings/barn_loft_main.mobj
new file mode 100644
index 0000000..b38efdf
Binary files /dev/null and b/gfx/mapobjects/floorings/barn_loft_main.mobj differ
diff --git a/gfx/mapobjects/furnitures/Makefile.am 
b/gfx/mapobjects/furnitures/Makefile.am
index 67321c1..9568581 100755
--- a/gfx/mapobjects/furnitures/Makefile.am
+++ b/gfx/mapobjects/furnitures/Makefile.am
@@ -10,6 +10,6 @@ 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
+       silverhair_rug-3.mobj silverhair_rug-4.mobj stove.mobj 
barn_loft_clutter.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/furnitures/barn_loft_clutter.mobj 
b/gfx/mapobjects/furnitures/barn_loft_clutter.mobj
new file mode 100644
index 0000000..83cbc4c
Binary files /dev/null and b/gfx/mapobjects/furnitures/barn_loft_clutter.mobj 
differ
diff --git a/gfx/mapobjects/stairs/Makefile.am 
b/gfx/mapobjects/stairs/Makefile.am
index 63f3f19..34a8a42 100755
--- a/gfx/mapobjects/stairs/Makefile.am
+++ b/gfx/mapobjects/stairs/Makefile.am
@@ -4,6 +4,7 @@ pkgdata_DATA = red-carpet_bl-tr.mobj red-carpet_br-tl.mobj \
        red-carpet_tr-bl.mobj red-carpet_tl-br.mobj \
        red-carpet-front_bl-tr.mobj red-carpet-front_back.mobj \
        red-carpet-front_br-tl.mobj red-carpet-front_tl-br.mobj \
-       red-carpet-front_tr-bl.mobj
+       red-carpet-front_tr-bl.mobj barn_ground-cellar.mobj \
+       barn_ground-loft.mobj barn_loft_ground.mobj barn_loft-ground.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/stairs/barn_ground-cellar.mobj 
b/gfx/mapobjects/stairs/barn_ground-cellar.mobj
new file mode 100644
index 0000000..072da74
Binary files /dev/null and b/gfx/mapobjects/stairs/barn_ground-cellar.mobj 
differ
diff --git a/gfx/mapobjects/stairs/barn_ground-loft.mobj 
b/gfx/mapobjects/stairs/barn_ground-loft.mobj
new file mode 100644
index 0000000..0a03d5c
Binary files /dev/null and b/gfx/mapobjects/stairs/barn_ground-loft.mobj differ
diff --git a/gfx/mapobjects/stairs/barn_loft-ground.mobj 
b/gfx/mapobjects/stairs/barn_loft-ground.mobj
new file mode 100644
index 0000000..413fce1
Binary files /dev/null and b/gfx/mapobjects/stairs/barn_loft-ground.mobj differ
diff --git a/gfx/mapobjects/stairs/barn_loft_ground.mobj 
b/gfx/mapobjects/stairs/barn_loft_ground.mobj
new file mode 100644
index 0000000..4813c97
Binary files /dev/null and b/gfx/mapobjects/stairs/barn_loft_ground.mobj differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 892c439..81a4608 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -4,6 +4,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
+       window_round_front.mobj window_back.mobj barn_back.mobj \
+       barn_loft_main.mobj barn_loft_main_top.mobj barn_ground_back_top.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/barn_back.mobj 
b/gfx/mapobjects/walls/barn_back.mobj
new file mode 100644
index 0000000..c26e411
Binary files /dev/null and b/gfx/mapobjects/walls/barn_back.mobj differ
diff --git a/gfx/mapobjects/walls/barn_ground_back_top.mobj 
b/gfx/mapobjects/walls/barn_ground_back_top.mobj
new file mode 100644
index 0000000..32d7f35
Binary files /dev/null and b/gfx/mapobjects/walls/barn_ground_back_top.mobj 
differ
diff --git a/gfx/mapobjects/walls/barn_loft_main.mobj 
b/gfx/mapobjects/walls/barn_loft_main.mobj
new file mode 100644
index 0000000..bf7019a
Binary files /dev/null and b/gfx/mapobjects/walls/barn_loft_main.mobj differ
diff --git a/gfx/mapobjects/walls/barn_loft_main_top.mobj 
b/gfx/mapobjects/walls/barn_loft_main_top.mobj
new file mode 100644
index 0000000..a9a41b3
Binary files /dev/null and b/gfx/mapobjects/walls/barn_loft_main_top.mobj differ
diff --git a/maps/test.map b/maps/test.map
index f2abe44..3394ae3 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/init.py b/scripts/init.py
index 06b4459..12a267c 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -621,24 +621,6 @@ class title_screen:
         ev.set_script ("teleport", (1, 9, 2, STAND_SOUTH))
         lm.add_event (ev)
 
-        # From cellar to barn
-        ev = enter_event ()
-        ev.thisown = C
-        ev.submap = 4
-        ev.x = 12
-        ev.y = 1
-        ev.set_script ("teleport", (0, 24, 11, STAND_SOUTH))
-        lm.add_event (ev)
-
-        # From barn to cellar
-        ev = enter_event ()
-        ev.thisown = C
-        ev.submap = 0
-        ev.x = 24
-        ev.y = 10
-        ev.set_script ("teleport", (4, 12, 2, STAND_SOUTH))
-        lm.add_event (ev)
-
         # From cellar to kitchen
         ev = enter_event ()
         ev.thisown = C
@@ -693,8 +675,158 @@ class title_screen:
         ev.set_script ("teleport", (18, 2, 8, STAND_EAST))
         lm.add_event (ev)
 
+#        # Make the barn disappear
+#        ev = enter_event ()
+#        ev.thisown = C
+#        ev.submap = 0
+#        ev.x = 24
+#        ev.y = 14
+#        ev.dir = WALK_EAST
+#        ev.set_script ("enter_barn")
+#        lm.add_event (ev)
+#        ev = enter_event ()
+#        ev.thisown = C
+#        ev.submap = 4
+#        ev.x = 12
+#        ev.y = 1
+#        ev.dir = WALK_NORTH
+#        ev.set_script ("enter_barn")
+#        lm.add_event (ev)
+
+#        # Make the barn appear
+#        ev = leave_event ()
+#        ev.thisown = C
+#        ev.submap = 0
+#        ev.x = 24
+#        ev.y = 14
+#        ev.dir = WALK_WEST
+#        ev.set_script ("enter_barn")
+#        lm.add_event (ev)
+#        ev = enter_event ()
+#        ev.thisown = C
+#        ev.submap = 0
+#        ev.x = 24
+#        ev.y = 9
+#        ev.dir = WALK_NORTH
+#        ev.set_script ("enter_barn")
+#        lm.add_event (ev)
+
+        # From barn ext. to barn int.
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 24
+        ev.y = 13
+        ev.set_script ("teleport", (20, 0, 6, STAND_NORTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 25
+        ev.y = 13
+        ev.set_script ("teleport", (20, 1, 6, STAND_NORTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 26
+        ev.y = 13
+        ev.set_script ("teleport", (20, 2, 6, STAND_NORTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 27
+        ev.y = 13
+        ev.set_script ("teleport", (20, 3, 6, STAND_NORTH))
+        lm.add_event (ev)
+
+        # From barn int. to barn ext.
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 0
+        ev.y = 7
+        ev.set_script ("teleport", (0, 24, 14, STAND_SOUTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 1
+        ev.y = 7
+        ev.set_script ("teleport", (0, 25, 14, STAND_SOUTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 2
+        ev.y = 7
+        ev.set_script ("teleport", (0, 26, 14, STAND_SOUTH))
+        lm.add_event (ev)
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 3
+        ev.y = 7
+        ev.set_script ("teleport", (0, 27, 14, STAND_SOUTH))
+        lm.add_event (ev)
+
+        # From cellar to barn
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 4
+        ev.x = 12
+        ev.y = 1
+        ev.set_script ("teleport", (20, 0, 3, STAND_SOUTH))
+        lm.add_event (ev)
+
+        # From barn to cellar
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 0
+        ev.y = 2
+        ev.set_script ("teleport", (4, 12, 2, STAND_SOUTH))
+        lm.add_event (ev)
+
+        # From barn to loft
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 20
+        ev.x = 2
+        ev.y = 2
+        ev.set_script ("teleport", (21, 1, 3, STAND_SOUTH))
+        lm.add_event (ev)
+
+        # From loft to barn
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 21
+        ev.x = 1
+        ev.y = 2
+        ev.set_script ("teleport", (20, 2, 3, STAND_SOUTH))
+        lm.add_event (ev)
+
+        # From loft to silverhair
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 21
+        ev.x = 0
+        ev.y = 7
+        ev.set_script ("teleport", (13, 6, 4, STAND_WEST))
+        lm.add_event (ev)
 
         # Action events
+        # From silverhair to loft
+        ev = action_event ()
+        ev.thisown = C
+        ev.submap = 13
+        ev.x = 6
+        ev.y = 4
+        ev.dir = STAND_EAST
+        ev.set_script ("teleport", (21, 1, 7, STAND_EAST))
+        lm.add_event (ev)
+
         # -- Common room
         ev = action_event ()
         ev.thisown = C