[wpdev-commits] xmlscripts/scripts/speech banker.py,1.6,1.7 barber.py,1.6,1.7 pets.py,1.7,1.8 stablemaster.py,1.4,1.5

[<dar...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/speech
In directory sc8-pr-cvs1:/tmp/cvs-serv31654/speech

Modified Files:
	banker.py barber.py pets.py stablemaster.py 
Log Message:
Changed scripts to resemble changes in wolfpack.registerglobal and wolfpack.registercommand
Added barebone for new magic system.

Index: banker.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/banker.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** banker.py	6 Jul 2003 16:46:23 -0000	1.6
--- banker.py	23 Sep 2003 12:21:04 -0000	1.7
***************
*** 22,35 ****
  amountre = re.compile( '(\d+)' )
  
- def onLoad():
- 	setCatchAll( 'speech.banker', 0 )
- 	addKeyword( 'speech.banker', 0x0 )
- 	addKeyword( 'speech.banker', 0x1 )
- 	addKeyword( 'speech.banker', 0x2 )
- 	addKeyword( 'speech.banker', 0x3 )	
- 
  def onSpeech( listener, speaker, text, keywords ):
  	for keyword in keywords:
- 
  		# withdraw
  		if keyword == 0x0:
--- 22,27 ----

Index: barber.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/barber.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** barber.py	6 Jul 2003 16:46:23 -0000	1.6
--- barber.py	23 Sep 2003 12:21:04 -0000	1.7
***************
*** 38,47 ****
  			0x204D: 50000
  		}
! 
! # 0x0171 *buy*
! def onLoad():
! 	setCatchAll( 'speech.barber', 0 )
! 	addKeyword( 'speech.barber', 0x171 )
! 
  def onSpeech( listener, speaker, text, keywords ):
  	# Check if our name is in the beginning of the string
--- 38,42 ----
  			0x204D: 50000
  		}
! 		
  def onSpeech( listener, speaker, text, keywords ):
  	# Check if our name is in the beginning of the string

Index: pets.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/pets.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pets.py	6 Jul 2003 16:46:23 -0000	1.7
--- pets.py	23 Sep 2003 12:21:04 -0000	1.8
***************
*** 12,51 ****
  import wolfpack
  
- def onLoad():
- 	# We only want to fetch the commands registered below
- 	setCatchAll( 'speech.pets', 0 ) 
- 
- 	# Register some keywords
- 	addKeyword( 'speech.pets', 0x155 ) # "*come"
- 	addKeyword( 'speech.pets', 0x156 ) # "*drop"
- 	addKeyword( 'speech.pets', 0x15A ) # "*follow"
- 	addKeyword( 'speech.pets', 0x15B ) # "*friend"
- 	addKeyword( 'speech.pets', 0x15C ) # "*guard"
- 	addKeyword( 'speech.pets', 0x15D ) # "*kill"
- 	addKeyword( 'speech.pets', 0x15E ) # "*attack"
- 	addKeyword( 'speech.pets', 0x161 ) # "*stop"
- 	addKeyword( 'speech.pets', 0x163 ) # "*follow me"
- 	addKeyword( 'speech.pets', 0x164 ) # "all come"
- 	addKeyword( 'speech.pets', 0x165 ) # "all follow"
- 	addKeyword( 'speech.pets', 0x166 ) # "all guard"
- 	addKeyword( 'speech.pets', 0x167 ) # "all stop"
- 	addKeyword( 'speech.pets', 0x168 ) # "all kill"
- 	addKeyword( 'speech.pets', 0x169 ) # "all attack"
- 	addKeyword( 'speech.pets', 0x16B ) # "all guard me"
- 	addKeyword( 'speech.pets', 0x16C ) # "all follow me"
- 	addKeyword( 'speech.pets', 0x16D ) # "*release"
- 	addKeyword( 'speech.pets', 0x16E ) # "*transfer"
- 	addKeyword( 'speech.pets', 0x16F ) # "*stay"
- 	addKeyword( 'speech.pets', 0x170 ) # "all stay"
- 
- 	# We're missing a good state-ai therefore these are disabled for now
- 	#addKeyword( 'speech.pets', 0x157 ) # "*fetch"
- 	#addKeyword( 'speech.pets', 0x158 ) # "*get"
- 	#addKeyword( 'speech.pets', 0x159 ) # "*bring"
- 	#addKeyword( 'speech.pets', 0x15F ) # "*patrol"
- 	#addKeyword( 'speech.pets', 0x160 ) # "*report"
- 	#addKeyword( 'speech.pets', 0x162 ) # "*hire"
- 	#addKeyword( 'speech.pets', 0x16A ) # "all report"
- 
  def onSpeech( pet, char, text, keywords ):
  	if not char.socket:
--- 12,15 ----

Index: stablemaster.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/stablemaster.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** stablemaster.py	6 Jul 2003 16:46:23 -0000	1.4
--- stablemaster.py	23 Sep 2003 12:21:04 -0000	1.5
***************
*** 112,121 ****
  	}
  
- 
- def onLoad():
- 	setCatchAll( 'speech.stablemaster', 0 )
- 	addKeyword( 'speech.stablemaster', 0x171 )
- 
- 
  def onSpeech( listener, speaker, text, keywords ):
  	# Check if our name is in the beginning of the string
--- 112,115 ----