[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.84,1.85 properties.py,1.17,1.18

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

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

Modified Files:
	consts.py properties.py 
Log Message:
slayer weapons

Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.84
retrieving revision 1.85
diff -C2 -d -r1.84 -r1.85
*** consts.py	27 Sep 2004 14:37:27 -0000	1.84
--- consts.py	6 Oct 2004 20:06:00 -0000	1.85
***************
*** 87,90 ****
--- 87,91 ----
  BESTSKILL = 55
  MAGEWEAPON = 56
+ SLAYER = 57
  
  # Checks for certain item types

Index: properties.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** properties.py	27 Sep 2004 17:42:35 -0000	1.17
--- properties.py	6 Oct 2004 20:06:00 -0000	1.18
***************
*** 9,12 ****
--- 9,13 ----
  from wolfpack.consts import *
  from system.lootlists import *
+ import system.slayer
  
  #
***************
*** 104,107 ****
--- 105,109 ----
  	DURABILITYBONUS: ['durabilitybonus', 0, 0],
  	WEIGHTBONUS: ['weightbonus', 0, 0],
+ 	SLAYER: ['slayer', '', 0],
  }
  
***************
*** 128,132 ****
  		if property in [HITSOUND, MISSSOUND, SWING]:
  			return str(item.gettag(info[0])).split(',')
! 		elif property == AMMUNITION:
  			return str(item.gettag(info[0]))
  		else:
--- 130,134 ----
  		if property in [HITSOUND, MISSSOUND, SWING]:
  			return str(item.gettag(info[0])).split(',')
! 		elif property == AMMUNITION or property == SLAYER:
  			return str(item.gettag(info[0]))
  		else:
***************
*** 613,616 ****
--- 615,620 ----
  	DURABILITYBONUS: [10, 100, 10, True],
  	LOWERREQS: [10, 100, 10, True],
+ 	
+ 	SLAYER: [1, 1, 1, False], # Special
  }
  
***************
*** 625,632 ****
  	for i in range(0, props):
  		property = random.choice(properties)
! 		properties.remove(property)
! 		
  		if not PROPERTIES.has_key(property):
  			continue
  
  		# Scale the value for the property
--- 629,645 ----
  	for i in range(0, props):
  		property = random.choice(properties)
! 
  		if not PROPERTIES.has_key(property):
  			continue
+ 			
+ 		# Special handling for slayers
+ 		if property == SLAYER:
+ 			slayer = system.slayer.getRandom()
+ 			if slayer:
+ 				item.settag('slayer', slayer)
+ 				properties.remove(property)
+ 			continue
+ 
+ 		properties.remove(property)
  
  		# Scale the value for the property
***************
*** 691,693 ****
  		
  	return LUCKTABLE[luck]
- 	
\ No newline at end of file
--- 704,705 ----