[adonthell-wastesedge-commits] Release_0-3-3 1643ad2 13/50: UPDATED schedules to support callback saving/restoring

[Kai Sterker]

tag: Release_0-3-3
commit 1643ad2883aae2e74beaf2fa88a6e9a828e2741f
Author: Kai Sterker <address@hidden>
Commit: Kai Sterker <address@hidden>

    UPDATED schedules to support callback saving/restoring
    FIXED Talan walking away during initial dialogue
---
 mapengine.data                                |  Bin 5601 -> 5809 bytes
 scripts/schedules/mapcharacters/alek.py       |   11 +----------
 scripts/schedules/mapcharacters/fellnir.py    |   11 +----------
 scripts/schedules/mapcharacters/frostbloom.py |   11 +----------
 scripts/schedules/mapcharacters/intro.py      |    5 +++--
 scripts/schedules/mapcharacters/janesta.py    |   13 ++-----------
 scripts/schedules/mapcharacters/jelom.py      |   11 +----------
 scripts/schedules/mapcharacters/lucia.py      |   11 +----------
 scripts/schedules/mapcharacters/orloth.py     |   17 +++--------------
 scripts/schedules/mapcharacters/sarin.py      |   23 ++---------------------
 scripts/schedules/mapcharacters/schedule.py   |   14 ++------------
 scripts/schedules/mapcharacters/silverhair.py |   11 +----------
 scripts/schedules/mapcharacters/talan.py      |   12 ++----------
 scripts/schedules/mapcharacters/tristan.py    |   16 +++-------------
 14 files changed, 23 insertions(+), 143 deletions(-)

diff --git a/mapengine.data b/mapengine.data
index 3a1a102..8cad4fb 100755
Binary files a/mapengine.data and b/mapengine.data differ
diff --git a/scripts/schedules/mapcharacters/alek.py 
b/scripts/schedules/mapcharacters/alek.py
index 2a7adfe..2aa86a6 100755
--- a/scripts/schedules/mapcharacters/alek.py
+++ b/scripts/schedules/mapcharacters/alek.py
@@ -32,12 +32,6 @@ class alek (schedule.speak):
         self.speech_delay = (20, 40)
         schedule.speak.__init__(self)
     
-        delay = "%it" % random.randrange (65, 90)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
        
     def walk (self):
@@ -50,7 +44,4 @@ class alek (schedule.speak):
 
     def goal_reached (self):
         delay = "%it" % random.randrange (65, 90)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/fellnir.py 
b/scripts/schedules/mapcharacters/fellnir.py
index 5796f73..844ebcf 100644
--- a/scripts/schedules/mapcharacters/fellnir.py
+++ b/scripts/schedules/mapcharacters/fellnir.py
@@ -36,12 +36,6 @@ class fellnir (schedule.speak):
                        (4, 2, adonthell.STAND_NORTH), \
                        (6, 5, adonthell.STAND_WEST)]
 
-        delay = "%it" % random.randrange (37, 75)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
         
     def walk (self):
@@ -50,7 +44,4 @@ class fellnir (schedule.speak):
     
     def goal_reached (self):
         delay = "%it" % random.randrange (37, 75)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/frostbloom.py 
b/scripts/schedules/mapcharacters/frostbloom.py
index ad46f97..70adc2a 100755
--- a/scripts/schedules/mapcharacters/frostbloom.py
+++ b/scripts/schedules/mapcharacters/frostbloom.py
@@ -38,12 +38,6 @@ class frostbloom (schedule.speak):
         self.speech_delay = (20, 55)
         schedule.speak.__init__(self)
         
-        delay = "%it" % random.randrange (20, 50)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
         
     def walk (self):
@@ -55,7 +49,4 @@ class frostbloom (schedule.speak):
     
     def goal_reached (self):
         delay = "%it" % random.randrange (20, 50)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/intro.py 
b/scripts/schedules/mapcharacters/intro.py
index 6da7791..6224c4a 100644
--- a/scripts/schedules/mapcharacters/intro.py
+++ b/scripts/schedules/mapcharacters/intro.py
@@ -55,10 +55,11 @@ class intro:
                 myself.set_schedule ("keyboard_control")
                 self.close_gate ()
                 myself.go_east ()
-                
+                talan = adonthell.gamedata_get_character ("Talan Wendth")
+                talan.time_callback_string ("3t", "walk")
 
 
-    # -- Opens the gate
+    # -- open the gate
     def open_gate (self):
         # Get the mapobjects
         gate_fore = adonthell.gamedata_engine ().get_landmap ().get_mapobject 
(90)
diff --git a/scripts/schedules/mapcharacters/janesta.py 
b/scripts/schedules/mapcharacters/janesta.py
index 9521164..0c62190 100644
--- a/scripts/schedules/mapcharacters/janesta.py
+++ b/scripts/schedules/mapcharacters/janesta.py
@@ -1,5 +1,5 @@
 #
