[adonthell-wastesedge-commits] Release_0-3-1 dcb7646 212/237: Continued veranda

[Kai Sterker]

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

    Continued veranda
---
 gfx/mapobjects/houses/redwyne-inn/Makefile.am                  |    4 ++--
 gfx/mapobjects/houses/redwyne-inn/barn.mobj                    |  Bin 18947 -> 
0 bytes
 gfx/mapobjects/houses/redwyne-inn/barn_backpart.mobj           |  Bin 0 -> 
7164 bytes
 gfx/mapobjects/houses/redwyne-inn/barn_frontpart.mobj          |  Bin 0 -> 
12194 bytes
 gfx/mapobjects/houses/redwyne-inn/barn_frontpart_entrance.mobj |  Bin 0 -> 
1584 bytes
 maps/test.map                                                  |  Bin 3196 -> 
3222 bytes
 scripts/events/teleport.py                                     |    7 +++++--
 scripts/init.py                                                |    6 +++---
 scripts/modules/events.py                                      |    4 ++--
 scripts/modules/intro.py                                       |    5 +++--
 10 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/gfx/mapobjects/houses/redwyne-inn/Makefile.am 
b/gfx/mapobjects/houses/redwyne-inn/Makefile.am
index aec2c70..57b816a 100755
--- a/gfx/mapobjects/houses/redwyne-inn/Makefile.am
+++ b/gfx/mapobjects/houses/redwyne-inn/Makefile.am
@@ -1,11 +1,11 @@
 pkgdatadir = $(gamedatadir)/gfx/mapobjects/houses/redwyne-inn
 
-pkgdata_DATA = barn.mobj barnroof.mobj entrance.mobj entrance-top-fore.mobj \
+pkgdata_DATA = barn_backpart.mobj barnroof.mobj entrance.mobj 
entrance-top-fore.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
+       guardhouse_main.mobj barn_frontpart.mobj barn_frontpart_entrance.mobj
 
 EXTRA_DIST = $(pkgdata_DATA)
diff --git a/gfx/mapobjects/houses/redwyne-inn/barn.mobj 
b/gfx/mapobjects/houses/redwyne-inn/barn.mobj
deleted file mode 100755
index 86d8617..0000000
Binary files a/gfx/mapobjects/houses/redwyne-inn/barn.mobj and /dev/null differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/barn_backpart.mobj 
b/gfx/mapobjects/houses/redwyne-inn/barn_backpart.mobj
new file mode 100644
index 0000000..70ef4e6
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/barn_backpart.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/barn_frontpart.mobj 
b/gfx/mapobjects/houses/redwyne-inn/barn_frontpart.mobj
new file mode 100644
index 0000000..ff0466f
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/barn_frontpart.mobj differ
diff --git a/gfx/mapobjects/houses/redwyne-inn/barn_frontpart_entrance.mobj 
b/gfx/mapobjects/houses/redwyne-inn/barn_frontpart_entrance.mobj
new file mode 100644
index 0000000..2caac98
Binary files /dev/null and 
b/gfx/mapobjects/houses/redwyne-inn/barn_frontpart_entrance.mobj differ
diff --git a/maps/test.map b/maps/test.map
index d635db5..ed1e67a 100755
Binary files a/maps/test.map and b/maps/test.map differ
diff --git a/scripts/events/teleport.py b/scripts/events/teleport.py
index 90e7d2e..d726570 100644
--- a/scripts/events/teleport.py
+++ b/scripts/events/teleport.py
@@ -25,12 +25,15 @@ class teleport:
     # xdest: X position on smdest
     # ydest: Y position on smdest
     # destdir: direction where to look at after the teleport
-    def __init__ (self, eventinstance, smdest, xdest, ydest, destdir):
+    # fade: if 0, won't fade in/out even if the trigger is the player
+    def __init__ (self, eventinstance, smdest, xdest, ydest, destdir, fade = 
1):
         self.smdest = smdest
         self.xdest = xdest
         self.ydest = ydest
         self.destdir = destdir
