[wpdev-commits] xmlscripts/scripts/system skillgain.py,1.18,1.19

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

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

Modified Files:
	skillgain.py 
Log Message:
Fix


Index: skillgain.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** skillgain.py	6 Oct 2004 20:56:23 -0000	1.18
--- skillgain.py	7 Oct 2004 23:09:19 -0000	1.19
***************
*** 109,113 ****
  	cap = char.skillcap[skill] / 10.0
  	info = SKILLS[skill]
! 	
  	if lock == 0 and value < cap:
  		# Skills lower than 10.0% will gain 0.1% - 0.5% at once
--- 109,113 ----
  	cap = char.skillcap[skill] / 10.0
  	info = SKILLS[skill]
! 
  	if lock == 0 and value < cap:
  		# Skills lower than 10.0% will gain 0.1% - 0.5% at once
***************
*** 127,131 ****
  						if char.hastag('skillbonus_%u' % i):
  							value = int(char.gettag('skillbonus_%u' % i))
! 							
  							# Skip this skill if reducing it wouldn't work
  							if char.skill[i] - int(points * 10) < value:
--- 127,131 ----
  						if char.hastag('skillbonus_%u' % i):
  							value = int(char.gettag('skillbonus_%u' % i))
! 
  							# Skip this skill if reducing it wouldn't work
  							if char.skill[i] - int(points * 10) < value:
***************
*** 133,137 ****
  					except:
  						pass
! 				
  					char.skill[i] -= int(points * 10)
  					totalskill -= points
--- 133,137 ----
  					except:
  						pass
! 
  					char.skill[i] -= int(points * 10)
  					totalskill -= points
***************
*** 152,158 ****
  			if DEBUG_SKILLS == 1:
  				char.log(LOG_TRACE, u'Character [%(serial)x] gained %(points).01f%% %(name)s [%(value).01f%%].\n' % { \
! 					'serial': char.serial, 
  					'points': points,
! 					'name': info[SKILL_NAME], 
  					'value': (char.skill[skill] / 10.0)
  					})
--- 152,158 ----
  			if DEBUG_SKILLS == 1:
  				char.log(LOG_TRACE, u'Character [%(serial)x] gained %(points).01f%% %(name)s [%(value).01f%%].\n' % { \
! 					'serial': char.serial,
  					'points': points,
! 					'name': info[SKILL_NAME],
  					'value': (char.skill[skill] / 10.0)
  					})
***************
*** 226,233 ****
  	# There is also a 1% minimum chance for gain
  	gainchance = gainchance * info[SKILL_GAINFACTOR]
! 	
  	# Multiply with another gainfactor
  	gainchance = gainchance * GLOBAL_FACTOR
! 	
  	char.log(LOG_TRACE, 'Gainchance for skill %s is %f.\n' % (SKILLNAMES[skill], gainchance))
  
--- 226,233 ----
  	# There is also a 1% minimum chance for gain
  	gainchance = gainchance * info[SKILL_GAINFACTOR]
! 
  	# Multiply with another gainfactor
  	gainchance = gainchance * GLOBAL_FACTOR
! 
  	char.log(LOG_TRACE, 'Gainchance for skill %s is %f.\n' % (SKILLNAMES[skill], gainchance))
  
***************
*** 253,257 ****
  		realint = char.intelligence - char.intelligence2
  
! 		if (char.npc or char.strengthlock != 0 or realstr >= char.strengthcap:
  			strchance = 0.0
  		else:
--- 253,257 ----
  		realint = char.intelligence - char.intelligence2
  
! 		if (char.npc or char.strengthlock != 0) or realstr >= char.strengthcap:
  			strchance = 0.0
  		else:
***************
*** 274,278 ****
  			gainstat(char, 1)
  		elif intchance > random():
! 			gainstat(char, 2)		
  
  #
--- 274,278 ----
  			gainstat(char, 1)
  		elif intchance > random():
! 			gainstat(char, 2)
  
  #