|
From: Sebastian H. <dar...@us...> - 2004-07-02 13:40:56
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31477 Modified Files: blades.py ore.py pickaxe.py potions.py wool.py Log Message: New documentation and a long overdue wolfpack.consts cleanup Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** potions.py 1 Jun 2004 22:10:39 -0000 1.37 --- potions.py 2 Jul 2004 13:40:45 -0000 1.38 *************** *** 53,66 **** if item.getoutmostchar() != char: char.message( "This potion is out of your reach..." ) ! return OOPS # Lets make sure the tag exists. if not item.hastag( 'potiontype' ): ! return OOPS else: potiontype = item.gettag( 'potiontype' ) # Make sure it's in the index if not potiontype in potions: ! return OOPS # Do we throw this thing? --- 53,66 ---- if item.getoutmostchar() != char: char.message( "This potion is out of your reach..." ) ! return False # Lets make sure the tag exists. if not item.hastag( 'potiontype' ): ! return False else: potiontype = item.gettag( 'potiontype' ) # Make sure it's in the index if not potiontype in potions: ! return False # Do we throw this thing? *************** *** 79,83 **** # If it's a drinkable potion we check if there is a free hand. if not canUsePotion( char, item ): ! return OK # Nightsight Potions --- 79,83 ---- # If it's a drinkable potion we check if there is a free hand. if not canUsePotion( char, item ): ! return True # Nightsight Potions *************** *** 103,107 **** refreshPotion( char, item, potiontype ) ! return OK --- 103,107 ---- refreshPotion( char, item, potiontype ) ! return True *************** *** 330,343 **** if not firsthand and not secondhand: ! return OK if firsthand and not secondhand and not firsthand.twohanded: ! return OK if not firsthand and secondhand and not secondhand.twohanded: ! return OK char.socket.clilocmessage( 0x7A99C ) # You must have a free hand to drink a potion. ! return OOPS # Consume the potion --- 330,343 ---- if not firsthand and not secondhand: ! return True if firsthand and not secondhand and not firsthand.twohanded: ! return True if not firsthand and secondhand and not secondhand.twohanded: ! return True char.socket.clilocmessage( 0x7A99C ) # You must have a free hand to drink a potion. ! return False # Consume the potion *************** *** 383,387 **** char.effect(0x376a, 9, 32) consumePotion( char, potion, potions[ potion.gettag('potiontype') ][ POT_RETURN_BOTTLE ] ) ! return OK # Heal Potions --- 383,387 ---- char.effect(0x376a, 9, 32) consumePotion( char, potion, potions[ potion.gettag('potiontype') ][ POT_RETURN_BOTTLE ] ) ! return True # Heal Potions *************** *** 389,398 **** socket = char.socket if not canUsePotion( char, potion ): ! return OOPS if char.poison > -1: # You can not heal yourself in your current state. socket.clilocmessage(1005000) ! return OOPS if char.hitpoints >= char.maxhitpoints: socket.clilocmessage(1049547) --- 389,398 ---- socket = char.socket if not canUsePotion( char, potion ): ! return False if char.poison > -1: # You can not heal yourself in your current state. socket.clilocmessage(1005000) ! return False if char.hitpoints >= char.maxhitpoints: socket.clilocmessage(1049547) *************** *** 400,404 **** char.hitpoints = char.maxhitpoints char.updatehealth() ! return OOPS if not char.hastag( "heal_pot_timer" ): --- 400,404 ---- char.hitpoints = char.maxhitpoints char.updatehealth() ! return False if not char.hastag( "heal_pot_timer" ): *************** *** 409,413 **** if elapsed > time.servertime(): socket.clilocmessage( 500235, '', GRAY ) # You must wait 10 seconds before using another healing potion. ! return OOPS else: char.settag( "heal_pot_timer", (time.servertime() + HEAL_POT_DELAY) ) --- 409,413 ---- if elapsed > time.servertime(): socket.clilocmessage( 500235, '', GRAY ) # You must wait 10 seconds before using another healing potion. ! return False else: char.settag( "heal_pot_timer", (time.servertime() + HEAL_POT_DELAY) ) *************** *** 436,440 **** consumePotion( char, potion, potions[ healtype ][ POT_RETURN_BOTTLE ] ) ! return OK # Cure Potions --- 436,440 ---- consumePotion( char, potion, potions[ healtype ][ POT_RETURN_BOTTLE ] ) ! return True # Cure Potions *************** *** 443,447 **** if char.poison == -1: socket.clilocmessage(1042000) # You are not poisoned. ! return OOPS if curetype == 4: --- 443,447 ---- if char.poison == -1: socket.clilocmessage(1042000) # You are not poisoned. ! return False if curetype == 4: *************** *** 481,485 **** else: socket.clilocmessage(500232) # That potion was not strong enough to cure your ailment! ! return OK # Agility Potion --- 481,485 ---- else: socket.clilocmessage(500232) # That potion was not strong enough to cure your ailment! ! return True # Agility Potion *************** *** 496,500 **** # Oops! else: ! return OOPS if not char.hastag( "dex_pot_timer" ): --- 496,500 ---- # Oops! else: ! return False if not char.hastag( "dex_pot_timer" ): *************** *** 505,509 **** if elapsed > time.servertime(): socket.clilocmessage(502173) # You are already under a similar effect. ! return OOPS else: char.settag( 'dex_pot_timer', (time.servertime() + AGILITY_TIME) ) --- 505,509 ---- if elapsed > time.servertime(): socket.clilocmessage(502173) # You are already under a similar effect. ! return False else: char.settag( 'dex_pot_timer', (time.servertime() + AGILITY_TIME) ) *************** *** 525,529 **** consumePotion( char, potion, potions[ agilitytype ][ POT_RETURN_BOTTLE ] ) ! return OK # Strength Potion --- 525,529 ---- consumePotion( char, potion, potions[ agilitytype ][ POT_RETURN_BOTTLE ] ) ! return True # Strength Potion *************** *** 531,535 **** socket = char.socket if not canUsePotion( char, potion ): ! return OOPS bonus = 0 --- 531,535 ---- socket = char.socket if not canUsePotion( char, potion ): ! return False bonus = 0 *************** *** 543,547 **** # Oops! else: ! return OOPS if not char.hastag( "str_pot_timer" ): --- 543,547 ---- # Oops! else: ! return False if not char.hastag( "str_pot_timer" ): *************** *** 552,556 **** if elapsed > time.servertime(): socket.clilocmessage(502173) # You are already under a similar effect ! return OOPS else: char.settag( 'str_pot_timer', (time.servertime() + STRENGTH_TIME) ) --- 552,556 ---- if elapsed > time.servertime(): socket.clilocmessage(502173) # You are already under a similar effect ! return False else: char.settag( 'str_pot_timer', (time.servertime() + STRENGTH_TIME) ) *************** *** 572,576 **** consumePotion( char, potion, potions[ strengthtype ][ POT_RETURN_BOTTLE ] ) ! return OK # Poison Potions --- 572,576 ---- consumePotion( char, potion, potions[ strengthtype ][ POT_RETURN_BOTTLE ] ) ! return True # Poison Potions *************** *** 587,596 **** poison.poison(char, 3) else: ! return OOPS char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) consumePotion( char, potion, potions[ poisontype ][ POT_RETURN_BOTTLE ] ) ! return OK def refreshPotion( char, potion, refreshtype ): --- 587,596 ---- poison.poison(char, 3) else: ! return False char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) consumePotion( char, potion, potions[ poisontype ][ POT_RETURN_BOTTLE ] ) ! return True def refreshPotion( char, potion, refreshtype ): *************** *** 605,619 **** char.updatestamina() else: ! return OOPS if char.stamina > char.maxstamina: char.stamina = char.maxstamina char.updatestamina() ! return OOPS char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) consumePotion( char, potion, potions[ refreshtype ][ POT_RETURN_BOTTLE ] ) ! return OK # INVIS POTION --- 605,619 ---- char.updatestamina() else: ! return False if char.stamina > char.maxstamina: char.stamina = char.maxstamina char.updatestamina() ! return False char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) consumePotion( char, potion, potions[ refreshtype ][ POT_RETURN_BOTTLE ] ) ! return True # INVIS POTION Index: pickaxe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickaxe.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** pickaxe.py 26 May 2004 13:07:20 -0000 1.2 --- pickaxe.py 2 Jul 2004 13:40:45 -0000 1.3 *************** *** 19,23 **** # You are already digging. char.socket.clilocmessage( 503029, "", GRAY ) ! return OK # Can't mine on horses --- 19,23 ---- # You are already digging. char.socket.clilocmessage( 503029, "", GRAY ) ! return True # Can't mine on horses *************** *** 25,29 **** # You can't mine while riding. char.socket.clilocmessage( 501864, "", GRAY ) ! return OK # Who is tool owner ? --- 25,29 ---- # You can't mine while riding. char.socket.clilocmessage( 501864, "", GRAY ) ! return True # Who is tool owner ? *************** *** 31,35 **** # You can't use that, it belongs to someone else char.socket.clilocmessage( 500364, "", GRAY ) ! return OK # Is that mining tool ? --- 31,35 ---- # You can't use that, it belongs to someone else char.socket.clilocmessage( 500364, "", GRAY ) ! return True # Is that mining tool ? *************** *** 40,44 **** else: char.socket.clilocmessage( 500735, "", GRAY) # Don't play with things you don't know about. :) ! return OK ! return OK --- 40,44 ---- else: char.socket.clilocmessage( 500735, "", GRAY) # Don't play with things you don't know about. :) ! return True ! return True Index: wool.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wool.py 26 May 2004 13:07:20 -0000 1.7 --- wool.py 2 Jul 2004 13:40:45 -0000 1.8 *************** *** 18,26 **** if item.getoutmostchar() != char: char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. ! return OK char.socket.clilocmessage( 502655 ) # What spinning wheel do you wish to spin this on? char.socket.attachtarget( "wool.response", [ item.serial ] ) ! return OK --- 18,26 ---- if item.getoutmostchar() != char: char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. ! return True char.socket.clilocmessage( 502655 ) # What spinning wheel do you wish to spin this on? char.socket.attachtarget( "wool.response", [ item.serial ] ) ! return True *************** *** 35,48 **** if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return OK if abs( char.pos.z - target.pos.z ) > 5: char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return OK # Check target (only item targets valid) if not target.item: char.socket.clilocmessage( 502658, '', GRAY ) # Use that on a spinning wheel. ! return OK if target.item.id in ids: --- 35,48 ---- if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return True if abs( char.pos.z - target.pos.z ) > 5: char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. ! return True # Check target (only item targets valid) if not target.item: char.socket.clilocmessage( 502658, '', GRAY ) # Use that on a spinning wheel. ! return True if target.item.id in ids: *************** *** 75,84 **** # That spinning wheel is being used. char.socket.clilocmessage( 502656, '', GRAY ) ! return OK else: # Use that on a spinning wheel. char.socket.clilocmessage( 502658, '', GRAY ) ! return OK def ProcessTimer( time, args ): --- 75,84 ---- # That spinning wheel is being used. char.socket.clilocmessage( 502656, '', GRAY ) ! return True else: # Use that on a spinning wheel. char.socket.clilocmessage( 502658, '', GRAY ) ! return True def ProcessTimer( time, args ): *************** *** 87,91 **** color = args[2] GetYarn( char, wheel, color ) ! return OK def GetYarn( char, wheel, color ): --- 87,91 ---- color = args[2] GetYarn( char, wheel, color ) ! return True def GetYarn( char, wheel, color ): *************** *** 116,118 **** # You put a ball of yarn in your backpack. char.socket.clilocmessage( 1010574, '', GRAY ) ! return OK --- 116,118 ---- # You put a ball of yarn in your backpack. char.socket.clilocmessage( 1010574, '', GRAY ) ! return True Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** blades.py 10 May 2004 08:03:43 -0000 1.3 --- blades.py 2 Jul 2004 13:40:44 -0000 1.4 *************** *** 104,108 **** # You can't use a bladed item on that. char.socket.clilocmessage( 500494, "", GRAY ) ! return OOPS # CARVE CORPSE --- 104,108 ---- # You can't use a bladed item on that. char.socket.clilocmessage( 500494, "", GRAY ) ! return False # CARVE CORPSE Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ore.py 29 May 2004 01:45:31 -0000 1.18 --- ore.py 2 Jul 2004 13:40:45 -0000 1.19 *************** *** 37,59 **** if char.pos.distance( ore.pos ) > 2: char.socket.clilocmessage( 501976, '', GRAY ) # You can't reach... ! return OK else: if not ore.hastag( 'resname' ): char.socket.clilocmessage( 501986, '', GRAY ) # Strange ore. ! return OK else: # Where do you want to smelt the ore? char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) ! return OK else: if not ore.hastag( 'resname' ): char.socket.clilocmessage( 501986, '', GRAY ) ! return OK else: # Where do you want to smelt the ore? char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) ! return OK def response( char, args, target ): --- 37,59 ---- if char.pos.distance( ore.pos ) > 2: char.socket.clilocmessage( 501976, '', GRAY ) # You can't reach... ! return True else: if not ore.hastag( 'resname' ): char.socket.clilocmessage( 501986, '', GRAY ) # Strange ore. ! return True else: # Where do you want to smelt the ore? char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) ! return True else: if not ore.hastag( 'resname' ): char.socket.clilocmessage( 501986, '', GRAY ) ! return True else: # Where do you want to smelt the ore? char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) ! return True def response( char, args, target ): *************** *** 74,78 **** if not item.hastag( 'resname' ): ! return OOPS else: resname = item.gettag( 'resname' ) --- 74,78 ---- if not item.hastag( 'resname' ): ! return False else: resname = item.gettag( 'resname' ) *************** *** 85,100 **** if char.pos.distance( target.pos ) > 3: char.socket.clilocmessage( 0x7A258 ) # You can't reach... ! return OK else: dosmelt( char, [ item, targetitem, resname ] ) ! return OK # This is for merging the ore piles elif target.item.baseid in DEF_ORES: if targetitem.serial == item.serial: ! return OOPS if not targetitem.hastag('resname'): char.socket.clilocmessage( 501986, '', GRAY ) ! return OOPS # Largest Ore Pile if item.baseid == DEF_ORES[3] and item.color == targetitem.color and item.gettag( 'resname' ) == targetitem.gettag( 'resname' ): --- 85,100 ---- if char.pos.distance( target.pos ) > 3: char.socket.clilocmessage( 0x7A258 ) # You can't reach... ! return True else: dosmelt( char, [ item, targetitem, resname ] ) ! return True # This is for merging the ore piles elif target.item.baseid in DEF_ORES: if targetitem.serial == item.serial: ! return False if not targetitem.hastag('resname'): char.socket.clilocmessage( 501986, '', GRAY ) ! return False # Largest Ore Pile if item.baseid == DEF_ORES[3] and item.color == targetitem.color and item.gettag( 'resname' ) == targetitem.gettag( 'resname' ): *************** *** 103,107 **** # The ore is too far away. char.socket.clilocmessage( 501976, '', GRAY) ! return OK else: # Merge the ore piles --- 103,107 ---- # The ore is too far away. char.socket.clilocmessage( 501976, '', GRAY) ! return True else: # Merge the ore piles *************** *** 124,128 **** # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. char.socket.clilocmessage( 501971, '', GRAY ) ! return OK else: # Merge the ore piles --- 124,128 ---- # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. char.socket.clilocmessage( 501971, '', GRAY ) ! return True else: # Merge the ore piles *************** *** 145,149 **** # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. char.socket.clilocmessage( 501971, '', GRAY ) ! return OK # Second Largest Ore --- 145,149 ---- # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. char.socket.clilocmessage( 501971, '', GRAY ) ! return True # Second Largest Ore *************** *** 153,157 **** # The ore is too far away. char.socket.clilocmessage( 501976, '', GRAY) ! return OK else: # Merge the ore piles --- 153,157 ---- # The ore is too far away. char.socket.clilocmessage( 501976, '', GRAY) ! return True else: # Merge the ore piles *************** *** 160,172 **** targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[3]: ! return OOPS ! return OK else: # Merge the ore piles --- 160,172 ---- targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[3]: ! return False ! return True else: # Merge the ore piles *************** *** 175,187 **** targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[3]: ! return OOPS ! return OK # Second Smallest --- 175,187 ---- targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[3]: ! return False ! return True # Second Smallest *************** *** 190,194 **** if char.pos.distance( target.pos ) > 2: char.socket.clilocmessage( 0x7A258 ) # You can't reach... ! return OK else: if targetitem.baseid == DEF_ORES[1]: --- 190,194 ---- if char.pos.distance( target.pos ) > 2: char.socket.clilocmessage( 0x7A258 ) # You can't reach... ! return True else: if targetitem.baseid == DEF_ORES[1]: *************** *** 196,208 **** targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[2] or targetitem.baseid == DEF_ORES[3]: ! return OOPS ! return OK else: # Merge the ore piles --- 196,208 ---- targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[2] or targetitem.baseid == DEF_ORES[3]: ! return False ! return True else: # Merge the ore piles *************** *** 211,223 **** targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return OK elif targetitem.baseid == DEF_ORES[2] or targetitem.baseid == DEF_ORES[3]: ! return OOPS ! return OK # Smallest --- 211,223 ---- targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[0]: targetitem.amount += ( item.amount * 2 ) targetitem.update() item.delete() ! return True elif targetitem.baseid == DEF_ORES[2] or targetitem.baseid == DEF_ORES[3]: ! return False ! return True # Smallest *************** *** 227,231 **** # The ore is too far away. char.socket.clilocmessage( 501976 ) ! return OK else: # Merge the ore piles --- 227,231 ---- # The ore is too far away. char.socket.clilocmessage( 501976 ) ! return True else: # Merge the ore piles *************** *** 237,241 **** item.delete() char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) ! return OK else: # Merge the ore piles --- 237,241 ---- item.delete() char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) ! return True else: # Merge the ore piles *************** *** 247,251 **** item.delete() char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) ! return OK def dosmelt(char, args): --- 247,251 ---- item.delete() char.socket.sysmessage( "You combine the two ore piles to create a single pile of ore.", GRAY ) ! return True def dosmelt(char, args): *************** *** 264,268 **** if not char.skill[MINING] >= reqskill: char.socket.clilocmessage(501986, '', GRAY) # You have no idea how to smelt this strange ore! ! return OOPS if ore.amount >= 1 and char.skill[ MINING ] >= reqskill: --- 264,268 ---- if not char.skill[MINING] >= reqskill: char.socket.clilocmessage(501986, '', GRAY) # You have no idea how to smelt this strange ore! ! return False if ore.amount >= 1 and char.skill[ MINING ] >= reqskill: *************** *** 291,295 **** # There is not enough metal-bearing ore in this pile to make an ingot. char.socket.clilocmessage( 501987, '', GRAY ) ! return OOPS success = 1 --- 291,295 ---- # There is not enough metal-bearing ore in this pile to make an ingot. char.socket.clilocmessage( 501987, '', GRAY ) ! return False success = 1 *************** *** 305,309 **** ore.delete() ! return OK def successsmelt(char, resname, amount): --- 305,309 ---- ore.delete() ! return True def successsmelt(char, resname, amount): *************** *** 323,325 **** char.socket.clilocmessage(501988, '', GRAY) char.soundeffect(SOUND_HAMMER_1) ! return OK --- 323,325 ---- char.socket.clilocmessage(501988, '', GRAY) char.soundeffect(SOUND_HAMMER_1) ! return True |
