Update of /cvsroot/wpdev/xmlscripts/scripts/system
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12383/system
Modified Files:
macro_opendoor.py poison.py spawns.py trading.py
Log Message:
Changed all references to "events" to "scripts"
Index: spawns.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/spawns.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** spawns.py 24 Aug 2004 18:10:30 -0000 1.5
--- spawns.py 25 Aug 2004 17:03:06 -0000 1.6
***************
*** 18,22 ****
npc.wandertype = 3
npc.wanderradius = area
! npc.addevent( 'system.spawns' )
npc.update()
elif spawntype == 0:
--- 18,22 ----
npc.wandertype = 3
npc.wanderradius = area
! npc.addscript( 'system.spawns' )
npc.update()
elif spawntype == 0:
***************
*** 78,82 ****
# Check if the spawn is valid.
valid = item != None
! if valid and not item.hasevent( 'spawngem' ):
valid = 0
if valid and not item.hastag('spawntype') or not item.hastag('spawndef'):
--- 78,82 ----
# Check if the spawn is valid.
valid = item != None
! if valid and not item.hasscript( 'spawngem' ):
valid = 0
if valid and not item.hastag('spawntype') or not item.hastag('spawndef'):
Index: trading.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/trading.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** trading.py 24 Aug 2004 18:10:30 -0000 1.5
--- trading.py 25 Aug 2004 17:03:06 -0000 1.6
***************
*** 66,71 ****
#onLogout event should be executed for tradewindow disposing
! player1.addevent( 'system.trading' )
! player2.addevent( 'system.trading' )
#We want to know serial of partner in future
--- 66,71 ----
#onLogout event should be executed for tradewindow disposing
! player1.addscript( 'system.trading' )
! player2.addscript( 'system.trading' )
#We want to know serial of partner in future
Index: poison.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/poison.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** poison.py 24 Aug 2004 18:10:30 -0000 1.5
--- poison.py 25 Aug 2004 17:03:06 -0000 1.6
***************
*** 27,33 ****
# If he did, save the strokes and level and restore it later
if char.player and not char.socket and char.logouttime == 0:
! if not char.hasevent( 'system.poison' ):
char.settag( 'poison_strokes', strokes )
! char.addevent( 'system.poison' )
return
--- 27,33 ----
# If he did, save the strokes and level and restore it later
if char.player and not char.socket and char.logouttime == 0:
! if not char.hasscript( 'system.poison' ):
char.settag( 'poison_strokes', strokes )
! char.addscript( 'system.poison' )
return
***************
*** 103,107 ****
#
def onLogin(char):
! char.removeevent( 'system.poison' )
if not POISONS.has_key(char.poison):
--- 103,107 ----
#
def onLogin(char):
! char.removescript( 'system.poison' )
if not POISONS.has_key(char.poison):
Index: macro_opendoor.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/macro_opendoor.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** macro_opendoor.py 17 Jul 2004 07:24:00 -0000 1.4
--- macro_opendoor.py 25 Aug 2004 17:03:06 -0000 1.5
***************
*** 38,42 ****
reach = 1
if reach == 1:
! for event in door.events:
if event == 'door':
opendoor = 1
--- 38,42 ----
reach = 1
if reach == 1:
! for event in door.scripts:
if event == 'door':
opendoor = 1
|
