[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters alek.py,1.5,1.6 fellnir.py,1.6,1.7 frostbloom.py,1.6,1.7 intro.py,1.6,1.7 janesta.py,1.5,1.6 jelom.py,1.5,1.6 lucia.py,1.7,1.8 orloth.py,1.6,1.7 sarin.py,1.6,1.7 schedule.py,1.2,1.3 silverhair.py,1.5,1.6 talan.py,1.5,1.6 tristan.py,1.6,1.7

[Kai Sterker <address@hidden>]

Update of /cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters
In directory subversions:/tmp/cvs-serv19397/scripts/schedules/mapcharacters

Modified Files:
        alek.py fellnir.py frostbloom.py intro.py janesta.py jelom.py 
        lucia.py orloth.py sarin.py schedule.py silverhair.py talan.py 
        tristan.py 
Log Message:
UPDATED schedules to support callback saving/restoring
FIXED Talan walking away during initial dialogue


Index: alek.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/alek.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** alek.py     18 Aug 2002 19:55:19 -0000      1.5
--- alek.py     19 Aug 2002 19:59:06 -0000      1.6
***************
*** 33,42 ****
          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)
         
--- 33,36 ----
***************
*** 51,56 ****
      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)
--- 45,47 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (65, 90)
!         self.myself.time_callback (delay, self.walk)

Index: fellnir.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/fellnir.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** fellnir.py  18 Aug 2002 19:55:19 -0000      1.6
--- fellnir.py  19 Aug 2002 19:59:06 -0000      1.7
***************
*** 37,46 ****
                         (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)
          
--- 37,40 ----
***************
*** 51,56 ****
      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)
--- 45,47 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (37, 75)
!         self.myself.time_callback (delay, self.walk)

Index: frostbloom.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/frostbloom.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** frostbloom.py       18 Aug 2002 19:55:19 -0000      1.6
--- frostbloom.py       19 Aug 2002 19:59:06 -0000      1.7
***************
*** 39,48 ****
          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)
          
--- 39,42 ----
***************
*** 56,61 ****
      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)
--- 50,52 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (20, 50)
!         self.myself.time_callback (delay, self.walk)

Index: intro.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/intro.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** intro.py    31 Dec 2001 18:08:38 -0000      1.6
--- intro.py    19 Aug 2002 19:59:06 -0000      1.7
***************
*** 56,63 ****
                  self.close_gate ()
                  myself.go_east ()
!                 
  
  
!     # -- Opens the gate
      def open_gate (self):
          # Get the mapobjects
--- 56,64 ----
                  self.close_gate ()
                  myself.go_east ()
!                 talan = adonthell.gamedata_get_character ("Talan Wendth")
!                 talan.time_callback_string ("3t", "walk")
  
  
!     # -- open the gate
      def open_gate (self):
          # Get the mapobjects

Index: janesta.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/janesta.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** janesta.py  18 Aug 2002 19:55:19 -0000      1.5
--- janesta.py  19 Aug 2002 19:59:06 -0000      1.6
***************
*** 1,4 ****
  #
! #  (C) Copyright 2001 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
--- 1,4 ----
  #
! #  (C) Copyright 2001/2002 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
***************
*** 39,48 ****
                         (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)
  
--- 39,42 ----
***************
*** 53,58 ****
      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)
--- 47,49 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (10, 30)
!         self.myself.time_callback (delay, self.walk)

Index: jelom.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/jelom.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** jelom.py    18 Aug 2002 19:55:19 -0000      1.5
--- jelom.py    19 Aug 2002 19:59:06 -0000      1.6
***************
*** 34,43 ****
          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)
  
--- 34,37 ----
***************
*** 50,55 ****
      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)
--- 44,46 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (20, 65)
!         self.myself.time_callback (delay, self.walk)

Index: lucia.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/lucia.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** lucia.py    18 Aug 2002 19:55:19 -0000      1.7
--- lucia.py    19 Aug 2002 19:59:06 -0000      1.8
***************
*** 37,46 ****
                    (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)
  
--- 37,40 ----
***************
*** 60,65 ****
              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)
--- 54,56 ----
              delay = "%it" % random.randrange (20, 40)
          
