adonthell-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters alek


From: Kai Sterker <address@hidden>
Subject: [Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters alek.py,1.3,1.4 bjarn.py,1.4,1.5 erek.py,1.5,1.6 fellnir.py,1.4,1.5 frostbloom.py,1.4,1.5 janesta.py,1.3,1.4 jelom.py,1.3,1.4 lucia.py,1.5,1.6 oliver.py,1.5,1.6 orloth.py,1.4,1.5 sarin.py,1.3,1.4 silverhair.py,1.3,1.4 talan.py,1.3,1.4 tristan.py,1.4,1.5
Date: Sat, 10 Aug 2002 18:03:17 -0400

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

Modified Files:
        alek.py bjarn.py erek.py fellnir.py frostbloom.py janesta.py 
        jelom.py lucia.py oliver.py orloth.py sarin.py silverhair.py 
        talan.py tristan.py 
Log Message:
CHANGED most schedules to use event-based walking; disabled the rest for now


Index: alek.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/alek.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** alek.py     10 Aug 2002 12:20:46 -0000      1.3
--- alek.py     10 Aug 2002 22:03:15 -0000      1.4
***************
*** 32,67 ****
          self.speech_delay = (20, 40)
          schedule.speak.__init__(self)
!         
!     def run (self):
!         myself = self.myself
! 
!         todo = myself.get_val ("todo")
! 
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- engage a new movement
!         elif todo == 1:
!             # -- walk to table
!             if myself.posx () == 1:
!                 myself.set_goal (12, 5, adonthell.STAND_NORTH)
!             # -- walk to bar
!             else:
!                 myself.set_goal (1, 3, adonthell.STAND_SOUTH)
! 
!             myself.set_val ("todo", 2)
! 
!         # -- moving
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 # -- the time we stay at the same place
!                 delay = random.randrange (60, 150) * 20
! 
!                 myself.set_val ("delay", delay)
!                 myself.set_val ("todo", 0)
--- 32,53 ----
          self.speech_delay = (20, 40)
          schedule.speak.__init__(self)
!     
!         delay = "%it" % random.randrange (65, 90)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
! 
!     def walk (self):
!         # -- walk to table
!         if self.myself.posx () == 1:
!             self.myself.set_goal (12, 5, adonthell.STAND_NORTH)
!         # -- walk to bar
!         else:
!             self.myself.set_goal (1, 3, adonthell.STAND_SOUTH)
! 
!     def goal_reached (self):
!         delay = "%it" % random.randrange (65, 90)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: bjarn.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/bjarn.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** bjarn.py    10 Aug 2002 12:20:46 -0000      1.4
--- bjarn.py    10 Aug 2002 22:03:15 -0000      1.5
***************
*** 38,42 ****
                         (3, 6, adonthell.STAND_WEST)]
  
!     def run (self):
          myself = self.myself
  
--- 38,42 ----
                         (3, 6, adonthell.STAND_WEST)]
  
!     def run_old (self):
          myself = self.myself
  

Index: erek.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/erek.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** erek.py     10 Aug 2002 12:20:46 -0000      1.5
--- erek.py     10 Aug 2002 22:03:15 -0000      1.6
***************
*** 55,59 ****
          self.index = 0
  
!     def run (self):
          myself = self.myself
          
--- 55,59 ----
          self.index = 0
  
!     def run_old (self):
          myself = self.myself
          

Index: fellnir.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/fellnir.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** fellnir.py  10 Aug 2002 12:20:46 -0000      1.4
--- fellnir.py  10 Aug 2002 22:03:15 -0000      1.5
***************
*** 37,67 ****
                         (6, 5, adonthell.STAND_WEST)]
  
!     def run (self):
!         myself = self.myself
!         
!         todo = myself.get_val ("todo")
  
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- engage a new movement
!         elif todo == 1:
!             x, y, dir = self.coords[random.randrange (0, 4)]
! 
!             myself.set_goal (x, y, dir)
!             myself.set_val ("todo", 2)
! 
!         # -- moving
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 # -- the time we stay at the same place
!                 delay = random.randrange (30, 60) * 25
! 
!                 myself.set_val ("delay", delay)
!                 myself.set_val ("todo", 0)
--- 37,53 ----
                         (6, 5, adonthell.STAND_WEST)]
  
