[adonthell-wastesedge-commits] Release_0-3-1 5b397b2 207/237: Varanda is now walkable

[Kai Sterker]

tag: Release_0-3-1
commit 5b397b28c9ea2ace2617cf73b7c51df672659666
Author: adondev <adondev>
Commit: adondev <adondev>

    Varanda is now walkable
---
 gfx/mapobjects/houses/redwyne-inn/Makefile.am      |    5 +-
 .../houses/redwyne-inn/inn_mainwing_left_bot.mobj  |  Bin 0 -> 2551 bytes
 .../houses/redwyne-inn/inn_mainwing_left_top.mobj  |  Bin 0 -> 4434 bytes
 .../houses/redwyne-inn/inn_mainwing_mid_bot.mobj   |  Bin 0 -> 2443 bytes
 .../houses/redwyne-inn/inn_mainwing_mid_top.mobj   |  Bin 0 -> 4253 bytes
 .../houses/redwyne-inn/inn_mainwing_right_bot.mobj |  Bin 0 -> 1739 bytes
 .../houses/redwyne-inn/inn_mainwing_right_top.mobj |  Bin 0 -> 6858 bytes
 gfx/mapobjects/stairs/Makefile.am                  |    2 +-
 gfx/mapobjects/stairs/barn_loft-ground.mobj        |  Bin 1184 -> 1183 bytes
 gfx/mapobjects/stairs/barn_loft_ground.mobj        |  Bin 48 -> 0 bytes
 gfx/mapobjects/walls/Makefile.am                   |    4 +-
 gfx/mapobjects/walls/barn_left.mobj                |  Bin 0 -> 301 bytes
 gfx/mapobjects/walls/barn_left_back.mobj           |  Bin 0 -> 162 bytes
 gfx/mapobjects/walls/barn_left_front.mobj          |  Bin 0 -> 304 bytes
 gfx/mapobjects/walls/barn_right.mobj               |  Bin 0 -> 305 bytes
 gfx/mapobjects/walls/barn_right_back.mobj          |  Bin 0 -> 164 bytes
 gfx/mapobjects/walls/barn_right_front.mobj         |  Bin 0 -> 309 bytes
 maps/test.map                                      |  Bin 3102 -> 3196 bytes
 scripts/init.py                                    |  101 ++++++++++----------
 19 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/gfx/mapobjects/houses/redwyne-inn/Makefile.am 
b/gfx/mapobjects/houses/redwyne-inn/Makefile.am
index 776dbc0..aec2c70 100755
--- a/gfx/mapobjects/houses/redwyne-inn/Makefile.am
+++ b/gfx/mapobjects/houses/redwyne-inn/Makefile.am
@@ -1,8 +1,9 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/houses/redwyne-inn
 
 pkgdata_DATA = barn.mobj barnroof.mobj entrance.mobj entrance-top-fore.mobj \
-       entrance-top.mobj gatepost.mobj inn_leftwing.mobj 
inn_mainwing_left.mobj \
-       inn_mainwing_mid.mobj inn_mainwing_right.mobj \
+       entrance-top.mobj gatepost.mobj inn_leftwing.mobj 
inn_mainwing_left_bot.mobj \
+       inn_mainwing_left_top.mobj inn_mainwing_mid_bot.mobj 
inn_mainwing_mid_top.mobj \
+       inn_mainwing_right_top.mobj inn_mainwing_right_bot.mobj \
        mainleft-top.mobj main-ltop.mobj inn_door.mobj \
        mainright-top.mobj inn_mainwing_roof.mobj main-rtop.mobj 