-#  (C) Copyright 2001 Kai Sterker <address@hidden>
+#  (C) Copyright 2001/2002 Kai Sterker <address@hidden>
 #  Part of the Adonthell Project http://adonthell.linuxgames.com
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -38,12 +38,6 @@ class janesta (schedule.speak):
                        (1, 5, adonthell.STAND_SOUTH), \
                        (4, 2, adonthell.STAND_WEST)]
 
-        delay = "%it" % random.randrange (10, 30)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
 
     def walk (self):
@@ -52,7 +46,4 @@ class janesta (schedule.speak):
     
     def goal_reached (self):
         delay = "%it" % random.randrange (10, 30)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/jelom.py 
b/scripts/schedules/mapcharacters/jelom.py
index df43039..73ac708 100644
--- a/scripts/schedules/mapcharacters/jelom.py
+++ b/scripts/schedules/mapcharacters/jelom.py
@@ -33,12 +33,6 @@ class jelom (schedule.speak):
         self.speech_delay = (30, 60)
         schedule.speak.__init__(self)
         
-        delay = "%it" % random.randrange (20, 65)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
 
     def walk (self):
@@ -49,7 +43,4 @@ class jelom (schedule.speak):
     
     def goal_reached (self):
         delay = "%it" % random.randrange (20, 65)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/lucia.py 
b/scripts/schedules/mapcharacters/lucia.py
index 9aeb2ae..7c9d8b4 100644
--- a/scripts/schedules/mapcharacters/lucia.py
+++ b/scripts/schedules/mapcharacters/lucia.py
@@ -36,12 +36,6 @@ class lucia (schedule.speak):
         self.coords = [(3, 3, adonthell.STAND_NORTH), \
                   (6, 3, adonthell.STAND_EAST)]
 
-        delay = "%it" % random.randrange (20, 40)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-        
         self.myself.set_callback (self.goal_reached)
 
     def walk (self):
@@ -59,7 +53,4 @@ class lucia (schedule.speak):
         else:
             delay = "%it" % random.randrange (20, 40)
         
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/orloth.py 
b/scripts/schedules/mapcharacters/orloth.py
index 4e2634d..9dec2bc 100755
--- a/scripts/schedules/mapcharacters/orloth.py
+++ b/scripts/schedules/mapcharacters/orloth.py
@@ -43,8 +43,6 @@ class orloth (schedule.speak):
                   (12, 5, 0), \
                   (6, 5, 0)]
         
-        # -- improve that!!!
-        self.goal_reached ()
         self.myself.set_callback (self.goal_reached)
         
     def walk (self):
@@ -73,20 +71,11 @@ class orloth (schedule.speak):
         else:
             delay = "3t"
             # -- put/take first mug
-            frst_mug = adonthell.time_event ("1t")
-            frst_mug.set_callback (self.put_object, (106, 0))
-            frst_mug.thisown = 0
-            self.myself.add_event (frst_mug)
+            self.myself.time_callback ("1t", self.put_object, (106, 0))
             # -- put/take second mug
-            scnd_mug = adonthell.time_event ("2t")
-            scnd_mug.set_callback (self.put_object, (107, 1))
-            scnd_mug.thisown = 0
-            self.myself.add_event (scnd_mug)
+            self.myself.time_callback ("2t", self.put_object, (107, 1))
             
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
 
     # -- put/remove something from the table we're standing next to
     def put_object (self, args):
diff --git a/scripts/schedules/mapcharacters/sarin.py 
b/scripts/schedules/mapcharacters/sarin.py
index 1e33369..6276440 100755
--- a/scripts/schedules/mapcharacters/sarin.py
+++ b/scripts/schedules/mapcharacters/sarin.py
@@ -42,20 +42,8 @@ class sarin (schedule.speak):
         self.speech_delay = (20, 40)
         schedule.speak.__init__(self)
 
-        delay = "%it" % random.randrange (3, 6)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-        
         self.myself.set_callback (self.goal_reached)
 
-        delay = "%it" % random.randrange (30, 60)
-        switch_event = adonthell.time_event (delay)
-        switch_event.set_callback (self.switch_direction)
-        switch_event.thisown = 0
-        self.myself.add_event (switch_event)
-
     def switch_direction (self):
         # -- ... and set the new one accordingly
         if self.direction == adonthell.WALK_EAST or self.direction == 
adonthell.WALK_WEST:
@@ -64,11 +52,7 @@ class sarin (schedule.speak):
             self.direction = random.randrange (adonthell.WALK_WEST, 
adonthell.WALK_EAST + 1)
         
         delay = "%it" % random.randrange (30, 60)
