[wpdev-commits] xmlscripts/scripts/skills __init__.py,1.17,1.18 tracking.py,1.8,1.9

[Richard M. <dr...@us...>]

Update of /cvsroot/wpdev/xmlscripts/scripts/skills
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19860/skills

Modified Files:
	__init__.py tracking.py 
Log Message:
Cleanups
New Utility Function
Trashcans!


Index: tracking.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tracking.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** tracking.py	16 Jul 2004 07:09:27 -0000	1.8
--- tracking.py	17 Jul 2004 07:24:00 -0000	1.9
***************
*** 18,34 ****
  
  def tracking( char, skill ):
! 	if skill != TRACKING:
! 		return 0
  
  	if char.socket.hastag( 'skill_delay' ):
! 		if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ):
! 			char.socket.clilocmessage( 500118, "", 0x3b2, 3 )
! 			return 1
  		else:
! 			char.socket.deltag( 'skill_delay' )
  
! 	char.socket.clilocmessage( 1011350 ) # What do you wish to track?
! 	char.socket.closegump( 0x87651592 ) # What to track
! 	gump = cGump( x = 20, y = 30, callback="skills.tracking.trackWhatResponse", type=0x87651592 )
  
  	gump.startPage( 0 )
--- 18,36 ----
  
  def tracking( char, skill ):
! 	socket = char.socket
! 
! 	if skill != TRACKING or not char.socket:
! 		return False
  
  	if char.socket.hastag( 'skill_delay' ):
! 		if wolfpack.time.currenttime() < socket.gettag( 'skill_delay' ):
! 			socket.clilocmessage( 500118, "", 0x3b2, 3 )
! 			return True
  		else:
! 			socket.deltag( 'skill_delay' )
  
! 	socket.clilocmessage( 1011350 ) # What do you wish to track?
! 	socket.closegump( 0x87651592 ) # What to track
! 	gump = cGump( x=20, y=30, callback="skills.tracking.trackWhatResponse", type=0x87651592 )
  
  	gump.startPage( 0 )
***************
*** 55,64 ****
  	gump.send( char )
  
! 	char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) )
  
! 	return 1
  
  def trackWhatResponse( char, args, target ):
! 	return 1
  
  def onLoad():
--- 57,66 ----
  	gump.send( char )
  
! 	socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) )
  
! 	return True
  
  def trackWhatResponse( char, args, target ):
! 	return True
  
  def onLoad():

Index: __init__.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** __init__.py	17 Jul 2004 03:49:21 -0000	1.17
--- __init__.py	17 Jul 2004 07:24:00 -0000	1.18
***************
*** 12,69 ****
  
  #SKILLID, STRGAIN, DEXGAIN, INTGAIN, GAINFACTOR, SKILLCAP, ANTIMACRO