guardhouse_entrance.mobj \
        guardhouse_main.mobj
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_bot.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_bot.mobj
new file mode 100644
index 0000000..66067e3
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_bot.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_top.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_top.mobj
new file mode 100644
index 0000000..360752a
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_left_top.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_bot.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_bot.mobj
new file mode 100644
index 0000000..c16454b
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_bot.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_top.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_top.mobj
new file mode 100644
index 0000000..768b732
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_mid_top.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_bot.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_bot.mobj
new file mode 100644
index 0000000..1ff883d
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_bot.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_top.mobj 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_top.mobj
new file mode 100644
index 0000000..853eaab
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/inn_mainwing_right_top.mobj differ
diff --git a/gfx/mapobjects/stairs/Makefile.am 
b/gfx/mapobjects/stairs/Makefile.am
index 34a8a42..5b84728 100755
--- a/gfx/mapobjects/stairs/Makefile.am
+++ b/gfx/mapobjects/stairs/Makefile.am
@@ -5,6 +5,6 @@ pkgdata_DATA = red-carpet_bl-tr.mobj red-carpet_br-tl.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 barn_ground-cellar.mobj \
-       barn_ground-loft.mobj barn_loft_ground.mobj barn_loft-ground.mobj
+       barn_ground-loft.mobj barn_loft-ground.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/stairs/barn_loft-ground.mobj 
b/gfx/mapobjects/stairs/barn_loft-ground.mobj
index 413fce1..aa8e9d8 100644
Binary files a/gfx/mapobjects/stairs/barn_loft-ground.mobj 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
deleted file mode 100644
index 4813c97..0000000
Binary files a/gfx/mapobjects/stairs/barn_loft_ground.mobj and /dev/null differ
diff --git a/gfx/mapobjects/walls/Makefile.am b/gfx/mapobjects/walls/Makefile.am
index 0c296c7..0d61189 100755
--- a/gfx/mapobjects/walls/Makefile.am
+++ b/gfx/mapobjects/walls/Makefile.am
@@ -6,6 +6,8 @@ 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_loft_main_front.mobj \
-       barn_ground_back_top.mobj gate_back_wall.mobj
+       barn_ground_back_top.mobj gate_back_wall.mobj barn_left.mobj 
barn_right.mobj \
+       barn_left_back.mobj barn_right_back.mobj barn_left_front.mobj \
+       barn_right_front.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/walls/barn_left.mobj 
b/gfx/mapobjects/walls/barn_left.mobj
new file mode 100644
index 0000000..e4dd20f
Binary files /dev/null and b/gfx/mapobjects/walls/barn_left.mobj differ
diff --git a/gfx/mapobjects/walls/barn_left_back.mobj 
b/gfx/mapobjects/walls/barn_left_back.mobj
new file mode 100644
index 0000000..cc01b6b
Binary files /dev/null and b/gfx/mapobjects/walls/barn_left_back.mobj differ
diff --git a/gfx/mapobjects/walls/barn_left_front.mobj 
b/gfx/mapobjects/walls/barn_left_front.mobj
new file mode 100644
index 0000000..057efd8
Binary files /dev/null and b/gfx/mapobjects/walls/barn_left_front.mobj differ
diff --git a/gfx/mapobjects/walls/barn_right.mobj 
b/gfx/mapobjects/walls/barn_right.mobj
new file mode 100644
index 0000000..c37cdb3
Binary files /dev/null and b/gfx/mapobjects/walls/barn_right.mobj differ
diff --git a/gfx/mapobjects/walls/barn_right_back.mobj 
b/gfx/mapobjects/walls/barn_right_back.mobj
new file mode 100644
index 0000000..af6c2cc
Binary files /dev/null and b/gfx/mapobjects/walls/barn_right_back.mobj differ
diff --git a/gfx/mapobjects/walls/barn_right_front.mobj 
b/gfx/mapobjects/walls/barn_right_front.mobj
new file mode 100644
index 0000000..80a12e5
Binary files /dev/null and b/gfx/mapobjects/walls/barn_right_front.mobj differ
diff --git a/maps/test.map b/maps/test.map
index 0e749ce..d635db5 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/init.py b/scripts/init.py
index 478e65e..e22dfb5 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -676,98 +676,62 @@ 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))
+        ev.set_script ("teleport", (20, 1, 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))
+        ev.set_script ("teleport", (20, 2, 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))
+        ev.set_script ("teleport", (20, 3, 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))
+        ev.set_script ("teleport", (20, 4, 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.x = 1
         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.x = 2
         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.x = 3
         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.x = 4
         ev.y = 7
         ev.set_script ("teleport", (0, 27, 14, STAND_SOUTH))
         lm.add_event (ev)
@@ -778,14 +742,14 @@ class title_screen:
         ev.submap = 4
         ev.x = 12
         ev.y = 1
-        ev.set_script ("teleport", (20, 0, 3, STAND_SOUTH))
+        ev.set_script ("teleport", (20, 1, 3, STAND_SOUTH))
         lm.add_event (ev)
 
         # From barn to cellar
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 20
-        ev.x = 0
+        ev.x = 1
         ev.y = 2
         ev.set_script ("teleport", (4, 12, 2, STAND_SOUTH))
         lm.add_event (ev)
@@ -794,7 +758,7 @@ class title_screen:
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 20
-        ev.x = 2
+        ev.x = 3
         ev.y = 2
         ev.set_script ("teleport", (21, 1, 3, STAND_SOUTH))
         lm.add_event (ev)
@@ -805,15 +769,52 @@ class title_screen:
         ev.submap = 21
         ev.x = 1
         ev.y = 2
-        ev.set_script ("teleport", (20, 2, 3, STAND_SOUTH))
+        ev.set_script ("teleport", (20, 3, 3, STAND_SOUTH))
         lm.add_event (ev)
 
-        # From loft to silverhair
+        # From loft to veranda
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 21
         ev.x = 0
         ev.y = 7
+        ev.set_script ("teleport", (0, 23, 12, STAND_WEST))
+        lm.add_event (ev)
+
+        # From veranda to loft
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 23
+        ev.y = 12
+        ev.set_script ("teleport", (21, 1, 7, STAND_EAST))
+        lm.add_event (ev)
+
+        # From veranda right to veranda left
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 19
+        ev.y = 12
+        ev.set_script ("teleport", (0, 16, 12, STAND_WEST))
+        lm.add_event (ev)
+
+        # From veranda left to veranda right
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 17
+        ev.y = 12
+        ev.set_script ("teleport", (0, 20, 12, STAND_EAST))
+        lm.add_event (ev)
+
+
+        # From veranda to silverhair
+        ev = enter_event ()
+        ev.thisown = C
+        ev.submap = 0
+        ev.x = 11
+        ev.y = 12
         ev.set_script ("brn_to_silverhair", (13, 6, 4, STAND_WEST))
         lm.add_event (ev)
 
@@ -823,7 +824,7 @@ class title_screen:
         ev.submap = 13
         ev.x = 6
         ev.y = 4
-        ev.set_script ("silverhair_to_brn", (21, 1, 7, STAND_EAST))
+        ev.set_script ("silverhair_to_brn", (0, 12, 12, STAND_EAST))
         lm.add_event (ev)
 
         # Action events