[wpdev-commits] xmlscripts/scripts/skills armslore.py,1.10,1.11

[Ki H. P. <kh...@us...>]

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

Modified Files:
	armslore.py 
Log Message:
more detailed arms lore skill


Index: armslore.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/armslore.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** armslore.py	26 May 2004 13:07:24 -0000	1.10
--- armslore.py	22 Jun 2004 12:05:30 -0000	1.11
***************
*** 9,14 ****
--- 9,17 ----
  from wolfpack.utilities import *
  from wolfpack.time import *
+ from wolfpack.properties import *
  import wolfpack
  import skills
+ from wolfpack import weaponinfo
+ from wolfpack import armorinfo
  
  ARMSLORE_DELAY = 1000
***************
*** 55,58 ****
--- 58,96 ----
  
  			char.socket.clilocmessage( 0x103319, "", 0x3b2, 3 )
+ 			condi = 10 * item.health / item.maxhealth
+ 			if condi < 0:
+ 				condi = 0
+ 			elif condi > 9:
+ 				condi = 9
+ 			char.socket.clilocmessage( 1038285 + condi )
+ 			if isweapon( item ):
+ 				layer_id = 0
+ 				if item.twohanded:
+ 					layer_id = 1
+ 				mindamage = fromitem( item, MINDAMAGE )
+ 				maxdamage = fromitem( item, MAXDAMAGE )
+ 				avdamage = ( mindamage + maxdamage ) / 2
+ 				dmg_id = 9 * max( 0, min( int( avdamage / 5 ), 6 ) )
+ 				if itemcheck( item, ITEM_PIERCING ):
+ 					char.socket.clilocmessage( 1038218 + layer_id + dmg_id )
+ 				elif itemcheck( item, ITEM_SLASHING ):
+ 					char.socket.clilocmessage( 1038220 + layer_id + dmg_id )
+ 				elif itemcheck( item, ITEM_BASHING ):
+ 					char.socket.clilocmessage( 1038222 + layer_id + dmg_id )
+ 				elif itemcheck( item, ITEM_RANGED ):
+ 					char.socket.clilocmessage( 1038224 + dmg_id )
+ 				else:
+ 					char.socket.clilocmessage( 1038216 + layer_id + dmg_id )
+ 				# check if poisoned
+ 				if item.hastag( 'poisoning_uses' ):
+ 					char.socket.clilocmessage( 1038284 )
+ 			else:
+ 				armor = fromitem( item, RESISTANCE_PHYSICAL )
+ 				armor = armor + fromitem( item, RESISTANCE_FIRE )
+ 				armor = armor + fromitem( item, RESISTANCE_COLD )
+ 				armor = armor + fromitem( item, RESISTANCE_POISON )
+ 				armor = armor + fromitem( item, RESISTANCE_ENERGY )
+ 				arm_id = max( 0, min( int( armor / 5 ), 7 ) )
+ 				char.socket.clilocmessage( 1038295 + arm_id )
  			return 1
  		else: