wpdev-commits Mailing List for Wolfpack Emu (Page 54)
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: Sebastian H. <dar...@us...> - 2004-09-03 15:44:58
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8031/webroot Modified Files: ChangeLog.wolfpack Log Message: Fixed a bug involving base definition reloads Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.53 retrieving revision 1.54 diff -C2 -d -r1.53 -r1.54 *** ChangeLog.wolfpack 3 Sep 2004 15:34:41 -0000 1.53 --- ChangeLog.wolfpack 3 Sep 2004 15:44:47 -0000 1.54 *************** *** 40,43 **** --- 40,44 ---- - Added wolfpack.queuecode to queue a python function for the next mainloop iteration. - Documentation fixes for item.addtimer. + - Item Base Definitions are now reloaded correctly. * Definition Changes: - Tag Changes: |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:44:56
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8028/items/misc Modified Files: misc.xml Log Message: Fixed a bug involving base definition reloads. Index: misc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/misc.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** misc.xml 27 Aug 2004 14:43:27 -0000 1.16 --- misc.xml 3 Sep 2004 15:44:41 -0000 1.17 *************** *** 152,157 **** </item> ! <item id="100b"> ! <inherit id="100a" /> <id>0x100b</id> <category>Misc\Archery Butte\Archery Butte (N/S)</category> --- 152,156 ---- </item> ! <item id="100b" inherit="100a"> <id>0x100b</id> <category>Misc\Archery Butte\Archery Butte (N/S)</category> |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:43:59
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7865 Modified Files: ChangeLog definitions.cpp Log Message: Fixed a bug involving base definition reloads. Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** definitions.cpp 22 Aug 2004 02:29:50 -0000 1.17 --- definitions.cpp 3 Sep 2004 15:43:50 -0000 1.18 *************** *** 300,303 **** --- 300,304 ---- impl->imports.clear(); CharBaseDefs::instance()->reset(); + ItemBaseDefs::instance()->reset(); listcache_.clear(); cComponent::unload(); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** ChangeLog 2 Sep 2004 23:29:51 -0000 1.20 --- ChangeLog 3 Sep 2004 15:43:50 -0000 1.21 *************** *** 38,41 **** --- 38,42 ---- - Fixed a bug related to serverlists duplication on configuration reload. - Documentation fixes for item.addtimer. + - Item Base Definitions are now reloaded correctly. Wolfpack 12.9.8 Beta (19. August 2004) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:34:50
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6176/webroot Modified Files: ChangeLog.wolfpack Log Message: Resolved bug #0000260 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** ChangeLog.wolfpack 3 Sep 2004 01:30:49 -0000 1.52 --- ChangeLog.wolfpack 3 Sep 2004 15:34:41 -0000 1.53 *************** *** 68,71 **** --- 68,72 ---- - Fix for bug #0000270 (.controlslots for blade spirits) - Fix for bug #0000263 (casting with weapon allowed although weapon is not spell channeling) + - Fix for bug #0000260 (.tile now caps at 250 items if the acl doesn't allow unlimited items) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:32:33
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5731/commands Modified Files: tile.py Log Message: Resolved bug #0000260 Index: tile.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/tile.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** tile.py 23 Aug 2004 03:10:39 -0000 1.3 --- tile.py 3 Sep 2004 15:32:24 -0000 1.4 *************** *** 10,13 **** --- 10,14 ---- import wolfpack + from wolfpack.consts import * import random *************** *** 27,32 **** z = arguments[0] ids = arguments[1] ! player.socket.sysmessage('Creating items from %u,%u to %u,%u at z=%d.' % (x1, y1, x2, y2, z)) pos = player.pos pos.z = z --- 28,42 ---- z = arguments[0] ids = arguments[1] + + unlimited = player.account.authorized('Misc', 'Unlimited Tile') + count = ((x2 - x1) + 1) * ((y2 - y1) + 1) + + # Cap at 500 items if not an admin is using it + if not unlimited and count > 250: + player.socket.sysmessage('You are not allowed to tile more than 250 items at once.') + return ! player.log(LOG_MESSAGE, "Tiling %u items (%s) from %u,%u to %u,%u at z=%d.\n" % (count, ", ".join(ids), x1, y1, x2, y2, z)) ! player.socket.sysmessage('Creating %u items from %u,%u to %u,%u at z=%d.' % (count, x1, y1, x2, y2, z)) pos = player.pos pos.z = z |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 15:32:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5699/system Modified Files: access.xml Log Message: Resolved bug #0000260 Index: access.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/access.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** access.xml 30 Aug 2004 14:24:22 -0000 1.4 --- access.xml 3 Sep 2004 15:32:13 -0000 1.5 *************** *** 20,23 **** --- 20,26 ---- <action name="any" permit="true" /> </group> + <group name="Misc"> + <action name="Unlimited Tile" permit="true" /> + </group> </acl> *************** *** 39,43 **** </group> <group name="multi"> ! <action name="any" permit="true" /> </group> </acl> --- 42,49 ---- </group> <group name="multi"> ! <action name="any" permit="true" /> ! </group> ! <group name="Misc"> ! <action name="Unlimited Tile" permit="false" /> </group> </acl> |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 07:39:18
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6595/magic Modified Files: __init__.py Log Message: Fix for custom spells Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** __init__.py 29 Aug 2004 13:37:16 -0000 1.12 --- __init__.py 31 Aug 2004 20:21:25 -0000 1.13 *************** *** 147,151 **** return ! message = "Casting spell %u (%s) on coordinate %s.\n" % (spell.spellid, spell.__class__.__name__, str(pos)) char.log(LOG_MESSAGE, message) spell.target(char, mode, TARGET_GROUND, pos, args, item) --- 147,154 ---- return ! if type(self.spellid) == int: ! message = "Casting spell %u (%s) on coordinate %s.\n" % (spell.spellid, spell.__class__.__name__, str(pos)) ! else: ! message = "Casting spell %s on coordinate %s.\n" % (spell.__class__.__name__, str(pos)) char.log(LOG_MESSAGE, message) spell.target(char, mode, TARGET_GROUND, pos, args, item) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:31:18
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11791/magic Modified Files: __init__.py spell.py Log Message: fix for bug #0000263 Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** spell.py 29 Aug 2004 13:00:34 -0000 1.18 --- spell.py 3 Sep 2004 01:31:05 -0000 1.19 *************** *** 6,10 **** from magic.utilities import * from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \ ! MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING # Recursive Function for counting reagents --- 6,10 ---- from magic.utilities import * from wolfpack.consts import MAGICRESISTANCE, EVALUATINGINTEL, INSCRIPTION, \ ! MAGERY, ANIM_CASTDIRECTED, SPELLDAMAGEBONUS, LOG_WARNING, SPELLCHANNELING # Recursive Function for counting reagents *************** *** 165,168 **** --- 165,183 ---- def calcdelay(self): return self.casttime + + def checkweapon(self, char): + weapon = char.itemonlayer(LAYER_RIGHTHAND) + + if not weapon or not properties.itemcheck(weapon, ITEM_WEAPON): + weapon = char.itemonlayer(LAYER_LEFTHAND) + + if not weapon: + return True + + # Check if the spellchanneling property is true for this item + if properties.fromitem(weapon, SPELLCHANNELING) == 0: + return False + else: + return True def checkrequirements(self, char, mode, args=[], target=None, item=None): *************** *** 171,174 **** --- 186,193 ---- if mode == MODE_BOOK: + if not self.checkweapon(char): + char.message(502626) + return 0 + # Check for Mana if char.mana < self.mana: *************** *** 186,189 **** --- 205,212 ---- elif mode == MODE_SCROLL: + if not self.checkweapon(char): + char.message(502626) + return 0 + # Check if the scroll is allright if not item or item.getoutmostchar() != char: Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/__init__.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** __init__.py 31 Aug 2004 20:27:42 -0000 1.14 --- __init__.py 3 Sep 2004 01:31:05 -0000 1.15 *************** *** 1,10 **** - #===============================================================# - # ) (\_ | WOLFPACK 13.0.0 Scripts # - # (( _/{ "-; | Created by: Correa # - # )).-' {{ ;'` | Revised by: # - # ( ( ;._ \\ ctr | Last Modification: Created # - #===============================================================# - # Main Magic Script # - #===============================================================# import wolfpack --- 1,2 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:31:18
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11791 Modified Files: equipment.py Log Message: fix for bug #0000263 Index: equipment.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/equipment.py,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** equipment.py 31 Aug 2004 01:48:43 -0000 1.31 --- equipment.py 3 Sep 2004 01:31:04 -0000 1.32 *************** *** 163,166 **** --- 163,171 ---- if energy: tooltip.add(1060407, str(energy)) + + # Spell Channeling + spellchanneling = properties.fromitem(object, SPELLCHANNELING) + if spellchanneling != 0: + tooltip.add(1060482, "") fire = properties.fromitem(object, RESISTANCE_FIRE) |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:31:17
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11791/wolfpack Modified Files: consts.py properties.py Log Message: fix for bug #0000263 Index: properties.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/properties.py,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** properties.py 29 Aug 2004 16:07:38 -0000 1.6 --- properties.py 3 Sep 2004 01:31:06 -0000 1.7 *************** *** 13,17 **** MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ ! ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING # --- 13,17 ---- MAGICRESISTANCE, INSCRIPTION, LAYER_RIGHTHAND, LAYER_MOUNT, \ ITEM_ARMOR, ITEM_WEAPON, ITEM_SHIELD, ITEM_MELEE, ITEM_RANGED, \ ! ITEM_PIERCING, ITEM_SLASHING, ITEM_BASHING, SPELLCHANNELING # *************** *** 51,54 **** --- 51,57 ---- DAMAGE_POISON: ['dmg_poison', 0, 0], DAMAGE_ENERGY: ['dmg_energy', 0, 0], + + # Flags (Weapons): + SPELLCHANNELING: ['spellchanneling', 0, 0], # % Boni Index: consts.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/consts.py,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** consts.py 10 Aug 2004 22:06:28 -0000 1.74 --- consts.py 3 Sep 2004 01:31:06 -0000 1.75 *************** *** 67,70 **** --- 67,71 ---- DURABILITYBONUS = 35 WEIGHTBONUS = 36 + SPELLCHANNELING = 37 # Checks for certain item types |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:31:04
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11747/webroot Modified Files: ChangeLog.wolfpack Log Message: fix for bug #0000263 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** ChangeLog.wolfpack 3 Sep 2004 01:16:30 -0000 1.51 --- ChangeLog.wolfpack 3 Sep 2004 01:30:49 -0000 1.52 *************** *** 67,70 **** --- 67,71 ---- - Implemented a new page system. - Fix for bug #0000270 (.controlslots for blade spirits) + - Fix for bug #0000263 (casting with weapon allowed although weapon is not spell channeling) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:16:38
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9464/webroot Modified Files: ChangeLog.wolfpack Log Message: fix for bug #0000270 Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.50 retrieving revision 1.51 diff -C2 -d -r1.50 -r1.51 *** ChangeLog.wolfpack 3 Sep 2004 00:55:40 -0000 1.50 --- ChangeLog.wolfpack 3 Sep 2004 01:16:30 -0000 1.51 *************** *** 66,69 **** --- 66,70 ---- - Fixed a bug where equipment didn't update stats if double clicked to equip. - Implemented a new page system. + - Fix for bug #0000270 (.controlslots for blade spirits) * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 01:16:35
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9436/magic Modified Files: circle5.py Log Message: fix for bug #0000270 Index: circle5.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle5.py,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** circle5.py 2 Sep 2004 01:50:47 -0000 1.19 --- circle5.py 3 Sep 2004 01:16:22 -0000 1.20 *************** *** 33,37 **** spirits = wolfpack.addnpc('summoned_blade_spirit', target) - spirits.controlslots = 1 spirits.owner = char spirits.summontime = wolfpack.time.servertime() + 120000 --- 33,36 ---- |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 00:56:11
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6399/webroot Modified Files: ChangeLog.wolfpack Log Message: Finished the page system. Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.49 retrieving revision 1.50 diff -C2 -d -r1.49 -r1.50 *** ChangeLog.wolfpack 2 Sep 2004 00:52:52 -0000 1.49 --- ChangeLog.wolfpack 3 Sep 2004 00:55:40 -0000 1.50 *************** *** 65,68 **** --- 65,69 ---- - Improved/Fixed pet control functionality through word commands. - Fixed a bug where equipment didn't update stats if double clicked to equip. + - Implemented a new page system. * Misc. Changes: - Experimental Mac OSX Support |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 00:54:05
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6009/system Modified Files: pages.py Log Message: Finished the page system. Index: pages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/pages.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pages.py 1 Sep 2004 20:08:11 -0000 1.1 --- pages.py 3 Sep 2004 00:53:54 -0000 1.2 *************** *** 3,26 **** from wolfpack.consts import * import wolfpack.gumps import time pages = None # # The class for a single page # class Page: def __init__(self, char): ! self.account = char.account.name ! self.serial = char.serial ! self.name = char.name ! self.pos = char.pos ! self.category = '' ! self.message = ['', '', '', ''] ! self.created = 0 self.assigned = None def tostring(self): ! pass # --- 3,257 ---- from wolfpack.consts import * import wolfpack.gumps + import commands.who + import wolfpack.sockets import time + from urllib import quote, unquote pages = None # + # Wrapper for the page details gump + # + def page_details_response(player, arguments, response): + page = arguments[0] + + # Check if the page is still valid + global pages + if page not in pages.pages: + return + + page.details_response(player, response) + + # # The class for a single page # class Page: def __init__(self, char): ! if type(char) == str: ! values = char.split(';') ! self.account = unquote( values[0] ) ! self.serial = int(values[1]) ! self.name = unquote(values[2]) ! (x, y, z, m) = values[3].split(',') ! self.pos = wolfpack.coord(int(x), int(y), int(z), int(m)) ! self.category = unquote(values[4]) ! self.message = ['', '', '', ''] ! self.message[0] = unquote(values[5]) ! self.message[1] = unquote(values[6]) ! self.message[2] = unquote(values[7]) ! self.message[3] = unquote(values[8]) ! self.created = float(values[9]) ! else: ! self.account = char.account.name ! self.serial = char.serial ! self.name = char.name ! self.pos = char.pos ! self.category = '' ! self.message = ['', '', '', ''] ! self.created = 0 ! self.assigned = None + + """ + Return an integer for the category of this page. + """ + def type(self): + if self.category == 'BUG': + return 0 + elif self.category == 'STUCK': + return 1 + elif self.category == 'GAMEPLAY': + return 2 + else: + return 3 + """ + Build a string for the database. + """ def tostring(self): ! values = [] ! values.append( quote( self.account ) ) ! values.append( str( self.serial ) ) ! values.append( quote( self.name ) ) ! values.append( '%d,%d,%d,%d' % ( self.pos.x, self.pos.y, self.pos.z, self.pos.map ) ) ! values.append( quote( self.category ) ) ! values.append( quote( self.message[0] ) ) ! values.append( quote( self.message[1] ) ) ! values.append( quote( self.message[2] ) ) ! values.append( quote( self.message[3] ) ) ! values.append( str( self.created ) ) ! return ";".join(values) ! ! """ ! Build a notification string for being shown to gms. ! """ ! def notification(self, updated = False): ! char = wolfpack.findchar(self.serial) ! if not char: ! return None ! ! if not updated: ! result = "New %s page from '%s' on account '%s':" % (self.category, char.name, self.account) ! else: ! result = "Updated %s page from '%s' on account '%s':" % (self.category, char.name, self.account) ! ! return result ! ! """ ! Show details for this page ! """ ! def details(self, player): ! char = wolfpack.findchar(self.serial) ! ! if not char: ! return ! ! # Assign the page to the viewer ! if not self.assigned: ! # Requeue an old page the gm is assigned to ! global pages ! page = pages.findassigned(player.serial) ! if page: ! page.assigned = None ! player.socket.sysmessage('You requeue your previous page.', 0x846) ! player.log(LOG_MESSAGE, "%s requeues gm page from %s (%s).\n" % (player.name, char.name, self.account)) ! ! player.log(LOG_MESSAGE, "%s assigns gm page from %s (%s) to himself.\n" % (player.name, char.name, self.account)) ! self.assigned = player.serial ! player.socket.sysmessage('You assign the gm page to yourself.', 0x846) ! ! assigned = self.assigned == player.serial ! if not assigned and self.assigned: ! player.socket.sysmessage('This page is already assigned to someone else.', 0x846) ! return ! ! gump = wolfpack.gumps.cGump() ! ! # Background ! gump.addBackground( 0xE10, 440, 440 ) ! gump.addResizeGump( 195, 360, 0xBB8, 205, 20 ) ! gump.addCheckerTrans( 15, 15, 410, 410 ) ! ! # Gump Header ! gump.addGump( 165, 18, 0xFA2 ) ! gump.addText( 200, 20, "Page Menu", 0x530 ) ! ! gump.addText( 150, 400, "Category: %s" % self.category, 0x844 + 5 * self.type() ); ! ! gump.startPage(1) ! hue = 0x834 ! ! gump.addText( 50, 60, "Char name:", hue ) ! gump.addText( 200, 60, char.name, hue ) ! gump.addText( 50, 80, "Account name:", hue ) ! gump.addText( 200, 80, self.account, hue ) ! gump.addText( 50, 100, "Char position:", hue ) ! gump.addText( 200, 100, str(char.pos), hue ) ! gump.addText( 50, 120, "Page sent from:", hue ) ! gump.addText( 200, 120, str(self.pos), hue ) ! gump.addText( 50, 140, "Date/time:", hue ) ! gump.addText( 200, 140, time.strftime(FORMAT_DATETIME, time.localtime(self.created)), hue ) ! ! gump.addText( 50, 160, "Message:", hue ) ! html = "<body text=\"#0000FF\" leftmargin=\"0\" topmargin=\"0\" marginwidth=\"0\" marginheight=\"0\">%s</body>" % "<br>".join(self.message) ! gump.addResizeGump( 45, 180, 0xBB8, 345, 84 ) ! gump.addHtmlGump( 50, 180, 340, 80, html ) ! ! # Commands ! gump.addButton( 20, 280, 0xFA5, 0xFA7, 1 ) ! gump.addText( 55, 280, "Go to char position", 0x834 ) ! gump.addButton( 20, 300, 0xFA5, 0xFA71, 2 ) ! gump.addText( 55, 300, "Bring char", 0x834 ) ! gump.addButton( 20, 320, 0xFA5, 0xFA7, 3 ) ! gump.addText( 55, 320, "Go to page position", 0x834 ) ! gump.addButton( 20, 360, 0xFBD, 0xFBF, 4 ) ! ! if char.socket: ! gump.addText( 55, 360, "Send message:", 0x834 ) ! gump.addInputField( 200, 360, 190, 16, 0x834, 1, "<msg>" ) ! ! gump.addButton( 220, 280, 0xFAB, 0xFAD, 5 ) ! gump.addText( 255, 280, "Show socket info gump", 0x834 ) ! ! gump.addButton( 220, 300, 0xFA5, 0xFA7, 6 ) ! gump.addText( 255, 300, "Requeue page", 0x834 ) ! gump.addButton( 220, 320, 0xFA5, 0xFA7, 7 ) ! gump.addText( 255, 320, "Delete page", 0x834 ) ! ! # X button ! gump.addText( 70, 400, "Close", 0x834 ) ! gump.addButton( 30, 400, 0xFB1, 0xFB3, 0 ) ! ! gump.setCallback("system.pages.page_details_response") ! gump.setArgs([self]) ! gump.send(player.socket) ! ! """ ! Response from the details gump ! """ ! def details_response(self, player, response): ! if response.button == 0: ! return ! ! char = wolfpack.findchar(self.serial) ! ! if not char: ! return ! ! # Go to character ! if response.button == 1: ! player.removefromview() ! player.moveto(char.pos) ! player.update() ! player.socket.resendworld() ! ! # Bring character ! elif response.button == 2: ! char.removefromview() ! char.moveto(player.pos) ! char.update() ! if char.socket: ! char.socket.resendworld() ! ! # Go to page position ! elif response.button == 3: ! player.removefromview() ! player.moveto(self.pos) ! player.update() ! player.socket.resendworld() ! ! # Send message ! elif response.button == 4: ! if char.socket: ! char.socket.sysmessage('A message from %s: %s' % (player.name, response.text[1]), 0x846) ! player.socket.sysmessage('The message has been sent.', 0x846) ! else: ! player.socket.sysmessage('This player is currently offline. The message has not been sent.', 0x846) ! player.log(LOG_MESSAGE, "%s sends player %s (%s) a message: %s\n" % (player.name, char.name, self.account, response.text[1])) ! ! # Show socket info gump ! elif response.button == 5: ! if char.socket: ! commands.who.details(player, char) ! else: ! player.socket.sysmessage('This player is currently offline.', 0x846) ! ! # Requeue page ! elif response.button == 6: ! self.assigned = None ! player.socket.sysmessage('You requeue the page.', 0x846) ! player.log(LOG_MESSAGE, "%s requeues gm page from %s (%s).\n" % (player.name, char.name, self.account)) ! ! # Delete page ! elif response.button == 7: ! self.assigned = None ! global pages ! pages.remove(self) ! ! if char.socket: ! char.socket.sysmessage('Your gm page has been deleted.', 0x846) ! ! player.socket.sysmessage('You remove the page.', 0x846) ! player.log(LOG_MESSAGE, "%s deletes gm page from %s (%s).\n" % (player.name, char.name, self.account)) # *************** *** 29,33 **** class Pages: def __init__(self): ! self.pages = {} """ --- 260,264 ---- class Pages: def __init__(self): ! self.pages = [] """ *************** *** 35,45 **** """ def save(self): ! pass ! """ Load the pages """ def load(self): ! pass """ --- 266,289 ---- """ def save(self): ! i = 0 ! for page in self.pages: ! i += 1 ! wolfpack.setoption('page_%u' % i, page.tostring()) ! wolfpack.setoption('pages', i) ! """ Load the pages """ def load(self): ! count = int(wolfpack.getoption('pages', '0')) ! for i in range(1, count+1): ! pagestr = wolfpack.getoption('page_%u' % i, '') ! if pagestr == '': ! continue ! page = Page(pagestr) ! ! char = wolfpack.findchar(page.serial) ! if char: ! self.add(page, False) """ *************** *** 47,55 **** """ def find(self, name): ! name = name.lower() ! if not self.pages.has_key(name): ! return None ! else: ! return self.pages[name] """ --- 291,332 ---- """ def find(self, name): ! name = hash(name.lower()) ! for page in self.pages: ! if hash(page.account.lower()) == name: ! return page ! return None ! ! """ ! Check for invalidly assigned pages ! """ ! def check(self): ! toremove = [] ! for page in self.pages: ! char = wolfpack.findchar(page.serial) ! if not char: ! toremove.append(page) ! continue ! if page.assigned: ! char = wolfpack.findchar(page.assigned) ! if not char or not char.socket: ! page.assigned = None ! continue ! for page in toremove: ! self.remove(page) ! ! """ ! Return the page count. ! """ ! def count(self): ! return len(self.pages) ! ! """ ! Get a page from the pages map. ! """ ! def findassigned(self, serial): ! for page in self.pages: ! if page.assigned == serial: ! return page ! return None """ *************** *** 57,77 **** """ def add(self, page, notify = True): ! self.pages[page.account.lower()] = page self.save() if notify: ! pass """ Resolve page. """ ! def remove(self, page, notify = False): ! if self.pages.has_key(page.account.lower()): ! del self.pages[page.account.lower()] self.save() - - # Notify Counselors and GMs with the pagenotify flag activated - if notify: - pass # --- 334,376 ---- """ def add(self, page, notify = True): ! updated = False ! if page in self.pages: ! updated = True ! self.pages.remove(page) ! self.pages.append(page) self.save() if notify: ! char = wolfpack.findchar(page.serial) ! if char: ! if updated: ! char.log(LOG_MESSAGE, "%s (%s) updates his gm page [%s]:\n%s\n" % (char.name, page.account, page.category, "\n".join(page.message))) ! else: ! char.log(LOG_MESSAGE, "%s (%s) makes a gm page [%s]:\n%s\n" % (char.name, page.account, page.category, "\n".join(page.message))) ! ! notification = page.notification(updated) ! socket = wolfpack.sockets.first() ! while socket: ! player = socket.player ! ! # If the pagenotify flag is on and it is a staff account, ! # send a notification about the new or updated page. ! if player and player.rank > 1 and player.account.flags & 0x10 != 0: ! # Send the notification to the socket ! socket.sysmessage(notification, 0x846) ! ! for line in page.message: ! if len(line) > 0: ! socket.sysmessage(line, 0x843) ! ! socket = wolfpack.sockets.next() """ Resolve page. """ ! def remove(self, page): ! if page in self.pages: ! self.pages.remove(page) self.save() # *************** *** 88,97 **** # Delete previous page if page and 5 in response.switches: ! pages.remove(page, True) # Notify GMs ! char.socket.sysmessage('Your page has been removed.') return if len(response.text[1]) + len(response.text[2]) + len(response.text[3]) + len(response.text[4]) == 0: ! char.socket.sysmessage('You have to enter a message for your page.') onHelp(char) return --- 387,397 ---- # Delete previous page if page and 5 in response.switches: ! pages.remove(page) ! char.socket.sysmessage('Your page has been removed.', 0x846) ! char.log(LOG_MESSAGE, "%s (%s) deletes his gm page.\n" % (char.name, page.account)) return if len(response.text[1]) + len(response.text[2]) + len(response.text[3]) + len(response.text[4]) == 0: ! char.socket.sysmessage('You have to enter a message for your page.', 0x846) onHelp(char) return *************** *** 116,120 **** pages.add(page, True) ! char.socket.sysmessage('Your page has been queued.') # --- 416,420 ---- pages.add(page, True) ! char.socket.sysmessage('Your page has been queued.', 0x846) # *************** *** 191,204 **** # # Initialize the page system # def onLoad(): global pages ! pages = Pages() wolfpack.registerglobal(EVENT_HELP, "system.pages") ! # ! # Finalize the page system. ! # ! def onUnload(): ! pass --- 491,605 ---- # + # Response to the pages gump. + # + def pages_gump_response(player, arguments, response): + if response.button == 0: + return + + # Show a detail gump for a given page. + global pages + id = response.button - 1 + + if id < 0 or id >= len(pages.pages): + return + else: + page = pages.pages[id] + page.details(player) + + # + # Show a pages gump to the player. + # + def pages_gump(player): + global pages + pages.check() # Make sure all pages are valid + + gump = wolfpack.gumps.cGump() + + gump.startPage(0) + + # Gump Background + gump.addBackground( 0xE10, 480, 360 ) # Background + gump.addCheckerTrans( 15, 15, 450, 330 ) + + # Gump Header + gump.addGump( 180, 18, 0xFA8 ) + gump.addText( 215, 20, "Page Queue", 0x530 ) + + # Close Button + gump.addText( 70, 320, "Close", 0x834 ) + gump.addButton( 30, 320, 0xFB1, 0xFB3, 0 ) + + count = (pages.count() + 9) / 10 + + # Iterate this loop once for every page + for i in range(0, count): + gump.startPage(i + 1) + offset = 0 + + for j in range(i * 10, i * 10 + 10): + if j < pages.count(): + page = pages.pages[j] + pagetype = page.type() + + if not page.assigned: + gump.addButton( 20, 60 + offset, 0xFA5, 0xFA7, 1 + j ) + + char = wolfpack.findchar(page.serial) + + if char.socket: + gump.addText( 55, 60 + offset, "%s (%s)" % (char.name, page.account), 0x844 + 5 * pagetype ) + gump.addText( 200, 60 + offset, page.category, 0x844 + 5 * pagetype ) + gump.addText( 280, 60 + offset, time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 0x844 + 5 * pagetype ) + else: + gump.addText( 55, 60 + offset, "%s (%s)" % (char.name, page.account), 2100 ) + gump.addText( 200, 60 + offset, page.category, 2100 ) + gump.addText( 280, 60 + offset, time.strftime(FORMAT_DATETIME, time.localtime(page.created)), 21000 ) + + offset += 20 + + gump.addText( 280, 320, "Page %u of %u" % ( i + 1, count ), 0x834 ) + + # Are we on the first page + if i > 0: + gump.addPageButton( 240, 320, 0x0FC, 0x0FC, i - 1 ) + + # Would the next page be valid? + if i + 1 < count: + gump.addPageButton( 260, 320, 0x0FA, 0x0FA, i + 2 ) + + gump.setCallback("system.pages.pages_gump_response") + gump.send(player.socket) + + # + # If we're not assigned to any page, get a new one. + # + def page(socket, command, arguments): + player = socket.player + page = pages.findassigned(player.serial) + + # Show a selection gump + if not page: + pages_gump(player) + + # Process page commands + else: + page.details(player) + + # # Initialize the page system # def onLoad(): global pages ! pages = Pages() wolfpack.registerglobal(EVENT_HELP, "system.pages") ! wolfpack.registercommand("page", page) ! ! if not wolfpack.isstarting(): ! pages.load() ! # ! # Server startup complete ! # ! def onServerStart(): ! global pages ! pages.load() |
|
From: Sebastian H. <dar...@us...> - 2004-09-03 00:54:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6009/commands Modified Files: who.py Log Message: Finished the page system. Index: who.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/who.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** who.py 28 Aug 2004 15:45:27 -0000 1.4 --- who.py 3 Sep 2004 00:53:54 -0000 1.5 *************** *** 73,79 **** gump.send( socket ) return def callbackWho( char, args, choice ): - socket = char.socket wholist = args[0] if choice.button == 0: --- 73,136 ---- gump.send( socket ) return + + def details(char, player): + if not player.socket: + char.socket.sysmessage('The player is currently offline.') + return + + pos = player.pos + account = player.account + # Socket Information + gump = cGump( 0, 0, 0, 50, 50 ) + gump.addBackground( 0xE10, 440, 340 ) + gump.addResizeGump( 195, 260, 0xBB8, 205, 20 ) + gump.addCheckerTrans( 15, 15, 410, 310 ) + gump.addGump( 160, 18, 0xFA2 ) + gump.addText( 195, 20, unicode( "Socket Menu" ), 0x530 ) + gump.addText( 70, 300, unicode("Close"), 0x834 ) + gump.addButton( 30, 300, 0xFB1, 0xFB3, 0 ) + gump.startPage( 1 ) + gump.addText( 50, 60, unicode( "Char name:" ), 0x834 ) + gump.addText( 250, 60, unicode( "%s" % player.name ), 0x834 ) + gump.addText( 50, 80, unicode( "IP:" ), 0x834 ) + gump.addText( 250, 80, unicode( "%s" % player.socket.address ), 0x834 ) + gump.addText( 50, 100, unicode( "Position:" ), 0x834 ) + gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 ) + gump.addText( 50, 120, unicode( "Region:" ), 0x834 ) + if player.region: + gump.addText( 250, 120, unicode( "%s" % unicode(player.region.name) ), 0x834 ) + else: + gump.addText( 250, 120, "Unknown", 0x834 ) + gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 ) + gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 ) + # Actions + # Go To Char + gump.addButton( 20, 180, 0xFA5, 0xFA7, 1 ) + gump.addText( 50, 180, unicode( "Go to position" ), 0x834 ) + # Bring Char + gump.addButton( 20, 200, 0xFA5, 0xFA7, 2 ) + gump.addText( 50, 200, unicode( "Bring char" ), 0x834 ) + # Jail Char + gump.addButton( 20, 220, 0xFA5, 0xFA7, 3 ) + gump.addText( 50, 220, unicode( "Jail char" ), 0x834 ) + # Forgive Char + gump.addButton( 220, 220, 0xFA5, 0xFA7, 4 ) + gump.addText( 250, 220, unicode( "Forgive char" ), 0x834 ) + # Show Char Info Gump + gump.addButton( 220, 180, 0xFAB, 0xFAD, 5 ) + gump.addText( 250, 180, unicode( "Show char info gump" ), 0x834 ) + # Send Message + gump.addButton( 20, 260, 0xFBD, 0xFBF, 6 ) + gump.addText( 50, 260, unicode( "Send message:" ), 0x834 ) + gump.addInputField( 200, 260, 190, 16, 0x834, 1, unicode( "<msg>" ) ) + # Disconnect + gump.addButton( 220, 200, 0xFA5, 0xFA7, 7 ) + gump.addText( 250, 200, unicode( "Disconnect" ), 0x834 ) + # Stuff and Send + gump.setCallback( "commands.who.callbackSocket" ) + gump.setArgs( [ player.serial ] ) + gump.send( char.socket ) def callbackWho( char, args, choice ): wholist = args[0] if choice.button == 0: *************** *** 81,136 **** elif wholist[ choice.button - 10 ]: player = wolfpack.findchar( wholist[ choice.button - 10 ] ) ! pos = player.pos ! account = player.account ! # Socket Information ! gump = cGump( 0, 0, 0, 50, 50 ) ! gump.addBackground( 0xE10, 440, 340 ) ! gump.addResizeGump( 195, 260, 0xBB8, 205, 20 ) ! gump.addCheckerTrans( 15, 15, 410, 310 ) ! gump.addGump( 160, 18, 0xFA2 ) ! gump.addText( 195, 20, unicode( "Socket Menu" ), 0x530 ) ! gump.addText( 70, 300, unicode("Close"), 0x834 ) ! gump.addButton( 30, 300, 0xFB1, 0xFB3, 0 ) ! gump.startPage( 1 ) ! gump.addText( 50, 60, unicode( "Char name:" ), 0x834 ) ! gump.addText( 250, 60, unicode( "%s" % player.name ), 0x834 ) ! gump.addText( 50, 80, unicode( "IP:" ), 0x834 ) ! gump.addText( 250, 80, unicode( "%s" % player.socket.address ), 0x834 ) ! gump.addText( 50, 100, unicode( "Position:" ), 0x834 ) ! gump.addText( 250, 100, unicode( "%i,%i,%i,%i" % ( pos.x, pos.y, pos.z, pos.map ) ), 0x834 ) ! gump.addText( 50, 120, unicode( "Region:" ), 0x834 ) ! if player.region: ! gump.addText( 250, 120, unicode( "%s" % unicode(player.region.name) ), 0x834 ) ! else: ! gump.addText( 250, 120, "Unknown", 0x834 ) ! gump.addText( 50, 140, unicode( "Account / ACL:" ), 0x834 ) ! gump.addText( 250, 140, unicode( "%s / %s" % ( account.name, account.acl) ), 0x834 ) ! # Actions ! # Go To Char ! gump.addButton( 20, 180, 0xFA5, 0xFA7, 1 ) ! gump.addText( 50, 180, unicode( "Go to position" ), 0x834 ) ! # Bring Char ! gump.addButton( 20, 200, 0xFA5, 0xFA7, 2 ) ! gump.addText( 50, 200, unicode( "Bring char" ), 0x834 ) ! # Jail Char ! gump.addButton( 20, 220, 0xFA5, 0xFA7, 3 ) ! gump.addText( 50, 220, unicode( "Jail char" ), 0x834 ) ! # Forgive Char ! gump.addButton( 220, 220, 0xFA5, 0xFA7, 4 ) ! gump.addText( 250, 220, unicode( "Forgive char" ), 0x834 ) ! # Show Char Info Gump ! gump.addButton( 220, 180, 0xFAB, 0xFAD, 5 ) ! gump.addText( 250, 180, unicode( "Show char info gump" ), 0x834 ) ! # Send Message ! gump.addButton( 20, 260, 0xFBD, 0xFBF, 6 ) ! gump.addText( 50, 260, unicode( "Send message:" ), 0x834 ) ! gump.addInputField( 200, 260, 190, 16, 0x834, 1, unicode( "<msg>" ) ) ! # Disconnect ! gump.addButton( 220, 200, 0xFA5, 0xFA7, 7 ) ! gump.addText( 250, 200, unicode( "Disconnect" ), 0x834 ) ! # Stuff and Send ! gump.setCallback( "commands.who.callbackSocket" ) ! gump.setArgs( [ player.serial ] ) ! gump.send( socket ) return True else: --- 138,142 ---- elif wholist[ choice.button - 10 ]: player = wolfpack.findchar( wholist[ choice.button - 10 ] ) ! details(char, player) return True else: |
|
From: Sebastian H. <dar...@us...> - 2004-09-02 23:30:16
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23873 Modified Files: ChangeLog Log Message: Encryption keys Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** ChangeLog 2 Sep 2004 00:52:29 -0000 1.19 --- ChangeLog 2 Sep 2004 23:29:51 -0000 1.20 *************** *** 35,38 **** --- 35,40 ---- - Fixed an issue with walking/running not being sent to other cliens. - Added wolfpack.queuecode to queue a python function for the next mainloop iteration. + - Ignore a 4.0.4a multi purpose packet that doesn't make sense. + - Fixed a bug related to serverlists duplication on configuration reload. - Documentation fixes for item.addtimer. |
|
From: Sebastian H. <dar...@us...> - 2004-09-02 23:30:03
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23873/network Modified Files: uosocket.cpp Log Message: Encryption keys Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.403 retrieving revision 1.404 diff -C2 -d -r1.403 -r1.404 *** uosocket.cpp 31 Aug 2004 14:05:05 -0000 1.403 --- uosocket.cpp 2 Sep 2004 23:29:51 -0000 1.404 *************** *** 1243,1246 **** --- 1243,1250 ---- handleParty( packet ); return; + + // Unknown Packet + case 0x24: + return; }; |
|
From: Sebastian H. <dar...@us...> - 2004-09-02 23:30:03
|
Update of /cvsroot/wpdev/wolfpack/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23873/win Modified Files: config_win.cpp Log Message: Encryption keys Index: config_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/win/config_win.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** config_win.cpp 31 Aug 2004 00:16:15 -0000 1.6 --- config_win.cpp 2 Sep 2004 23:29:51 -0000 1.7 *************** *** 122,125 **** --- 122,127 ---- if ( serverList_.empty() || ( dynamicIP && lastIpCheck <= Server::instance()->time() ) ) // Empty? Try to load { + serverList_.clear(); + bool bKeepLooping = true; unsigned int i = 1; |
|
From: spddmn <xxx...@us...> - 2004-09-02 18:20:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26547/scripts Modified Files: archery_butte.py Log Message: updated to use cliloc messages Index: archery_butte.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/archery_butte.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** archery_butte.py 9 Jul 2004 21:47:45 -0000 1.10 --- archery_butte.py 2 Sep 2004 18:19:53 -0000 1.11 *************** *** 39,63 **** if( arrowCount ): if( arrowCount > 1 ): ! message = "You retrieve " + str( arrowCount ) + " arrows." ! else: ! message = "You retrieve an arrow." ! ! char.message( arrowCount ) ! arrow = wolfpack.additem( "f3f" ) ! arrow.container = char.getbackpack() ! arrow.amount = arrowCount ! arrow.update() if( boltCount ): if( boltCount > 1 ): ! message = "You retrieve " + str( boltCount ) + " bolts." ! else: ! message = "You retrieve a bolt." ! char.message( message ) ! bolt = wolfpack.additem( "1bfb" ) ! bolt.container = char.getbackpack() ! bolt.amount = boltCount ! bolt.update() # Reset the counters --- 39,57 ---- if( arrowCount ): if( arrowCount > 1 ): ! char.message( arrowCount ) ! arrow = wolfpack.additem( "f3f" ) ! arrow.container = char.getbackpack() ! arrow.amount = arrowCount ! arrow.update() if( boltCount ): if( boltCount > 1 ): ! char.message( message ) ! bolt = wolfpack.additem( "1bfb" ) ! bolt.container = char.getbackpack() ! bolt.amount = boltCount ! bolt.update() ! char.socket.clilocmessage(500593) # Reset the counters *************** *** 78,88 **** return giveAmmo( char, item ) ! if( char.distanceto( item ) > 10 or char.distanceto( item ) < 5 ): ! char.message( "You are either too near or far to shoot." ) return True # Sanity checks for the line-of-fire if( ( item.id == 0x100b and ( char.pos.x != item.pos.x or char.pos.y <= item.pos.y ) ) or ( item.id == 0x100a and ( char.pos.y != item.pos.y or char.pos.x <= item.pos.x ) ) ): ! char.message( "You can't shoot from here." ) return True --- 72,85 ---- return giveAmmo( char, item ) ! if( char.distanceto( item ) > 10): ! char.socket.clilocmessage(500603) ! return True ! elif( char.distanceto( item ) < 5 ): ! char.socket.clilocmessage(500604) return True # Sanity checks for the line-of-fire if( ( item.id == 0x100b and ( char.pos.x != item.pos.x or char.pos.y <= item.pos.y ) ) or ( item.id == 0x100a and ( char.pos.y != item.pos.y or char.pos.x <= item.pos.x ) ) ): ! char.socket.clilocmessage(500597) return True *************** *** 101,115 **** if( ( weaponskill(char, char.getweapon()) != ARCHERY ) or ( ammo == -1 ) ): ! char.message( "You only can use crossbows and bows on this butte." ) return True # If we've already learned all we can > cancel. if( char.skill[ ARCHERY ] >= 300 ): ! char.message( "You can learn much from a dummy but you have already learned it all." ) ! return True ! ! # Use ammo (if 0 was used = no ammo) ! if( not char.useresource( 1, ammo ) ): ! char.message( "You are out of ammunition." ) return True --- 98,107 ---- if( ( weaponskill(char, char.getweapon()) != ARCHERY ) or ( ammo == -1 ) ): ! char.socket.clilocmessage(500594) return True # If we've already learned all we can > cancel. if( char.skill[ ARCHERY ] >= 300 ): ! char.socket.clilocmessage(501829) return True *************** *** 123,129 **** --- 115,128 ---- ammoname = "arrow" movingeff = 0xf42 + if( not char.useresource( 1, ammo ) ): + char.socket.clilocmessage(500595) + return True else: ammoname = "bolt" movingeff = 0x1bfe + # Use ammo (if 0 was used = no ammo) + if( not char.useresource( 1, ammo ) ): + char.socket.clilocmessage(500596) + return True |
|
From: spddmn <xxx...@us...> - 2004-09-02 18:18:15
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26148/scripts Modified Files: bandages.py Log Message: changed to cliloc messages Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** bandages.py 31 Aug 2004 22:10:08 -0000 1.9 --- bandages.py 2 Sep 2004 18:17:57 -0000 1.10 *************** *** 67,80 **** if not char.gm and not char.canreach( target, 2 ): ! char.socket.sysmessage( 'You can''t reach that.' ) return 0 if target.id != 0x2006: ! char.socket.sysmessage( 'Try using these on a corpse.' ) return 0 # Check Owner if not target.owner or not target.owner.dead: ! char.socket.sysmessage( 'You can''t help them anymore.' ) return 0 --- 67,80 ---- if not char.gm and not char.canreach( target, 2 ): ! char.socket.clilocmessage(500313) return 0 if target.id != 0x2006: ! char.socket.clilocmessage(500971) return 0 # Check Owner if not target.owner or not target.owner.dead: ! char.socket.clilocmessage(500971) return 0 *************** *** 94,100 **** if not target.poison and target.health >= target.maxhitpoints: if target == char: ! char.socket.sysmessage( 'You are healthy.' ) else: ! char.socket.sysmessage( '%s does not require you to heal or cure them!' % target.name ) return 0 --- 94,100 ---- if not target.poison and target.health >= target.maxhitpoints: if target == char: ! char.socket.clilocmessage(1061289) else: ! char.socket.clilocmessage(500956) return 0 *************** *** 118,130 **** if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage( 'You are not skilled enough to resurrect.' ) return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.sysmessage( 'You are not skilled enough to resurrect.' ) return if target.char and target.char.poison and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.sysmessage( 'You are not skilled enough to cure poison.' ) return --- 118,130 ---- if corpse and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.clilocmessage(1002086) return if target.char and target.char.dead and ( char.skill[ HEALING ] < 800 or char.skill[ ANATOMY ] < 800 ): ! char.socket.clilocmessage(1002086) return if target.char and target.char.poison and ( char.skill[ HEALING ] < 600 or char.skill[ ANATOMY ] < 600 ): ! char.socket.clilocmessage(1002086) return *************** *** 200,204 **** if not success: ! char.socket.sysmessage( 'You fail to resurrect the target.' ) return --- 200,204 ---- if not success: ! char.socket.clilocmessage(500967) return *************** *** 219,223 **** target.delete() ! char.socket.sysmessage( 'You successfully resurrect ' + owner.name ) else: char.socket.sysmessage( 'You can''t help them anymore' ) --- 219,223 ---- target.delete() ! char.socket.clilocmessage(500966) else: char.socket.sysmessage( 'You can''t help them anymore' ) *************** *** 233,237 **** if target.dead: if not success: ! char.socket.sysmessage( 'You fail to resurrect the target.' ) return --- 233,237 ---- if target.dead: if not success: ! char.socket.clilocmessage(500967) return *************** *** 239,243 **** target.update() ! char.socket.sysmessage( 'You successfully resurrect ' + target.name ) elif target.poison: if not success: --- 239,243 ---- target.update() ! char.socket.clilocmessage(500966) elif target.poison: if not success: *************** *** 253,259 **** if not success: if target != char: ! char.socket.sysmessage( 'You fail applying bandages to %s.' % target.name ) else: ! char.socket.sysmessage( 'You fail applying bandages to yourself.' ) return --- 253,259 ---- if not success: if target != char: ! char.socket.clilocmessage(500969) else: ! char.socket.clilocmessage(500969) return *************** *** 276,282 **** if char == target: ! char.socket.sysmessage( 'You successfully apply bandages on yourself.' ) else: ! char.socket.sysmessage( 'You successfully apply bandages on %s' % target.name ) # Create bloody bandages --- 276,282 ---- if char == target: ! char.socket.clilocmessage(500970) else: ! char.socket.clilocmessage(500970) # Create bloody bandages *************** *** 290,292 **** item = wolfpack.additem( 'e22' ) if not wolfpack.utilities.tobackpack( item, char ): ! item.update() \ No newline at end of file --- 290,292 ---- item = wolfpack.additem( 'e22' ) if not wolfpack.utilities.tobackpack( item, char ): ! item.update() |
|
From: Sebastian H. <dar...@us...> - 2004-09-02 17:36:34
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18052/system Modified Files: encryption.xml Log Message: Encryption keys Index: encryption.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/encryption.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** encryption.xml 24 Aug 2004 20:13:21 -0000 1.4 --- encryption.xml 2 Sep 2004 17:36:25 -0000 1.5 *************** *** 12,15 **** --- 12,16 ---- <!-- Client identification string (optional) ; Key1 ; Key2 --> + <item> Client 4.0.4 ; 0x2EF385BD ; 0xA26D127F </item> <item> Client 4.0.3 ; 0x2EBBB7CD ; 0xA2495E7F </item> <item> Client 4.0.2 ; 0x2E63ADDD ; 0xA225227F </item> *************** *** 19,23 **** <item> Client 3.0.7 ; 0x2C1BC78D ; 0xA31BFE7F </item> <item> Client 3.0.6 ; 0x2CC3ED9D ; 0xA374227F </item> ! <item> Client 3.0.5 ; 0x2C8B97AD ; 0xA350DE7F </item> </list> </definitions> --- 20,24 ---- <item> Client 3.0.7 ; 0x2C1BC78D ; 0xA31BFE7F </item> <item> Client 3.0.6 ; 0x2CC3ED9D ; 0xA374227F </item> ! <item> Client 3.0.5 ; 0x2C8B97AD ; 0xA350DE7F </item> </list> </definitions> |
|
From: spddmn <xxx...@us...> - 2004-09-02 17:25:11
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15718 Modified Files: verinfo.h Log Message: undos the last change :-( Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** verinfo.h 2 Sep 2004 17:21:25 -0000 1.42 --- verinfo.h 2 Sep 2004 17:25:02 -0000 1.43 *************** *** 31,39 **** inline const char* productString() { ! #ifdef _DEBUG ! return "Wolfpack DEBUG BUILD"; ! #else ! return "Wolfpack Release"; ! #endif } --- 31,35 ---- inline const char* productString() { ! return "Wolfpack"; } |
|
From: spddmn <xxx...@us...> - 2004-09-02 17:21:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15016 Modified Files: verinfo.h Log Message: Now reports DEBUG or RELEASE build info in the "product name" parameter, depending on preprocessor #define _DEBUG Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.41 retrieving revision 1.42 diff -C2 -d -r1.41 -r1.42 *** verinfo.h 19 Aug 2004 19:17:08 -0000 1.41 --- verinfo.h 2 Sep 2004 17:21:25 -0000 1.42 *************** *** 31,35 **** inline const char* productString() { ! return "Wolfpack"; } --- 31,39 ---- inline const char* productString() { ! #ifdef _DEBUG ! return "Wolfpack DEBUG BUILD"; ! #else ! return "Wolfpack Release"; ! #endif } |
|
From: spddmn <xxx...@us...> - 2004-09-02 17:20:09
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14706 Modified Files: wolf.dsp Log Message: removed twofish.c, added twofish.cpp added some new python files updated linker config to use QTLib 3.31 instead of 3.22 Works with Python 2.3.4 Moved initial output of .exe to DEBUG or RELEASE subdirectory instead of to ..\wolfpack.exe Added post build step "Automove" for debug config. you should configure this to move your debug output to your working debug server directory Index: wolf.dsp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v retrieving revision 1.271 retrieving revision 1.272 diff -C2 -d -r1.271 -r1.272 *** wolf.dsp 31 Aug 2004 19:16:49 -0000 1.271 --- wolf.dsp 2 Sep 2004 17:19:59 -0000 1.272 *************** *** 8,24 **** !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project --- 8,24 ---- !MESSAGE This is not a valid makefile. To build this project using NMAKE, !MESSAGE use the Export Makefile command and run ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak". ! !MESSAGE !MESSAGE You can specify a configuration when running NMAKE !MESSAGE by defining the macro CFG on the command line. For example: ! !MESSAGE !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug" ! !MESSAGE !MESSAGE Possible choices for configuration are: ! !MESSAGE !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application") !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application") ! !MESSAGE # Begin Project *************** *** 43,50 **** # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo --- 43,50 ---- # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c ! # ADD CPP /nologo /MD /W3 /GR /GX /O2 /I "lib/Python/PC" /I "sqlite" /I "lib/Python/include" /I "lib\ZThread\include" /I "$(QTDIR)\include" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /c # SUBTRACT CPP /YX # ADD BASE RSC /l 0x409 /d "NDEBUG" ! # ADD RSC /l 0x409 BSC32=bscmake.exe # ADD BASE BSC32 /nologo *************** *** 52,56 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib comctl32.lib $(QTDIR)\lib\qt-mt322.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"..\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98 # SUBTRACT LINK32 /pdb:none --- 52,56 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib comctl32.lib $(QTDIR)\lib\qt-mt331.lib shell32.lib /nologo /subsystem:windows /map /machine:I386 /out:"release\wolfpack.exe" /libpath:"lib\ZThread\lib" /libpath:"lib\Python\lib" /libpath:"lib\bugreport\lib" /libpath:"flatstore\Release" /opt:ref /opt:nowin98 # SUBTRACT LINK32 /pdb:none *************** *** 64,73 **** # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "..\" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /Gm /GR /GX /Zi /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" --- 64,73 ---- # PROP Use_MFC 0 # PROP Use_Debug_Libraries 1 ! # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" # PROP Ignore_Export_Lib 0 # PROP Target_Dir "" # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c ! # ADD CPP /nologo /MD /W3 /Gm /GR /GX /Zi /Od /I "sqlite" /I "lib\bugreport" /I "$(QTDIR)\include" /D "_CONSOLE" /D "_MBCS" /D "_DEBUG" /D "WIN32" /D "QT_DLL" /D "QT_NO_STL" /D "QT_THREAD_SUPPORT" /Fr /FD /GZ /c # ADD BASE RSC /l 0x409 /d "_DEBUG" # ADD RSC /l 0x409 /d "_DEBUG" *************** *** 77,84 **** LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt322.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /debug /machine:I386 /out:"..\wolfpack.exe" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map ! !ENDIF # Begin Target --- 77,89 ---- LINK32=link.exe # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept ! # ADD LINK32 kernel32.lib user32.lib gdi32.lib ole32.lib advapi32.lib ws2_32.lib $(QTDIR)\lib\qt-mt331.lib shell32.lib /nologo /version:12.9 /subsystem:windows /incremental:no /debug /machine:I386 /out:"debug\wolfpack.exe" /pdbtype:sept /fixed:no # SUBTRACT LINK32 /pdb:none /map + # Begin Special Build Tool + SOURCE="$(InputPath)" + PostBuild_Desc=MoveIt + PostBuild_Cmds=copy debug\wolfpack.exe d:\wolfpack\wolfpackEXE\WolfpackDebug\WolfpackCurrent\wolfpack.exe + # End Special Build Tool ! !ENDIF # Begin Target *************** *** 135,142 **** # Begin Source File - SOURCE=.\serverconfig.cpp - # End Source File - # Begin Source File - SOURCE=.\win\config_win.cpp # End Source File --- 140,143 ---- *************** *** 271,274 **** --- 272,279 ---- # Begin Source File + SOURCE=.\serverconfig.cpp + # End Source File + # Begin Source File + SOURCE=.\skills.cpp # End Source File *************** *** 311,315 **** # Begin Source File ! SOURCE=.\twofish\TWOFISH2.C # End Source File # Begin Source File --- 316,320 ---- # Begin Source File ! SOURCE=.\twofish\twofish2.cpp # End Source File # Begin Source File *************** *** 374,381 **** # Begin Source File - SOURCE=.\serverconfig.h - # End Source File - # Begin Source File - SOURCE=.\console.h # End Source File --- 379,382 ---- *************** *** 484,491 **** # Begin Source File - SOURCE=.\python\pyaction.h - # End Source File - # Begin Source File - SOURCE=.\pagesystem.h # End Source File --- 485,488 ---- *************** *** 540,543 **** --- 537,544 ---- # Begin Source File + SOURCE=.\serverconfig.h + # End Source File + # Begin Source File + SOURCE=.\singleton.h # End Source File *************** *** 688,692 **** # PROP Ignore_Default_Tool 1 ! !ENDIF # End Source File --- 689,693 ---- # PROP Ignore_Default_Tool 1 ! !ENDIF # End Source File *************** *** 709,716 **** # Begin Source File - SOURCE=.\python\pyaction.cpp - # End Source File - # Begin Source File - SOURCE=.\python\content.h # End Source File --- 710,713 ---- *************** *** 741,744 **** --- 738,749 ---- # Begin Source File + SOURCE=.\python\pyaction.cpp + # End Source File + # Begin Source File + + SOURCE=.\python\pyaction.h + # End Source File + # Begin Source File + SOURCE=.\python\pyai.cpp # End Source File |
