[wpdev-commits] xmlscripts/scripts/wolfpack consts.py,1.35,1.36 utilities.py,1.23,1.24

[<dr...@pr...>]

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

Modified Files:
	consts.py utilities.py 
Log Message:
Mining now works great, all four ore types can be dug up. 12 ore types 
(silver, merkite and mythril are added ontop of OSI ones.) There is a few
bugs that I noticed when clicking mountain tiles that are of certain angles
but I think that is hard coded... I'll look into it later.


Index: consts.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** consts.py	25 Nov 2003 06:17:50 -0000	1.35
--- consts.py	25 Jan 2004 01:26:16 -0000	1.36
***************
*** 9,13 ****
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2594
  
  # Spell Settings
--- 9,13 ----
  
  # Which port should the remote admin run on
! REMOTEADMIN_PORT = 2600
  
  # Spell Settings
***************
*** 19,24 ****
  # Potions
  POTION_LESSERHEAL_RANGE = [ 1, 16 ]
! POTION_HEAL_RANGE = [ 1, 16 ]
! POTION_GREATERHEAL_RANGE = [ 1, 16 ]
  
  # Fishing Settings
--- 19,24 ----
  # Potions
  POTION_LESSERHEAL_RANGE = [ 1, 16 ]
! POTION_HEAL_RANGE = [ 3, 19 ]
! POTION_GREATERHEAL_RANGE = [ 5, 25 ]
  
  # Fishing Settings
***************
*** 37,41 ****
  
  # Mining Settings
! MINING_MAX_DISTANCE = 2
  
  
--- 37,41 ----
  
  # Mining Settings
! MINING_MAX_DISTANCE = 3
  
  
***************
*** 106,119 ****
  	'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry' ]
  
! skillnamesids = { 'alchemy' : ALCHEMY, 'anatomy' : ANATOMY, 'animallore' : ANIMALLORE, 'itemid' : ITEMID, 'armslore' : ARMSLORE, 'parrying' : PARRYING,
! 	'begging' : BEGGING, 'blacksmithing' : BLACKSMITHING, 'bowcraft' : BOWCRAFT, 'peacemaking' : PEACEMAKING, 'camping' : CAMPING, 'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 'cooking' : COOKING, 'detectinghidden' : DETECTINGHIDDEN, 'enticement' : ENTICEMENT, 'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 'fishing' : FISHING, 'forensics' : FORENSICS, 'herding' : HERDING, 'hiding' : HIDING, 'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 'lockpicking' : LOCKPICKING, 'magery' : MAGERY, 'magicresistance' : MAGICRESISTANCE, 'tactics' : TACTICS, 'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 'poisoning' : POISONING, 'archery' : ARCHERY, 'spiritspeak' : SPIRITSPEAK, 'stealing' : STEALING, 'tailoring' : TAILORING,
! 	'taming' : TAMING, 'tasteid' : TASTEID, 'tinkering' : TINKERING, 'tracking' : TRACKING, 'veterinary' : VETERINARY, 'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 'fencing' : FENCING, 'wrestling' : WRESTLING, 'lumberjacking' : LUMBERJACKING, 'mining' : MINING, 'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 'removetraps' : REMOVETRAPS, 'necromancy' : NECROMANCY, 'focus' : FOCUS, 'chivalry' : CHIVALRY }
! 
  
  statnames = [ 'str', 'int', 'dex' ]
--- 106,164 ----
  	'stealth', 'removetraps', 'necromancy', 'focus', 'chivalry' ]
  
