wpdev-commits Mailing List for Wolfpack Emu (Page 79)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Richard M. <dr...@us...> - 2004-07-13 21:43:05
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20280/webroot Modified Files: ChangeLog.wolfpack Log Message: Removed allskills from the core. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** ChangeLog.wolfpack 13 Jul 2004 20:29:21 -0000 1.18 --- ChangeLog.wolfpack 13 Jul 2004 21:42:51 -0000 1.19 *************** *** 17,20 **** --- 17,21 ---- - Removed command: fix - Removed command: resend + - Removed command: allskills - Region Updates/Fixes. Added flags: noentermessage and noguardmessage *************** *** 41,44 **** --- 42,46 ---- - New command: fix - New command: resend + - New command: allskills - Fixed carving - Fixed sheering of sheeps and wool regrowing |
|
From: Richard M. <dr...@us...> - 2004-07-13 20:29:30
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4478/webroot Modified Files: ChangeLog.wolfpack Log Message: Updates/Cleanups. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** ChangeLog.wolfpack 12 Jul 2004 21:12:19 -0000 1.17 --- ChangeLog.wolfpack 13 Jul 2004 20:29:21 -0000 1.18 *************** *** 49,56 **** This overrides the core region change messages. - Updates to the food script. ! - Checks on export to not export spawnregion items. - New script: system.hunger This allows players to suffer from hunger once again. - Potion Kegs now work. * Misc. Changes: - New Features: --- 49,61 ---- This overrides the core region change messages. - Updates to the food script. ! - Export command updates. ! Checks for doors and corpses. ! Doesn't save spawnregion items. - New script: system.hunger This allows players to suffer from hunger once again. - Potion Kegs now work. + - Door improvements. + Speed in which blocks are checked improved. + Manual closing block checks. * Misc. Changes: - New Features: |
|
From: Richard M. <dr...@us...> - 2004-07-13 20:25:36
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3414 Modified Files: door.py Log Message: Improved door blocking check speed. Made it so players can not close on others if the path is blocked. Index: door.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** door.py 9 Jul 2004 21:47:45 -0000 1.12 --- door.py 13 Jul 2004 20:25:24 -0000 1.13 *************** *** 255,274 **** # char.message( 'You refresh the house' ) ! return 1 # Return to the original state elif door[1] == item.id: ! # Change the door id and update the clients around it ! item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3], pos.z ) ! if item.hastag('opened'): ! item.deltag( 'opened' ) ! item.update() ! # Soundeffect (close) ! char.soundeffect( door[5] ) ! return 1 ! return 0 def autoclose( item, args ): --- 255,294 ---- # char.message( 'You refresh the house' ) ! return True # Return to the original state elif door[1] == item.id: ! blocked = 0 ! chars = None ! chars = wolfpack.chars( item.pos.x - door[2], item.pos.y - door[3], item.pos.map, 0 ) ! if chars: ! for bchar in chars: ! if bchar.pos.z == item.pos.z: ! blocked = 1 ! break ! elif bchar.pos.z < item.pos.z and bchar.pos.z >= ( item.pos.z - 5): ! blocked = 1 ! break ! elif bchar.pos.z > item.pos.z and bchar.pos.z <= ( item.pos.z + 5): ! blocked = 1 ! break ! if blocked == 1: ! char.socket.sysmessage( "There is someone blocking the door!" ) ! return False ! else: ! pos = item.pos ! # Change the door id and update the clients around it ! item.id = door[0] ! item.moveto( pos.x - door[2], pos.y - door[3], pos.z ) ! if item.hastag('opened'): ! item.deltag( 'opened' ) ! item.update() ! # Soundeffect (close) ! char.soundeffect( door[5] ) ! return True ! ! return False def autoclose( item, args ): *************** *** 293,303 **** if door[1] == item.id: chars = wolfpack.chars( item.pos.x - door[2], item.pos.y - door[3], item.pos.map, 0 ) ! for char in chars: ! if char.pos.z == item.pos.z: blocked = 1 ! elif char.pos.z < item.pos.z and char.pos.z >= ( item.pos.z - 5): blocked = 1 ! elif char.pos.z > item.pos.z and char.pos.z <= ( item.pos.z + 5): blocked = 1 if blocked == 1: --- 313,326 ---- if door[1] == item.id: chars = wolfpack.chars( item.pos.x - door[2], item.pos.y - door[3], item.pos.map, 0 ) ! for bchar in chars: ! if bchar.pos.z == item.pos.z: blocked = 1 ! break ! elif bchar.pos.z < item.pos.z and bchar.pos.z >= ( item.pos.z - 5): blocked = 1 ! break ! elif bchar.pos.z > item.pos.z and bchar.pos.z <= ( item.pos.z + 5): blocked = 1 + break if blocked == 1: *************** *** 308,312 **** if door[1] == item.id: pos = item.pos - # Change the door id and update the clients around it item.id = door[0] --- 331,334 ---- |
|
From: Richard M. <dr...@us...> - 2004-07-13 19:54:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27690/commands Modified Files: export.py Log Message: Doors/Gates will no longer be exported. Same goes to corpses. Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** export.py 13 Jul 2004 06:41:21 -0000 1.8 --- export.py 13 Jul 2004 19:54:38 -0000 1.9 *************** *** 46,50 **** # BaseID's not to save. ! nonsaves = ['gem','ore_gem','wood_gem'] def exportcmd( socket, command, arguments ): --- 46,74 ---- # BaseID's not to save. ! # World Gems ! # Doors/Gates ! nonsaves = [ \ ! 'gem', 'ore_gem', 'wood_gem', \ ! '675','676','677','678','679','67a','67b','67c','67d','67e','67f','680','681','682', \ ! '683','684','685','686','687','688','689','68a','68b','68c','68d','68e','68f','690', \ ! '691','692','693','694','695','696','697','698','699','69a','69b','69c','69d','69e', \ ! '69f','6a0','6a1','6a2','6a3','6a4','6a5','6a6','6a7','6a8','6a9','6aa','6ab','6ac', \ ! '6ad','6ae','6af','6b0','6b1','6b2','6b3','6b4','6b5','6b6','6b7','6b8','6b9','6ba', \ ! '6bb','6bc','6bd','6be','6bf','6c0','6c1','6c2','6c3','6c4','6c5','6c6','6c7','6c8', \ ! '6c9','6ca','6cb','6cc','6cd','6ce','6cf','6d0','6d1','6d2','6d3','6d4','6d5','6d6', \ ! '6d7','6d8','6d9','6da','6db','6dc','6dd','6de','6df','6e0','6e1','6e2','6e3','6e4', \ ! '6e5','6e6','6e7','6e8','6e9','6ea','6eb','6ec','6ed','6ef','6f0','6f1','6f2','6f3','6f4', \ ! '824','825','826','827','828','829','82a','82b','82c','82d','82e','82f','830','831','832', \ ! '833','839','83a','83b','83c','83d','83e','83f','840','841','842','843','844','845','846', \ ! '847','848','84c','84d','84e','84f','850','851','852','853','854','855','856','857','858', \ ! '859','85a','85b','866','867','868','869','86a','86b','86c','86d','86e','86f','870','871', \ ! '872','873','874','875','1fed','1fee','1fef','1ff0','1ff1','1ff2','1ff3','1ff4','1ff5','1ff6', \ ! '1ff7','1ff8','1ff9','1ffa','1ffb','1ffc','e8','e9','ea','eb','ec','ed','ef','f0','f1','f2','f3','f4', \ ! 'f5','f6','f7','314','315','316','317','318','319','31a','31b','31c','31d','31e','31f','320', \ ! '321','322','323','324','325','326','327','328','329','32a','32b','32c','32d','32e','32f', \ ! '330','331','332','333','334','335','336','337','338','339','33a','33b','33c','33d','33e', \ ! '33f','340','341','342','343','344','345','346','347','348','349','34a','34b','34c','34d', \ ! '34e','34f','350','351','352','353','354','355','356','357','358','359','35a','35b','35c', \ ! '35d','35e','35f','360','361','362','363' ] def exportcmd( socket, command, arguments ): *************** *** 138,142 **** i = 0 while item: ! if not item.baseid in nonsaves and len( item.spawnregion ) == 0: # Build our string if format == 1: # Sphere 51a --- 162,166 ---- i = 0 while item: ! if ( not item.baseid in nonsaves or not item.corpse ) and len( item.spawnregion ) == 0 : # Build our string if format == 1: # Sphere 51a |
|
From: Richard M. <dr...@us...> - 2004-07-13 06:41:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5625/commands Modified Files: export.py Log Message: error fix Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** export.py 12 Jul 2004 18:03:35 -0000 1.7 --- export.py 13 Jul 2004 06:41:21 -0000 1.8 *************** *** 177,188 **** if item.amount > 1: ! warnings += 'Item %i has an amount of %i. This information will be lost when made static.<br><br>' % ( hex( item.serial ), item.amount ) eventlist = item.eventlist if len( eventlist ) > 0: ! warnings += 'Item %i has events (%s) assigned to it. It wont be usable when made static.<br><br>' % ( hex( item.serial ), eventlist ) if item.type != 0: ! warnings += 'Item %i is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) i += 1 --- 177,188 ---- if item.amount > 1: ! warnings += 'Item %s has an amount of %i. This information will be lost when made static.<br><br>' % ( hex( item.serial ), item.amount ) eventlist = item.eventlist if len( eventlist ) > 0: ! warnings += 'Item %s has events (%s) assigned to it. It wont be usable when made static.<br><br>' % ( hex( item.serial ), eventlist ) if item.type != 0: ! warnings += 'Item %s is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) i += 1 |
|
From: Richard M. <dr...@us...> - 2004-07-13 06:35:45
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4969 Modified Files: potions.py Log Message: Error Fix + Explosion Potion Keg Fix Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** potions.py 12 Jul 2004 21:06:29 -0000 1.40 --- potions.py 13 Jul 2004 06:35:36 -0000 1.41 *************** *** 66,70 **** potiontype = item.gettag( 'potiontype' ) # Make sure it's in the index ! if not potiontype in potions: return False --- 66,70 ---- potiontype = item.gettag( 'potiontype' ) # Make sure it's in the index ! if not potiontype in POTIONS: return False *************** *** 253,256 **** --- 253,257 ---- # Potion Kegs elif (chainbomb.hastag('kegfill') and chainbomb.hastag('potiontype')) and ( chainbomb.gettag('potiontype') in [11, 12, 13] and chainbomb.gettag('kegfill') >= 1 ): + chainbomb.settag('exploding', 'true') wolfpack.addtimer(randint(1000, 2250), "potions.potioncountdown", [char.serial, chainbomb.serial, 11, chainbomb.gettag('kegfill') ] ) chainbomb = chainregion.next *************** *** 286,289 **** --- 287,291 ---- chainbomb = chainregion.next elif ( chainbomb.hastag('kegfill') and chainbomb.hastag('potiontype') ) and ( chainbomb.gettag('potiontype') in [11, 12, 13] and chainbomb.gettag('kegfill') >= 1 ): + chainbomb.settag('exploding', 'true') wolfpack.addtimer(randint(1000, 2250), "potions.potioncountdown", [char.serial, chainbomb.serial, 11, chainbomb.gettag('kegfill') ] ) chainbomb = chainregion.next *************** *** 325,329 **** target.effect(0x3709, 10, 30) target.effect( explosions[randint(0,2)], 20, 10) ! energydamage(target, char, damage, fire=100) return --- 327,331 ---- target.effect(0x3709, 10, 30) target.effect( explosions[randint(0,2)], 20, 10) ! energydamage(target, char, damage, fire=100 ) return |
|
From: Richard M. <dr...@us...> - 2004-07-12 21:12:28
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18223/webroot Modified Files: ChangeLog.wolfpack Log Message: Stuff. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** ChangeLog.wolfpack 12 Jul 2004 02:21:13 -0000 1.16 --- ChangeLog.wolfpack 12 Jul 2004 21:12:19 -0000 1.17 *************** *** 50,55 **** - Updates to the food script. - Checks on export to not export spawnregion items. * Misc. Changes: ! - New Feature: Farm animals will eat spawned crops! * Known Issues, Bugs, and Missing Features: - Some skills are still incomplete. --- 50,61 ---- - Updates to the food script. - Checks on export to not export spawnregion items. + - New script: system.hunger + This allows players to suffer from hunger once again. + - Potion Kegs now work. * Misc. Changes: ! - New Features: ! Farm animals will eat spawned crops! ! Potion Kegs now work. ! Player Hunger now works again. * Known Issues, Bugs, and Missing Features: - Some skills are still incomplete. *************** *** 61,64 **** --- 67,71 ---- - There are still some memory leaks. - Healers do not resurrect. + - Large gumps can potentially crash remote clients. Wolfpack 12.9.7 Beta |
|
From: Richard M. <dr...@us...> - 2004-07-12 21:06:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16737 Modified Files: food.py potionkeg.py potions.py Log Message: Updates! I made potion kegs work now! Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** potions.py 11 Jul 2004 02:47:25 -0000 1.39 --- potions.py 12 Jul 2004 21:06:29 -0000 1.40 *************** *** 13,40 **** # potion [ return_bottle, aggressive, target, name ] ! potions = \ { ! 0: [ 1, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight ! 1: [ 1, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal ! 2: [ 1, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal ! 3: [ 1, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal ! 4: [ 1, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure ! 5: [ 1, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure ! 6: [ 1, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure ! 7: [ 1, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility ! 8: [ 1, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility ! 9: [ 1, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength ! 10: [ 1, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength ! 11: [ 0, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion ! 12: [ 0, 1, 1, '#1044556', '#1041638', 'potion_explosion' ], # explosion ! 13: [ 0, 1, 1, '#1044557', '#1041639', 'potion_greaterexplosion' ], # greater explosion ! 14: [ 1, 0, 0, '#1044548', '#1041628', 'potion_lesserpoison' ], # lesser poison ! 15: [ 1, 0, 0, '#1044549', '#1041629', 'potion_poison' ], # poison ! 16: [ 1, 0, 0, '#1044550', '#1041630', 'potion_greaterpoison' ], # greater poison ! 17: [ 1, 0, 0, '#1044551', '#1041631', 'potion_deadlypoison' ], # deadly poison ! 18: [ 1, 0, 0, '#1044538', '#1041632', 'potion_refresh' ], # refresh ! 19: [ 1, 0, 0, '#1044539', '#1041633', 'potion_totalrefresh' ], # total refresh ! 20: [ 1, 0, 0, 'Intellegence', 'A keg of Intellegence potions', 'potion_intelligence' ], # intelligence ! 21: [ 1, 0, 0, 'Greater Intellegence', 'A keg of Greater Intellegence potions', 'potion_greaterintelligence' ], # greater intelligence 22: [ 1, 0, 0, 'Lesser Mana', 'A keg of Lesser Mana potions', 'potion_lessermana' ], # lesser mana 23: [ 1, 0, 0, 'Mana', 'A keg of Mana potions', 'potion_mana' ], # mana --- 13,40 ---- # potion [ return_bottle, aggressive, target, name ] ! POTIONS = \ { ! 0: [ True, 0, 0, '#1044542', '#1041620', 'potion_nightsight' ], # nightsight ! 1: [ True, 0, 0, '#1044543', '#1041634', 'potion_lesserheal' ], # lesser heal ! 2: [ True, 0, 0, '#1044544', '#1041635', 'potion_heal' ], # heal ! 3: [ True, 0, 0, '#1044545', '#1041636', 'potion_greaterheal' ], # greater heal ! 4: [ True, 0, 0, '#1044552', '#1041621', 'potion_lessercure' ], # lesser cure ! 5: [ True, 0, 0, '#1044553', '#1041622', 'potion_cure' ], # cure ! 6: [ True, 0, 0, '#1044554', '#1041623', 'potion_greatercure' ], # greater cure ! 7: [ True, 0, 0, '#1044540', '#1041624', 'potion_agility' ], # agility ! 8: [ True, 0, 0, '#1044541', '#1041625', 'potion_greateragility' ], # greater agility ! 9: [ True, 0, 0, '#1044546', '#1041626', 'potion_strength' ], # strength ! 10: [ True, 0, 0, '#1044547', '#1041627', 'potion_greaterstrength' ], # greater strength ! 11: [ False, 1, 1, '#1044555', '#1041637', 'potion_lesserexplosion' ], # lesser explosion ! 12: [ False, 1, 1, '#1044556', '#1041638', 'potion_explosion' ], # explosion ! 13: [ False, 1, 1, '#1044557', '#1041639', 'potion_greaterexplosion' ], # greater explosion ! 14: [ True, 0, 0, '#1044548', '#1041628', 'potion_lesserpoison' ], # lesser poison ! 15: [ True, 0, 0, '#1044549', '#1041629', 'potion_poison' ], # poison ! 16: [ True, 0, 0, '#1044550', '#1041630', 'potion_greaterpoison' ], # greater poison ! 17: [ True, 0, 0, '#1044551', '#1041631', 'potion_deadlypoison' ], # deadly poison ! 18: [ True, 0, 0, '#1044538', '#1041632', 'potion_refresh' ], # refresh ! 19: [ True, 0, 0, '#1044539', '#1041633', 'potion_totalrefresh' ], # total refresh ! 20: [ True, 0, 0, 'Intellegence', 'A keg of Intellegence potions', 'potion_intelligence' ], # intelligence ! 21: [ True, 0, 0, 'Greater Intellegence', 'A keg of Greater Intellegence potions', 'potion_greaterintelligence' ], # greater intelligence 22: [ 1, 0, 0, 'Lesser Mana', 'A keg of Lesser Mana potions', 'potion_lessermana' ], # lesser mana 23: [ 1, 0, 0, 'Mana', 'A keg of Mana potions', 'potion_mana' ], # mana *************** *** 70,74 **** # Do we throw this thing? ! if potions[ potiontype ][ POT_TARGET ] == True: # Explosion Potion if potiontype in [ 11, 12, 13 ]: --- 70,74 ---- # Do we throw this thing? ! if POTIONS[ potiontype ][ POT_TARGET ] == True: # Explosion Potion if potiontype in [ 11, 12, 13 ]: *************** *** 347,351 **** # Consume the potion ! def consumePotion( char, potion, givebottle ): if potion.amount == 1: --- 347,351 ---- # Consume the potion ! def consumePotion( char, potion, givebottle=True ): if potion.amount == 1: *************** *** 355,359 **** potion.update() ! if givebottle == True: # Lets add an empty bottle! bottle = wolfpack.additem( 'f0e' ) # Empty Bottle Definition if not wolfpack.utilities.tocontainer( bottle, char.getbackpack() ): --- 355,359 ---- potion.update() ! if givebottle: # Lets add an empty bottle! bottle = wolfpack.additem( 'f0e' ) # Empty Bottle Definition if not wolfpack.utilities.tocontainer( bottle, char.getbackpack() ): *************** *** 387,391 **** char.soundeffect(0x1e3) char.effect(0x376a, 9, 32) ! consumePotion( char, potion, potions[ potion.gettag('potiontype') ][ POT_RETURN_BOTTLE ] ) return True --- 387,391 ---- char.soundeffect(0x1e3) char.effect(0x376a, 9, 32) ! consumePotion( char, potion, POTIONS[ potion.gettag('potiontype') ][ POT_RETURN_BOTTLE ] ) return True *************** *** 439,443 **** char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, potions[ healtype ][ POT_RETURN_BOTTLE ] ) return True --- 439,443 ---- char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, POTIONS[ healtype ][ POT_RETURN_BOTTLE ] ) return True *************** *** 478,482 **** char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, potions[ curetype ][ POT_RETURN_BOTTLE ] ) # If we succeeded, special effects if char.poison == -1: --- 478,482 ---- char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, POTIONS[ curetype ][ POT_RETURN_BOTTLE ] ) # If we succeeded, special effects if char.poison == -1: *************** *** 528,532 **** char.effect( 0x375a, 10, 15 ) char.soundeffect( SOUND_AGILITY_UP ) ! consumePotion( char, potion, potions[ agilitytype ][ POT_RETURN_BOTTLE ] ) return True --- 528,532 ---- char.effect( 0x375a, 10, 15 ) char.soundeffect( SOUND_AGILITY_UP ) ! consumePotion( char, potion, POTIONS[ agilitytype ][ POT_RETURN_BOTTLE ] ) return True *************** *** 575,579 **** char.effect( 0x375a, 10, 15 ) char.soundeffect( SOUND_STRENGTH_UP ) ! consumePotion( char, potion, potions[ strengthtype ][ POT_RETURN_BOTTLE ] ) return True --- 575,579 ---- char.effect( 0x375a, 10, 15 ) char.soundeffect( SOUND_STRENGTH_UP ) ! consumePotion( char, potion, POTIONS[ strengthtype ][ POT_RETURN_BOTTLE ] ) return True *************** *** 596,600 **** char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, potions[ poisontype ][ POT_RETURN_BOTTLE ] ) return True --- 596,600 ---- char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, POTIONS[ poisontype ][ POT_RETURN_BOTTLE ] ) return True *************** *** 619,623 **** char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, potions[ refreshtype ][ POT_RETURN_BOTTLE ] ) return True --- 619,623 ---- char.action( ANIM_FIDGET3 ) char.soundeffect( SOUND_DRINK1 ) ! consumePotion( char, potion, POTIONS[ refreshtype ][ POT_RETURN_BOTTLE ] ) return True Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** food.py 12 Jul 2004 01:51:52 -0000 1.9 --- food.py 12 Jul 2004 21:06:29 -0000 1.10 *************** *** 23,27 **** if not player.canreach(char, 2): player.socket.clilocmessage(500312) ! if not tobackpack(item, player): item.update() return 1 --- 23,27 ---- if not player.canreach(char, 2): player.socket.clilocmessage(500312) ! if not tobackpack( item, player ): item.update() return 1 *************** *** 29,33 **** if char.hunger >= 6: player.message('They don''t seem to be hungry.') ! if not tobackpack(item, player): item.update() return 1 --- 29,33 ---- if char.hunger >= 6: player.message('They don''t seem to be hungry.') ! if not tobackpack( item, player ): item.update() return 1 *************** *** 44,52 **** # Fidget animation and munch munch sound ! char.soundeffect(random.choice([0x03a, 0x03b, 0x03c])) char.action(ANIM_FIDGET3) return 1 ! char.say('Dropped item on char') return 0 --- 44,52 ---- # Fidget animation and munch munch sound ! char.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) char.action(ANIM_FIDGET3) return 1 ! #char.say('Dropped item on char') return 0 Index: potionkeg.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potionkeg.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** potionkeg.py 11 Jul 2004 02:47:25 -0000 1.8 --- potionkeg.py 12 Jul 2004 21:06:29 -0000 1.9 *************** *** 1,82 **** - # http://uo.stratics.com/alchemy/potions/potionkegs.shtml - import wolfpack import wolfpack.time import wolfpack.utilities ! from potions import potions # Imports the potion table. ! #from wolfpack.consts import * ! ! POT_RETURN_BOTTLE = 0 ! POT_AGGRESSIVE = 1 ! POT_TARGET = 2 ! POT_NAME = 3 ! KEG_NAME = 4 ! POT_DEF = 5 ### Filling the keg ### ! def onDropOnItem(potionkeg, potion): ! if ('potionkeg' not in potionkeg.events) or ('potions' not in potion.events): ! return False ! char = potion.container socket = char.socket ! if not potion.hastag('potiontype') or not potionkeg.hastag('kegfill'): ! socket.sysmessage("Only potions may be added to a potion keg!") return False ! char.say("Test") ! """ ! char.say("Step 1") ! if potionkeg.id in [ hex2dec(0x1ad6), hex2dec(0x1ad7) ]: ! char.say("Step 2") ! if potionkeg.hastag('kegfill') and potionkeg.hastag('potiontype'): ! char.say("Step 3") ! if potion.gettag('potiontype') == potionkeg.gettag('potiontype'): ! kegfill = potionkeg.gettag('kegfill') ! if kegfill < 100: kegfill += 1 ! potionkeg.settag('kegfill', kegfill) ! potion.delete() return True else: ! # The keg will not hold any more! ! socket.clilocmessage(502233) return True else: ! # You decide that it would be a bad idea to mix different types of potions. ! socket.clilocmessage(502236) return True else: ! potionkeg.settag( 'potiontype', potion.gettag('potiontype') ) potionkeg.settag( 'kegfill', 1 ) ! potionkeg.name = potions[ potion.gettag('potiontype') ][ KEG_NAME ] ! consumePotion( char, potion, 1 ) return True else: ! return False ! """ ! return True - ### End Filling ### ! def onUse(char, potionkeg): socket = char.socket - kegfill = int(potionkeg.gettag('kegfill')) backpack = char.getbackpack() ! if potionkeg.hastag('potiontype'): ! checkkegstatus( char, keg, potionkeg.gettag('potiontype') ) ! if kegfill > 0: ! count = backpack.countitems(['f0e']) if count >= 1: ! backpack.removeitems(['f0e'], 1) ! newpot = wolfpack.additem(potions[potionkeg.gettag('potiontype')][POT_DEF]) newpot.decay = 1 newpot.magic = 1 ! if not tobackpack(newpot, char): newpot.update() kegfill -= 1 potionkeg.settag('kegfill', kegfill ) --- 1,105 ---- import wolfpack import wolfpack.time import wolfpack.utilities ! # Imports the potion table. ! from potions import POTIONS, POT_RETURN_BOTTLE, POT_AGGRESSIVE, \ ! POT_TARGET, POT_NAME, KEG_NAME, POT_DEF, consumePotion ### Filling the keg ### ! def onDropOnItem( potionkeg, potion ): char = potion.container socket = char.socket ! if not char or not socket: return False ! if ( not 'potionkeg' in potionkeg.events ) or ( not 'potions' in potion.events ): ! return False ! ! if not potionkeg.hastag( 'kegfill' ): ! kegfill = 0 ! potionkeg.settag( 'kegfill', kegfill ) ! else: ! kegfill = int( potionkeg.gettag( 'kegfill' ) ) ! if kegfill < 0: # Safeguard against negative fills ! kegfill = 0 ! ! if not potion.hastag( 'potiontype' ): ! socket.sysmessage("Only potions may be added to a potion keg!") ! return True ! ! if kegfill >= 100: ! socket.clilocmessage( 502247 ) ! return True ! ! if potionkeg.id in [ int(0x1ad6), int(0x1ad7), int(0x1940) ]: ! if potionkeg.hastag( 'potiontype' ): ! if potion.gettag( 'potiontype' ) == potionkeg.gettag( 'potiontype' ): ! if kegfill < 100 and kegfill >= 0: kegfill += 1 ! potionkeg.settag( 'kegfill', kegfill ) ! char.soundeffect( 0x240 ) ! consumePotion( char, potion ) ! potionkeg.update() ! kegfillmessage( char, kegfill ) ! socket.clilocmessage( 502239 ) return True else: ! socket.clilocmessage( 502233 ) # The keg will not hold any more! return True else: ! socket.clilocmessage( 502236 ) # You decide that it would be a bad idea to mix different types of potions. return True else: ! kegtype = potion.gettag( 'potiontype' ) ! potionkeg.settag( 'potiontype', kegtype ) potionkeg.settag( 'kegfill', 1 ) ! potionkeg.name = POTIONS[ potion.gettag('potiontype') ][ KEG_NAME ] ! char.soundeffect( 0x240 ) ! consumePotion( char, potion ) ! potionkeg.update() return True else: ! return True ! # Pouring a potion. ! def onUse( char, potionkeg ): socket = char.socket backpack = char.getbackpack() ! if not char or not backpack: ! return False ! if not 'potionkeg' in potionkeg.events: ! return False ! ! if not potionkeg.hastag( 'kegfill' ): ! kegfill = 0 ! potionkeg.settag( 'kegfill', kegfill ) ! else: ! kegfill = int( potionkeg.gettag( 'kegfill' ) ) ! if kegfill < 0: # Safeguard against negative fills ! kegfill = 0 ! ! if potionkeg.hastag( 'potiontype' ) and potionkeg.name != POTIONS[ potionkeg.gettag( 'potiontype' ) ][ KEG_NAME ]: ! potionkeg.name = POTIONS[ potionkeg.gettag( 'potiontype' ) ][ KEG_NAME ] ! potionkeg.update() ! ! if kegfill > 0 and kegfill <= 100: ! count = backpack.countitems( [ 'f0e' ] ) if count >= 1: ! backpack.removeitems( [ 'f0e' ], 1 ) ! newpot = wolfpack.additem( POTIONS[ potionkeg.gettag( 'potiontype' ) ][ POT_DEF ] ) ! if not newpot: ! return False newpot.decay = 1 newpot.magic = 1 ! socket.clilocmessage( 502242 ) # You pour some of the keg's contents into an empty bottle... ! socket.clilocmessage( 502243 ) # ...and place it into your backpack. ! if not wolfpack.utilities.tobackpack( newpot, char ): newpot.update() + char.soundeffect(0x240) kegfill -= 1 potionkeg.settag('kegfill', kegfill ) *************** *** 84,102 **** if potionkeg.name != "#1041641": potionkeg.name = '#1041641' ! potionkeg.deltag('potiontype') else: ! socket.clilocmessage(500315) else: if potionkeg.name != "#1041641": potionkeg.name = '#1041641' ! if potionkeg.hastag('potiontype'): ! potionkeg.deltag('potiontype') ! ! return True ! ! def checkkegstatus(char, potionkeg, potiontype): ! if potionkeg.name != potions[ potiontype ][ KEG_NAME ]: ! potionkeg.name = potions[ potiontype ][ KEG_NAME ] ! return True --- 107,153 ---- if potionkeg.name != "#1041641": potionkeg.name = '#1041641' ! potionkeg.deltag( 'potiontype' ) ! potionkeg.update() ! socket.clilocmessage( 502245 ) # The keg is now empty ! return True else: ! socket.clilocmessage( 500315 ) ! return True else: if potionkeg.name != "#1041641": potionkeg.name = '#1041641' ! if potionkeg.hastag( 'potiontype' ): ! potionkeg.deltag( 'potiontype' ) ! socket.clilocmessag( 502222 ) ! potionkeg.update() ! return True + # Potion Filling Messages + def kegfillmessage( char, kegfill ): + socket = char.socket + if kegfill == 100: + socket.clilocmessage( 502258 ) # The keg is completely full. + elif kegfill <= 99 and kegfill >= 96: + socket.clilocmessage( 502257 ) # The liquid is almost to the top of the keg. + elif kegfill <= 95 and kegfill >= 80: + socket.clilocmessage( 502256 ) # The keg is very full. + elif kegfill <= 79 and kegfill >= 70: + socket.clilocmessage( 502255 ) # The keg is about three quarters full. + elif kegfill <= 69 and kegfill >= 54: + socket.clilocmessage( 502253 ) # The keg is more than half full. + elif kegfill <= 53 and kegfill >= 47: + socket.clilocmessage( 502254 ) # The keg is approximately half full. + elif kegfill <= 46 and kegfill >= 40: + socket.clilocmessage( 502252 ) # The keg is almost half full. + elif kegfill <= 39 and kegfill >= 30: + socket.clilocmessage( 502251 ) # The keg is about one third full. + elif kegfill <= 29 and kegfill >= 20: + socket.clilocmessage( 502250 ) # The keg is about one quarter full. + elif kegfill <= 19 and kegfill >= 5: + socket.clilocmessage( 502249 ) # The keg is not very full. + elif kegfill <= 4 and kegfill >= 1: + socket.clilocmessage( 502248 ) # The keg is nearly empty. + else: + socket.clilocmessage( 502259 ) # The keg is damaged. + return |
|
From: Richard M. <dr...@us...> - 2004-07-12 21:06:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16737/system Modified Files: debugging.py Log Message: Updates! I made potion kegs work now! Index: debugging.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/debugging.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** debugging.py 16 Jun 2004 20:18:43 -0000 1.1 --- debugging.py 12 Jul 2004 21:06:30 -0000 1.2 *************** *** 4,12 **** # True = 1 ! DEBUG_COMBAT_INFO = 0 ! ! DEBUG_SPAWNS = 0 ! ! DEBUG_STATS = 0 ! DEBUG_SKILLS = 0 --- 4,10 ---- # True = 1 ! DEBUG_COMBAT_INFO = False ! DEBUG_SPAWNS = False ! DEBUG_STATS = False ! DEBUG_SKILLS = False |
|
From: Richard M. <dr...@us...> - 2004-07-12 18:22:34
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13368 Modified Files: scripts.xml Log Message: Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.143 retrieving revision 1.144 diff -C2 -d -r1.143 -r1.144 *** scripts.xml 11 Jul 2004 01:26:25 -0000 1.143 --- scripts.xml 12 Jul 2004 18:22:16 -0000 1.144 *************** *** 161,164 **** --- 161,165 ---- <!-- System Scripts --> <script>system.hardwareinfo</script> + <script>system.hunger</script> <script>system.loot</script> <script>system.macro_opendoor</script> *************** *** 171,177 **** <script>system.spawns</script> <script>system.trading</script> <script>system.uogstatus</script> <script>system.webadmin</script> ! <!-- Skills --> <script>skills</script> --- 172,179 ---- <script>system.spawns</script> <script>system.trading</script> + <!-- <script>system.uogstatus</script> <script>system.webadmin</script> ! --> <!-- Skills --> <script>skills</script> |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 18:04:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9024/spawnregions/trammel Modified Files: testing.xml Log Message: Map Definitions Index: testing.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/trammel/testing.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** testing.xml 8 Jul 2004 18:02:41 -0000 1.1 --- testing.xml 12 Jul 2004 18:03:53 -0000 1.2 *************** *** 4,8 **** <spawnregion id="trammel_testing_1"> <maxnpcamount>10</maxnpcamount> - <maxitemamount>10</maxitemamount> <mintime>2</mintime> <maxtime>5</maxtime> --- 4,7 ---- *************** *** 10,18 **** <npc>headless</npc> </npcs> - <items> - <item inherit="eed"><amount>100</amount></item> - </items> <npcspercycle>1</npcspercycle> - <itemspercycle>1</itemspercycle> <rectangle x1="1377" x2="1387" y1="3808" y2="3822" map="1" /> </spawnregion> --- 9,13 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 18:04:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9024/items/professions Modified Files: mapmaker.xml Log Message: Map Definitions Index: mapmaker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/mapmaker.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** mapmaker.xml 26 May 2004 13:45:30 -0000 1.3 --- mapmaker.xml 12 Jul 2004 18:03:52 -0000 1.4 *************** *** 86,88 **** --- 86,311 ---- </item> + <item id="map_britain" inherit="14eb"> + <name>map of Britain</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="britain" /> + <category>Professions\Mapmaker\Maps\Britain</category> + </item> + + <item id="map_britaintoskarabrae" inherit="14eb"> + <name>map of Britain to Skara Brae</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="britaintoskarabrae" /> + <category>Professions\Mapmaker\Maps\Britain to Skara Brae</category> + </item> + + <item id="map_britaintotrinsic" inherit="14eb"> + <name>map of Britain to Trinsic</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="britaintotrinsic" /> + <category>Professions\Mapmaker\Maps\Britain to Trinsic</category> + </item> + + <item id="map_bucsden" inherit="14eb"> + <name>map of Buccaneer's Den</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="bucsden" /> + <category>Professions\Mapmaker\Maps\Buccaneer's Den</category> + </item> + + <item id="map_bucsdentomagincia" inherit="14eb"> + <name>map of Buccaneer's Den to Magincia</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="bucsdentomagincia" /> + <category>Professions\Mapmaker\Maps\Buccaneer's Den to Magincia</category> + </item> + + <item id="map_bucsdentoocllo" inherit="14eb"> + <name>map of Buccaneer's Den to Ocllo</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="bucsdentoocllo" /> + <category>Professions\Mapmaker\Maps\Buccaneer's Den to Ocllo</category> + </item> + + <item id="map_jhelom" inherit="14eb"> + <name>map of Jhelom</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="jhelom" /> + <category>Professions\Mapmaker\Maps\Jhelom</category> + </item> + + <item id="map_magincia" inherit="14eb"> + <name>map of Magincia</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="magincia" /> + <category>Professions\Mapmaker\Maps\Magincia</category> + </item> + + <item id="map_maginciatoocllo" inherit="14eb"> + <name>map of Magincia to Ocllo</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="maginciatoocllo" /> + <category>Professions\Mapmaker\Maps\Magincia to Ocllo</category> + </item> + + <item id="map_minoc" inherit="14eb"> + <name>map of Minoc</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="minoc" /> + <category>Professions\Mapmaker\Maps\Minoc</category> + </item> + + <item id="map_minoctoyew" inherit="14eb"> + <name>map of Minoc to Yew</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="minoctoyew" /> + <category>Professions\Mapmaker\Maps\Minoc to Yew</category> + </item> + + <item id="map_minoctovesper" inherit="14eb"> + <name>map of Minoc to Vesper</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="minoctovesper" /> + <category>Professions\Mapmaker\Maps\Minoc to Vesper</category> + </item> + + <item id="map_moonglow" inherit="14eb"> + <name>map of Moonglow</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="moonglow" /> + <category>Professions\Mapmaker\Maps\Moonglow</category> + </item> + + <item id="map_moonglowtonujelm" inherit="14eb"> + <name>map of Moonglow to Nujelm</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="moonglowtonujelm" /> + <category>Professions\Mapmaker\Maps\Moonglow to Nujelm</category> + </item> + + <item id="map_nujelm" inherit="14eb"> + <name>map of Nujelm</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="nujelm" /> + <category>Professions\Mapmaker\Maps\Nujelm</category> + </item> + + <item id="map_nujelmtomagincia" inherit="14eb"> + <name>map of Nujelm to Magincia</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="nujelmtomagincia" /> + <category>Professions\Mapmaker\Maps\Nujelm to Magincia</category> + </item> + + <item id="map_occlo" inherit="14eb"> + <name>map of Ocllo</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="occlo" /> + <category>Professions\Mapmaker\Maps\Ocllo</category> + </item> + + <item id="map_serpentshold" inherit="14eb"> + <name>map of Serpent's Hold</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="serpentshold" /> + <category>Professions\Mapmaker\Maps\Serpent's Hold</category> + </item> + + <item id="map_serpentsholdtoocllo" inherit="14eb"> + <name>map of Serpent's Hold to Ocllo</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="serpentsholdtoocllo" /> + <category>Professions\Mapmaker\Maps\Serpent's Hold to Ocllo</category> + </item> + + <item id="map_skarabrae" inherit="14eb"> + <name>map of Skara Brae</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="skarabrae" /> + <category>Professions\Mapmaker\Maps\Skara Brae</category> + </item> + + <item id="map_world" inherit="14eb"> + <name>map of The World</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="world" /> + <category>Professions\Mapmaker\Maps\The World</category> + </item> + + <item id="map_trinsic" inherit="14eb"> + <name>map of Trinsic</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="trinsic" /> + <category>Professions\Mapmaker\Maps\Trinsic</category> + </item> + + <item id="map_trinsictobucsden" inherit="14eb"> + <name>map of Trinsic to Buccaneer's Den</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="trinsictobucsden" /> + <category>Professions\Mapmaker\Maps\Trinsic to Buccaneer's Den</category> + </item> + + <item id="map_trinsictojhelom" inherit="14eb"> + <name>map of Trinsic to Jhelom</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="trinsictojhelom" /> + <category>Professions\Mapmaker\Maps\Trinsic to Jhelom</category> + </item> + + <item id="map_vesper" inherit="14eb"> + <name>map of Vesper</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="vesper" /> + <category>Professions\Mapmaker\Maps\Vesper</category> + </item> + + <item id="map_vespertonujelm" inherit="14eb"> + <name>map of Vesper to Nujelm</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="vespertonujelm" /> + <category>Professions\Mapmaker\Maps\Vesper to Nujelm</category> + </item> + + <item id="map_yew" inherit="14eb"> + <name>map of Yew</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="yew" /> + <category>Professions\Mapmaker\Maps\Yew</category> + </item> + + <item id="map_yewtobritain" inherit="14eb"> + <name>map of Yew to Britain</name> + <events>map</events> + <tag name="type" value="preset" /> + <tag name="preset" value="yewtobritain" /> + <category>Professions\Mapmaker\Maps\Yew to Britain</category> + </item> </definitions> |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 18:04:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9024/spawnregions/felucca Modified Files: testing.xml Log Message: Map Definitions Index: testing.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/spawnregions/felucca/testing.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** testing.xml 8 Jul 2004 18:02:40 -0000 1.1 --- testing.xml 12 Jul 2004 18:03:52 -0000 1.2 *************** *** 4,8 **** <spawnregion id="felucca_testing_1"> <maxnpcamount>10</maxnpcamount> - <maxitemamount>10</maxitemamount> <mintime>2</mintime> <maxtime>5</maxtime> --- 4,7 ---- *************** *** 10,18 **** <npc>headless</npc> </npcs> - <items> - <item inherit="eed"><amount>100</amount></item> - </items> <npcspercycle>1</npcspercycle> - <itemspercycle>1</itemspercycle> <rectangle x1="1377" x2="1387" y1="3808" y2="3822" map="0" /> </spawnregion> --- 9,13 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 18:03:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972 Modified Files: map.py Log Message: More Maps Index: map.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/map.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** map.py 7 Jul 2004 21:53:55 -0000 1.1 --- map.py 12 Jul 2004 18:03:35 -0000 1.2 *************** *** 3,6 **** --- 3,41 ---- # + # Table for preset maps + # + MAP_PRESETS = { + # Width, Height, xtop, ytop, xbottom, ybottom + 'britain': [200, 200, 1092, 1396, 1736, 1924], # map of Britain + 'britaintoskarabrae': [200, 200, 256, 1792, 1736, 2560], # map of Britain to Skara Brae + 'britaintotrinsic': [200, 200, 1024, 1280, 2304, 3072], # map of Britain to Trinsic + 'bucsden': [200, 200, 2500, 1900, 3000, 2400], # map of Buccaneer's Den + 'bucsdentomagincia': [200, 200, 2560, 1792, 3840, 2560], # map of Buccaneer's Den to Magincia + 'bucsdentoocllo': [200, 200, 2560, 1792, 3840, 3072], # map of Buccaneer's Den to Ocllo + 'jhelom': [200, 200, 1088, 3572, 1528, 4056], # map of Jhelom + 'magincia': [200, 200, 3530, 2022, 3818, 2298], # map of Magincia + 'maginciatoocllo': [200, 200, 3328, 1792, 3840, 2304], # map of Magincia to Ocllo + 'minoc': [200, 200, 2360, 356, 2706, 702], # map of Minoc + 'minoctoyew': [200, 200, 0, 256, 2304, 3072], # map of Minoc to Yew + 'minoctovesper': [200, 200, 2467, 572, 2878, 746], # map of Minoc to Vesper + 'moonglow': [200, 200, 4156, 808, 4732, 1528], # map of Moonglow + 'moonglowtonujelm': [200, 200, 3328, 768, 4864, 1536], # map of Moonglow to Nujelm + 'nujelm': [200, 200, 3446, 1030, 3832, 1424], # map of Nujelm + 'nujelmtomagincia': [200, 200, 3328, 1024, 3840, 2304], # map of Nujelm to Magincia + 'occlo': [200, 200, 3582, 2456, 3770, 2742], # map of Ocllo + 'serpentshold': [200, 200, 2714, 3329, 3100, 3639], # map of Serpent's Hold + 'serpentsholdtoocllo': [200, 200, 2560, 2560, 3840, 3840], # map of Serpent's Hold to Ocllo + 'skarabrae': [200, 200, 524, 2064, 960, 2452], # map of Skara Brae + 'world': [200, 200, 0, 0, 5199, 4095], # map of The World + 'trinsic': [200, 200, 1792, 2630, 2118, 2952], # map of Trinsic + 'trinsictobucsden': [200, 200, 1792, 1792, 3072, 3072], # map of Trinsic to Buccaneer's Den + 'trinsictojhelom': [200, 200, 256, 1792, 2304, 4095], # map of Trinsic to Jhelom + 'vesper': [200, 200, 2636, 592, 3064, 1012], # map of Vesper + 'vespertonujelm': [200, 200, 2636, 592, 3840, 1536], # map of Vesper to Nujelm + 'yew': [200, 200, 236, 741, 766, 1269], # map of Yew + 'yewtobritain': [200, 200, 0, 512, 1792, 2048], # map of Yew to Britain + } + + # # Send a map command # *************** *** 96,105 **** # def sendmap(player, item, maptype): ! xtop = 0 ! ytop = 0 ! xbottom = 768 * 8 ! ybottom = 512 * 8 ! width = 500 ! height = 330 # Send a map detail packet --- 131,159 ---- # def sendmap(player, item, maptype): ! if maptype == 'preset' and item.hastag('preset'): ! preset = item.gettag('preset') ! if not MAP_PRESETS.has_key(preset): ! player.socket.sysmessage('Unknown map preset: %s.' % preset) ! return ! (width, height, xtop, ytop, xbottom, ybottom) = MAP_PRESETS[preset] ! elif maptype == 'world': ! (width, height, xtop, ytop, xbottom, ybottom) = (400, 400, 0, 0, 5119, 4095) ! elif maptype == 'custom': ! (width, height, xtop, ytop, xbottom, ybottom) = (200, 200, 0, 0, 5119, 4095) ! if item.hastag('width'): ! width = int(item.gettag('width')) ! if item.hastag('height'): ! height = int(item.gettag('height')) ! if item.hastag('xtop'): ! xtop = int(item.gettag('xtop')) ! if item.hastag('xbottom'): ! xbottom = int(item.gettag('xbottom')) ! if item.hastag('ytop'): ! ytop = int(item.gettag('ytop')) ! if item.hastag('ybottom'): ! ybottom = int(item.gettag('ybottom')) ! else: ! player.socket.sysmessage('Unknown map type: %s.' % maptype) ! return # Send a map detail packet |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 18:03:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8972/commands Modified Files: export.py Log Message: More Maps Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** export.py 12 Jul 2004 02:04:41 -0000 1.6 --- export.py 12 Jul 2004 18:03:35 -0000 1.7 *************** *** 138,142 **** i = 0 while item: ! if not item.baseid in nonsaves and len( item.spawnregion ) == 0 # Build our string if format == 1: # Sphere 51a --- 138,142 ---- i = 0 while item: ! if not item.baseid in nonsaves and len( item.spawnregion ) == 0: # Build our string if format == 1: # Sphere 51a *************** *** 184,188 **** if item.type != 0: ! warnings += 'Item %i is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) i += 1 --- 184,188 ---- if item.type != 0: ! warnings += 'Item %i is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) i += 1 |
|
From: Sebastian H. <dar...@us...> - 2004-07-12 16:06:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16605/system Modified Files: hunger.py Log Message: Fix Index: hunger.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/hunger.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hunger.py 12 Jul 2004 00:48:54 -0000 1.1 --- hunger.py 12 Jul 2004 16:06:27 -0000 1.2 *************** *** 12,16 **** player.update() player.socket.sysmessage( "Your stomach hurts from the lack of food..." ) ! return True ! else: ! return False --- 12,15 ---- player.update() player.socket.sysmessage( "Your stomach hurts from the lack of food..." ) ! ! return False |
|
From: Richard M. <dr...@us...> - 2004-07-12 02:21:22
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14360/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: Changes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** ChangeLog.wolfpack 11 Jul 2004 01:49:16 -0000 1.15 --- ChangeLog.wolfpack 12 Jul 2004 02:21:13 -0000 1.16 *************** *** 25,28 **** --- 25,30 ---- This gives a better overview of what we have and do not have. - Fixed regions so they work properly again. + - Moved windows from walls. New file: windows.xml + - Changed direction to lightvalue in light objects. * Python Script Changes: - New Command: taginfo *************** *** 46,50 **** --- 48,55 ---- - New script: system.regionchange This overrides the core region change messages. + - Updates to the food script. + - Checks on export to not export spawnregion items. * Misc. Changes: + - New Feature: Farm animals will eat spawned crops! * Known Issues, Bugs, and Missing Features: - Some skills are still incomplete. |
|
From: Richard M. <dr...@us...> - 2004-07-12 02:04:52
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12334/commands Modified Files: export.py Log Message: Actually, this worked better. Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** export.py 12 Jul 2004 01:51:53 -0000 1.5 --- export.py 12 Jul 2004 02:04:41 -0000 1.6 *************** *** 138,142 **** i = 0 while item: ! if not item.baseid in nonsaves and ( item.spawnregion == None or item.spawnregion == '' ): # Build our string if format == 1: # Sphere 51a --- 138,142 ---- i = 0 while item: ! if not item.baseid in nonsaves and len( item.spawnregion ) == 0 # Build our string if format == 1: # Sphere 51a *************** *** 176,190 **** #output.write( "0x%x %i %i %i 0x%x%s" % ( item.id, item.pos.x, item.pos.y, item.pos.z, item.color, newline ) ) ! if item.amount > 1: ! warnings += 'Item %i has an amount of %i. This information will be lost when made static.<br><br>' % ( hex( item.serial ), item.amount ) ! eventlist = item.eventlist ! if len( eventlist ) > 0: ! warnings += 'Item %i has events (%s) assigned to it. It wont be usable when made static.<br><br>' % ( hex( item.serial ), eventlist ) ! if item.type != 0: warnings += 'Item %i is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) ! i += 1 item = iterator.next --- 176,190 ---- #output.write( "0x%x %i %i %i 0x%x%s" % ( item.id, item.pos.x, item.pos.y, item.pos.z, item.color, newline ) ) ! if item.amount > 1: ! warnings += 'Item %i has an amount of %i. This information will be lost when made static.<br><br>' % ( hex( item.serial ), item.amount ) ! eventlist = item.eventlist ! if len( eventlist ) > 0: ! warnings += 'Item %i has events (%s) assigned to it. It wont be usable when made static.<br><br>' % ( hex( item.serial ), eventlist ) ! if item.type != 0: warnings += 'Item %i is of type %i. It wont be usable when made static.<br><br>' % ( hex( item.serial ), item.type ) ! i += 1 item = iterator.next |
|
From: Richard M. <dr...@us...> - 2004-07-12 01:52:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10700 Modified Files: food.py Log Message: Error prevention for farm eating animals. Prevent exporting of spawnregion objects. Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** food.py 12 Jul 2004 00:48:53 -0000 1.8 --- food.py 12 Jul 2004 01:51:52 -0000 1.9 *************** *** 105,108 **** --- 105,109 ---- if char.baseid in farm_eaters: items = wolfpack.items(char.pos.x, char.pos.y, char.pos.map, 0) + food = None for item in items: if 'food' in item.events and item.baseid in farm_food: |
|
From: Richard M. <dr...@us...> - 2004-07-12 01:52:01
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10700/commands Modified Files: export.py Log Message: Error prevention for farm eating animals. Prevent exporting of spawnregion objects. Index: export.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/export.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** export.py 20 Jun 2004 18:51:42 -0000 1.4 --- export.py 12 Jul 2004 01:51:53 -0000 1.5 *************** *** 138,142 **** i = 0 while item: ! if not item.baseid in nonsaves: # Build our string if format == 1: # Sphere 51a --- 138,142 ---- i = 0 while item: ! if not item.baseid in nonsaves and ( item.spawnregion == None or item.spawnregion == '' ): # Build our string if format == 1: # Sphere 51a |
|
From: Richard M. <dr...@us...> - 2004-07-12 01:24:56
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7008 Modified Files: blades.py Log Message: Make sure the sheep are npcs. Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/blades.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** blades.py 9 Jul 2004 21:47:45 -0000 1.6 --- blades.py 12 Jul 2004 01:24:48 -0000 1.7 *************** *** 27,31 **** def regrow_wool(char, arguments): ! if char: char.baseid = 'sheep_unsheered' char.id = 207 --- 27,31 ---- def regrow_wool(char, arguments): ! if char.npc: char.baseid = 'sheep_unsheered' char.id = 207 *************** *** 65,69 **** # This is for sheering only ! elif target.char: if target.char.baseid == 'sheep_unsheered': target.char.id = 223 --- 65,69 ---- # This is for sheering only ! elif target.char and target.char.npc: if target.char.baseid == 'sheep_unsheered': target.char.id = 223 |
|
From: Richard M. <dr...@us...> - 2004-07-12 00:49:39
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1581 Modified Files: players.xml Log Message: Hunger Index: players.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/players.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** players.xml 11 Jul 2004 01:26:25 -0000 1.2 --- players.xml 12 Jul 2004 00:49:30 -0000 1.3 *************** *** 5,13 **** <definitions> <npc id="player_male"> ! <events>system.regionchange</events> </npc> <npc id="player_female"> ! <events>system.regionchange</events> </npc> </definitions> --- 5,13 ---- <definitions> <npc id="player_male"> ! <events>system.regionchange,system.hunger</events> </npc> <npc id="player_female"> ! <events>system.regionchange,system.hunger</events> </npc> </definitions> |
|
From: Richard M. <dr...@us...> - 2004-07-12 00:49:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1477 Modified Files: food.py Log Message: Fixes, added a hunger script. Index: food.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/food.py,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** food.py 11 Jul 2004 23:56:58 -0000 1.7 --- food.py 12 Jul 2004 00:48:53 -0000 1.8 *************** *** 7,11 **** farm_food = [ 'c7c', 'c70', 'c7b', 'c78', 'c71', 'c64', 'c65' ] ! farm_eaters = [ 'rabbit' ] # # Feed the food --- 7,13 ---- farm_food = [ 'c7c', 'c70', 'c7b', 'c78', 'c71', 'c64', 'c65' ] ! farm_eaters = [ 'rabbit', 'goat', 'hind', 'pack_horse', 'pack_llama', 'cow', 'bull', ! 'sheep_unsheered', 'sheep_sheered', 'llama', 'horse', 'great_hart', ! 'ostard_desert', 'ostard_forest', 'ostard_frinzied' ] # # Feed the food *************** *** 66,70 **** # Fidget animation and munch munch sound ! player.soundeffect(random.choice([0x03a, 0x03b, 0x03c])) player.action(ANIM_FIDGET3) --- 68,72 ---- # Fidget animation and munch munch sound ! player.soundeffect( random.choice([0x03a, 0x03b, 0x03c]), 1 ) player.action(ANIM_FIDGET3) *************** *** 89,94 **** if 'food' in char.events: return True ! if char.baseid in farm_food: char.events = ['food'] + char.events return True else: --- 91,99 ---- if 'food' in char.events: return True ! if char.baseid in farm_eaters: char.events = ['food'] + char.events + char.say( "*nibbles*" ) + item.magic = 3 + item.update() return True else: *************** *** 106,110 **** if food: food.delete() ! char.sound( random.choice( [ 0x03a, 0x03b, 0x03c ] ) ) char.say( "*munch*" ) if char.hitpoints < char.maxhitpoints: --- 111,115 ---- if food: food.delete() ! char.soundeffect( random.choice( [ 0x03a, 0x03b, 0x03c ] ), 1 ) char.say( "*munch*" ) if char.hitpoints < char.maxhitpoints: *************** *** 116,117 **** --- 121,128 ---- char.events = events return True + else: + events = char.events + while 'food' in events: + events.remove('food') + char.events = events + return True |
|
From: Richard M. <dr...@us...> - 2004-07-12 00:49:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1477/system Added Files: hunger.py Log Message: Fixes, added a hunger script. --- NEW FILE: hunger.py --- import wolfpack import wolfpack.time def onTimeChange( player ): if player.socket: if player.hunger >= 1 and player.hunger <= 6: player.hunger -= 1 player.socket.sysmessage( "Your stomach growls..." ) elif player.hunger == 0: player.hitpoints -= 1 player.update() player.socket.sysmessage( "Your stomach hurts from the lack of food..." ) return True else: return False |
|
From: Richard M. <dr...@us...> - 2004-07-12 00:49:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1477/commands Modified Files: events.py Log Message: Fixes, added a hunger script. Index: events.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/events.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** events.py 9 Jul 2004 21:08:36 -0000 1.2 --- events.py 12 Jul 2004 00:48:54 -0000 1.3 *************** *** 10,14 **** object = target.item elif target.char: ! if target.char.rank >= player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return --- 10,14 ---- object = target.item elif target.char: ! if target.char.rank > player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return *************** *** 53,57 **** object = target.item elif target.char: ! if target.char.rank >= player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return --- 53,57 ---- object = target.item elif target.char: ! if target.char.rank > player.rank and player != target.char: player.socket.sysmessage("You've burnt your fingers!") return |
