|
From: <dr...@pr...> - 2004-01-26 22:26:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7865/scripts Modified Files: equipment.py ore.py scissors.py wool.py yarn.py Log Message: mmmmmm cliloc messages Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** equipment.py 26 Jan 2004 06:23:08 -0000 1.4 --- equipment.py 26 Jan 2004 22:25:21 -0000 1.5 *************** *** 7,30 **** if item.hastag( 'req_str' ) and wearer.strength < int( item.gettag( 'req_str' ) ): if player != wearer: ! player.message( 'This person can\'t wear that item, seems not strong enough.' ) return 1 else: ! player.message( 'You cannot wear that item, you seem not strong enough.' ) return 1 if item.hastag( 'req_dex' ) and wearer.dexterity < int( item.gettag( 'req_dex' ) ): if player != wearer: ! player.message( 'This person can\'t wear that item, seems not agile enough.' ) return 1 else: ! player.message( 'You cannot wear that item, you seem not agile enough.' ) return 1 if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ): if player != wearer: ! player.message( 'This person can\'t wear that item, seems not smart enough.' ) return 1 else: ! player.message( 'You cannot wear that item, you seem not smart enough.' ) return 1 --- 7,32 ---- if item.hastag( 'req_str' ) and wearer.strength < int( item.gettag( 'req_str' ) ): if player != wearer: ! player.socket.sysmessage( 'This person can\'t wear that item, seems not strong enough.' ) return 1 else: ! # You are not strong enough to equip that. ! player.socket.clilocmessage( 500213, '', GRAY ) return 1 if item.hastag( 'req_dex' ) and wearer.dexterity < int( item.gettag( 'req_dex' ) ): if player != wearer: ! player.socket.sysmessage( 'This person can\'t wear that item, seems not agile enough.' ) return 1 else: ! # You do not have enough dexterity to equip this item. ! player.socket.clilocmessage( 502077, '', GRAY ) return 1 if item.hastag( 'req_int' ) and wearer.intelligence < int( item.gettag( 'req_int' ) ): if player != wearer: ! player.socket.sysmessage( 'This person can\'t wear that item, seems not smart enough.' ) return 1 else: ! player.socket.sysmessage( 'You are not ingellgent enough to equip this item.' ) return 1 Index: ore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/ore.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ore.py 26 Jan 2004 21:00:40 -0000 1.4 --- ore.py 26 Jan 2004 22:25:21 -0000 1.5 *************** *** 58,62 **** else: # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK --- 58,62 ---- else: # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK *************** *** 67,71 **** else: # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK --- 67,71 ---- else: # Where do you want to smelt the ore? ! char.socket.clilocmessage( 501971, '', GRAY ) char.socket.attachtarget( "ore.response", [ ore.serial ] ) return OK *************** *** 125,129 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) --- 125,129 ---- item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) *************** *** 131,135 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == item.id: targetitem.amount += item.amount --- 131,135 ---- item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY ) elif targetitem.id == item.id: targetitem.amount += item.amount *************** *** 137,141 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) return OK else: --- 137,141 ---- item.delete() # 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: *************** *** 146,150 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) --- 146,150 ---- item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY ) elif targetitem.id == oreids[0]: targetitem.amount += ( item.amount * 4 ) *************** *** 152,156 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) elif targetitem.id == item.id: targetitem.amount += item.amount --- 152,156 ---- item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY ) elif targetitem.id == item.id: targetitem.amount += item.amount *************** *** 158,162 **** item.delete() # Select the forge on which to smelt the ore, or another pile of ore with which to combine it. ! char.socket.clilocmessage( 501971, '', GRAY, NORMAL ) return OK --- 158,162 ---- item.delete() # 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 Index: scissors.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/scissors.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** scissors.py 14 Jan 2004 01:30:22 -0000 1.6 --- scissors.py 26 Jan 2004 22:25:21 -0000 1.7 *************** *** 30,37 **** # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return 1 ! char.socket.clilocmessage( 0x7AAA2 ) # What do you want to use this scissors on? char.socket.attachtarget( "scissors.response", [ item.serial ] ) return 1 --- 30,37 ---- # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. return 1 ! char.socket.clilocmessage( 502434 ) # What do you want to use this scissors on? char.socket.attachtarget( "scissors.response", [ item.serial ] ) return 1 *************** *** 45,62 **** if not item: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return if not ( item.getoutmostchar() == char): ! char.socket.clilocmessage( 0x7AAA5 ) # You can't reach... return # Check target (only item targets valid) if not target.item: ! char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything return if not target.item.getoutmostchar() == char: ! char.socket.clilocmessage( 0x7A4FC ) return --- 45,62 ---- if not item: ! char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. return if not ( item.getoutmostchar() == char): ! char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. return # Check target (only item targets valid) if not target.item: ! char.socket.clilocmessage( 502440, "", GRAY ) # Scissors can not be used on that to produce anything return if not target.item.getoutmostchar() == char: ! char.socket.clilocmessage( 502440 ) # Scissors cannot be used on that to produce anything. return *************** *** 209,212 **** else: ! char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything return --- 209,212 ---- else: ! char.socket.clilocmessage( 502440, "", GRAY ) # Scissors can not be used on that to produce anything return Index: wool.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wool.py 14 Jan 2004 01:30:22 -0000 1.4 --- wool.py 26 Jan 2004 22:25:21 -0000 1.5 *************** *** 17,24 **** # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return OK ! char.socket.clilocmessage( 0x7AB7F ) # What spinning wheel do you wish to spin this on? char.socket.attachtarget( "wool.response", [ item.serial ] ) return OK --- 17,24 ---- # Needs to be on ourself 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 *************** *** 34,47 **** if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): ! char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that. return OK if abs( char.pos.z - target.pos.z ) > 5: ! char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that. return OK # Check target (only item targets valid) if not target.item: ! char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel. return OK --- 34,47 ---- 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 *************** *** 73,81 **** elif target.item.id in animids: ! char.socket.sysmessage( 'This spinning wheel is currently in use.' ) return OK else: ! char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel. return OK --- 73,83 ---- elif target.item.id in animids: ! # 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 *************** *** 107,110 **** if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() ! char.socket.sysmessage( 'You put the yarn into your backpack.' ) return OK \ No newline at end of file --- 109,118 ---- if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() ! ! if item_new.amount > 1: ! # You put the balls of yarn in your backpack. ! char.socket.clilocmessage( 1010576, '', GRAY ) ! else: ! # You put a ball of yarn in your backpack. ! char.socket.clilocmessage( 1010574, '', GRAY ) return OK \ No newline at end of file Index: yarn.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/yarn.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** yarn.py 14 Jan 2004 01:30:22 -0000 1.5 --- yarn.py 26 Jan 2004 22:25:21 -0000 1.6 *************** *** 15,22 **** # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 0x7A258 ) # You can't reach... return 1 ! char.socket.clilocmessage( 0x7A28E ) # Select a loom to use that on. char.socket.attachtarget( "yarn.response", [ item.serial ] ) return 1 --- 15,22 ---- # Needs to be on ourself if item.getoutmostchar() != char: ! char.socket.clilocmessage( 500312, '', GRAY ) # You cannot reach that. return 1 ! char.socket.clilocmessage( 500366, '', GRAY ) # Select a loom to use that on. char.socket.attachtarget( "yarn.response", [ item.serial ] ) return 1 *************** *** 31,44 **** if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4): ! char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that. return 1 if abs( char.pos.z - target.pos.z ) > 5: ! char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that. return 1 # Check target (only item targets valid) if not target.item: ! char.socket.clilocmessage( 0x7A28F ) # Try using that on a loom. return 1 --- 31,44 ---- 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 1 if abs( char.pos.z - target.pos.z ) > 5: ! char.socket.clilocmessage( 502648, '', GRAY) # You are too far away to do that. return 1 # Check target (only item targets valid) if not target.item: ! char.socket.clilocmessage( 500367, '', GRAY ) # Try using that on a loom. return 1 *************** *** 62,72 **** if amount < 5: if amount == 1: ! char.socket.sysmessage( 'You have just started the bolt of cloth.' ) elif amount == 2: ! char.socket.sysmessage( 'The bolt of cloth could use quite a bit more.' ) elif amount == 3: ! char.socket.sysmessage( 'The bolt of cloth could use a bit more.' ) elif amount == 4: ! char.socket.sysmessage( 'The bolt of cloth is almost finished.' ) target.item.settag( 'amount', str(amount) ) --- 62,76 ---- if amount < 5: if amount == 1: ! #The bolt of cloth has just been started. ! char.socket.clilocmessage( 1010001, '', GRAY ) elif amount == 2: ! #The bolt of cloth needs quite a bit more. ! char.socket.clilocmessage( 1010002, '', GRAY ) elif amount == 3: ! #The bolt of cloth needs a little more. ! char.socket.clilocmessage( 1010003, '', GRAY ) elif amount == 4: ! #The bolt of cloth is almost finished. ! char.socket.clilocmessage( 1010004, '', GRAY ) target.item.settag( 'amount', str(amount) ) *************** *** 77,79 **** if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() ! char.socket.clilocmessage( 0x7A290 ) # You create some cloth and put it in your backpack. --- 81,83 ---- if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() ! char.socket.clilocmessage( 500368, '', GRAY ) # You create some cloth and put it in your backpack. |