!         delay = "%it" % random.randrange (37, 75)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
  
!     def walk (self):
!         x, y, dir = self.coords[random.randrange (0, 4)]
!         self.myself.set_goal (x, y, dir)
!     
!     def goal_reached (self):
!         delay = "%it" % random.randrange (37, 75)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: frostbloom.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/frostbloom.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** frostbloom.py       10 Aug 2002 12:20:46 -0000      1.4
--- frostbloom.py       10 Aug 2002 22:03:15 -0000      1.5
***************
*** 39,71 ****
          schedule.speak.__init__(self)
          
!     def run (self):
!         myself = self.myself
!         
!         todo = myself.get_val ("todo")
! 
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
! 
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- get movement target
!         elif todo == 1:
!             # -- the position we want to reach
!             x = random.randrange (self.min_x, self.max_x)
!             y = random.randrange (self.min_y, self.max_y)
! 
!             myself.set_goal (x, y)
! 
!             delay = random.randrange (30, 90) * 30
!             myself.set_val ("delay", delay)
!             myself.set_val ("todo", 2)
! 
!         # -- walk to the new position
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 myself.set_val ("todo", 0)
--- 39,58 ----
          schedule.speak.__init__(self)
          
!         delay = "%it" % random.randrange (20, 50)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
! 
!     def walk (self):
!         # -- the position we want to reach
!         x = random.randrange (self.min_x, self.max_x)
!         y = random.randrange (self.min_y, self.max_y)
! 
!         self.myself.set_goal (x, y)
!     
!     def goal_reached (self):
!         delay = "%it" % random.randrange (20, 50)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: janesta.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/janesta.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** janesta.py  10 Aug 2002 12:20:46 -0000      1.3
--- janesta.py  10 Aug 2002 22:03:15 -0000      1.4
***************
*** 39,69 ****
                         (4, 2, adonthell.STAND_WEST)]
  
!     def run (self):
!         myself = self.myself
!         
!         todo = myself.get_val ("todo")
  
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- engage a new movement
!         elif todo == 1:
!             x, y, dir = self.coords[random.randrange (0, 4)]
! 
!             myself.set_goal (x, y, dir)
!             myself.set_val ("todo", 2)
! 
!         # -- moving
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 # -- the time we stay at the same place
!                 delay = random.randrange (20, 60) * 10
! 
!                 myself.set_val ("delay", delay)
!                 myself.set_val ("todo", 0)
--- 39,55 ----
                         (4, 2, adonthell.STAND_WEST)]
  
!         delay = "%it" % random.randrange (10, 30)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
  
!     def walk (self):
!         x, y, dir = self.coords[random.randrange (0, 4)]
!         self.myself.set_goal (x, y, dir)
!     
!     def goal_reached (self):
!         delay = "%it" % random.randrange (10, 30)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: jelom.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/jelom.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** jelom.py    10 Aug 2002 12:20:46 -0000      1.3
--- jelom.py    10 Aug 2002 22:03:15 -0000      1.4
***************
*** 34,67 ****
          schedule.speak.__init__(self)
          
!     def run (self):
!         myself = self.myself
!         
!         todo = myself.get_val ("todo")
  
!         # If standing
!         if todo == 0:
!             delay = myself.get_val ("delay")
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # Engage a new movement
!         elif todo == 1:
!             # Choose where to move, if destination is already occupied we'll
!             # fall into the wait state (0) again automatically next time
!             if myself.posy () == 3:
!                 myself.set_goal (2, 6, adonthell.STAND_NORTH)
!             else:
!                 myself.set_goal (2, 3, adonthell.STAND_SOUTH)
! 
!             # Next time we'll actually move!
!             myself.set_val ("todo", 2)
! 
!         # Moving, follow the path until it is reached.
!         elif todo == 2:
!             # Reached the goal? Wait a while then...
!             if myself.follow_path ():
!                 myself.set_val ("delay", random.randrange (30, 60) * 20)
!                 myself.set_val ("todo", 0)
--- 34,52 ----
          schedule.speak.__init__(self)
          
