[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters Make
|
From: |
Kai Sterker <address@hidden> |
|
Subject: |
[Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters Makefile.am,1.12,1.13 alek.py,1.4,1.5 fellnir.py,1.5,1.6 frostbloom.py,1.5,1.6 janesta.py,1.4,1.5 jelom.py,1.4,1.5 lucia.py,1.6,1.7 oliver.py,1.6,1.7 orloth.py,1.5,1.6 sarin.py,1.5,1.6 schedule.py,1.1,1.2 silverhair.py,1.4,1.5 talan.py,1.4,1.5 tristan.py,1.5,1.6 |
|
Date: |
Sun, 18 Aug 2002 15:55:21 -0400 |
Update of /cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters
In directory subversions:/tmp/cvs-serv1023/scripts/schedules/mapcharacters
Modified Files:
Makefile.am alek.py fellnir.py frostbloom.py janesta.py
jelom.py lucia.py oliver.py orloth.py sarin.py schedule.py
silverhair.py talan.py tristan.py
Log Message:
UPDATED schedules once again for new event system - still not all done though
Index: Makefile.am
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/Makefile.am,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** Makefile.am 6 May 2002 13:47:18 -0000 1.12
--- Makefile.am 18 Aug 2002 19:55:19 -0000 1.13
***************
*** 6,10 ****
keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
talan.py tristan.py fellnir.py to_cellar.py lucia.py intro.py \
! extro.py __init__.py
all:
--- 6,10 ----
keyboard_control.py oliver.py orloth.py sarin.py silverhair.py \
talan.py tristan.py fellnir.py to_cellar.py lucia.py intro.py \
! extro.py __init__.py schedule.py
all:
Index: alek.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/alek.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** alek.py 10 Aug 2002 22:03:15 -0000 1.4
--- alek.py 18 Aug 2002 19:55:19 -0000 1.5
***************
*** 34,42 ****
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
--- 34,44 ----
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):
# -- walk to table
***************
*** 49,53 ****
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)
--- 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)
Index: fellnir.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/fellnir.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** fellnir.py 10 Aug 2002 22:03:15 -0000 1.5
--- fellnir.py 18 Aug 2002 19:55:19 -0000 1.6
***************
*** 38,46 ****
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)]
--- 38,48 ----
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):
x, y, dir = self.coords[random.randrange (0, 4)]
***************
*** 49,53 ****
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)
--- 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)
Index: frostbloom.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/frostbloom.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** frostbloom.py 10 Aug 2002 22:03:15 -0000 1.5
--- frostbloom.py 18 Aug 2002 19:55:19 -0000 1.6
***************
*** 40,48 ****
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
--- 40,50 ----
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):
# -- the position we want to reach
***************
*** 54,58 ****
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)
--- 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)
Index: janesta.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/janesta.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** janesta.py 10 Aug 2002 22:03:15 -0000 1.4
--- janesta.py 18 Aug 2002 19:55:19 -0000 1.5
***************
*** 40,46 ****
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)
--- 40,48 ----
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)
***************
*** 51,55 ****
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)
--- 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)
Index: jelom.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/jelom.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** jelom.py 10 Aug 2002 22:03:15 -0000 1.4
--- jelom.py 18 Aug 2002 19:55:19 -0000 1.5
***************
*** 35,41 ****
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)
--- 35,43 ----
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)
***************
*** 48,52 ****
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)
--- 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)
Index: lucia.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/lucia.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** lucia.py 10 Aug 2002 22:03:15 -0000 1.6
--- lucia.py 18 Aug 2002 19:55:19 -0000 1.7
***************
*** 38,44 ****
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)
--- 38,46 ----
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)
***************
*** 58,62 ****
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)
--- 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)
Index: oliver.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/oliver.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** oliver.py 10 Aug 2002 22:03:15 -0000 1.6
--- oliver.py 18 Aug 2002 19:55:19 -0000 1.7
***************
*** 36,117 ****
self.offsets = [(1,1),(1,-1),(-1,1),(-1,-1),(1,0),(0,1),(-1,0),(0,-1)]
!
! def run_old (self):
! myself = self.myself
! # -- Oliver summoned to common room
! if myself.get_val ("goto_players_room") == 1:
! # -- beam him directly there, as it is faster that way
! if myself.submap () != 1:
! myself.jump_to (1, 13, 7, adonthell.STAND_NORTH)
!
! # -- find a free spot near Orloth and the player
! i = 0
! orloth = adonthell.gamedata_get_character ("Orloth Redwyne")
! while i < 7:
! x, y = self.offsets[i][:2]
! x = x + orloth.posx ()
! y = y + orloth.posy ()
! if myself.set_goal (x, y): break
! i = i + 1
!
! myself.set_val ("goto_players_room", 2)
! myself.set_val ("todo", 2)
!
! # -- in the player's room
! elif myself.get_val ("goto_players_room") == 3:
! # -- start talking to the player
! myself.launch_action (adonthell.gamedata_player ())
!
! # -- leave the player's room and goto the barn
! elif myself.get_val ("goto_barn") == 1:
! location = myself.submap ()
! myself.set_val ("goto_barn", 2)
!
! # -- Player's room
! if location == 12:
! myself.set_goal (5, 1)
!
! # -- First floor
! elif location == 9:
! myself.set_goal (8, 1)
!
! # -- Second floor (this shouldn't happen, but it once did ...)
! elif location == 14:
! myself.set_goal (4, 1)
!
! # -- Common Room
! elif location == 1:
! myself.set_goal (13, 8)
!
! # -- Yard, our final goal (for now)
! elif location == 0:
! myself.set_goal (25, 15)
! myself.set_val ("goto_barn", 0)
!
! myself.set_val ("todo", 2)
!
!
! # -- "normal" schedule
! 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:
! # -- on our way back from bjarn's room
! if myself.get_val ("goto_barn") == 2:
! myself.set_val ("goto_barn", 1)
!
! # -- move
! elif todo == 2:
! if myself.follow_path () == 1:
! myself.set_val ("todo", 0)
--- 36,81 ----
self.offsets = [(1,1),(1,-1),(-1,1),(-1,-1),(1,0),(0,1),(-1,0),(0,-1)]
! self.myself.set_callback (self.goal_reached)
!
! # -- summoned to the common room player to his room
! def goto_common_room (self):
! # -- beam directly to common room, as it is faster that way
! self.myself.jump_to (1, 13, 7, adonthell.STAND_NORTH)
! # -- find a free spot near Orloth and the player
! orloth = adonthell.gamedata_get_character ("Orloth Redwyne")
! for (x, y) in self.offsets:
! x = x + orloth.posx ()
! y = y + orloth.posy ()
!
! if self.myself.set_goal (x, y):
! break
!
! # -- leave the player's room and goto the barn
! def goto_barn (self):
! location = self.myself.submap ()
!
! # -- Player's room
! if location == 12:
! self.myself.set_goal (5, 1)
!
! # -- First floor
! elif location == 9:
! self.myself.set_goal (8, 1)
!
! # -- Second floor (this shouldn't happen, but it once did ...)
! elif location == 14:
! self.myself.set_goal (4, 1)
!
! # -- Common Room
! elif location == 1:
! self.myself.set_goal (13, 8)
!
! # -- Yard, our final goal (for now)
! elif location == 0:
! self.myself.set_goal (25, 15)
! self.myself.goto_barn = 0
!
! def goal_reached (self):
! if self.myself.get_val ("goto_barn") == 1:
! self.goto_barn ()
Index: orloth.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/orloth.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** orloth.py 10 Aug 2002 22:03:15 -0000 1.5
--- orloth.py 18 Aug 2002 19:55:19 -0000 1.6
***************
*** 43,119 ****
(12, 5, 0), \
(6, 5, 0)]
!
! def run_old (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)
!
! # -- put/take the first mug
! if delay == 100:
! self.put_object (106, 0)
!
! # -- put/take the second mug
! elif delay == 50:
! self.put_object (107, 1)
!
! # -- engage a new movement
! elif todo == 1:
! # -- when we are at the bar, then wait a while before
! # moving again
! if myself.posx () != 2:
! delay = random.randrange (40, 120) * 20
! myself.set_val ("delay", delay)
! myself.set_goal (2, 2, adonthell.STAND_SOUTH)
! myself.set_val ("table_num", 0)
!
! # -- otherwise only wait a little
! else:
! index = random.randrange (0, 5)
! x, y, dir = self.coords[index]
! myself.set_goal (x, y, dir)
! myself.set_val ("delay", 150)
! myself.set_val ("table_num", index)
!
! myself.set_val ("todo", 2)
!
! # -- moving
! elif todo == 2:
! if myself.follow_path () == 1:
! # -- standing in front of the clock
! if myself.posx () == 10:
! myself.speak (_("That clock is late again!"))
!
! tmp = myself.get_val ("say_something")
! myself.set_val ("say_something", tmp + 75)
!
! myself.set_val ("todo", 0)
!
# -- put/remove something from the table we're standing next to
! def put_object (self, object, update):
! myself = self.myself
# -- the table we're next to
! index = myself.get_val ("table_num")
if index > 0:
# -- see whether table is laid or not
key = "table%i_set" % index
! val = myself.get_val (key)
x, y = self.coords[index+4][:2]
if val == 0:
adonthell.gamedata_engine ().get_landmap ().put_mapobject (1,
x, y, object)
! if update == 1: myself.set_val (key, 1)
else:
adonthell.gamedata_engine ().get_landmap ().remove_mapobject
(1, x, y, object)
! if update == 1: myself.set_val (key, 0)
!
--- 43,108 ----
(12, 5, 0), \
(6, 5, 0)]
!
! # -- improve that!!!
! self.goal_reached ()
! self.myself.set_callback (self.goal_reached)
!
! def walk (self):
! # -- return to bar
! if self.myself.posx () != 2:
! self.myself.set_goal (2, 2, adonthell.STAND_SOUTH)
! self.myself.set_val ("table_num", 0)
!
! # -- when we are at the bar, then wait a while before
! # moving again
! else:
! index = random.randrange (0, 5)
! x, y, dir = self.coords[index]
! self.myself.set_goal (x, y, dir)
! self.myself.set_val ("table_num", index)
!
! def goal_reached (self):
! # -- standing in front of the clock
! if self.myself.posx () == 10:
! self.myself.speak (_("That clock is late again!"))
! delay = "%it" % random.randrange (3, 6)
! # -- standing at the bar
! elif self.myself.posx () == 2:
! delay = "%it" % random.randrange (16, 48)
! # -- standing at a table
! 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)
! # -- 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
! def put_object (self, args):
! object, update = args[:]
# -- the table we're next to
! index = self.myself.get_val ("table_num")
if index > 0:
# -- see whether table is laid or not
key = "table%i_set" % index
! val = self.myself.get_val (key)
x, y = self.coords[index+4][:2]
if val == 0:
adonthell.gamedata_engine ().get_landmap ().put_mapobject (1,
x, y, object)
! if update == 1: self.myself.set_val (key, 1)
else:
adonthell.gamedata_engine ().get_landmap ().remove_mapobject
(1, x, y, object)
! if update == 1: self.myself.set_val (key, 0)
Index: sarin.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/sarin.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** sarin.py 11 Aug 2002 11:59:07 -0000 1.5
--- sarin.py 18 Aug 2002 19:55:19 -0000 1.6
***************
*** 44,59 ****
delay = "%it" % random.randrange (3, 6)
! 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)
! #delay = "%it" % random.randrange (13, 16)
! #self.switch_event = adonthell.time_event (delay)
! #self.switch_event.set_callback (self.switch_direction)
! #adonthell.event_handler_register_event (self.switch_event)
! def switch_direction (self):
# -- ... and set the new one accordingly
if self.direction == adonthell.WALK_EAST or self.direction ==
adonthell.WALK_WEST:
--- 44,61 ----
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:
***************
*** 62,69 ****
self.direction = random.randrange (adonthell.WALK_WEST,
adonthell.WALK_EAST + 1)
! delay = "%it" % random.randrange (13, 16)
! self.switch_event = adonthell.time_event (delay)
! self.switch_event.set_callback (self.switch_direction)
! adonthell.event_handler_register_event (self.switch_event)
self.walk ()
--- 64,72 ----
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.walk ()
***************
*** 90,94 ****
def goal_reached (self):
delay = "%it" % random.randrange (3, 6)
! self.walk_event = adonthell.time_event (delay)
! self.walk_event.set_callback (self.walk)
! adonthell.event_handler_register_event (self.walk_event)
--- 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)
Index: schedule.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/schedule.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** schedule.py 10 Aug 2002 12:20:46 -0000 1.1
--- schedule.py 18 Aug 2002 19:55:19 -0000 1.2
***************
*** 20,23 ****
--- 20,24 ----
# requires the NPC schedule to have the members
#
+ # myself, a pointer to the mapcharacter
# speech, an array of remarks for the NPC, and
# speech_delay, a tuple with the minimum and maximum delay
***************
*** 29,37 ****
def __init__ (self):
# -- sanity checks
! if type (self.speech) != types.ListType:
print "*** speak::__init__: 'speech' list not found!"
! if type (self.speech_delay) != types.TupleType:
print "*** speak::__init__: 'speech_delay' tuple not found!"
! if len (self.speech_delay) != 2:
print "*** speak::__init__: 'speech_delay' has wrong size!"
--- 30,42 ----
def __init__ (self):
# -- sanity checks
! if not hasattr (self, "myself"):
! print "*** speak::__init__: character 'myself' not found!"
! if not hasattr (self, "speech") and \
! type (self.speech) != types.ListType:
print "*** speak::__init__: 'speech' list not found!"
! if not hasattr (self, "speech_delay") and \
! type (self.speech_delay) != types.TupleType:
print "*** speak::__init__: 'speech_delay' tuple not found!"
! elif len (self.speech_delay) != 2:
print "*** speak::__init__: 'speech_delay' has wrong size!"
***************
*** 41,48 ****
# -- register first speech
delay = "%it" % random.randrange (self.speech_delay[0],
self.speech_delay[1])
! self.speak_event = adonthell.time_event (delay)
! self.speak_event.set_callback (self.speak)
! adonthell.event_handler_register_event (self.speak_event)
!
# -- make remark and set delay for the next one
--- 46,53 ----
# -- 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
***************
*** 51,55 ****
delay = "%it" % random.randrange (self.speech_delay[0],
self.speech_delay[1])
! self.speak_event = adonthell.time_event (delay)
! self.speak_event.set_callback (self.speak)
! adonthell.event_handler_register_event (self.speak_event)
--- 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)
Index: silverhair.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/silverhair.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** silverhair.py 10 Aug 2002 22:03:15 -0000 1.4
--- silverhair.py 18 Aug 2002 19:55:19 -0000 1.5
***************
*** 35,41 ****
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)
--- 35,43 ----
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)
***************
*** 58,62 ****
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)
--- 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)
Index: talan.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/talan.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** talan.py 10 Aug 2002 22:03:15 -0000 1.4
--- talan.py 18 Aug 2002 19:55:19 -0000 1.5
***************
*** 34,40 ****
# -- 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)
--- 34,42 ----
# -- 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)
***************
*** 47,51 ****
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)
--- 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)
Index: tristan.py
===================================================================
RCS file:
/cvsroot/adonthell/wastesedge/scripts/schedules/mapcharacters/tristan.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** tristan.py 10 Aug 2002 22:03:15 -0000 1.5
--- tristan.py 18 Aug 2002 19:55:19 -0000 1.6
***************
*** 34,43 ****
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
--- 34,47 ----
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)
+
def walk (self):
# -- in common room -> go outside
***************
*** 61,65 ****
# -- 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)
--- 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)
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Adonthell-commits] CVS: wastesedge/scripts/schedules/mapcharacters Makefile.am,1.12,1.13 alek.py,1.4,1.5 fellnir.py,1.5,1.6 frostbloom.py,1.5,1.6 janesta.py,1.4,1.5 jelom.py,1.4,1.5 lucia.py,1.6,1.7 oliver.py,1.6,1.7 orloth.py,1.5,1.6 sarin.py,1.5,1.6 schedule.py,1.1,1.2 silverhair.py,1.4,1.5 talan.py,1.4,1.5 tristan.py,1.5,1.6,
Kai Sterker <address@hidden> <=
- Prev by Date:
[Adonthell-commits] CVS: wastesedge/scripts/dialogues oliver_start.py,1.6,1.7 orloth_start.py,1.22,1.23
- Next by Date:
[Adonthell-commits] CVS: adonthell/src map_event_handler.cc,1.3,1.4
- Previous by thread:
[Adonthell-commits] CVS: wastesedge/scripts/dialogues oliver_start.py,1.6,1.7 orloth_start.py,1.22,1.23
- Next by thread:
[Adonthell-commits] CVS: adonthell/src map_event_handler.cc,1.3,1.4
- Index(es):