[adonthell-wastesedge-commits] Release_0-3-1 9a014b6 191/237: FIXES to the extro

[Kai Sterker]

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

    FIXES to the extro
---
 scripts/dialogues/extro.py               |    2 +-
 scripts/init.py                          |    2 +-
 scripts/schedules/mapcharacters/extro.py |   24 +++++++++++++-----------
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/scripts/dialogues/extro.py b/scripts/dialogues/extro.py
index 343d4b4..4a4d550 100644
--- a/scripts/dialogues/extro.py
+++ b/scripts/dialogues/extro.py
@@ -2,7 +2,7 @@ import adonthell
 
 class extro:
        loop = []
-       strings = ["What is going on here? What are all these people doing in 
my room? Are you behind this, Half-Elf? I demand an explanation!", "Please calm 
down Master Fingolson. We are here to sort out this business once and for 
all.", "Sort this business out? Good ... good! It's about time, I'd say! So ... 
will that foul Elf finally return my Catseyes? I hear one was found amongst her 
belongings. And where there is one, the others shouldn't be far.", "I fear you 
are mistaken my good Dwarf.  [...]
+       strings = ["What is going on here? What are all these people doing in 
my room? Are you behind this, Half-Elf? I demand an explanation!", "Please calm 
down Master Fingolson. We are here to sort out this business once and for 
all.", "Sort this business out? Good ... good! It's about time, I'd say! So ... 
will that foul Elf finally return my Catseyes? I hear one was found amongst her 
belongings. And where there is one, the others shouldn't be far.", "I fear you 
are mistaken my good Dwarf.  [...]
 
        def set_name (self, new_name):
                pass
diff --git a/scripts/init.py b/scripts/init.py
index 5f4b4a8..554f553 100755
--- a/scripts/init.py
+++ b/scripts/init.py
@@ -1227,7 +1227,7 @@ class title_screen:
         ev.y = 5
         ev.dir = STAND_NORTH
         ev.set_script ("character_speak", (player.get_id (), \
-            "The Lady's luggage, but not what I am looking for."))
+            "Lady Silverhair's luggage, but not what I am looking for."))
         lm.add_event (ev)
 
         ev = action_event ()
diff --git a/scripts/schedules/mapcharacters/extro.py 
b/scripts/schedules/mapcharacters/extro.py
index eede5a7..a5874c1 100644
--- a/scripts/schedules/mapcharacters/extro.py
+++ b/scripts/schedules/mapcharacters/extro.py
@@ -13,6 +13,7 @@
 # -- the game's extro
 
 import adonthell
+import events
 
 class extro:
     def __init__(self, mapchar):
@@ -129,8 +130,8 @@ class extro:
             bjarn.go_south ()
             bjarn.load ('bjarn_crying.mchar')
             
-            import events
             talan = adonthell.gamedata_get_character ('Talan Wendth')
+            talan.load ("talan_beaten.mchar")
             events.switch_submap (talan, 7, 1, 6, adonthell.STAND_EAST)
             talan.go_east ()
             talan.stand_south ()
@@ -189,11 +190,11 @@ class extro:
         bubble.set_visible (1)
         adonthell.win_manager_get_active ().add (bubble)
         
-        if wait == 1:
-            bubble.py_signal_connect (self.on_close_bubble, 
adonthell.win_event_CLOSE)
-            return bubble
+        # if wait == 1:
+        bubble.py_signal_connect (self.on_close_bubble, 
adonthell.win_event_CLOSE)
+        return bubble
             
-        else: return None
+        # else: return None
 
     # -- bubble death callback
     def on_close_bubble (self, retval):
@@ -360,6 +361,7 @@ class extro:
             adonthell.gamedata_engine ().main_quit ()
             adonthell.gamedata_player ().set_schedule_active (1)
             self.done = 0
+            self.index = 23
         
     # -- forest sequence
     def fade_to_forest (self):
@@ -466,7 +468,7 @@ class extro:
                 if self.cursor < len (self.typeover[self.index]):
                     self.delay = self.delay + 1
                     
-                    if self.delay >= 10:
+                    if self.delay >= 7:
                         if self.cursor == 0: self.label.set_text ("")
                         txt = self.typeover[self.index][self.cursor]
                         self.label.add_text (txt)
@@ -494,12 +496,12 @@ class extro:
 
     # -- update the forest position
     def update_wood (self, pic, x):
-        if x <= -pic.length (): x = x + pic.length ()
-        else: x = x - 1
+        if x >= pic.length (): x = x - pic.length ()
+        else: x = x + 1
         return x
 
     # -- draw the forest
     def draw_wood (self, pic, x):
-        pic.draw (x, 0, self.da, self.target)
-        if x < adonthell.screen_length () - pic.length (): 
-            pic.draw (pic.length () + x, 0, self.da, self.target)
+        pic.draw (x - pic.length (), 0, self.da, self.target)
+        if x < adonthell.screen_length (): 
+            pic.draw (x, 0, self.da, self.target)