!         delay = "%it" % random.randrange (20, 65)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
  
!     def walk (self):
!         if self.myself.posy () == 3:
!             self.myself.set_goal (2, 6, adonthell.STAND_NORTH)
!         else:
!             self.myself.set_goal (2, 3, adonthell.STAND_SOUTH)
!     
!     def goal_reached (self):
!         delay = "%it" % random.randrange (20, 65)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: lucia.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/lucia.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** lucia.py    10 Aug 2002 12:20:46 -0000      1.5
--- lucia.py    10 Aug 2002 22:03:15 -0000      1.6
***************
*** 37,77 ****
                    (6, 3, adonthell.STAND_EAST)]
  
!     def run (self):
!         myself = self.myself
!         todo = myself.get_val ("todo")
! 
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
! 
!             # -- If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
! 
!         # -- engage a new movement
!         elif todo == 1:
!             if myself.posx () != 3:
!                 x, y, dir = self.coords[0]
!             else:
!                 x, y, dir = self.coords[random.randrange(0, 2)]
!             myself.set_goal (x, y, dir)
!             myself.set_val ("todo", 2)
! 
!         # -- moving
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 # -- standing in front of the exit
!                 if myself.posx () == 6:
!                     myself.speak (_("Ah, some fresh air!"))
! 
!                     tmp = myself.get_val ("say_something")
!                     myself.set_val ("say_something", tmp + 75)
!                     myself.set_val ("delay", 300)
! 
!                 else:
!                     myself.set_val ("delay", 1000 + random.randrange (0, 
2000))
!                                     
!                 myself.set_val ("todo", 0)
--- 37,62 ----
                    (6, 3, adonthell.STAND_EAST)]
  
!         delay = "%it" % random.randrange (20, 40)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
! 
!     def walk (self):
!         if self.myself.posx () != 3:
!             x, y, dir = self.coords[0]
!         else:
!             x, y, dir = self.coords[random.randrange(0, 2)]
!         self.myself.set_goal (x, y, dir)
!     
!     def goal_reached (self):
!         # -- standing in front of the exit
!         if self.myself.posx () == 6:
!             self.myself.speak (_("Ah, some fresh air!"))
!             delay = "8t"
!         else:
!             delay = "%it" % random.randrange (20, 40)
!         
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: oliver.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/oliver.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** oliver.py   10 Aug 2002 12:20:46 -0000      1.5
--- oliver.py   10 Aug 2002 22:03:15 -0000      1.6
***************
*** 37,41 ****
  
  
!     def run (self):
          myself = self.myself
          
--- 37,41 ----
  
  
!     def run_old (self):
          myself = self.myself
          

Index: orloth.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/orloth.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** orloth.py   10 Aug 2002 12:20:46 -0000      1.4
--- orloth.py   10 Aug 2002 22:03:15 -0000      1.5
***************
*** 44,48 ****
                    (6, 5, 0)]
  
!     def run (self):
          myself = self.myself
          todo = myself.get_val ("todo")
--- 44,48 ----
                    (6, 5, 0)]
  
!     def run_old (self):
          myself = self.myself
          todo = myself.get_val ("todo")

Index: sarin.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/sarin.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** sarin.py    10 Aug 2002 12:20:46 -0000      1.3
--- sarin.py    10 Aug 2002 22:03:15 -0000      1.4
***************
*** 42,46 ****
          schedule.speak.__init__(self)
          
!     def run (self):
          myself = self.myself
  
--- 42,50 ----
          schedule.speak.__init__(self)
          
!     def walk (self):
!         pass
!     def goal_reached (self):
!         pass
!     def run_old (self):
          myself = self.myself
  

Index: silverhair.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/silverhair.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** silverhair.py       6 May 2002 13:47:18 -0000       1.3
--- silverhair.py       10 Aug 2002 22:03:15 -0000      1.4
***************
*** 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
  #
***************
*** 17,20 ****
--- 17,21 ----
  
  import adonthell
+ import schedule
  import random
  
