[adonthell-wastesedge-commits] master 2460d90 2/2: UPDATED extro timing to better fit updated music

[Kai Sterker]

branch: master
commit 2460d90a4fdb12b0a9344957203fac741cd60a70
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED extro timing to better fit updated music
    FIXED possible segfault when skipping forest sequence
---
 scripts/schedules/mapcharacters/extro.py |   25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/scripts/schedules/mapcharacters/extro.py 
b/scripts/schedules/mapcharacters/extro.py
index 1a20a9c..6a4dbed 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -151,9 +151,9 @@ class extro(object):
             ("Joseph Toscano", 2), \
             (_("title design:"), 1), \
             ("John Havard", 1), \
-            ("James Nash", 2), \
+            ("James Nash", 3), \
             (_("soundtrack available on:"), 1), \
-            ("http://bandcamp.zhaytee.net";, 5), \
+            ("http://bandcamp.zhaytee.net";, 7), \
             (_("the Adonthell team wishes to thank:"), 2), \
             ("Al Koskelin", 1), \
             ("Andrew Henderson", 1), \
@@ -168,9 +168,9 @@ class extro(object):
             (_("Software developers whose work"), 1), \
             (_("made Adonthell possible"), 3), \
             (_("career portal:"), 1), \
-            ("http://adonthell.nongnu.org";, 5), \
+            ("http://adonthell.nongnu.org";, 6), \
             (_("No Yetis were harmed during\n the production of this game"), 
5), \
-            (_("presented in"), 2), \
+            (_("presented in"), 3), \
             (_("Ogg Vorbis Stereo"), 1), \
             (_("(where available)"), 14), \
             (_("The END"), 6), \
@@ -275,7 +275,7 @@ class extro(object):
     # -- create the text bubbles
     def make_bubble (self):
         (npc, text) = self.text[self.index]
-        length = len(text) + 100
+        length = len(text) + 110
         
         if npc != None:
             # -- get color
@@ -382,17 +382,21 @@ class extro(object):
         
         elif self.step == 86:
             offset = -2
-            if self.chest.x () <= -20: self.step = 87
+            if self.chest.x () <= -160: self.step = 87
         
         elif self.step == 87:
-            offset = -3
+            offset = -1
             if self.chest.x () <= -200: self.step = 88
         
         # -- spring back a little
         elif self.step == 88:
             offset = 2
             if self.chest.x () >= -185: self.step = 89
-        
+
+        elif self.step == 89:
+            offset = 1
+            if self.chest.x () >= -175: self.step = 90
+                    
         else:
             self.draw_func = self.show_niche
             self.step = 0
@@ -455,7 +459,7 @@ class extro(object):
             self.step = self.step + 1
 
         # -- zoom to bjarn's face        
-        elif self.step == 651:
+        elif self.step == 651 and adonthell.audio_is_background_finished():
             # -- audio
             adonthell.audio_load_background (1, "audio/at-demo-a.ogg")
             adonthell.audio_play_background (1)
@@ -533,6 +537,7 @@ class extro(object):
         self.window = adonthell.win_container ()
         self.window.move (0, 0)
         self.window.resize (320, 240)
+        self.window.thisown = 0
         self.window.set_visible_border (False)
         self.window.set_trans_background (True)
         
@@ -724,7 +729,7 @@ class extro(object):
     # -- make a credit label
     def make_credit_label (self, ypos):
         if self.index > 0:
-             ypos = ypos + (self.credits[self.index - 1][1] - 1) * 14
+             ypos = ypos + (self.credits[self.index - 1][1] - 1) * 15
 
         label = adonthell.win_label ()
         label.resize (10, 0)