Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16134/skills Modified Files: __init__.py alchemy.py anatomy.py animallore.py animaltaming.py armslore.py begging.py detectinghidden.py evaluatingintel.py fishing.py healing.py hiding.py itemid.py lumberjacking.py mining.py musicianship.py peacemaking.py poisoning.py spiritspeak.py stealth.py tasteid.py tracking.py Log Message: More import cleanups... Removed wolfpack.currentime() and moved it to wolfpack.time.currenttime() / wolfpack.time.servertime() It seems to belong here more than it would in wolfpack.currenttime() Scripts updated to support this. Index: anatomy.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/anatomy.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** anatomy.py 9 Jul 2004 10:30:26 -0000 1.13 --- anatomy.py 16 Jul 2004 07:09:27 -0000 1.14 *************** *** 6,13 **** ################################################################# - from wolfpack.consts import * import wolfpack import skills ! from wolfpack.time import * from math import floor --- 6,13 ---- ################################################################# import wolfpack + import wolfpack.time import skills ! from wolfpack.consts import ANATOMY from math import floor *************** *** 23,28 **** if socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 23,27 ---- if socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 37,43 **** def response( char, args, target ): - socket = char.socket - # Check for a valid target if not target.char: --- 36,40 ---- *************** *** 62,67 **** return ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + ANATOMY_DELAY ) # Make a skillcheck and display the fail or success message above the targets head --- 59,63 ---- return ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + ANATOMY_DELAY ) ) # Make a skillcheck and display the fail or success message above the targets head Index: tracking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tracking.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** tracking.py 15 Jul 2004 00:31:14 -0000 1.7 --- tracking.py 16 Jul 2004 07:09:27 -0000 1.8 *************** *** 6,15 **** ################################################################# - from wolfpack.consts import * - from wolfpack.utilities import * - from wolfpack.time import * - from wolfpack.gumps import * import wolfpack import skills STEALTH_DELAY = 5000 --- 6,15 ---- ################################################################# import wolfpack + import wolfpack.time import skills + from wolfpack.consts import TRACKING + from wolfpack.gumps import cGump + STEALTH_DELAY = 5000 *************** *** 22,27 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 --- 22,26 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 *************** *** 56,61 **** gump.send( char ) ! cur_time = servertime() ! char.socket.settag( 'skill_delay', ( cur_time + STEALTH_DELAY ) ) return 1 --- 55,59 ---- gump.send( char ) ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) ) return 1 Index: tasteid.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/tasteid.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** tasteid.py 26 May 2004 13:07:25 -0000 1.8 --- tasteid.py 16 Jul 2004 07:09:27 -0000 1.9 *************** *** 8,13 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * import wolfpack import skills --- 8,13 ---- from wolfpack.consts import * from wolfpack.utilities import * import wolfpack + import wolfpack.time import skills *************** *** 18,22 **** if socket.hastag('skill_delay'): ! if servertime() < socket.gettag('skill_delay'): socket.clilocmessage(500118) return 1 --- 18,22 ---- if socket.hastag('skill_delay'): ! if wolfpack.time.currenttime() < socket.gettag('skill_delay'): socket.clilocmessage(500118) return 1 *************** *** 31,35 **** socket = char.socket ! socket.settag('skill_delay', servertime() + TASTEID_DELAY) if target.item: --- 31,35 ---- socket = char.socket ! socket.settag('skill_delay', int( wolfpack.time.currenttime() + TASTEID_DELAY ) ) if target.item: Index: hiding.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/hiding.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** hiding.py 9 Jul 2004 10:30:26 -0000 1.10 --- hiding.py 16 Jul 2004 07:09:27 -0000 1.11 *************** *** 8,13 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * import wolfpack import skills --- 8,13 ---- from wolfpack.consts import * from wolfpack.utilities import * import wolfpack + import wolfpack.time import skills *************** *** 19,24 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 19,23 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 36,41 **** char.socket.clilocmessage( 501237, "", 0x3b2, 4, char ) ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + HIDING_DELAY ) return True --- 35,39 ---- char.socket.clilocmessage( 501237, "", 0x3b2, 4, char ) ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + HIDING_DELAY ) ) return True Index: musicianship.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/musicianship.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** musicianship.py 26 May 2004 13:07:25 -0000 1.5 --- musicianship.py 16 Jul 2004 07:09:27 -0000 1.6 *************** *** 8,12 **** from wolfpack.consts import * import wolfpack ! from wolfpack.time import * import wolfpack.utilities --- 8,12 ---- from wolfpack.consts import * import wolfpack ! import wolfpack.time import wolfpack.utilities *************** *** 30,47 **** # first introduction of GGS success = 0 - cur_time = servertime() if not char.socket.hastag( 'musicianship_gain_time' ): success = char.checkskill( MUSICIANSHIP, 0, 1000 ) if success: ! char.socket.settag( 'musicianship_gain_time', cur_time ) else: success = 0 last_gain = char.socket.gettag( 'musicianship_gain_time' ) ! if cur_time - last_gain >= MUSICIANSHIP_GAIN_DELAY: success = char.checkskill( MUSICIANSHIP, 0, 1000 ) if not success: char.skill[ MUSICIANSHIP ] += 1 success = 1 ! char.socket.settag( 'musicianship_gain_time', cur_time ) # item wear out - will be added --- 30,46 ---- # first introduction of GGS success = 0 if not char.socket.hastag( 'musicianship_gain_time' ): success = char.checkskill( MUSICIANSHIP, 0, 1000 ) if success: ! char.socket.settag( 'musicianship_gain_time', wolfpack.time.currenttime() ) else: success = 0 last_gain = char.socket.gettag( 'musicianship_gain_time' ) ! if wolfpack.time.currenttime() - last_gain >= MUSICIANSHIP_GAIN_DELAY: success = char.checkskill( MUSICIANSHIP, 0, 1000 ) if not success: char.skill[ MUSICIANSHIP ] += 1 success = 1 ! char.socket.settag( 'musicianship_gain_time', wolfpack.time.currenttime() ) # item wear out - will be added *************** *** 58,63 **** # the 'last used' item will be used # set last use item for musicianship ! cur_time = servertime() ! item.settag( 'last_musicianship_use', cur_time ) char.socket.settag( 'instrument', item.serial ) if success: --- 57,61 ---- # the 'last used' item will be used # set last use item for musicianship ! item.settag( 'last_musicianship_use', wolfpack.time.currenttime() ) char.socket.settag( 'instrument', item.serial ) if success: Index: armslore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/armslore.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** armslore.py 9 Jul 2004 10:30:26 -0000 1.12 --- armslore.py 16 Jul 2004 07:09:27 -0000 1.13 *************** *** 8,14 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * from wolfpack.properties import * import wolfpack import skills from wolfpack import weaponinfo --- 8,14 ---- from wolfpack.consts import * from wolfpack.utilities import * from wolfpack.properties import * import wolfpack + import wolfpack.time import skills from wolfpack import weaponinfo *************** *** 23,28 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 23,27 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 51,56 **** if isweapon( item ) or isarmor( item ) or isshield( item ): ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + ARMSLORE_DELAY ) if not char.checkskill( ARMSLORE, 0, 1000 ): char.socket.clilocmessage( 0x7A281, "", 0x3b2, 3 ) --- 50,54 ---- if isweapon( item ) or isarmor( item ) or isshield( item ): ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + ARMSLORE_DELAY ) ) if not char.checkskill( ARMSLORE, 0, 1000 ): char.socket.clilocmessage( 0x7A281, "", 0x3b2, 3 ) *************** *** 58,62 **** char.socket.clilocmessage( 0x103319, "", 0x3b2, 3 ) ! condi = 10 * item.health / item.maxhealth if condi < 0: condi = 0 --- 56,60 ---- char.socket.clilocmessage( 0x103319, "", 0x3b2, 3 ) ! condi = ( 10 * ( item.health / item.maxhealth ) ) if condi < 0: condi = 0 Index: begging.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/begging.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** begging.py 9 Jul 2004 10:30:26 -0000 1.13 --- begging.py 16 Jul 2004 07:09:27 -0000 1.14 *************** *** 8,13 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * import wolfpack import skills --- 8,13 ---- from wolfpack.consts import * from wolfpack.utilities import * import wolfpack + import wolfpack.time import skills *************** *** 19,23 **** # 5. If your karma gets too low, there is a chance the NPC will refuse to give you any gold at all. Where "low" means negative karma. All karma my GM Beggar had was the little he could acquire from wrestling rats in town. ! GOLD_COIN = "0xeed" GOLD_COIN1 = "eed" BEGGING_RANGE = 3 --- 19,23 ---- # 5. If your karma gets too low, there is a chance the NPC will refuse to give you any gold at all. Where "low" means negative karma. All karma my GM Beggar had was the little he could acquire from wrestling rats in town. ! GOLD_COIN = "eed" GOLD_COIN1 = "eed" BEGGING_RANGE = 3 *************** *** 30,35 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 30,34 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 66,70 **** # town cryer : I feel sorry for thee... Thou dost not look trustworthy... no gold for thee today! : 500405 + 500406 ! gold = npc.countresource( hex2dec(GOLD_COIN) ) if not gold or gold < 10: # Thou dost not look trustworthy... no gold for thee today! --- 65,69 ---- # town cryer : I feel sorry for thee... Thou dost not look trustworthy... no gold for thee today! : 500405 + 500406 ! gold = npc.countresource( wolfpack.utilities.hex2dec( 0xeed ) ) if not gold or gold < 10: # Thou dost not look trustworthy... no gold for thee today! *************** *** 73,78 **** success = char.checkskill( BEGGING, 0, 1200 ) ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + BEGGING_DELAY ) # npc who has more than 100gp will give you 10gp --- 72,76 ---- success = char.checkskill( BEGGING, 0, 1200 ) ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + BEGGING_DELAY ) ) # npc who has more than 100gp will give you 10gp Index: alchemy.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/alchemy.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** alchemy.py 9 Jul 2004 10:30:25 -0000 1.5 --- alchemy.py 16 Jul 2004 07:09:27 -0000 1.6 *************** *** 1,11 **** from wolfpack import console ! from wolfpack.consts import * from wolfpack import properties - import math - import wolfpack from system.makemenus import CraftItemAction, MakeMenu, findmenu from wolfpack.utilities import hex2dec, tobackpack, createlockandkey ! import random # --- 1,12 ---- + import wolfpack + import math + import random from wolfpack import console ! from wolfpack.consts import ALCHEMY, LOG_ERROR, WPDT_MENU, WPDT_ITEM, skillnamesids from wolfpack import properties from system.makemenus import CraftItemAction, MakeMenu, findmenu from wolfpack.utilities import hex2dec, tobackpack, createlockandkey ! # *************** *** 74,78 **** if lostmaterials: bottle = wolfpack.additem('f0e') ! if not tobackpack(bottle, player): bottle.update() --- 75,79 ---- if lostmaterials: bottle = wolfpack.additem('f0e') ! if not wolfpack.utilities.tobackpack(bottle, player): bottle.update() Index: fishing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/fishing.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** fishing.py 9 Jul 2004 10:30:26 -0000 1.7 --- fishing.py 16 Jul 2004 07:09:27 -0000 1.8 *************** *** 39,43 **** # Are we already fishing? ! if socket.hastag( 'is_fishing' ) and socket.gettag( 'is_fishing' ) > wolfpack.time.servertime(): socket.clilocmessage( 0x7A4EC, "", 0x3b2, 3 ) # You are already fishing. return True --- 39,43 ---- # Are we already fishing? ! if socket.hastag( 'is_fishing' ) and socket.gettag( 'is_fishing' ) > wolfpack.time.currenttime(): socket.clilocmessage( 0x7A4EC, "", 0x3b2, 3 ) # You are already fishing. return True *************** *** 130,134 **** mapZ = mapTile[ "z" ] if not blockedspot and pos.z < mapZ: ! if pos.z > mapZ - FISHING_BLOCK_RANGE: blockedspot = 1 --- 130,134 ---- mapZ = mapTile[ "z" ] if not blockedspot and pos.z < mapZ: ! if pos.z > ( mapZ - FISHING_BLOCK_RANGE ): blockedspot = 1 *************** *** 147,151 **** # You broke your fishing pole. ! socket.settag( 'is_fishing', wolfpack.time.servertime() + 5000 ) # Times out after 5000ms char.addtimer( 2500, "skills.fishing.effecttimer", [ pos, deepwater ] ) char.addtimer( 5000, "skills.fishing.itemtimer", [ pos, deepwater ] ) --- 147,151 ---- # You broke your fishing pole. ! socket.settag( 'is_fishing', int( wolfpack.time.currenttime() + 5000 ) ) # Times out after 5000ms char.addtimer( 2500, "skills.fishing.effecttimer", [ pos, deepwater ] ) char.addtimer( 5000, "skills.fishing.itemtimer", [ pos, deepwater ] ) *************** *** 170,175 **** itemname = None possibleitems = [] ! maxvalue = 0 # We calculate a random value from 0 to this value and ! # then check the array above for matching items # Fill items and name with real values --- 170,176 ---- itemname = None possibleitems = [] ! maxvalue = 0 ! # We calculate a random value from 0 to this value and ! # then check the array above for matching items # Fill items and name with real values Index: stealth.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/stealth.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** stealth.py 26 May 2004 13:07:25 -0000 1.6 --- stealth.py 16 Jul 2004 07:09:27 -0000 1.7 *************** *** 8,13 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * import wolfpack import skills from math import ceil --- 8,13 ---- from wolfpack.consts import * from wolfpack.utilities import * import wolfpack + import wolfpack.time import skills from math import ceil *************** *** 19,24 **** def stealth( char, skill ): if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 --- 19,23 ---- def stealth( char, skill ): if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 *************** *** 51,56 **** char.update() ! cur_time = servertime() ! char.socket.settag( 'skill_delay', ( cur_time + STEALTH_DELAY ) ) return 1 --- 50,54 ---- char.update() ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + STEALTH_DELAY ) ) return 1 Index: detectinghidden.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/detectinghidden.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** detectinghidden.py 9 Jul 2004 10:30:26 -0000 1.7 --- detectinghidden.py 16 Jul 2004 07:09:27 -0000 1.8 *************** *** 8,13 **** from wolfpack.consts import * from wolfpack.utilities import * - from wolfpack.time import * import wolfpack import skills --- 8,13 ---- from wolfpack.consts import * from wolfpack.utilities import * import wolfpack + import wolfpack.time import skills *************** *** 30,35 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 30,34 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 61,66 **** return ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + DETECTHIDDEN_DELAY ) success = char.checkskill( DETECTINGHIDDEN, 0, 1000 ) --- 60,64 ---- return ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + DETECTHIDDEN_DELAY ) ) success = char.checkskill( DETECTINGHIDDEN, 0, 1000 ) *************** *** 130,132 **** def onLoad(): ! skills.register( DETECTINGHIDDEN, detectinghidden ) \ No newline at end of file --- 128,130 ---- def onLoad(): ! skills.register( DETECTINGHIDDEN, detectinghidden ) Index: healing.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/healing.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** healing.py 9 Jul 2004 10:30:26 -0000 1.4 --- healing.py 16 Jul 2004 07:09:27 -0000 1.5 *************** *** 100,105 **** # res chance : 25% at 80/80 skill, max 75% at 100/100 chance = 250 + ( healing - RES_HEALING ) + ( anatomy - RES_ANATOMY ) ! start_time = wolfpack.time.servertime() ! end_time = start_time + RES_DELAY char.addtimer( CHECK_DELAY, "skills.healing.delay_check", [ resto.serial, chance, start_time, end_time, 0 ] ) --- 100,104 ---- # res chance : 25% at 80/80 skill, max 75% at 100/100 chance = 250 + ( healing - RES_HEALING ) + ( anatomy - RES_ANATOMY ) ! end_time = wolfpack.time.currenttime() + RES_DELAY char.addtimer( CHECK_DELAY, "skills.healing.delay_check", [ resto.serial, chance, start_time, end_time, 0 ] ) *************** *** 107,115 **** # 80% at skill 60/60, 100% over skill 80/80 chance = min( 800 + ( healing - CURE_HEALING ) / 2 + ( anatomy - CURE_ANATOMY ) / 2, 1000 ) - start_time = wolfpack.time.servertime() if char == cureto: ! end_time = start_time + 8400 + 60 * ( 120 - char.dexterity ) else: ! end_time = start_time + CURE_OTHER_DELAY char.addtimer( CHECK_DELAY, "skills.healing.delay_check", [ cureto.serial, chance, start_time, end_time, 1 ] ) --- 106,113 ---- # 80% at skill 60/60, 100% over skill 80/80 chance = min( 800 + ( healing - CURE_HEALING ) / 2 + ( anatomy - CURE_ANATOMY ) / 2, 1000 ) if char == cureto: ! end_time = wolfpack.time.currenttime() + 8400 + 60 * ( 120 - char.dexterity ) else: ! end_time = wolfpack.time.currenttime() + CURE_OTHER_DELAY char.addtimer( CHECK_DELAY, "skills.healing.delay_check", [ cureto.serial, chance, start_time, end_time, 1 ] ) *************** *** 142,151 **** end_time = args[ 3 ] heal_type = args[ 4 ] - current_time = wolfpack.time.servertime() # useup one bandage char.useresource( 1, 0x0e21 ) ! if current_time >= end_time: # resurrect if heal_type == 0: --- 140,148 ---- end_time = args[ 3 ] heal_type = args[ 4 ] # useup one bandage char.useresource( 1, 0x0e21 ) ! if wolfpack.time.currenttime() >= end_time: # resurrect if heal_type == 0: *************** *** 187,191 **** # go loop delay = CHECK_DELAY ! if ( current_time + CHECK_DELAY ) > end_time: delay = end_time - current_time char.addtimer( delay, "skills.healing.delay_check", [ healto.serial, chance, start_time, end_time, heal_type ] ) --- 184,188 ---- # go loop delay = CHECK_DELAY ! if ( wolfpack.time.currenttime() + CHECK_DELAY ) > end_time: delay = end_time - current_time char.addtimer( delay, "skills.healing.delay_check", [ healto.serial, chance, start_time, end_time, heal_type ] ) Index: spiritspeak.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/spiritspeak.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** spiritspeak.py 26 May 2004 13:07:25 -0000 1.8 --- spiritspeak.py 16 Jul 2004 07:09:27 -0000 1.9 *************** *** 7,12 **** from wolfpack.consts import * - from wolfpack.time import * import wolfpack from math import floor import random --- 7,12 ---- from wolfpack.consts import * import wolfpack + import wolfpack.time from math import floor import random *************** *** 23,28 **** if socket.hastag('skill_delay'): ! cur_time = servertime() ! if cur_time < socket.gettag( 'skill_delay' ): socket.clilocmessage(500118) return 1 --- 23,27 ---- if socket.hastag('skill_delay'): ! if wolfpack.time.currenttime() < socket.gettag( 'skill_delay' ): socket.clilocmessage(500118) return 1 *************** *** 46,53 **** socket = char.socket socket.deltag('spiritspeaking') ! socket.settag('skill_delay', servertime() + SPSPEAK_DELAY) # Check for skill usage success ! if not char.checkskill(SPIRITSPEAK, 0, 1000): char.socket.clilocmessage(502443) return --- 45,52 ---- socket = char.socket socket.deltag('spiritspeaking') ! socket.settag('skill_delay', int( wolfpack.time.currenttime() + SPSPEAK_DELAY ) ) # Check for skill usage success ! if not char.checkskill( SPIRITSPEAK, 0, 1000 ): char.socket.clilocmessage(502443) return *************** *** 59,63 **** corpses = [] for item in items: ! if item.id == 0x2006 and not item.hastag('drained'): corpses.append(item) --- 58,62 ---- corpses = [] for item in items: ! if item.baseid == '2006' and not item.hastag('drained'): corpses.append(item) Index: lumberjacking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/lumberjacking.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** lumberjacking.py 9 Jul 2004 10:30:26 -0000 1.14 --- lumberjacking.py 16 Jul 2004 07:09:27 -0000 1.15 *************** *** 1,8 **** import wolfpack import whrandom import skills from wolfpack.consts import * - from wolfpack.time import * from wolfpack.utilities import * from random import randint --- 1,8 ---- import wolfpack + import wolfpack.time import whrandom import skills from wolfpack.consts import * from wolfpack.utilities import * from random import randint *************** *** 22,26 **** woodtable = \ { ! 'plainwood': [ 0, 10, 0x0 ] } yewtree = [ 4789, 4790, 4791, 4792, 4793, 4794, 4795, 4796, 4797 ] --- 22,26 ---- woodtable = \ { ! 'plainwood': [ 0, 10, 0x0 ] } yewtree = [ 4789, 4790, 4791, 4792, 4793, 4794, 4795, 4796, 4797 ] *************** *** 36,40 **** return False ! if socket.hastag('is_lumberjacking') and ( socket.gettag( 'is_lumberjacking' ) > servertime() ): socket.clilocmessage( 500119, "", GRAY ) return False --- 36,40 ---- return False ! if socket.hastag('is_lumberjacking') and ( socket.gettag( 'is_lumberjacking' ) > wolfpack.time.currenttime() ): socket.clilocmessage( 500119, "", GRAY ) return False *************** *** 80,84 **** resname = veingem.gettag( 'resname' ) ! socket.settag( 'is_lumberjacking', int( servertime() + nextchopdelay ) ) hack_logs( char, target, tool, veingem ) --- 80,84 ---- resname = veingem.gettag( 'resname' ) ! socket.settag( 'is_lumberjacking', int( wolfpack.time.currenttime() + nextchopdelay ) ) hack_logs( char, target, tool, veingem ) Index: evaluatingintel.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/evaluatingintel.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** evaluatingintel.py 9 Jul 2004 10:30:26 -0000 1.10 --- evaluatingintel.py 16 Jul 2004 07:09:27 -0000 1.11 *************** *** 10,14 **** from math import floor import skills ! from wolfpack.time import currenttime EVALINTDELAY = 1000 --- 10,14 ---- from math import floor import skills ! import wolfpack.time EVALINTDELAY = 1000 *************** *** 20,25 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = currenttime() ! if cur_time < char.socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 20,24 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 50,55 **** return False ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + EVALINTDELAY ) if not char.checkskill( EVALUATINGINTEL, 0, 1000 ): --- 49,53 ---- return False ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + EVALINTDELAY ) ) if not char.checkskill( EVALUATINGINTEL, 0, 1000 ): Index: peacemaking.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/peacemaking.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** peacemaking.py 26 May 2004 13:07:25 -0000 1.8 --- peacemaking.py 16 Jul 2004 07:09:27 -0000 1.9 *************** *** 9,13 **** from wolfpack.consts import * from wolfpack.utilities import * ! from wolfpack.time import * import skills --- 9,13 ---- from wolfpack.consts import * from wolfpack.utilities import * ! import wolfpack.time import skills *************** *** 19,24 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 --- 19,23 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return 1 *************** *** 71,76 **** char.socket.deltag( 'peacemaking_instrument' ) ! cur_time = servertime() ! char.socket.settag( 'skill_delay', ( cur_time + PEACE_DELAY ) ) # if target him/her self : standard (regional) mode --- 70,74 ---- char.socket.deltag( 'peacemaking_instrument' ) ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + PEACE_DELAY ) ) # if target him/her self : standard (regional) mode Index: poisoning.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/poisoning.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** poisoning.py 20 Jun 2004 20:34:28 -0000 1.2 --- poisoning.py 16 Jul 2004 07:09:27 -0000 1.3 *************** *** 7,14 **** from wolfpack.consts import * - from wolfpack.time import * from wolfpack.utilities import tobackpack import skills import wolfpack import random from system import poison --- 7,14 ---- from wolfpack.consts import * from wolfpack.utilities import tobackpack import skills import wolfpack + import wolfpack.time import random from system import poison *************** *** 159,163 **** if item.hastag( 'poisoning_char' ): item.deltag( 'poisoning_char' ) ! def onLoad(): skills.register( POISONING, poisoning ) --- 159,163 ---- if item.hastag( 'poisoning_char' ): item.deltag( 'poisoning_char' ) ! def onLoad(): skills.register( POISONING, poisoning ) Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/__init__.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** __init__.py 2 Jul 2004 13:40:46 -0000 1.15 --- __init__.py 16 Jul 2004 07:09:27 -0000 1.16 *************** *** 1,8 **** - import time import wolfpack import random import wolfpack.settings from wolfpack.consts import * - from random import randrange STRGAIN = 0 --- 1,6 ---- *************** *** 113,117 **** if object.hastag( tagname ): count = object.gettag( tagname ) ! object.settag( tagname, str( int( count + 1 ) ) ) if count <= ANTIMACROALLOWANCE: return True --- 111,115 ---- if object.hastag( tagname ): count = object.gettag( tagname ) ! object.settag( tagname, int( count + 1 ) ) if count <= ANTIMACROALLOWANCE: return True Index: mining.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/mining.py,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** mining.py 15 Jul 2004 22:08:02 -0000 1.32 --- mining.py 16 Jul 2004 07:09:27 -0000 1.33 *************** *** 46,50 **** def mining( char, pos, tool ): wolfpack.addtimer( 1300, "skills.mining.domining", [ char, SOUND_MINING, tool, pos ] ) ! char.socket.settag( 'is_mining', ( servertime() + miningdelay ) ) char.turnto( pos ) char.action( ANIM_ATTACK3 ) --- 46,50 ---- def mining( char, pos, tool ): wolfpack.addtimer( 1300, "skills.mining.domining", [ char, SOUND_MINING, tool, pos ] ) ! char.socket.settag( 'is_mining', ( wolfpack.time.currenttime() + miningdelay ) ) char.turnto( pos ) char.action( ANIM_ATTACK3 ) *************** *** 201,209 **** # Remaining Tool Uses if not tool.hastag('remaining_uses'): ! tool.settag('remaining_uses', tool.health) else: remaining_uses = int(tool.gettag('remaining_uses')) if remaining_uses > 1: ! tool.settag('remaining_uses', remaining_uses - 1) tool.resendtooltip() else: --- 201,209 ---- # Remaining Tool Uses if not tool.hastag('remaining_uses'): ! tool.settag('remaining_uses', tool.health ) else: remaining_uses = int(tool.gettag('remaining_uses')) if remaining_uses > 1: ! tool.settag('remaining_uses', remaining_uses - 1 ) tool.resendtooltip() else: *************** *** 255,259 **** vein = args[0] if vein and vein.hastag('resource_empty') and vein.gettag('resourcecount') == 0: ! vein.settag('resourcecount', random.randint(MINING_ORE[0], MINING_ORE[1])) vein.deltag('resource_empty') return True --- 255,259 ---- vein = args[0] if vein and vein.hastag('resource_empty') and vein.gettag('resourcecount') == 0: ! vein.settag('resourcecount', random.randint( MINING_ORE[0], MINING_ORE[1] ) ) vein.deltag('resource_empty') return True Index: animaltaming.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animaltaming.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** animaltaming.py 9 Jul 2004 10:30:26 -0000 1.15 --- animaltaming.py 16 Jul 2004 07:09:27 -0000 1.16 *************** *** 6,14 **** ################################################################# ! from wolfpack.consts import * ! from wolfpack.time import * import skills import wolfpack import whrandom # max number an animal can be tamed --- 6,15 ---- ################################################################# ! ! import wolfpack.time import skills import wolfpack import whrandom + from wolfpack.consts import * # max number an animal can be tamed *************** *** 28,33 **** def animaltaming( char, skill ): if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 29,33 ---- def animaltaming( char, skill ): if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 121,126 **** socket.clilocmessage( 1010598, "", 0x3b2, 3, totame ) ! cur_time = servertime() ! char.socket.settag('skill_delay', cur_time + TAMING_DELAY) # set timer --- 121,125 ---- socket.clilocmessage( 1010598, "", 0x3b2, 3, totame ) ! char.socket.settag('skill_delay', wolfpack.time.currenttime() + TAMING_DELAY) # set timer Index: itemid.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/itemid.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** itemid.py 26 May 2004 13:07:25 -0000 1.11 --- itemid.py 16 Jul 2004 07:09:27 -0000 1.12 *************** *** 18,22 **** if socket.hastag('skill_delay'): ! if servertime() < socket.gettag('skill_delay'): socket.clilocmessage(500118) return 1 --- 18,22 ---- if socket.hastag('skill_delay'): ! if wolfpack.time.currenttime() < socket.gettag('skill_delay'): socket.clilocmessage(500118) return 1 *************** *** 31,35 **** socket = char.socket ! socket.settag('skill_delay', servertime() + ITEMID_DELAY) # Identify an item and send the buy and sellprice. --- 31,35 ---- socket = char.socket ! socket.settag('skill_delay', int( wolfpack.time.currenttime() + ITEMID_DELAY ) ) # Identify an item and send the buy and sellprice. Index: animallore.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/animallore.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** animallore.py 9 Jul 2004 10:30:26 -0000 1.18 --- animallore.py 16 Jul 2004 07:09:27 -0000 1.19 *************** *** 6,14 **** ################################################################# ! from wolfpack.consts import * import wolfpack ! from wolfpack.time import * ! from wolfpack.gumps import cGump import skills ANIMALLORE_DELAY = 1000 --- 6,16 ---- ################################################################# ! import wolfpack ! import wolfpack.time import skills + from wolfpack.gumps import cGump + from wolfpack.consts import ANIMALLORE, MAGERY, TACTICS, ANATOMY, \ + EVALUATINGINTEL, POISONING, MAGICRESISTANCE, WRESTLING ANIMALLORE_DELAY = 1000 *************** *** 19,24 **** if char.socket.hastag( 'skill_delay' ): ! cur_time = servertime() ! if cur_time < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True --- 21,25 ---- if char.socket.hastag( 'skill_delay' ): ! if wolfpack.time.currenttime() < char.socket.gettag( 'skill_delay' ): char.socket.clilocmessage( 500118, "", 0x3b2, 3 ) return True *************** *** 80,84 **** loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 1 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></div>" %target.char.name, 0, 0 ) loreGump.addGump( 128,152, 2086 ) --- 81,85 ---- loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 1 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></div>" % target.char.name, 0, 0 ) loreGump.addGump( 128,152, 2086 ) *************** *** 86,105 **** loreGump.addXmfHtmlGump( 153, 168, 160, 18, 0x1003EA, 0, 0, 16000229 ) # Hits ! loreGump.addHtmlGump( 280, 168, 75, 18, "<div align=right>%i/%i</div>" %( target.char.health, target.char.strength ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 186, 160, 18, 0x1003EB, 0, 0, 16000229 ) # Stamina ! loreGump.addHtmlGump( 280, 186, 75, 18, "<div align=right>%i/%i</div>" %( target.char.stamina, target.char.dexterity ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 204, 160, 18, 0x1003EC, 0, 0, 16000229 ) # Mana ! loreGump.addHtmlGump( 280, 204, 75, 18, "<div align=right>%i/%i</div>" %( target.char.mana, target.char.intelligence ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 222, 160, 18, 0xFB0EF, 0, 0, 16000229 ) # Strength ! loreGump.addHtmlGump( 320, 222, 35, 18, "<div align=right>%i</div>" %target.char.strength, 0, 0 ) loreGump.addXmfHtmlGump( 153, 240, 160, 18, 0x2DC731, 0, 0, 16000229 ) # Dexterity ! loreGump.addHtmlGump( 320, 240, 35, 18, "<div align=right>%i</div>" %target.char.dexterity, 0, 0 ) loreGump.addXmfHtmlGump( 153, 258, 160, 18, 0x2DC730, 0, 0, 16000229 ) # Intelligence ! loreGump.addHtmlGump( 320, 258, 35, 18, "<div align=right>%i</div>" %target.char.intelligence, 0, 0 ) loreGump.addGump( 128, 278, 2086 ) --- 87,106 ---- loreGump.addXmfHtmlGump( 153, 168, 160, 18, 0x1003EA, 0, 0, 16000229 ) # Hits ! loreGump.addHtmlGump( 280, 168, 75, 18, "<div align=right>%i/%i</div>" % ( target.char.health, target.char.strength ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 186, 160, 18, 0x1003EB, 0, 0, 16000229 ) # Stamina ! loreGump.addHtmlGump( 280, 186, 75, 18, "<div align=right>%i/%i</div>" % ( target.char.stamina, target.char.dexterity ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 204, 160, 18, 0x1003EC, 0, 0, 16000229 ) # Mana ! loreGump.addHtmlGump( 280, 204, 75, 18, "<div align=right>%i/%i</div>" % ( target.char.mana, target.char.intelligence ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 222, 160, 18, 0xFB0EF, 0, 0, 16000229 ) # Strength ! loreGump.addHtmlGump( 320, 222, 35, 18, "<div align=right>%i</div>" % target.char.strength, 0, 0 ) loreGump.addXmfHtmlGump( 153, 240, 160, 18, 0x2DC731, 0, 0, 16000229 ) # Dexterity ! loreGump.addHtmlGump( 320, 240, 35, 18, "<div align=right>%i</div>" % target.char.dexterity, 0, 0 ) loreGump.addXmfHtmlGump( 153, 258, 160, 18, 0x2DC730, 0, 0, 16000229 ) # Intelligence ! loreGump.addHtmlGump( 320, 258, 35, 18, "<div align=right>%i</div>" % target.char.intelligence, 0, 0 ) loreGump.addGump( 128, 278, 2086 ) *************** *** 122,126 **** loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 1 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></center>" %target.char.name, 0, 0 ) loreGump.addGump( 128,152, 2086 ) --- 123,127 ---- loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 1 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></center>" % target.char.name, 0, 0 ) loreGump.addGump( 128,152, 2086 ) *************** *** 142,146 **** if char.poison > 0: ! loreGump.addHtmlGump( 280, 240, 75, 18, "<div align=right>%.1f</div>" %( target.char.skill[ POISONGING ] / 10.0 ), 0, 0 ) else: loreGump.addHtmlGump( 280, 240, 75, 18, "<div align=right>--</div>", 0, 0 ) --- 143,147 ---- if char.poison > 0: ! loreGump.addHtmlGump( 280, 240, 75, 18, "<div align=right>%.1f</div>" %( target.char.skill[ POISONING ] / 10.0 ), 0, 0 ) else: loreGump.addHtmlGump( 280, 240, 75, 18, "<div align=right>--</div>", 0, 0 ) *************** *** 150,160 **** loreGump.addXmfHtmlGump( 153, 276, 160, 18, 0xFEE75, 0, 0, 16000229 ) # Magery ! loreGump.addHtmlGump( 280, 276, 75, 18, "<div align=right>%.1f</div>" %( target.char.skill[ MAGERY ] / 10.0 ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 294, 160, 18, 0xFEE6C, 0, 0, 16000229 ) # Evaluating Intelligence ! loreGump.addHtmlGump( 280, 294, 75, 18, "<div align=right>%.1f</div>" %( target.char.skill[ EVALUATINGINTEL ] / 10.0 ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 312, 160, 18, 0xFEE8A, 0, 0, 16000229 ) # Meditation ! loreGump.addHtmlGump( 280, 312, 75, 18, "<div align=right>%.1f</div>" %( target.char.skill[ MEDITATION ] / 10.0 ), 0, 0 ) #page 3 --- 151,161 ---- loreGump.addXmfHtmlGump( 153, 276, 160, 18, 0xFEE75, 0, 0, 16000229 ) # Magery ! loreGump.addHtmlGump( 280, 276, 75, 18, "<div align=right>%.1f</div>" % ( target.char.skill[ MAGERY ] / 10.0 ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 294, 160, 18, 0xFEE6C, 0, 0, 16000229 ) # Evaluating Intelligence ! loreGump.addHtmlGump( 280, 294, 75, 18, "<div align=right>%.1f</div>" % ( target.char.skill[ EVALUATINGINTEL ] / 10.0 ), 0, 0 ) loreGump.addXmfHtmlGump( 153, 312, 160, 18, 0xFEE8A, 0, 0, 16000229 ) # Meditation ! loreGump.addHtmlGump( 280, 312, 75, 18, "<div align=right>%.1f</div>" % ( target.char.skill[ MEDITATION ] / 10.0 ), 0, 0 ) #page 3 *************** *** 170,174 **** loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 2 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></center>" %target.char.name, 0, 0 ) #loreGump.addGump( 128, 152, 2086 ) --- 171,175 ---- loreGump.addPageButton( 317, 358, 0x15E3, 0x15E7, 2 ) ! loreGump.addHtmlGump( 147, 108, 210, 18, "<div align=center><i>%s</i></center>" % target.char.name, 0, 0 ) #loreGump.addGump( 128, 152, 2086 ) *************** *** 218,223 **** loreGump.send( char ) ! cur_time = servertime() ! char.socket.settag( 'skill_delay', cur_time + ANIMALLORE_DELAY ) def onLoad(): --- 219,223 ---- loreGump.send( char ) ! char.socket.settag( 'skill_delay', int( wolfpack.time.currenttime() + ANIMALLORE_DELAY ) ) def onLoad(): |
