|
From: Sebastian H. <dar...@us...> - 2004-09-11 15:20:58
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29433 Modified Files: environment.py ore.py potions.py Log Message: Fixes Index: environment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/environment.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** environment.py 10 Aug 2004 22:06:58 -0000 1.15 --- environment.py 11 Sep 2004 15:20:48 -0000 1.16 *************** *** 228,232 **** return ! char.socket.log( LOG_TRACE, "Dying item (%x,%x) using tub (%x,%x)\n" % ( target.item.serial, target.item.color, dyetub.serial, dyetub.color ) ) target.item.color = dyetub.color target.item.update() --- 228,232 ---- return ! char.log( LOG_MESSAGE, "Dying item (%x,%x) using tub (%x,%x)\n" % ( target.item.serial, target.item.color, dyetub.serial, dyetub.color ) ) target.item.color = dyetub.color target.item.update() Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.47 retrieving revision 1.48 diff -C2 -d -r1.47 -r1.48 *** potions.py 7 Sep 2004 14:22:17 -0000 1.47 --- potions.py 11 Sep 2004 15:20:48 -0000 1.48 *************** *** 10,14 **** POTION_HEAL_RANGE, POTION_LESSERHEAL_RANGE, MAGERY, \ POTION_LESSEREXPLOSION_RANGE, POTION_GREATEREXPLOSION_RANGE, \ ! POTION_EXPLOSION_RANGE, SOUND_STRENGTH_UP --- 10,14 ---- POTION_HEAL_RANGE, POTION_LESSERHEAL_RANGE, MAGERY, \ POTION_LESSEREXPLOSION_RANGE, POTION_GREATEREXPLOSION_RANGE, \ ! POTION_EXPLOSION_RANGE, SOUND_STRENGTH_UP, HEAL_POT_DELAY Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** ore.py 5 Sep 2004 22:31:13 -0000 1.23 --- ore.py 11 Sep 2004 15:20:48 -0000 1.24 *************** *** 277,290 **** ore.delete() elif ore.baseid == DEF_ORES[0]: ! if evenorodd( ore.amount ) == "even": amount = ( ore.amount / 2 ) successsmelt(char, resname, amount) ore.delete() ! elif evenorodd( ore.amount ) == "odd" and ore.amount > 1: amount = ( ( ore.amount - 1 ) / 2 ) successsmelt(char, resname, amount) ore.amount = 1 ore.update() ! elif ore.amount == 1: # There is not enough metal-bearing ore in this pile to make an ingot. char.socket.clilocmessage( 501987, '', GRAY ) --- 277,290 ---- ore.delete() elif ore.baseid == DEF_ORES[0]: ! if ore.amount > 1 and ore.amount % 2 == 0: amount = ( ore.amount / 2 ) successsmelt(char, resname, amount) ore.delete() ! elif ore.amount > 1: amount = ( ( ore.amount - 1 ) / 2 ) successsmelt(char, resname, amount) ore.amount = 1 ore.update() ! else: # There is not enough metal-bearing ore in this pile to make an ingot. char.socket.clilocmessage( 501987, '', GRAY ) |
