[wpdev-commits] xmlscripts/scripts/magic spell.py,1.19,1.20 utilities.py,1.13,1.14

[spddmn <xxx...@us...>]

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

Modified Files:
	spell.py utilities.py 
Log Message:
reg define fixes, and count regs fixes

Index: spell.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** spell.py	3 Sep 2004 01:31:05 -0000	1.19
--- spell.py	6 Sep 2004 19:30:33 -0000	1.20
***************
*** 11,15 ****
  def countReagents(item, items):
  	for key in items.keys():
! 		if key == item.id and item.color == 0:
  			items[ key ] = max(0, items[ key ] - item.amount)
  			return items # Reagents normally dont have content
--- 11,15 ----
  def countReagents(item, items):
  	for key in items.keys():
! 		if( key == item.baseid ):
  			items[ key ] = max(0, items[ key ] - item.amount)
  			return items # Reagents normally dont have content
***************
*** 24,29 ****
  def consumeReagents(item, items):
  	for (key, value) in items.items():
! 		if key == item.id and item.color == 0:
! 			if item.amount <= value:
  				items[ key ] -= item.amount
  				item.delete()
--- 24,29 ----
  def consumeReagents(item, items):
  	for (key, value) in items.items():
! 		if( key == item.baseid ):
! 			if( item.amount <= value ):
  				items[ key ] -= item.amount
  				item.delete()

Index: utilities.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/utilities.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** utilities.py	25 Aug 2004 17:03:05 -0000	1.13
--- utilities.py	6 Sep 2004 19:30:33 -0000	1.14
***************
*** 11,42 ****
  
  # Common Reagents
! REAGENT_BLACKPEARL = 0xf7a
! REAGENT_BLOODMOSS = 0xf7b
! REAGENT_GARLIC = 0xf84
! REAGENT_GINSENG = 0xf85
! REAGENT_MANDRAKE = 0xf86
! REAGENT_NIGHTSHADE = 0xf88
! REAGENT_SULFURASH = 0xf8c
! REAGENT_SPIDERSILK = 0xf8d
  
  # Rarer Reagents
! REAGENT_BATWING = 0xf78
! REAGENT_BLACKMOOR = 0xf79
! REAGENT_BLOODSPAWN = 0xf7c
! REAGENT_DAEMONBLOOD = 0xf7d
! REAGENT_BONE = 0xf7e
! REAGENT_BRIMSTONE = 0xf7f
! REAGENT_DAEMONBONE = 0xf8
! REAGENT_FERTILEDIRT = 0xf81
! REAGENT_DRAGONSBLOOD = 0xf82
! REAGENT_EXECUTIONERSCAP = 0xf83
! REAGENT_EYEOFNEWT = 0xf87
! REAGENT_OBSIDIAN = 0xf89
! REAGENT_PIGIRON = 0xf8a
! REAGENT_PUMICE = 0xf8b
! REAGENT_NOXCRYSTAL = 0xf8e
! REAGENT_GRAVEDUST = 0xf8f
! REAGENT_DEADWOOD = 0xf9
! REAGENT_WYRMSHEART = 0xf91
  
  # Casting modes
--- 11,42 ----
  
  # Common Reagents
! REAGENT_BLACKPEARL = 'f7a'
! REAGENT_BLOODMOSS = 'f7b'
! REAGENT_GARLIC = 'f84'
! REAGENT_GINSENG = 'f85'
! REAGENT_MANDRAKE = 'f86'
! REAGENT_NIGHTSHADE = 'f88'
! REAGENT_SULFURASH = 'f8c'
! REAGENT_SPIDERSILK = 'f8d'
  
  # Rarer Reagents
! REAGENT_BATWING = 'f78'
! REAGENT_BLACKMOOR = 'f79'
! REAGENT_BLOODSPAWN = 'f7c'
! REAGENT_DAEMONBLOOD = 'f7d'
! REAGENT_BONE = 'f7e'
! REAGENT_BRIMSTONE = 'f7f'
! REAGENT_DAEMONBONE = 'f80'
! REAGENT_FERTILEDIRT = 'f81'
! REAGENT_DRAGONSBLOOD = 'f82'
! REAGENT_EXECUTIONERSCAP = 'f83'
! REAGENT_EYEOFNEWT = 'f87'
! REAGENT_OBSIDIAN = 'f89'
! REAGENT_PIGIRON = 'f8a'
! REAGENT_PUMICE = 'f8b'
! REAGENT_NOXCRYSTAL = 'f8e'
! REAGENT_GRAVEDUST = 'f8f'
! REAGENT_DEADWOOD = 'f90'
! REAGENT_WYRMSHEART = 'f91'
  
  # Casting modes