[wpdev-commits] xmlscripts/scripts equipment.py,1.46,1.47

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

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

Modified Files:
	equipment.py 
Log Message:
enhancing

Index: equipment.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** equipment.py	8 Oct 2004 18:51:52 -0000	1.46
--- equipment.py	13 Oct 2004 18:45:42 -0000	1.47
***************
*** 354,358 ****
  
  				# Add a Bonus for the skill
! 				tooltip.add(1060451 + i, "#%u\t%0.01f%%" % (1044060 + skill, bonus / 10.0))
  			except:
  				object.deltag('skillbonus_%u' % i)
--- 354,358 ----
  
  				# Add a Bonus for the skill
! 				tooltip.add(1060451 + i, "#%u\t%u" % (1044060 + skill, int(bonus / 10)))
  			except:
  				object.deltag('skillbonus_%u' % i)
***************
*** 476,481 ****
  
  				# Add a Bonus for the skill
- 				if char.skill[skill] + bonus > char.skillcap[skill]:
- 					bonus = max(0, char.skillcap[skill] - char.skill[skill])
  				if char.skill[skill] + bonus < 0:
  					bonus = - char.skill[skill]
--- 476,479 ----
***************
*** 586,591 ****
  				# If the bonus would add over the skill limit,
  				# make sure it doesnt
- 				if bonus < 0 and char.skill[skill] - bonus > char.skillcap[skill]:
- 					bonus = - (char.skillcap[skill] - char.skill[skill])
  				if char.skill[skill] - bonus < 0:
  					bonus = char.skill[skill]
--- 584,587 ----