! skilltable = \
! {
! ALCHEMY:					[0, 0.5, 0.5, 1, 1000, FALSE],
! ANATOMY:					[0.1, 0.1, 0.8, 1, 1000, FALSE ],
! ANIMALLORE:				[0, 0, 1, 1, 1000, FALSE ],
! ITEMID:						[0, 0, 1, 1, 1000, FALSE ],
! ARMSLORE:				[0.8, 0.1, 0.1, 1, 1000, FALSE ],
! PARRYING:				[0.75, 0.25, 0, 1, 1000, FALSE],
! BEGGING:					[0, 0, 0, 1, 1000, FALSE ],
! BLACKSMITHING:		[1, 0, 0, 1, 1000, FALSE],
! BOWCRAFT:				[0.6, 1.6, 0, 1, 1000, FALSE],
! PEACEMAKING:			[0, 0, 0, 1, 1000, FALSE ],
! CAMPING:					[2, 1.5, 1.5, 1, 1000, FALSE ],
! CARPENTRY:				[2, 0.5, 0, 1, 1000, FALSE],
! CARTOGRAPHY:			[0, 0.75, 0.75, 1, 1000, FALSE],
! COOKING:					[0, 2, 3, 1, 1000, FALSE],
! DETECTINGHIDDEN:	[0, 0.4, 0.6, 1, 1000, FALSE ],
! ENTICEMENT:				[0, 0.25, 0.25, 1, 1000, FALSE ],
! EVALUATINGINTEL:	[0, 0, 1, 1, 1000, FALSE ],
! HEALING:					[0.6, 0.6, 0.8, 1, 1000, FALSE ],
! FISHING:					[0.5, 0.5, 0, 1, 1000, FALSE ],
! FORENSICS:				[0, 0.2, 0.8, 1, 1000, FALSE ],
! HERDING:					[1.625, 0.625, 0.25, 1, 1000, FALSE ],
! HIDING:					[0, 0.8, 0.2, 1, 1000, FALSE ],
! PROVOCATION:			[0, 0.45, 0.05, 1, 1000, FALSE ],
! INSCRIPTION:			[0, 0.2, 0.8, 1, 1000, FALSE],
! LOCKPICKING:			[0, 2, 0, 1, 1000, FALSE ],
! MAGERY:		 			[0, 0, 1.5, 1, 1000, FALSE ],
! MAGICRESISTANCE:	[0.25, 0.25, 0.5, 1, 1000, FALSE ],
! TACTICS:	 				[0, 0, 0, 1, 1000, FALSE],
! SNOOPING:				[0, 2.5, 0, 1, 1000, FALSE ],
! MUSICIANSHIP:			[0, 0.8, 0.2, 1, 1000, FALSE ],
! POISONING:	 			[0, 0.4, 1.6, 1, 1000, FALSE ],
! ARCHERY:					[0.25, 0.75, 0, 1, 1000, FALSE],
! SPIRITSPEAK:			[0, 0, 1, 1, 1000, FALSE ],
! STEALING:					[0, 1, 0, 1, 1000, FALSE ],
! TAILORING:				[0.38, 1.63, 0.5, 1, 1000, FALSE],
! TAMING:	 	 			[1.4, 0.2, 0.4, 1, 1000, FALSE ],
! TASTEID:					[0.2, 0, 0.8, 1, 1000, FALSE ],
! TINKERING:				[0.5, 0.2, 0.3, 1, 1000, FALSE],
! TRACKING:				[0, 1.25, 1.25, 1, 1000, FALSE ],
! VETERINARY:				[0.8, 0.4, 0,8,	1, 1000, FALSE ],
! SWORDSMANSHIP:		[0.75, 0.25, 0, 1, 1000, FALSE],
! MACEFIGHTING:			[0.9, 0.1, 0, 1, 1000, FALSE],
! FENCING:	 				[0.45, 0.55, 0, 1, 1000, FALSE],
! WRESTLING:	 			[0.9, 0.1, 0, 1, 1000, FALSE],
! LUMBERJACKING:		[2, 0, 0, 1, 1000, FALSE ],
! MINING:	 				[2, 0, 0, 1, 1000, FALSE ],
! MEDITATION: 			[0, 0, 0, 1, 1000, FALSE ],
! STEALTH:					[0, 0, 0, 1, 1000, FALSE ],
! REMOVETRAPS:			[0, 0, 0, 1, 1000, FALSE ],
! NECROMANCY:			[0, 0, 0, 1, 1000, FALSE ],
! FOCUS:	 					[0, 0, 0, 1, 1000, FALSE],
! CHIVALRY:				[0, 0, 0, 1, 1000, FALSE ]
  }
  
--- 12,68 ----
  
  #SKILLID, STRGAIN, DEXGAIN, INTGAIN, GAINFACTOR, SKILLCAP, ANTIMACRO
