[wpdev-commits] xmlscripts/scripts/system loot.py,1.16,1.17

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

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

Modified Files:
	loot.py 
Log Message:
loot

Index: loot.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/loot.py,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** loot.py	3 Sep 2004 16:03:04 -0000	1.16
--- loot.py	19 Sep 2004 22:57:18 -0000	1.17
***************
*** 26,35 ****
  	# Common Loot Packs
  	'lootpack_poor': [
! 		[1.0, 'eed', random.randint(11,20), 1], # Gold
  		[0.0002, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
  	],
  	'lootpack_meager': [
! 		[1.0, 'eed', random.randint(11,20), 1], # Gold
  		[0.001, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 10%] 2 max properties
--- 26,35 ----
  	# Common Loot Packs
  	'lootpack_poor': [
! 		[1.0, 'eed', [11, 20], 1], # Gold
  		[0.0002, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.0002, 'RANDOM_MAGIC_ITEM', 1, 0 ] # [0% -> 90%] 5 max properties
  	],
  	'lootpack_meager': [
! 		[1.0, 'eed', [11, 20], 1], # Gold
  		[0.001, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.01, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 10%] 2 max properties
***************
*** 37,41 ****
  	],
  	'lootpack_average': [
! 		[1.0, 'eed', random.randint(55,100), 1], # Gold
  		[0.004, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 20%] 4 max properties
--- 37,41 ----
  	],
  	'lootpack_average': [
! 		[1.0, 'eed', [55, 100], 1], # Gold
  		[0.004, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.05, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 20%] 4 max properties
***************
*** 44,48 ****
  	],
  	'lootpack_rich': [
! 		[1.0, 'eed', random.randint(160,250), 1], # Gold
  		[0.01, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 40%] 4 max properties
--- 44,48 ----
  	],
  	'lootpack_rich': [
! 		[1.0, 'eed', [160, 250], 1], # Gold
  		[0.01, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.2, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 40%] 4 max properties
***************
*** 51,55 ****
  	],
  	'lootpack_filthy_rich': [
! 		[1.0, 'eed', random.randint(202,400), 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 4 max properties
--- 51,55 ----
  	],
  	'lootpack_filthy_rich': [
! 		[1.0, 'eed', [202, 400], 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[0.33, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [0% -> 50%] 4 max properties
***************
*** 59,63 ****
  	],
  	'lootpack_ultra_rich': [
! 		[1.0, 'eed', random.randint(505,1000), 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
--- 59,63 ----
  	],
  	'lootpack_ultra_rich': [
! 		[1.0, 'eed', [505, 1000], 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
***************
*** 68,72 ****
  	],
  	'lootpack_super_boss': [
! 		[1.0, 'eed', random.randint(505,1000), 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
--- 68,72 ----
  	],
  	'lootpack_super_boss': [
! 		[1.0, 'eed', [505, 1000], 1], # Gold
  		[0.02, 'DEF_INSTRUMENTS', 1, 0 ] # Slayer Instruments
  		#[1.0, 'RANDOM_MAGIC_ITEM', 1, 0 ], # [25% -> 100%] 5 max properties
***************
*** 473,476 ****
--- 473,478 ----
  			if type( packamount ) == str:
  				amount = utilities.rolldice( packamount )
+ 			elif type( packamount ) == list:
+ 				amount = random.randint( packamount[0], packamount[1] )
  			else:
  				amount = int( packamount )