***************
*** 22,26 ****
  def _(message): return message
  
! class silverhair:
  
      def __init__ (self, mapcharacterinstance):
--- 23,27 ----
  def _(message): return message
  
! class silverhair (schedule.speak):
  
      def __init__ (self, mapcharacterinstance):
***************
*** 30,84 ****
                         _("Janesta, please bring my figurine. I wish to see it 
more closely."), \
                         _("It truly is a lovely day. I expect we will have 
time yet to enjoy it.")]
  
!     def run (self):
!         myself = self.myself
! 
!         todo = myself.get_val ("todo")
! 
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
! 
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- get movement target
!         elif todo == 1:
!             # -- goto the window
!             if myself.posx () == 4:
!                 # ... and speak about the weather
!                 say = random.randrange (33, 66) * 10
!                 delay = random.randrange (50, 75) * 15
!                 myself.set_val ("say_something", say)
!                 myself.set_goal (6, 4, adonthell.STAND_EAST)
! 
!             # -- go back to our normal position
!             else:
!                 say = random.randrange (33, 66) * 10
!                 delay = random.randrange (100, 200) * 35
!                 if myself.set_goal (4, 4, adonthell.STAND_SOUTH) == 0:
!                     return
! 
!             myself.set_val ("say_something", say)
!             myself.set_val ("delay", delay)
!             myself.set_val ("todo", 2)
! 
!         # -- move
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 myself.set_val ("todo", 0)
! 
!         # -- speak
!         say = myself.get_val ("say_something")
!         myself.set_val ("say_something", say - 1)
!         if say == 0:
!             if myself.posx () == 6:
!                 myself.speak (self.speech[3])
!             else:
!                 myself.speak (self.speech[random.randrange (0, 3)])
! 
!             say = random.randrange (60, 180) * 20
!             myself.set_val ("say_something", say)
--- 31,62 ----
                         _("Janesta, please bring my figurine. I wish to see it 
more closely."), \
                         _("It truly is a lovely day. I expect we will have 
time yet to enjoy it.")]
+         self.speech_delay = (20, 72)
+         schedule.speak.__init__(self)
  
!         delay = "%it" % random.randrange (70, 140)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
! 
!     def walk (self):
!         # -- goto the window
!         if self.myself.posx () == 4:
!             # ... and speak about the weather
!             self.delay = "%it" % random.randrange (15, 22)
!             self.myself.set_goal (6, 4, adonthell.STAND_EAST)
! 
!         # -- go back to our normal position
!         else:
!             self.delay = "%it" % random.randrange (70, 140)
!             if self.myself.set_goal (4, 4, adonthell.STAND_SOUTH) == 0:
!                 self.myself.go_north ()
!                                 
!     def goal_reached (self):
!         # -- standing in front of the window
!         if self.myself.posx () == 6:
!             self.myself.speak (self.speech[3])
!         
!         self.walk_event = adonthell.time_event (self.delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: talan.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/talan.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** talan.py    10 Aug 2002 12:20:46 -0000      1.3
--- talan.py    10 Aug 2002 22:03:15 -0000      1.4
***************
*** 32,66 ****
          self.speech_delay = (30, 60)
          schedule.speak.__init__(self)
! 
!     def run (self):
!         # Caching this often used variable for faster access
!         myself = self.myself
!         todo = myself.get_val ("todo")
! 
!         # If standing
!         if todo == 0:
!             delay = myself.get_val ("delay")
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # Engage a new movement
!         elif todo == 1:
!             # Choose where to move, if destination is already occupied we'll
!             # fall into the wait state (0) again automatically next time
!             if myself.posy () == 17:
!                 myself.set_goal (11, 19, adonthell.STAND_NORTH)
!             else:
!                 myself.set_goal (11, 17, adonthell.STAND_SOUTH)
! 
!             # Next time we'll actually move!
!             myself.set_val ("todo", 2)
! 
!         # Moving, follow the path until it is reached.
!         elif todo == 2:
!             # Reached the goal? Wait a while then...
!             if myself.follow_path ():
!                 myself.set_val ("delay", random.randrange (25, 50) * 20)
!                 myself.set_val ("todo", 0)
--- 32,51 ----
          self.speech_delay = (30, 60)
          schedule.speak.__init__(self)
!         
!         # -- walking stuff
!         self.walk_event = adonthell.time_event ("5t")
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
!         
!     def walk (self):
!         if self.myself.posy () == 17:
!             self.myself.set_goal (11, 19, adonthell.STAND_NORTH)
!         else:
!             self.myself.set_goal (11, 17, adonthell.STAND_SOUTH)
!         
!     def goal_reached (self):
!         delay = "%it" % random.randrange (10, 20)
!         self.walk_event = adonthell.time_event (delay)
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)

Index: tristan.py
===================================================================
RCS file: 
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/tristan.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** tristan.py  10 Aug 2002 12:20:46 -0000      1.4
--- tristan.py  10 Aug 2002 22:03:15 -0000      1.5
***************
*** 33,79 ****
          self.speech_delay = (20, 55)
          schedule.speak.__init__(self)
! 
!     def run (self):
!         myself = self.myself
!         todo = myself.get_val ("todo")
! 
!         # -- waiting
!         if todo == 0:
!             delay = myself.get_val ("delay")
! 
!             # If standing delay expired, move around next time
!             if delay == 0:
!                 myself.set_val ("todo", 1)
!             else:
!                 myself.set_val ("delay", delay - 1)
! 
!         # -- get movement target
!         elif todo == 1:
!             # -- in common room -> go outside
!             if myself.submap () == 1 and \
!                 adonthell.gamedata_get_quest ("demo").get_val ("intro_on") == 
0:
!                 myself.set_goal (13, 8, adonthell.STAND_SOUTH)
!                 delay = random.randint (100, 150) * 30
! 
!             # -- outside -> goto common room
!             else:
!                 myself.set_goal (18, 13, adonthell.STAND_NORTH)
!                 delay = random.randint (75, 150) * 30
! 
!             myself.set_val ("delay", delay)
!             myself.set_val ("todo", 2)
! 
!         # -- move
!         elif todo == 2:
!             if myself.follow_path () == 1:
!                 # -- reached common room
!                 if myself.submap () == 1 and myself.posx () == 13:
!                     myself.set_goal (4, 6, adonthell.STAND_WEST)
! 
!                 # -- reached yard
!                 elif myself.submap () == 0 and myself.posx () == 18:
!                     myself.set_goal (12, 18, adonthell.STAND_WEST)
! 
!                 # -- reached our final destination
!                 else:
!                     myself.set_val ("todo", 0)
--- 33,65 ----
          self.speech_delay = (20, 55)
          schedule.speak.__init__(self)
!         
!         # -- walking
!         self.walk_event = adonthell.time_event ("35t")
!         self.walk_event.set_callback (self.walk)
!         adonthell.event_handler_register_event (self.walk_event)
!         self.myself.set_callback (self.goal_reached)
! 
!     def walk (self):
!         # -- in common room -> go outside
!         if self.myself.submap () == 1 and \
!             adonthell.gamedata_get_quest ("demo").get_val ("intro_on") == 0:
!             self.myself.set_goal (13, 8, adonthell.STAND_SOUTH)
!             self.walk_delay = "%it" % random.randint (60, 90)
! 
!         # -- outside -> goto common room
!         else:
!             self.myself.set_goal (18, 13, adonthell.STAND_NORTH)
!             self.walk_delay = "%it" % random.randint (45, 90)
!     
!     def goal_reached (self):
!         # -- reached common room
!         if self.myself.submap () == 1 and self.myself.posx () == 13:
!             self.myself.set_goal (4, 6, adonthell.STAND_WEST)
!         # -- reached yard
!         elif self.myself.submap () == 0 and self.myself.posx () == 18:
!             self.myself.set_goal (12, 18, adonthell.STAND_WEST)
!         # -- reached our final destination
!         else:
!             self.walk_event = adonthell.time_event (self.walk_delay)
!             self.walk_event.set_callback (self.walk)
!             adonthell.event_handler_register_event (self.walk_event)





reply via email to

[Prev in Thread] Current Thread [Next in Thread]