! skilltable = {
! 	ALCHEMY:					[ 0, 0.5, 0.5, 1, 1000, FALSE ],
! 	ANATOMY:					[ 0.1, 0.1, 0.8, 1, 1000, FALSE ],
! 	ANIMALLORE:				[ 0, 0, 1, 1, 1000, FALSE ],
! 	ITEMID:						[ 0, 0, 1, 1, 1000, FALSE ],
! 	ARMSLORE:				[ 0.8, 0.1, 0.1, 1, 1000, FALSE ],
! 	PARRYING:				[ 0.75, 0.25, 0, 1, 1000, FALSE],
! 	BEGGING:					[ 0, 0, 0, 1, 1000, FALSE ],
! 	BLACKSMITHING:		[ 1, 0, 0, 1, 1000, FALSE],
! 	BOWCRAFT:				[ 0.6, 1.6, 0, 1, 1000, FALSE],
! 	PEACEMAKING:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	CAMPING:					[ 2, 1.5, 1.5, 1, 1000, FALSE ],
! 	CARPENTRY:				[ 2, 0.5, 0, 1, 1000, FALSE],
! 	CARTOGRAPHY:			[ 0, 0.75, 0.75, 1, 1000, FALSE],
! 	COOKING:					[ 0, 2, 3, 1, 1000, FALSE],
! 	DETECTINGHIDDEN:	[ 0, 0.4, 0.6, 1, 1000, FALSE ],
! 	ENTICEMENT:				[ 0, 0.25, 0.25, 1, 1000, FALSE ],
! 	EVALUATINGINTEL:	[ 0, 0, 1, 1, 1000, FALSE ],
! 	HEALING:					[ 0.6, 0.6, 0.8, 1, 1000, FALSE ],
! 	FISHING:					[ 0.5, 0.5, 0, 1, 1000, FALSE ],
! 	FORENSICS:				[ 0, 0.2, 0.8, 1, 1000, FALSE ],
! 	HERDING:					[ 1.625, 0.625, 0.25, 1, 1000, FALSE ],
! 	HIDING:					[ 0, 0.8, 0.2, 1, 1000, FALSE ],
! 	PROVOCATION:			[ 0, 0.45, 0.05, 1, 1000, FALSE ],
! 	INSCRIPTION:			[ 0, 0.2, 0.8, 1, 1000, FALSE],
! 	LOCKPICKING:			[ 0, 2, 0, 1, 1000, FALSE ],
! 	MAGERY:		 			[ 0, 0, 1.5, 1, 1000, FALSE ],
! 	MAGICRESISTANCE:	[ 0.25, 0.25, 0.5, 1, 1000, FALSE ],
! 	TACTICS:	 				[ 0, 0, 0, 1, 1000, FALSE],
! 	SNOOPING:				[ 0, 2.5, 0, 1, 1000, FALSE ],
! 	MUSICIANSHIP:			[ 0, 0.8, 0.2, 1, 1000, FALSE ],
! 	POISONING:	 			[ 0, 0.4, 1.6, 1, 1000, FALSE ],
! 	ARCHERY:					[ 0.25, 0.75, 0, 1, 1000, FALSE],
! 	SPIRITSPEAK:			[ 0, 0, 1, 1, 1000, FALSE ],
! 	STEALING:					[ 0, 1, 0, 1, 1000, FALSE ],
! 	TAILORING:				[ 0.38, 1.63, 0.5, 1, 1000, FALSE ],
! 	TAMING:	 	 			[ 1.4, 0.2, 0.4, 1, 1000, FALSE ],
! 	TASTEID:					[ 0.2, 0, 0.8, 1, 1000, FALSE ],
! 	TINKERING:				[ 0.5, 0.2, 0.3, 1, 1000, FALSE ],
! 	TRACKING:				[ 0, 1.25, 1.25, 1, 1000, FALSE ],
! 	VETERINARY:				[ 0.8, 0.4, 0,8,	1, 1000, FALSE ],
! 	SWORDSMANSHIP:		[ 0.75, 0.25, 0, 1, 1000, FALSE ],
! 	MACEFIGHTING:			[ 0.9, 0.1, 0, 1, 1000, FALSE ],
! 	FENCING:	 				[ 0.45, 0.55, 0, 1, 1000, FALSE ],
! 	WRESTLING:	 			[ 0.9, 0.1, 0, 1, 1000, FALSE ],
! 	LUMBERJACKING:		[ 2, 0, 0, 1, 1000, FALSE ],
! 	MINING:	 				[ 2, 0, 0, 1, 1000, FALSE ],
! 	MEDITATION: 			[ 0, 0, 0, 1, 1000, FALSE ],
! 	STEALTH:					[ 0, 0, 0, 1, 1000, FALSE ],
! 	REMOVETRAPS:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	NECROMANCY:			[ 0, 0, 0, 1, 1000, FALSE ],
! 	FOCUS:	 					[ 0, 0, 0, 1, 1000, FALSE],
! 	CHIVALRY:				[ 0, 0, 0, 1, 1000, FALSE ]
  }
  
***************
*** 82,88 ****
  	if skills.has_key( skill ):
  		skills[ skill ]( char, skill )
! 		return 1
  
! 	return 0
  
  #
--- 81,87 ----
  	if skills.has_key( skill ):
  		skills[ skill ]( char, skill )
! 		return True
  
! 	return False
  
  #
***************
*** 122,125 ****
  		object.settag( tagname, "1" )
  		return True
- 
- 
--- 121,122 ----