+        self.fade = fade
     
     def run (self, submap, x, y, dir, name):
         events.switch_submap (adonthell.gamedata_get_character (name),
-                              self.smdest, self.xdest, self.ydest, 
self.destdir)
+                              self.smdest, self.xdest, self.ydest, 
self.destdir,
+                              self.fade)
diff --git a/scripts/init.py b/scripts/init.py
index 1c1198d..2f73f03 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -785,7 +785,7 @@ class title_screen:
         ev = enter_event ()
         ev.thisown = C
         ev.submap = 0
-        ev.x = 23
+        ev.x = 24
         ev.y = 12
         ev.set_script ("teleport", (21, 1, 7, STAND_EAST))
         lm.add_event (ev)
@@ -796,7 +796,7 @@ class title_screen:
         ev.submap = 0
         ev.x = 19
         ev.y = 12
-        ev.set_script ("teleport", (0, 16, 12, STAND_WEST))
+        ev.set_script ("teleport", (0, 16, 12, STAND_WEST, 0))
         lm.add_event (ev)
 
         # From veranda left to veranda right
@@ -805,7 +805,7 @@ class title_screen:
         ev.submap = 0
         ev.x = 17
         ev.y = 12
-        ev.set_script ("teleport", (0, 20, 12, STAND_EAST))
+        ev.set_script ("teleport", (0, 20, 12, STAND_EAST, 0))
         lm.add_event (ev)
 
         # From veranda to silverhair
diff --git a/scripts/modules/events.py b/scripts/modules/events.py
index b98ebba..3965731 100755
--- a/scripts/modules/events.py
+++ b/scripts/modules/events.py
@@ -14,7 +14,7 @@ import adonthell
 
 # -- switch submaps (character, new coordinates, new submap,
 #    direction the character shall face)
-def switch_submap (mychar, x, y, submap, dir):
+def switch_submap (mychar, x, y, submap, dir, fade = 1):
     # -- deactivate schedule during teleport
     if mychar.is_schedule_activated ():
         mychar.set_schedule_active (0)
@@ -23,7 +23,7 @@ def switch_submap (mychar, x, y, submap, dir):
         schedule_active = 0
 
     # -- only fade for the player
-    if mychar.get_id () == "Player":
+    if mychar.get_id () == "Player" and fade != 0:
         # -- fade the new submap in if we teleport the player
         adonthell.gamedata_engine ().fade_out ()
         mychar.jump_to (x, y, submap, dir)
diff --git a/scripts/modules/intro.py b/scripts/modules/intro.py
index 143837d..038ecbb 100644
--- a/scripts/modules/intro.py
+++ b/scripts/modules/intro.py
@@ -98,7 +98,7 @@ business in her name,\ntrusting me to follow in good speed.",
 was now only a day\nahead.  The thought nearly caused me\nto forget \
 the harshness of the road.",
            "Still, Waste's Edge was a welcome sight.",
-           "As you approach the trading post, there\nseems to be little sign 
of life.                 \
+           "As you approach the trading post, there\nseems to be little sign 
of life.      \
            \nEventually you find the Redwyne Inn,\nwhich seems to be the main 
building\nhere.",
            "The heavy wooden doors are closed,\nand no one is there \
 to let you in. As you\napproach the gate, you suddenly hear a voice from 
within.",
@@ -193,8 +193,9 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
                     if windelay >= 10:
                         if wincpt == 0: lab.set_text ("")
                         lab.add_text (wintext[wintextocc][wincpt])
+                        if wintext[wintextocc][wincpt] == '.': windelay = -50
+                        else: windelay = 0
                         wincpt = wincpt + 1
-                        windelay = 0
                     else:
                         windelay = windelay + 1
                         # Shall we fade to the Inn view?