!         self.myself.time_callback (delay, self.walk)

Index: orloth.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/orloth.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** orloth.py   18 Aug 2002 19:55:19 -0000      1.6
--- orloth.py   19 Aug 2002 19:59:06 -0000      1.7
***************
*** 44,49 ****
                    (6, 5, 0)]
          
-         # -- improve that!!!
-         self.goal_reached ()
          self.myself.set_callback (self.goal_reached)
          
--- 44,47 ----
***************
*** 74,91 ****
              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)
              # -- 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)
              
!         walk_event = adonthell.time_event (delay)
!         walk_event.set_callback (self.walk)
!         walk_event.thisown = 0
!         self.myself.add_event (walk_event)
  
      # -- put/remove something from the table we're standing next to
--- 72,80 ----
              delay = "3t"
              # -- put/take first mug
!             self.myself.time_callback ("1t", self.put_object, (106, 0))
              # -- put/take second mug
!             self.myself.time_callback ("2t", self.put_object, (107, 1))
              
!         self.myself.time_callback (delay, self.walk)
  
      # -- put/remove something from the table we're standing next to

Index: sarin.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/sarin.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** sarin.py    18 Aug 2002 19:55:19 -0000      1.6
--- sarin.py    19 Aug 2002 19:59:06 -0000      1.7
***************
*** 43,60 ****
          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
--- 43,48 ----
***************
*** 65,73 ****
          
          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.walk ()
      
--- 53,57 ----
          
          delay = "%it" % random.randrange (30, 60)
!         self.myself.time_callback (delay, self.switch_direction)
          self.walk ()
      
***************
*** 93,98 ****
      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)
--- 77,79 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (3, 6)
!         self.myself.time_callback (delay, self.walk)

Index: schedule.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/schedule.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** schedule.py 18 Aug 2002 19:55:19 -0000      1.2
--- schedule.py 19 Aug 2002 19:59:06 -0000      1.3
***************
*** 43,54 ****
          # -- 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):
--- 43,47 ----
          # -- member initialization
          self.speech_length = len (self.speech)
!                
      # -- make remark and set delay for the next one
      def speak (self):
***************
*** 56,61 ****
  
          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)
--- 49,51 ----
  
          delay = "%it" % random.randrange (self.speech_delay[0], 
self.speech_delay[1])
!         self.myself.time_callback (delay, self.speak)

Index: silverhair.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/silverhair.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** silverhair.py       18 Aug 2002 19:55:19 -0000      1.5
--- silverhair.py       19 Aug 2002 19:59:06 -0000      1.6
***************
*** 34,43 ****
          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)
  
--- 34,37 ----
***************
*** 60,65 ****
              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)
--- 54,56 ----
              self.myself.speak (self.speech[3])
          
!         self.myself.time_callback (self.delay, self.walk)

Index: talan.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/talan.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** talan.py    18 Aug 2002 19:55:19 -0000      1.5
--- talan.py    19 Aug 2002 19:59:06 -0000      1.6
***************
*** 33,42 ****
          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)
          
--- 33,36 ----
***************
*** 49,54 ****
      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)
--- 43,46 ----
      def goal_reached (self):
          delay = "%it" % random.randrange (10, 20)
!         self.myself.time_callback (delay, self.walk)
! 

Index: tristan.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/tristan.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** tristan.py  18 Aug 2002 19:55:19 -0000      1.6
--- tristan.py  19 Aug 2002 19:59:06 -0000      1.7
***************
*** 1,4 ****
  #
! #  (C) Copyright 2001 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
--- 1,4 ----
  #
! #  (C) Copyright 2001/2002 Kai Sterker <address@hidden>
  #  Part of the Adonthell Project http://adonthell.linuxgames.com
  #
***************
*** 34,45 ****
          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.myself.set_callback (self.goal_reached)
          
--- 34,38 ----
          schedule.speak.__init__(self)
          
!         self.walk_delay = "75t"
          self.myself.set_callback (self.goal_reached)
          
***************
*** 65,70 ****
          # -- 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)
--- 58,60 ----
          # -- reached our final destination
          else:
!             self.myself.time_callback (self.walk_delay, self.walk)