-        switch_event = adonthell.time_event (delay)
-        switch_event.set_callback (self.switch_direction)
-        switch_event.thisown = 0
-        self.myself.add_event (switch_event)
-
+        self.myself.time_callback (delay, self.switch_direction)
         self.walk ()
     
     def walk (self):
@@ -92,7 +76,4 @@ class sarin (schedule.speak):
 
     def goal_reached (self):
         delay = "%it" % random.randrange (3, 6)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/schedule.py 
b/scripts/schedules/mapcharacters/schedule.py
index c12476a..5d5748d 100644
--- a/scripts/schedules/mapcharacters/schedule.py
+++ b/scripts/schedules/mapcharacters/schedule.py
@@ -42,20 +42,10 @@ class speak:
             
         # -- member initialization
         self.speech_length = len (self.speech)
-        
-        # -- register first speech
-        delay = "%it" % random.randrange (self.speech_delay[0], 
self.speech_delay[1])
-        speak_event = adonthell.time_event (delay)
-        speak_event.thisown = 0
-        speak_event.set_callback (self.speak)
-        self.myself.add_event (speak_event)
-        
+               
     # -- make remark and set delay for the next one
     def speak (self):
         self.myself.speak (self.speech[random.randrange (0, 
self.speech_length)])
 
         delay = "%it" % random.randrange (self.speech_delay[0], 
self.speech_delay[1])
-        speak_event = adonthell.time_event (delay)
-        speak_event.thisown = 0
-        speak_event.set_callback (self.speak)
-        self.myself.add_event (speak_event)
+        self.myself.time_callback (delay, self.speak)
diff --git a/scripts/schedules/mapcharacters/silverhair.py 
b/scripts/schedules/mapcharacters/silverhair.py
index 52beae6..6f0c1a8 100755
--- a/scripts/schedules/mapcharacters/silverhair.py
+++ b/scripts/schedules/mapcharacters/silverhair.py
@@ -33,12 +33,6 @@ class silverhair (schedule.speak):
         self.speech_delay = (20, 72)
         schedule.speak.__init__(self)
 
-        delay = "%it" % random.randrange (70, 140)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
 
     def walk (self):
@@ -59,7 +53,4 @@ class silverhair (schedule.speak):
         if self.myself.posx () == 6:
             self.myself.speak (self.speech[3])
         
-        walk_event = adonthell.time_event (self.delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (self.delay, self.walk)
diff --git a/scripts/schedules/mapcharacters/talan.py 
b/scripts/schedules/mapcharacters/talan.py
index 5909deb..955e2c7 100755
--- a/scripts/schedules/mapcharacters/talan.py
+++ b/scripts/schedules/mapcharacters/talan.py
@@ -32,12 +32,6 @@ class talan (schedule.speak):
         self.speech_delay = (30, 60)
         schedule.speak.__init__(self)
         
-        # -- walking stuff
-        walk_event = adonthell.time_event ("5t")
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
         self.myself.set_callback (self.goal_reached)
         
     def walk (self):
@@ -48,7 +42,5 @@ class talan (schedule.speak):
         
     def goal_reached (self):
         delay = "%it" % random.randrange (10, 20)
-        walk_event = adonthell.time_event (delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
+        self.myself.time_callback (delay, self.walk)
+
diff --git a/scripts/schedules/mapcharacters/tristan.py 
b/scripts/schedules/mapcharacters/tristan.py
index d28f3c9..0eb5c22 100644
--- a/scripts/schedules/mapcharacters/tristan.py
+++ b/scripts/schedules/mapcharacters/tristan.py
@@ -1,5 +1,5 @@
 #
-#  (C) Copyright 2001 Kai Sterker <address@hidden>
+#  (C) Copyright 2001/2002 Kai Sterker <address@hidden>
 #  Part of the Adonthell Project http://adonthell.linuxgames.com
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -33,14 +33,7 @@ class tristan (schedule.speak):
         self.speech_delay = (20, 55)
         schedule.speak.__init__(self)
         
-        self.walk_delay = "30t"
-        
-        # -- walking
-        walk_event = adonthell.time_event (self.walk_delay)
-        walk_event.set_callback (self.walk)
-        walk_event.thisown = 0
-        self.myself.add_event (walk_event)
-
+        self.walk_delay = "75t"
         self.myself.set_callback (self.goal_reached)
         
     def walk (self):
@@ -64,7 +57,4 @@ class tristan (schedule.speak):
             self.myself.set_goal (12, 18, adonthell.STAND_WEST)
         # -- reached our final destination
         else:
-            walk_event = adonthell.time_event (self.walk_delay)
-            walk_event.set_callback (self.walk)
-            walk_event.thisown = 0
-            self.myself.add_event (walk_event)
+            self.myself.time_callback (self.walk_delay, self.walk)