[adonthell-wastesedge-commits] master 0d4c866 1/2: UPDATED synchronization of intro/extro with new music

[Kai Sterker]

branch: master
commit 0d4c8668edd456827acee15c017e5c73036a1c51
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED synchronization of intro/extro with new music
---
 scripts/modules/intro.py                 |   12 ++++++++----
 scripts/schedules/mapcharacters/extro.py |    6 +++++-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/scripts/modules/intro.py b/scripts/modules/intro.py
index 1819bc3..94ade11 100644
--- a/scripts/modules/intro.py
+++ b/scripts/modules/intro.py
@@ -208,7 +208,9 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
                     else:
                         windelay = windelay + 1
                         # Shall we fade to the Inn view?
-                        if status == 0 and wintextocc == 5 and windelay == - 
250: status = 1
+                        if status == 0 and wintextocc == 5 and windelay == - 
250: 
+                            audio_fade_out_background (1500)
+                            status = 1
                 else:
                     wintextocc = wintextocc + 1
                     wincpt = 0
@@ -232,12 +234,14 @@ while not input_has_been_pushed (SDLK_ESCAPE) and not 
input_has_been_pushed (SDL
 
             # Fade to the Inn view.
             if status == 1:
-                if (bg.alpha ()) < 255:
-                    bg.set_alpha (bg.alpha () + 1)
+                bga = bg.alpha ()
+                if bga < 255:
+                    if bga == 128:
+                        audio_play_background (1)
+                    bg.set_alpha (bga + 1)
                     if bg.alpha () == 255:
                         # Start scrolling
                         status = 2
-                        audio_play_background (1)
 
             if status == 2:
                 if inny > - (inn_close.height () - screen_height ()):
diff --git a/scripts/schedules/mapcharacters/extro.py 
b/scripts/schedules/mapcharacters/extro.py
index 6a4dbed..9f40d4c 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -454,8 +454,12 @@ class extro(object):
             self.o_bag.set_alpha (self.step - 307)
             self.step = self.step + 1
         
+        elif self.step == 562:
+               adonthell.audio_fade_out_background (500)
+            self.step = self.step + 1
+        
         # -- wait a little
-        elif self.step > 561 and self.step <= 650:
+        elif self.step > 562 and self.step <= 650:
             self.step = self.step + 1
 
         # -- zoom to bjarn's face