! skillnamesids = \
! { 
! 	'alchemy' : ALCHEMY, 
! 	'anatomy' : ANATOMY, 
! 	'animallore' : ANIMALLORE, 
! 	'itemid' : ITEMID, 
! 	'armslore' : ARMSLORE, 
! 	'parrying' : PARRYING,
! 	'begging' : BEGGING, 
! 	'blacksmithing' : BLACKSMITHING, 
! 	'bowcraft' : BOWCRAFT, 
! 	'peacemaking' : PEACEMAKING, 
! 	'camping' : CAMPING, 
! 	'carpentry' : CARPENTRY,
! 	'cartography' : CARTOGRAPHY, 
! 	'cooking' : COOKING, 
! 	'detectinghidden' : DETECTINGHIDDEN, 
! 	'enticement' : ENTICEMENT, 
! 	'evaluatingintel' : EVALUATINGINTEL,
! 	'healing' : HEALING, 
! 	'fishing' : FISHING, 
! 	'forensics' : FORENSICS, 
! 	'herding' : HERDING, 
! 	'hiding' : HIDING, 
! 	'provocation' : PROVOCATION,
! 	'inscription' : INSCRIPTION, 
! 	'lockpicking' : LOCKPICKING, 
! 	'magery' : MAGERY, 
! 	'magicresistance' : MAGICRESISTANCE, 
! 	'tactics' : TACTICS, 
! 	'snooping' : SNOOPING,
! 	'musicianship' : MUSICIANSHIP, 
! 	'poisoning' : POISONING, 
! 	'archery' : ARCHERY, 
! 	'spiritspeak' : SPIRITSPEAK, 
! 	'stealing' : STEALING, 
! 	'tailoring' : TAILORING,
! 	'taming' : TAMING, 
! 	'tasteid' : TASTEID, 
! 	'tinkering' : TINKERING, 
! 	'tracking' : TRACKING, 
! 	'veterinary' : VETERINARY, 
! 	'swordsmanship' : SWORDSMANSHIP,
! 	'macefighting' : MACEFIGHTING, 
! 	'fencing' : FENCING, 
! 	'wrestling' : WRESTLING, 
! 	'lumberjacking' : LUMBERJACKING, 
! 	'mining' : MINING, 
! 	'meditation' : MEDITATION,
! 	'stealth' : STEALTH, 
! 	'removetraps' : REMOVETRAPS, 
! 	'necromancy' : NECROMANCY, 
! 	'focus' : FOCUS, 
! 	'chivalry' : CHIVALRY 
! }
  
  statnames = [ 'str', 'int', 'dex' ]
***************
*** 127,131 ****
  STRENGTH = 5
  
- 
  #Requirements
  MANACOST = 0
--- 172,175 ----
***************
*** 141,145 ****
  HITCHANCE = 5
  LOWERATTACK = 6
! LOWERDEFENCE = 7	   
  #... here we need to add every spell also
  
--- 185,189 ----
  HITCHANCE = 5
  LOWERATTACK = 6
! LOWERDEFENCE = 7
  #... here we need to add every spell also
  
***************
*** 154,167 ****
  
  #Advanced properties ID's
! REGEN = 1	
! BONUS = 2	
  DAMAGE = 3
! ENH = 4	
! HIT = 5	
! REQ = 6	
  RESIST = 7
  REFLECT = 8
  
- 
  # Constants for char.sound
  SND_STARTATTACK = 0
--- 198,210 ----
  
  #Advanced properties ID's
! REGEN = 1
! BONUS = 2
  DAMAGE = 3
! ENH = 4
! HIT = 5
! REQ = 6
  RESIST = 7
  REFLECT = 8
  
  # Constants for char.sound
  SND_STARTATTACK = 0
***************
*** 335,348 ****
  OOPS = 0
  
! 
! # Harvest table items
  REQSKILL = 0
  MINSKILL = 1
  MAXSKILL = 2
  SUCCESSCLILOC = 3
! RESOURCEID = 4
! COLORID = 5
! MUTATECHANCE = 6
! FALLBACKCHANCE = 7 
  
  #SKILLS GROW LOCKS
--- 378,388 ----
  OOPS = 0
  
! # Mining Harvest Table Items
  REQSKILL = 0
  MINSKILL = 1
  MAXSKILL = 2
  SUCCESSCLILOC = 3
! COLORID = 4
! RESOURCENAME = 5
  
  #SKILLS GROW LOCKS
***************
*** 352,356 ****
  
  #Stat gain delay = 15 minutes ( 900 seconds )
! STATGAINDELAY = 900 
  
  RELOAD_SCRIPTS = 0
--- 392,396 ----
  
  #Stat gain delay = 15 minutes ( 900 seconds )
! STATGAINDELAY = 900
  
  RELOAD_SCRIPTS = 0

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** utilities.py	12 Jan 2004 05:02:59 -0000	1.23
--- utilities.py	25 Jan 2004 01:26:17 -0000	1.24
***************
*** 120,123 ****
--- 120,129 ----
  		return int( value.replace( "0x", "" ), 16 )
  
+ def evenorodd( value ):
+ 	if value % 2 == 0:
+ 		return "even"
+ 	else:
+ 		return "odd"
+ 
  def itemsmatch( a, b ):
  	return a.type == b.type and a.id == b.id and a.color == b.color and a.events == b.events