wpdev-commits Mailing List for Wolfpack Emu (Page 173)
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: <dr...@us...> - 2004-01-14 04:11:40
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands
In directory sc8-pr-cvs1:/tmp/cvs-serv9026
Modified Files:
info.py
Log Message:
This fixes changing an objects position.
Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/info.py,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** info.py 14 Jan 2004 03:41:14 -0000 1.15
--- info.py 14 Jan 2004 04:11:37 -0000 1.16
***************
*** 436,448 ****
char.defense = int( hex2dec( textentries[ key ] ) )
elif key == 22:
! pos = textentries[key].split( "," )
! if len(pos) > 0:
! char.pos.x = int( pos[0] )
! if len(pos) > 1:
! char.pos.y = int( pos[1] )
! if len(pos) > 2:
! char.pos.z = int( pos[2] )
! if len(pos) > 3:
! char.pos.map = int( pos[3] )
elif key == 23:
char.direction = int( hex2dec( textentries[ key ] ) )
--- 436,440 ----
char.defense = int( hex2dec( textentries[ key ] ) )
elif key == 22:
! char.pos = str( textentries[ key ] )
elif key == 23:
char.direction = int( hex2dec( textentries[ key ] ) )
***************
*** 698,710 ****
item.id = int( hex2dec( textentries[ key ] ) )
elif key == 5:
! pos = textentries[key].split(",")
! if len(pos) > 0:
! item.pos.x = int( pos[0] )
! if len(pos) > 1:
! item.pos.y = int( pos[1] )
! if len(pos) > 2:
! item.pos.z = int( pos[2] )
! if len(pos) > 3:
! item.pos.map = int( pos[3] )
elif key == 6:
item.color = int( hex2dec( textentries[ key ] ) )
--- 690,694 ----
item.id = int( hex2dec( textentries[ key ] ) )
elif key == 5:
! item.pos = str( textentries[key] )
elif key == 6:
item.color = int( hex2dec( textentries[ key ] ) )
|
|
From: <dr...@us...> - 2004-01-14 03:41:17
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands In directory sc8-pr-cvs1:/tmp/cvs-serv3316 Modified Files: info.py Log Message: char.update() and item.update() added, allows you to see the tweaks faster :) Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/info.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** info.py 13 Jan 2004 15:39:00 -0000 1.14 --- info.py 14 Jan 2004 03:41:14 -0000 1.15 *************** *** 516,520 **** if choice.button == 1: charinfo( socket, char ) ! return 1 --- 516,521 ---- if choice.button == 1: charinfo( socket, char ) ! char.update() ! return 1 *************** *** 759,762 **** --- 760,764 ---- if choice.button == 1: iteminfo( socket, item ) + item.update() return 1 |
|
From: <dr...@us...> - 2004-01-14 03:11:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv31260
Modified Files:
door.py
Log Message:
Door linking:
'tags set link serial_of_other_door
Index: door.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/door.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** door.py 8 Oct 2003 01:35:48 -0000 1.3
--- door.py 14 Jan 2004 03:11:41 -0000 1.4
***************
*** 1,4 ****
--- 1,5 ----
import wolfpack
+ from wolfpack.utilities import *
# Sound constants for opening and closing a door
***************
*** 230,234 ****
opencount = int( item.gettag( 'opencount' ) ) + 1
! item.settag( 'opencount', opencount )
# Add an autoclose tempeffect
--- 231,240 ----
opencount = int( item.gettag( 'opencount' ) ) + 1
! item.settag( 'opencount', str(opencount) )
!
! if not item.hastag('opened'):
! item.settag( 'opened', 'true' )
! else:
! item.deltag( 'opened' )
# Add an autoclose tempeffect
***************
*** 259,263 ****
return 0
!
def autoclose( item, args ):
if not item or not item.hastag( 'opencount' ):
--- 265,269 ----
return 0
!
def autoclose( item, args ):
if not item or not item.hastag( 'opencount' ):
***************
*** 272,275 ****
--- 278,284 ----
item.deltag( 'opencount' )
+
+ if item.hastag( 'opened' ):
+ item.deltag( 'opened' )
# Find the door definition for this item
***************
*** 285,293 ****
# Soundeffect (close)
item.soundeffect( door[5] )
!
def onUse( char, item ):
# Using doors doesnt count against the object-delay
char.objectdelay = 0
# In Range?
if not char.gm and not char.canreach( item, 2 ):
--- 294,308 ----
# Soundeffect (close)
item.soundeffect( door[5] )
!
!
def onUse( char, item ):
# Using doors doesnt count against the object-delay
char.objectdelay = 0
+ if item.hastag('link') and not item.gettag('opened'):
+ doubledoor = wolfpack.finditem( hex2dec(item.gettag('link')) )
+ if not doubledoor.gettag('opened'):
+ opendoor( char, doubledoor )
+
# In Range?
if not char.gm and not char.canreach( item, 2 ):
***************
*** 296,297 ****
--- 311,313 ----
return opendoor( char, item )
+
|
|
From: <thi...@us...> - 2004-01-14 02:43:14
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv26807
Modified Files:
maps.cpp
Log Message:
Fixed memory leak accessing statics?.mul
Index: maps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/maps.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** maps.cpp 29 Aug 2003 17:58:57 -0000 1.23
--- maps.cpp 14 Jan 2004 02:43:11 -0000 1.24
***************
*** 82,85 ****
--- 82,87 ----
if ( !staticsfile.open( IO_ReadOnly ) )
throw wpFileNotFoundException( QString("Couldn't open file %1").arg( statics ) );
+ staticsCache.setAutoDelete( true );
+ mapCache.setAutoDelete( true );
}
|
|
From: <thi...@us...> - 2004-01-14 02:42:23
|
Update of /cvsroot/wpdev/xmlscripts/web
In directory sc8-pr-cvs1:/tmp/cvs-serv26638
Modified Files:
console.py
Log Message:
Added some more console commands to the web interface
Index: console.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/web/console.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** console.py 6 Jan 2004 12:55:44 -0000 1.4
--- console.py 14 Jan 2004 02:42:19 -0000 1.5
***************
*** 31,34 ****
--- 31,45 ----
wolfpack.queueaction( RELOAD_SCRIPTS )
sys.exit()
+ elif action == 2:
+ print "Content-type: text/html\n\n"
+ print "Server is reloading Python scripts, you will have to re-login after reloading is done"
+ wolfpack.queueaction( RELOAD_PYTHON )
+ sys.exit()
+ elif action == 3:
+ wolfpack.queueaction( RELOAD_ACCOUNTS )
+ elif action == 4:
+ wolfpack.queueaction( RELOAD_CONFIGURATION )
+ elif action == 5:
+ wolfpack.queueaction( SAVE_WORLD )
content = """
***************
*** 60,63 ****
--- 71,79 ----
"""
content += '<input type="submit" value="Reload Scripts" onClick="window.location.href=\'console.py?session=%s&action=1\';"/>' % session_id
+ content += '<input type="submit" value="Reload Python" onClick="window.location.href=\'console.py?session=%s&action=2\';"/>' % session_id
+ content += '<input type="submit" value="Reload Accounts" onClick="window.location.href=\'console.py?session=%s&action=3\';"/>' % session_id
+ content += '<input type="submit" value="Reload Configuration" onClick="window.location.href=\'console.py?session=%s&action=4\';"/>' % session_id
+ content += '<input type="submit" value="Save world" onClick="window.location.href=\'console.py?session=%s&action=5\';"/>' % session_id
+
web.template.output( '> <a href="console.py?session=%(session)s" class="header">Console</a>' % { 'session': session_id },
|
|
From: <dr...@us...> - 2004-01-14 01:31:47
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1:/tmp/cvs-serv14128/items/professions Modified Files: healer.xml Log Message: Fixes for the script updates. Index: healer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/healer.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** healer.xml 15 Sep 2003 15:39:57 -0000 1.3 --- healer.xml 14 Jan 2004 01:31:44 -0000 1.4 *************** *** 12,28 **** <!-- Bandages --> <item id="e20"> ! <id>0x0e20</id> ! <category>Equipment\Misc\Bloody Bandages 2</category> <events>bandages</events> </item> <item id="e21"> ! <id>0x0e21</id> ! <category>Equipment\Misc\Clean Bandages 2</category> <events>bandages</events> </item> <item id="e22"> ! <id>0x0e22</id> <category>Professions\Healer\Bloody Bandages 1</category> <events>bandages</events> --- 12,28 ---- <!-- Bandages --> <item id="e20"> ! <id>0xe20</id> ! <category>Professions\Healer\Bloody Bandages 2</category> <events>bandages</events> </item> <item id="e21"> ! <id>0xe21</id> ! <category>Professions\Healer\Clean Bandages 2</category> <events>bandages</events> </item> <item id="e22"> ! <id>0xe22</id> <category>Professions\Healer\Bloody Bandages 1</category> <events>bandages</events> |
|
From: <dr...@us...> - 2004-01-14 01:30:25
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv13596 Modified Files: scissors.py wool.py yarn.py Log Message: Color passes between wool -> yarn/thread -> cloth -> bandages Fixes to using the loom. Cutting up clothes no longer makes bandages, it makes cloth. Color also passes between cut clothing to the cloth. Index: scissors.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/scissors.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** scissors.py 8 Feb 2003 13:07:38 -0000 1.5 --- scissors.py 14 Jan 2004 01:30:22 -0000 1.6 *************** *** 23,28 **** ids_clothes_16 = [ 0x1f03, 0x1f04 ] ids_clothes_24 = [ 0x1f9f, 0x1fa0 ] ! ids_bolts = [ 0x0f95, 0xf96, 0x0f97, 0xf98, 0x0f99, 0x0f9a, 0x0f9b, 0x0f9c ] ! ids_clothes = [ 0x1765, 0x1766, 0x1767, 0x1768 ] --- 23,28 ---- ids_clothes_16 = [ 0x1f03, 0x1f04 ] ids_clothes_24 = [ 0x1f9f, 0x1fa0 ] ! ids_bolts = [ 0xf95, 0xf96, 0xf97, 0xf98, 0xf99, 0xf9a, 0xf9b, 0xf9c ] ! ids_clothes = [ 0x1766, 0x1765, 0x1767, 0x1768 ] *************** *** 72,77 **** elif target.item.id in ids_clothes_2: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 2 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 72,78 ---- elif target.item.id in ids_clothes_2: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 2 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 81,86 **** elif target.item.id in ids_clothes_4: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 4 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 82,88 ---- elif target.item.id in ids_clothes_4: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 4 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 90,95 **** elif target.item.id in ids_clothes_6: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 6 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 92,98 ---- elif target.item.id in ids_clothes_6: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 6 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 99,104 **** elif target.item.id in ids_clothes_8: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 8 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 102,108 ---- elif target.item.id in ids_clothes_8: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 8 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 108,113 **** elif target.item.id in ids_clothes_10: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 10 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 112,118 ---- elif target.item.id in ids_clothes_10: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 10 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 117,122 **** elif target.item.id in ids_clothes_11: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 11 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 122,128 ---- elif target.item.id in ids_clothes_11: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 11 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 126,131 **** elif target.item.id in ids_clothes_12: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 12 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 132,138 ---- elif target.item.id in ids_clothes_12: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 12 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 135,140 **** elif target.item.id in ids_clothes_13: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 13 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 142,148 ---- elif target.item.id in ids_clothes_13: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 13 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 144,149 **** elif target.item.id in ids_clothes_14: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 14 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 152,158 ---- elif target.item.id in ids_clothes_14: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 14 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 153,158 **** elif target.item.id in ids_clothes_15: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 15 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 162,168 ---- elif target.item.id in ids_clothes_15: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 15 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 162,167 **** elif target.item.id in ids_clothes_16: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 16 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 172,178 ---- elif target.item.id in ids_clothes_16: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 16 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 171,176 **** elif target.item.id in ids_clothes_24: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "ee9" ) item_new.amount = 24 target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 182,188 ---- elif target.item.id in ids_clothes_24: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) item_new.amount = 24 + item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 180,185 **** elif target.item.id in ids_bolts: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1765" ) ! item_new.amount = ( target.item.amount * 5 ) target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): --- 192,198 ---- elif target.item.id in ids_bolts: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "1766" ) ! item_new.amount = 50 ! item_new.color = target.item.color target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): *************** *** 188,201 **** elif target.item.id in ids_clothes: char.soundeffect( 0x248 ) ! if ( target.item.amount > 1 ): ! target.item.amount = target.item.amount -1 ! item.update() ! else: ! target.item.delete() ! ! item_new = wolfpack.additem( "ee9" ) ! item_new.amount = 10 if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() else: char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything --- 201,211 ---- elif target.item.id in ids_clothes: char.soundeffect( 0x248 ) ! item_new = wolfpack.additem( "e21" ) ! item_new.amount = target.item.amount ! item_new.color = target.item.color ! target.item.delete() if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() + else: char.socket.clilocmessage( 0x7AAA8, "", 0x3b2, 3, char ) # Scissors can not be used on that to produce anything Index: wool.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** wool.py 14 Jan 2004 00:15:40 -0000 1.3 --- wool.py 14 Jan 2004 01:30:22 -0000 1.4 *************** *** 47,51 **** if target.item.id in ids: ! if ( item.amount > 1 ): item.amount = item.amount -1 --- 47,51 ---- if target.item.id in ids: ! color = item.color if ( item.amount > 1 ): item.amount = item.amount -1 *************** *** 70,74 **** wheel = wolfpack.finditem( target.item.serial ) processtime = 5000 # 5 Seconds ! wolfpack.addtimer( processtime, "wool.ProcessTimer", [char, wheel] ) elif target.item.id in animids: --- 70,74 ---- wheel = wolfpack.finditem( target.item.serial ) processtime = 5000 # 5 Seconds ! wolfpack.addtimer( processtime, "wool.ProcessTimer", [char, wheel, color] ) elif target.item.id in animids: *************** *** 83,90 **** char = args[0] wheel = args[1] ! GetYarn( char, wheel ) return OK ! def GetYarn( char, wheel ): # End the animations. if wheel.id == animids[0]: --- 83,91 ---- char = args[0] wheel = args[1] ! color = args[2] ! GetYarn( char, wheel, color ) return OK ! def GetYarn( char, wheel, color ): # End the animations. if wheel.id == animids[0]: *************** *** 103,106 **** --- 104,108 ---- item_new = wolfpack.additem( 'e1d' ) # Yarn balls item_new.amount = 3 + item_new.color = color if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() Index: yarn.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/yarn.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** yarn.py 28 Aug 2003 20:51:32 -0000 1.4 --- yarn.py 14 Jan 2004 01:30:22 -0000 1.5 *************** *** 44,47 **** --- 44,48 ---- if target.item.id in ids: + color = item.color if ( item.amount > 1 ): item.amount = item.amount -1 *************** *** 49,67 **** else: item.delete() ! ! # action ! # soundeffect ! char.action( 0x10 ) ! char.soundeffect( 0x48 ) ! if target.item.hastag( 'amount' ): amount = int( target.item.gettag( 'amount' ) ) - - if amount < 5: - target.item.settag( 'amount', amount + 1 ) - else: ! target.item.settag( 'amount', 0 ) ! item_new = wolfpack.additem( "f9a" ) if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() --- 50,78 ---- else: item.delete() ! ! # Make sure it has a tag, if not, set and default to 0 ammount. if target.item.hastag( 'amount' ): amount = int( target.item.gettag( 'amount' ) ) else: ! target.item.settag( 'amount', '0' ) ! amount = int( target.item.gettag( 'amount' ) ) ! ! amount += 1 ! ! if amount < 5: ! if amount == 1: ! char.socket.sysmessage( 'You have just started the bolt of cloth.' ) ! elif amount == 2: ! char.socket.sysmessage( 'The bolt of cloth could use quite a bit more.' ) ! elif amount == 3: ! char.socket.sysmessage( 'The bolt of cloth could use a bit more.' ) ! elif amount == 4: ! char.socket.sysmessage( 'The bolt of cloth is almost finished.' ) ! target.item.settag( 'amount', str(amount) ) ! ! elif amount == 5: ! target.item.settag( 'amount', '0' ) ! item_new = wolfpack.additem( "f9a" ) # Adds a bolt of cloth. ! item_new.color = color if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ): item_new.update() |
|
From: <dr...@us...> - 2004-01-14 00:21:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1:/tmp/cvs-serv1754 Modified Files: tailorer.xml Log Message: Update to make wool work on wheels. Update to make yarn/thread work on looms. Index: tailorer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/tailorer.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** tailorer.xml 15 Sep 2003 15:39:57 -0000 1.5 --- tailorer.xml 14 Jan 2004 00:21:21 -0000 1.6 *************** *** 234,255 **** <!-- Pile of Wool --> <item id="df8"> ! <id>0x0df8</id> <category>Professions\Tailorer\Pile of Wool 1</category> </item> <!-- Ball of Yarn --> <item id="e1d"> ! <id>0x0e1d</id> <category>Professions\Tailorer\Ball of Yarn 1</category> </item> <item id="e1e"> ! <id>0x0e1e</id> <category>Professions\Tailorer\Ball of Yarn 2</category> </item> <item id="e1f"> ! <id>0x0e1f</id> <category>Professions\Tailorer\Ball of Yarn 3</category> </item> --- 234,265 ---- <!-- Pile of Wool --> <item id="df8"> ! <id>0xdf8</id> <category>Professions\Tailorer\Pile of Wool 1</category> + <events>wool</events> + </item> + + <item id="101f"> + <id>0x101f</id> + <category>Professions\Tailorer\Pile of Wool 2</category> + <events>wool</events> </item> <!-- Ball of Yarn --> <item id="e1d"> ! <id>0xe1d</id> <category>Professions\Tailorer\Ball of Yarn 1</category> + <events>yarn</events> </item> <item id="e1e"> ! <id>0xe1e</id> <category>Professions\Tailorer\Ball of Yarn 2</category> + <events>yarn</events> </item> <item id="e1f"> ! <id>0xe1f</id> <category>Professions\Tailorer\Ball of Yarn 3</category> + <events>yarn</events> </item> *************** *** 314,324 **** <item id="fa0"> ! <id>0x0fa0</id> <category>Professions\Tailorer\Spool of Thread (N/S)</category> </item> <item id="fa1"> ! <id>0x0fa1</id> <category>Professions\Tailorer\Spool of Thread (W/E)</category> </item> --- 324,336 ---- <item id="fa0"> ! <id>0xfa0</id> <category>Professions\Tailorer\Spool of Thread (N/S)</category> + <events>yarn</events> </item> <item id="fa1"> ! <id>0xfa1</id> <category>Professions\Tailorer\Spool of Thread (W/E)</category> + <events>yarn</events> </item> *************** *** 329,333 **** <item id="fab"> ! <id>0x0fab</id> <category>Professions\Tailorer\Dying Tub</category> <events>environment</events> --- 341,345 ---- <item id="fab"> ! <id>0xfab</id> <category>Professions\Tailorer\Dying Tub</category> <events>environment</events> *************** *** 374,382 **** </item> - <item id="101f"> - <id>0x101f</id> - <category>Professions\Tailorer\Pile of Wool 2</category> - </item> - <item id="105f"> <id>0x105f</id> --- 386,389 ---- |
|
From: <dr...@us...> - 2004-01-14 00:15:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv767
Modified Files:
wool.py
Log Message:
I updated this script.
1. Spinning wheels now animate.
2. 5 second delay to process the wool into yarn.
3. Can't use the spinning wheel while it spins.
Enjoy! :D
Index: wool.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wool.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wool.py 8 Feb 2003 13:07:38 -0000 1.2
--- wool.py 14 Jan 2004 00:15:40 -0000 1.3
***************
*** 2,6 ****
# ) (\_ # WOLFPACK 13.0.0 Scripts #
# (( _/{ "-; # Created by: DarkStorm #
! # )).-' {{ ;'` # Revised by: #
# ( ( ;._ \\ ctr # Last Modification: Created #
#################################################################
--- 2,6 ----
# ) (\_ # WOLFPACK 13.0.0 Scripts #
# (( _/{ "-; # Created by: DarkStorm #
! # )).-' {{ ;'` # Revised by: Dreoth #
# ( ( ;._ \\ ctr # Last Modification: Created #
#################################################################
***************
*** 8,14 ****
# wool
import wolfpack
! import wolfpack.utilities
! ids = [ 0x10a4, 0x10a5, 0x1015, 0x1016, 0x101c, 0x101d, 0x1019, 0x101a ]
def onUse( char, item ):
--- 8,16 ----
# wool
import wolfpack
! from wolfpack.utilities import *
! from wolfpack.consts import *
! ids = [ 0x10a4, 0x1015, 0x101c, 0x1019 ]
! animids = [ 0x10a5, 0x1016, 0x101d, 0x101a ]
def onUse( char, item ):
***************
*** 16,24 ****
if item.getoutmostchar() != char:
char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! return 1
char.socket.clilocmessage( 0x7AB7F ) # What spinning wheel do you wish to spin this on?
char.socket.attachtarget( "wool.response", [ item.serial ] )
! return 1
--- 18,26 ----
if item.getoutmostchar() != char:
char.socket.clilocmessage( 0x7A258 ) # You can't reach...
! return OK
char.socket.clilocmessage( 0x7AB7F ) # What spinning wheel do you wish to spin this on?
char.socket.attachtarget( "wool.response", [ item.serial ] )
! return OK
***************
*** 33,52 ****
if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! return 1
if abs( char.pos.z - target.pos.z ) > 5:
char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! return 1
# Check target (only item targets valid)
if not target.item:
char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
! return 1
if target.item.id in ids:
! # action
! # soundeffect
! char.action( 0x9 )
! char.soundeffect( 0x2c4 )
if ( item.amount > 1 ):
item.amount = item.amount -1
--- 35,51 ----
if ( ( char.pos.x-target.pos.x )**2 + ( char.pos.y-target.pos.y )**2 > 4):
char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! return OK
if abs( char.pos.z - target.pos.z ) > 5:
char.socket.clilocmessage( 0x7A247 ) # You are too far away to do that.
! return OK
# Check target (only item targets valid)
if not target.item:
char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
! return OK
if target.item.id in ids:
!
if ( item.amount > 1 ):
item.amount = item.amount -1
***************
*** 55,64 ****
item.delete()
! item_new = wolfpack.additem( "e1d" )
! item_new.amount = 3
! if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
! item_new.update()
else:
char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
! return
--- 54,108 ----
item.delete()
! # Spinning Wheel Animations
! if target.item.id == ids[0]:
! target.item.id = animids[0]
! target.item.update()
! elif target.item.id == ids[1]:
! target.item.id = animids[1]
! target.item.update()
! elif target.item.id == ids[2]:
! target.item.id = animids[2]
! target.item.update()
! elif target.item.id == ids[3]:
! target.item.id = animids[3]
! target.item.update()
+ wheel = wolfpack.finditem( target.item.serial )
+ processtime = 5000 # 5 Seconds
+ wolfpack.addtimer( processtime, "wool.ProcessTimer", [char, wheel] )
+
+ elif target.item.id in animids:
+ char.socket.sysmessage( 'This spinning wheel is currently in use.' )
+ return OK
+
else:
char.socket.clilocmessage( 0x7AB82 ) # Use that on a spinning wheel.
! return OK
!
! def ProcessTimer( time, args ):
! char = args[0]
! wheel = args[1]
! GetYarn( char, wheel )
! return OK
!
! def GetYarn( char, wheel ):
! # End the animations.
! if wheel.id == animids[0]:
! wheel.id = ids[0]
! wheel.update()
! elif wheel.id == animids[1]:
! wheel.id = ids[1]
! wheel.update()
! elif wheel.id == animids[2]:
! wheel.id = ids[2]
! wheel.update()
! elif wheel.id == animids[3]:
! wheel.id = ids[3]
! wheel.update()
!
! item_new = wolfpack.additem( 'e1d' ) # Yarn balls
! item_new.amount = 3
! if not wolfpack.utilities.tocontainer( item_new, char.getbackpack() ):
! item_new.update()
! char.socket.sysmessage( 'You put the yarn into your backpack.' )
! return OK
\ No newline at end of file
|
|
From: <thi...@us...> - 2004-01-13 19:17:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1:/tmp/cvs-serv28043 Modified Files: __init__.py Log Message: Fix: wolfpack.statics() was ignoring the last optional param ( exact ) Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/__init__.py,v retrieving revision 1.35 retrieving revision 1.36 diff -C2 -d -r1.35 -r1.36 *** __init__.py 8 Oct 2003 01:56:41 -0000 1.35 --- __init__.py 13 Jan 2004 19:17:15 -0000 1.36 *************** *** 66,70 **** raise TypeError, "x, y and map need to be integer values" else: ! return _wolfpack.statics( x, y, map, range ) def items( x, y, map, range=1 ): --- 66,71 ---- raise TypeError, "x, y and map need to be integer values" else: ! return _wolfpack.statics( x, y, map, exact ) ! #statics = _wolfpack.statics def items( x, y, map, range=1 ): *************** *** 160,166 **** return _wolfpack.tiledata( id ) - def statics( x, y, map ): - return _wolfpack.statics( x, y, map ) - def newnpc( createserial = 0 ): return _wolfpack.newnpc( createserial ) --- 161,164 ---- |
|
From: <dr...@us...> - 2004-01-13 15:39:03
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands
In directory sc8-pr-cvs1:/tmp/cvs-serv3647
Modified Files:
info.py
Log Message:
This might work better with the timeunused problem, made it a tag for now...
Index: info.py
===================================================================
RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/commands/info.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** info.py 28 Nov 2003 11:53:04 -0000 1.13
--- info.py 13 Jan 2004 15:39:00 -0000 1.14
***************
*** 665,669 ****
gump.addText( 50, 140, "Time unused:", 0x834 )
! gump.addInputField( 200, 140, 200, 16, 0x834, 32, str( item.timeunused ) )
gump.addText( 310, 340, "Page "+str( page_ )+" of "+str( pages ), 0x834 )
--- 665,672 ----
gump.addText( 50, 140, "Time unused:", 0x834 )
! if ( item.hastag( 'timeunused' ) ):
! gump.addInputField( 200, 140, 200, 16, 0x834, 32, str( item.gettag( 'timeunused' ) ) )
! else:
! gump.addInputField( 200, 140, 200, 16, 0x834, 32, '' )
gump.addText( 310, 340, "Page "+str( page_ )+" of "+str( pages ), 0x834 )
***************
*** 748,752 ****
item.disabled = int( hex2dec( textentries[ key ] ) )
elif key == 32:
! item.timeunused = int( hex2dec( textentries[ key ] ) )
if choice.button == 1:
--- 751,759 ----
item.disabled = int( hex2dec( textentries[ key ] ) )
elif key == 32:
! if ( textentries[ key ] == '' ):
! if ( item.hastag('timeunused') ):
! item.deltag('timeunused')
! else:
! item.settag( 'timeunused', int( hex2dec( textentries[ key ] ) ) )
if choice.button == 1:
***************
*** 754,758 ****
return 1
!
!
!
--- 761,763 ----
return 1
!
|
|
From: <as...@us...> - 2004-01-12 23:25:26
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1:/tmp/cvs-serv23022 Modified Files: barber.py Log Message: fixed a typo Index: barber.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/barber.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** barber.py 23 Sep 2003 12:22:46 -0000 1.8 --- barber.py 12 Jan 2004 23:25:23 -0000 1.9 *************** *** 44,48 **** if speaker.id != 0x190 and speaker.id != 0x191: ! listener.say( "I can't cat your hair!",5 ) return 1 --- 44,48 ---- if speaker.id != 0x190 and speaker.id != 0x191: ! listener.say( "I can't cut your hair!",5 ) return 1 |
|
From: <as...@us...> - 2004-01-12 21:19:48
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1:/tmp/cvs-serv25647/web Modified Files: index.html login.py logout.py Log Message: use xhtml 1.0 strict on some pages Index: index.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/index.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** index.html 12 Jan 2004 21:12:29 -0000 1.2 --- index.html 12 Jan 2004 21:19:44 -0000 1.3 *************** *** 1,5 **** <html> <head> ! <meta http-equiv="refresh" content="0; URL=login.py"> </head> <body> --- 1,7 ---- + <?xml version="1.0" encoding="iso-8859-1" ?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/strict.dtd"> <html> <head> ! <meta http-equiv="refresh" content="0; URL=login.py" /> </head> <body> Index: login.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/login.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** login.py 12 Jan 2004 21:12:29 -0000 1.3 --- login.py 12 Jan 2004 21:19:44 -0000 1.4 *************** *** 69,79 **** print "Content-type: text/html\n\n" print """ <html> <head> <title>You were logged in succesfully</title> ! <meta http-equiv="refresh" content="1; URL=main.py?session=""" + session + """"> </head> <body> ! <h1>You were logged in successfully</h1><br> Click <a href="main.py?session=""" + session + """">here</a> to continue. </body> --- 69,81 ---- print "Content-type: text/html\n\n" print """ + <?xml version="1.0" encoding="iso-8859-1" ?> + <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/strict.dtd"> <html> <head> <title>You were logged in succesfully</title> ! <meta http-equiv="refresh" content="1; URL=main.py?session=""" + session + """" /> </head> <body> ! <h1>You were logged in successfully</h1><br /> Click <a href="main.py?session=""" + session + """">here</a> to continue. </body> Index: logout.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/logout.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** logout.py 5 Jan 2003 18:57:41 -0000 1.1 --- logout.py 12 Jan 2004 21:19:44 -0000 1.2 *************** *** 11,13 **** web.sessions.destroy_session( session_id ) ! web.template.output( '> <a href="login.py" class="header">Login</a>', '', 0, 'Your have been logged out.<br />Click <a href="login.py">here</a> to return to the login page.', '' ) --- 11,13 ---- web.sessions.destroy_session( session_id ) ! web.template.output( '> <a href="login.py" class="header">Login</a>', '', 0, 'You have been logged out.<br />Click <a href="login.py">here</a> to return to the login page.', '' ) |
|
From: <as...@us...> - 2004-01-12 21:12:32
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1:/tmp/cvs-serv23408/web Modified Files: index.html login.py Log Message: killed off some ugly javascript Index: index.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/index.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** index.html 5 Jan 2003 18:57:41 -0000 1.1 --- index.html 12 Jan 2004 21:12:29 -0000 1.2 *************** *** 1,5 **** ! <script language="JavaScript"> ! <!-- ! window.location.href = 'login.py' ! // --> ! </script> \ No newline at end of file --- 1,8 ---- ! <html> ! <head> ! <meta http-equiv="refresh" content="0; URL=login.py"> ! </head> ! <body> ! if you are not forwarded, please follow <a href="login.py">this</a> link. ! </body> ! </html> Index: login.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/login.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** login.py 30 Nov 2003 18:16:00 -0000 1.2 --- login.py 12 Jan 2004 21:12:29 -0000 1.3 *************** *** 67,79 **** session = web.sessions.start_session( username ) print """ <html> <head> <title>You were logged in succesfully</title> ! <script language="JavaScript"> ! <!-- ! window.location.href = 'main.py?session=""" + session + """'; ! // --> ! </script> </head> <body> --- 67,76 ---- session = web.sessions.start_session( username ) + print "Content-type: text/html\n\n" print """ <html> <head> <title>You were logged in succesfully</title> ! <meta http-equiv="refresh" content="1; URL=main.py?session=""" + session + """"> </head> <body> |
|
From: <as...@us...> - 2004-01-12 20:33:20
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv11869
Modified Files:
uobject.cpp
Log Message:
applied patch from Varan Dar
Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** uobject.cpp 17 Dec 2003 12:10:58 -0000 1.120
--- uobject.cpp 12 Jan 2004 20:33:15 -0000 1.121
***************
*** 261,266 ****
// i is the count of real elements in the old array
cPythonScript **newScriptChain = new cPythonScript* [ count + 1 ];
! memcpy( newScriptChain, scriptChain, count * sizeof( cPythonScript* ) );
! newScriptChain[ count ] = Event;
newScriptChain[ 0 ] = reinterpret_cast< cPythonScript* >( count + 1 );
--- 261,266 ----
// i is the count of real elements in the old array
cPythonScript **newScriptChain = new cPythonScript* [ count + 1 ];
! memcpy( newScriptChain, scriptChain, (count+1) * sizeof( cPythonScript* ) );
! newScriptChain[ count+1 ] = Event;
newScriptChain[ 0 ] = reinterpret_cast< cPythonScript* >( count + 1 );
***************
*** 297,304 ****
unsigned int pos = 1;
! cPythonScript **newScriptChain = new cPythonScript*[ count - 1 ];
newScriptChain[0] = reinterpret_cast< cPythonScript* >( count - 1 );
! for( unsigned int i = 1; i <= count; ++i )
{
if( scriptChain[i]->name() != name )
--- 297,304 ----
unsigned int pos = 1;
! cPythonScript **newScriptChain = new cPythonScript*[ count ];
newScriptChain[0] = reinterpret_cast< cPythonScript* >( count - 1 );
! for( unsigned int i = 1; i < count; ++i )
{
if( scriptChain[i]->name() != name )
***************
*** 377,383 ****
// i is the count of real elements in the old array
! cPythonScript **newScriptChain = new cPythonScript* [ count + 1 ];
! memcpy( newScriptChain, scriptChain, count * sizeof( cPythonScript* ) );
! newScriptChain[ count ] = Event;
newScriptChain[ 0 ] = reinterpret_cast< cPythonScript* >( count + 1 );
--- 377,383 ----
// i is the count of real elements in the old array
! cPythonScript **newScriptChain = new cPythonScript* [ count + 2 ];
! memcpy( newScriptChain, scriptChain, (count+1) * sizeof( cPythonScript* ) );
! newScriptChain[ count+1 ] = Event;
newScriptChain[ 0 ] = reinterpret_cast< cPythonScript* >( count + 1 );
|
|
From: <as...@us...> - 2004-01-12 17:25:01
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv26657
Modified Files:
configure
Log Message:
added possibiblity to disable mysql support
Index: configure
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/configure,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** configure 11 Jan 2004 05:03:16 -0000 1.4
--- configure 12 Jan 2004 17:24:56 -0000 1.5
***************
*** 7,11 ****
#################################################################
! # TODO: check for dependencies like "seq".
ask_path()
--- 7,23 ----
#################################################################
! # seq replacement (not all distributions include seq)
! #wp_seq()
! #{
! # FIRST="$1";
! # LAST="$2";
! # while [ "$FIRST" -le "$LAST" ];
! # do
! # echo "$FIRST";
! # FIRST="$(expr $FIRST + 1)";
! # done;
! #}
!
! # aszlig: weird, i thought i used seq!?
ask_path()
***************
*** 18,22 ****
echo -en "\e[A\rPlease enter the correct include directory: ";
read SUPPLIED_PATH;
! if [ "$SUPPLIED_PATH" = "" ]; then
break;
fi
--- 30,34 ----
echo -en "\e[A\rPlease enter the correct include directory: ";
read SUPPLIED_PATH;
! if [ ! "$SUPPLIED_PATH" = "" ]; then
break;
fi
***************
*** 24,43 ****
}
! # <mysql>
! echo -n "Searching for MySQL includes... ";
! MYSQLINC=$(mysql_config --cflags|cut -d\' -f2);
! if ! [ "$MYSQLINC" ];
! then
! ask_path;
! MYSQLINC="$SUPPLIED_PATH";
! if ! [ "$MYSQLINC" ]; then
! echo "MySQL support disabled ";
! fi
! else
! echo "$MYSQLINC";
fi;
- # </mysql>
# <python>
--- 36,58 ----
}
! if [ "$1" != "--disable-mysql" ]
! then
! # <mysql>
! echo -n "Searching for MySQL includes... ";
! MYSQLINC=$(mysql_config --cflags|cut -d\' -f2);
! if ! [ "$MYSQLINC" ];
! then
! ask_path;
! MYSQLINC="$SUPPLIED_PATH";
! if [ ! "$MYSQLINC" ]; then
! echo "MySQL support disabled ";
! fi
! else
! echo "$MYSQLINC";
! fi;
! # </mysql>
fi;
# <python>
|
|
From: <thi...@us...> - 2004-01-12 05:03:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1:/tmp/cvs-serv24543 Modified Files: archery_butte.py moongate.py pickpocket_dip.py Log Message: Fix bugs pointed out by Naddel Index: archery_butte.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/archery_butte.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** archery_butte.py 15 Mar 2003 19:50:35 -0000 1.4 --- archery_butte.py 12 Jan 2004 05:02:59 -0000 1.5 *************** *** 104,108 **** # If we've already learned all we can > cancel. ! if( char.baseskill[ ARCHERY ] >= 300 ): char.message( "You can learn much from a dummy but you have already learned it all." ) return 1 --- 104,108 ---- # 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 1 *************** *** 127,131 **** ! wolfpack.movingeffect( movingeff, char, item ) --- 127,131 ---- ! char.movingeffect( movingeff, item, 1, 1, 1, 0, 1 ) Index: moongate.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/moongate.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** moongate.py 7 Mar 2003 17:41:28 -0000 1.8 --- moongate.py 12 Jan 2004 05:02:59 -0000 1.9 *************** *** 20,24 **** return 1 ! def onCollideItem( char, item ): # npc would not travel through moongate ;) if( char.npc ): --- 20,24 ---- return 1 ! def onCollide( char, item ): # npc would not travel through moongate ;) if( char.npc ): Index: pickpocket_dip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/pickpocket_dip.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pickpocket_dip.py 11 Aug 2002 14:33:55 -0000 1.1 --- pickpocket_dip.py 12 Jan 2004 05:02:59 -0000 1.2 *************** *** 14,18 **** def onUse( char, item ): # If we've already learned all we can > cancel. ! if( char.baseskill[ STEALING ] >= 600 ): char.message( "Go search for real people." ) return 1 --- 14,18 ---- def onUse( char, item ): # If we've already learned all we can > cancel. ! if( char.skill[ STEALING ] >= 600 ): char.message( "Go search for real people." ) return 1 |
|
From: <thi...@us...> - 2004-01-12 05:03:02
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1:/tmp/cvs-serv24543/wolfpack Modified Files: utilities.py Log Message: Fix bugs pointed out by Naddel Index: utilities.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/utilities.py,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** utilities.py 25 Nov 2003 18:54:12 -0000 1.22 --- utilities.py 12 Jan 2004 05:02:59 -0000 1.23 *************** *** 30,35 **** # Calculate the resistances ! chance1 = floor( defender.baseskill[ MAGICRESISTANCE ] / 5 ) ! chance2 = floor( defender.baseskill[ MAGICRESISTANCE ] - ( mage.baseskill[ MAGERY ] / 5 + circle * 5 ) ) chance = max( [ chance1, chance2 ] ) # The higher chance is used --- 30,35 ---- # Calculate the resistances ! chance1 = floor( defender.skill[ MAGICRESISTANCE ] / 5 ) ! chance2 = floor( defender.skill[ MAGICRESISTANCE ] - ( mage.skill[ MAGERY ] / 5 + circle * 5 ) ) chance = max( [ chance1, chance2 ] ) # The higher chance is used *************** *** 48,55 **** # If your resistance is lower than your opponents evaluate intelligence, then the equation is: #(1 + (Attackers_EI - Your_resistance) / 500 ) ! if( defender.baseskill[ MAGICRESISTANCE ] > mage.baseskill[ EVALUATINGINTEL ] ): ! damage = damage * ( 1 + ( mage.baseskill[ EVALUATINGINTEL ] - defender.baseskill[ MAGICRESISTANCE ] ) / 200 ) else: ! damage = damage * ( 1 + ( mage.baseskill[ EVALUATINGINTEL ] - defender.baseskill[ MAGICRESISTANCE ] ) / 500 ) return damage --- 48,55 ---- # If your resistance is lower than your opponents evaluate intelligence, then the equation is: #(1 + (Attackers_EI - Your_resistance) / 500 ) ! if( defender.skill[ MAGICRESISTANCE ] > mage.skill[ EVALUATINGINTEL ] ): ! damage = damage * ( 1 + ( mage.skill[ EVALUATINGINTEL ] - defender.skill[ MAGICRESISTANCE ] ) / 200 ) else: ! damage = damage * ( 1 + ( mage.skill[ EVALUATINGINTEL ] - defender.skill[ MAGICRESISTANCE ] ) / 500 ) return damage |
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship In directory sc8-pr-cvs1:/tmp/cvs-serv24047/items/weaponry/swordsmanship Modified Files: bardiche.xml bladed_staff.xml bone_harvester.xml broadsword.xml butcher_knife.xml cleaver.xml crescent_blade.xml cutlass.xml halberd.xml katana.xml long_sword.xml longsword.xml paladin_sword.xml scimitar.xml scythe.xml skinning_knife.xml viking_sword.xml Log Message: Fix bugs pointed out by Naddel Index: bardiche.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bardiche.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bardiche.xml 27 Dec 2003 15:26:59 -0000 1.1 --- bardiche.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="45" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Bardiche (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="45" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Bardiche (N/S)</category> </item> Index: bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bladed_staff.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bladed_staff.xml 27 Dec 2003 15:33:10 -0000 1.1 --- bladed_staff.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="40" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Bladed Staff (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="40" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Bladed Staff (N/S)</category> </item> Index: bone_harvester.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/bone_harvester.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bone_harvester.xml 27 Dec 2003 15:26:59 -0000 1.1 --- bone_harvester.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Bone Harvester (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Bone Harvester (N/S)</category> </item> Index: broadsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/broadsword.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** broadsword.xml 27 Dec 2003 15:26:59 -0000 1.1 --- broadsword.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="30" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Broadsword (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="30" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Broadsword (N/S)</category> </item> Index: butcher_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/butcher_knife.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** butcher_knife.xml 27 Dec 2003 15:26:59 -0000 1.1 --- butcher_knife.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="5" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Butcher Knife (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="5" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Butcher Knife (N/S)</category> </item> Index: cleaver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cleaver.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cleaver.xml 27 Dec 2003 15:26:59 -0000 1.1 --- cleaver.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="10" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Cleaver (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="10" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Cleaver (N/S)</category> </item> Index: crescent_blade.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/crescent_blade.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** crescent_blade.xml 27 Dec 2003 15:26:59 -0000 1.1 --- crescent_blade.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="55" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Crescent Blade (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="55" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Crescent Blade (N/S)</category> </item> Index: cutlass.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cutlass.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** cutlass.xml 27 Dec 2003 15:26:59 -0000 1.1 --- cutlass.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Cutlass (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Cutlass (N/S)</category> </item> Index: halberd.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/halberd.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** halberd.xml 27 Dec 2003 15:26:59 -0000 1.1 --- halberd.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="95" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Halberd (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="95" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Halberd (N/S)</category> </item> Index: katana.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/katana.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** katana.xml 27 Dec 2003 15:26:59 -0000 1.1 --- katana.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Katana (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Katana (N/S)</category> </item> Index: long_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/long_sword.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** long_sword.xml 27 Dec 2003 15:26:59 -0000 1.1 --- long_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="35" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Long Sword (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="35" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Long Sword (N/S)</category> </item> Index: longsword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/longsword.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** longsword.xml 27 Dec 2003 15:26:59 -0000 1.1 --- longsword.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="35" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Longsword (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="35" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Longsword (N/S)</category> </item> Index: paladin_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/paladin_sword.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** paladin_sword.xml 27 Dec 2003 15:26:59 -0000 1.1 --- paladin_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="30" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Paladin Sword (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="30" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Paladin Sword (N/S)</category> </item> Index: scimitar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scimitar.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scimitar.xml 27 Dec 2003 15:26:59 -0000 1.1 --- scimitar.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Scimitar (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="25" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Scimitar (N/S)</category> </item> Index: scythe.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/scythe.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** scythe.xml 27 Dec 2003 15:26:59 -0000 1.1 --- scythe.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="45" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Scythe (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="45" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Scythe (N/S)</category> </item> Index: skinning_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/skinning_knife.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** skinning_knife.xml 27 Dec 2003 15:26:59 -0000 1.1 --- skinning_knife.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="5" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Skinning Knive (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="5" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Skinning Knive (N/S)</category> </item> Index: viking_sword.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/viking_sword.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** viking_sword.xml 27 Dec 2003 15:26:59 -0000 1.1 --- viking_sword.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 17,21 **** <tag name="req_str" value="40" type="int" /> <type>1001</type> ! <events>equipment,weapons_blades</events> <category>Weapons\Swords\Viking Sword (N/S)</category> </item> --- 17,21 ---- <tag name="req_str" value="40" type="int" /> <type>1001</type> ! <events>equipment,weapons.blades</events> <category>Weapons\Swords\Viking Sword (N/S)</category> </item> |
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing In directory sc8-pr-cvs1:/tmp/cvs-serv24047/items/weaponry/fencing Modified Files: dagger.xml double_bladed_staff.xml kryss.xml lance.xml pike.xml pitchfork.xml short_spear.xml spear.xml war_fork.xml Log Message: Fix bugs pointed out by Naddel Index: dagger.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/dagger.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** dagger.xml 27 Dec 2003 15:26:59 -0000 1.1 --- dagger.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>1.0</weight> <tag name="req_str" value="10" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="10" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Dagger (N/S)</category> Index: double_bladed_staff.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/double_bladed_staff.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** double_bladed_staff.xml 27 Dec 2003 15:26:59 -0000 1.1 --- double_bladed_staff.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>7.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> --- 16,20 ---- <weight>7.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Double Bladed Staff (N/S)</category> Index: kryss.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/kryss.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** kryss.xml 27 Dec 2003 15:26:59 -0000 1.1 --- kryss.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>1.0</weight> <tag name="req_str" value="10" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="10" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Kryss (N/S)</category> Index: lance.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/lance.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** lance.xml 27 Dec 2003 15:26:59 -0000 1.1 --- lance.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>12.0</weight> <tag name="req_str" value="95" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> --- 16,20 ---- <weight>12.0</weight> <tag name="req_str" value="95" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Lance (N/S)</category> Index: pike.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pike.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pike.xml 27 Dec 2003 15:26:59 -0000 1.1 --- pike.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>10.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> --- 16,20 ---- <weight>10.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Pike (N/S)</category> Index: pitchfork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/pitchfork.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** pitchfork.xml 27 Dec 2003 15:26:59 -0000 1.1 --- pitchfork.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>10.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> --- 16,20 ---- <weight>10.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Pitchfork (N/S)</category> Index: short_spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/short_spear.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** short_spear.xml 27 Dec 2003 15:26:59 -0000 1.1 --- short_spear.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>4.0</weight> <tag name="req_str" value="40" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> --- 16,20 ---- <weight>4.0</weight> <tag name="req_str" value="40" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Short Spear (N/S)</category> Index: spear.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/spear.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** spear.xml 27 Dec 2003 15:26:59 -0000 1.1 --- spear.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>7.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> --- 16,20 ---- <weight>7.0</weight> <tag name="req_str" value="50" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\Spear (N/S)</category> Index: war_fork.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/fencing/war_fork.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** war_fork.xml 27 Dec 2003 15:26:59 -0000 1.1 --- war_fork.xml 12 Jan 2004 05:00:49 -0000 1.2 *************** *** 16,20 **** <weight>1.0</weight> <tag name="req_str" value="35" type="int" /> ! <events>equipment,weapons_blades</events> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> --- 16,20 ---- <weight>1.0</weight> <tag name="req_str" value="35" type="int" /> ! <events>equipment,weapons.blades</events> <type>1005</type> <category>Weapons\Fencing\War Fork (N/S)</category> |
|
From: <thi...@us...> - 2004-01-12 05:00:52
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1:/tmp/cvs-serv24047/items/professions Modified Files: thieve.xml Log Message: Fix bugs pointed out by Naddel Index: thieve.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/thieve.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** thieve.xml 26 Dec 2002 00:04:35 -0000 1.1 --- thieve.xml 12 Jan 2004 05:00:48 -0000 1.2 *************** *** 38,41 **** --- 38,42 ---- <item id="1ec1"> <id>0x1ec1</id> + <events>pickpocket_dip</events> <category>Professions\Thieve\Pickpocket Dip (Animated)</category> </item> |
|
From: <thi...@us...> - 2004-01-12 04:59:31
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1:/tmp/cvs-serv23681 Modified Files: uosocket.cpp Log Message: no message Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.300 retrieving revision 1.301 diff -C2 -d -r1.300 -r1.301 *** uosocket.cpp 5 Jan 2004 06:25:38 -0000 1.300 --- uosocket.cpp 12 Jan 2004 04:59:28 -0000 1.301 *************** *** 627,636 **** break; case cAccounts::BadPassword: ! denyPacket.setReason( DL_BADPASSWORD ); break; case cAccounts::Wipped: case cAccounts::Banned: ! denyPacket.setReason( DL_BLOCKED ); break; case cAccounts::AlreadyInUse: ! denyPacket.setReason( DL_INUSE ); break; }; --- 627,642 ---- break; case cAccounts::BadPassword: ! log( QString( "Failed to log in as '%1', wrong password\n" ).arg( username ) ); ! denyPacket.setReason( DL_BADPASSWORD ); ! break; case cAccounts::Wipped: case cAccounts::Banned: ! log( QString( "Failed to log in as '%1', Wipped/Banned account\n" ).arg( username ) ); ! denyPacket.setReason( DL_BLOCKED ); ! break; case cAccounts::AlreadyInUse: ! log( QString( "Failed to log in as '%1', account is already in use\n" ).arg( username ) ); ! denyPacket.setReason( DL_INUSE ); ! break; }; |
|
From: <thi...@us...> - 2004-01-12 04:58:18
|
Update of /cvsroot/wpdev/wolfpack/python
In directory sc8-pr-cvs1:/tmp/cvs-serv23531
Modified Files:
gump.h item.cpp
Log Message:
fixed item.settag() from python script interface. This will fix books and maybe several other thing
Index: gump.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** gump.h 10 Jun 2003 00:55:24 -0000 1.9
--- gump.h 12 Jan 2004 04:58:15 -0000 1.10
***************
*** 93,97 ****
};
! PyObject *PyGetGumpResponse( gumpChoice_st &response )
{
wpGumpResponse *returnVal = PyObject_New( wpGumpResponse, &wpGumpResponseType );
--- 93,97 ----
};
! PyObject *PyGetGumpResponse( const gumpChoice_st &response )
{
wpGumpResponse *returnVal = PyObject_New( wpGumpResponse, &wpGumpResponseType );
***************
*** 120,124 ****
}
! void handleResponse( cUOSocket* socket, gumpChoice_st choice )
{
// Call the response function (and pass it a response-object)
--- 120,124 ----
}
! void handleResponse( cUOSocket* socket, const gumpChoice_st& choice )
{
// Call the response function (and pass it a response-object)
Index: item.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** item.cpp 30 Sep 2003 15:06:30 -0000 1.77
--- item.cpp 12 Jan 2004 04:58:15 -0000 1.78
***************
*** 369,386 ****
return PyFalse;
! if( PyTuple_Size( args ) < 1 || !checkArgStr( 0 ) || ( !checkArgStr( 1 ) && !checkArgInt( 1 ) ) )
{
! PyErr_BadArgument();
! return NULL;
}
!
! QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
self->pItem->removeTag( key );
! if( checkArgStr( 1 ) )
! self->pItem->setTag( key, cVariant( QString( getArgStr( 1 ) ) ) );
! else if( checkArgInt( 1 ) )
! self->pItem->setTag( key, cVariant( (int)getArgInt( 1 ) ) );
return PyTrue;
--- 369,390 ----
return PyFalse;
! char* pKey = 0, *pTag = 0;
! int iTag;
! cVariant tag;
! if( PyArg_ParseTuple( args, "ss:item.settag( key, tag )", &pKey, &pTag ) )
{
! tag = cVariant( QString( pTag ) );
}
! else if ( PyArg_ParseTuple( args, "si:item.settag( key, tag )", &pKey, &iTag ) )
! {
! tag = cVariant( iTag );
! }else
! return 0;
!
! QString key = pKey;
self->pItem->removeTag( key );
! self->pItem->setTag( key, tag );
return PyTrue;
***************
*** 395,405 ****
return PyFalse;
! if( PyTuple_Size( args ) < 1 || !checkArgStr( 0 ) )
! {
! PyErr_BadArgument();
! return NULL;
! }
! QString key = PyString_AsString( PyTuple_GetItem( args, 0 ) );
return self->pItem->getTag( key ).isValid() ? PyTrue : PyFalse;
--- 399,407 ----
return PyFalse;
! char* pKey = 0;
! if ( !PyArg_ParseTuple( args, "s:item.hastag( key )", &pKey ) )
! return 0;
! QString key = pKey;
return self->pItem->getTag( key ).isValid() ? PyTrue : PyFalse;
|
|
From: <thi...@us...> - 2004-01-11 05:03:23
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1:/tmp/cvs-serv32004 Modified Files: configure globals.h platform.h Log Message: Few Linux clean-ups Index: configure =================================================================== RCS file: /cvsroot/wpdev/wolfpack/configure,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** configure 3 Nov 2003 01:17:09 -0000 1.3 --- configure 11 Jan 2004 05:03:16 -0000 1.4 *************** *** 18,21 **** --- 18,24 ---- echo -en "\e[A\rPlease enter the correct include directory: "; read SUPPLIED_PATH; + if [ "$SUPPLIED_PATH" = "" ]; then + break; + fi done; } *************** *** 30,33 **** --- 33,39 ---- ask_path; MYSQLINC="$SUPPLIED_PATH"; + if ! [ "$MYSQLINC" ]; then + echo "MySQL support disabled "; + fi else echo "$MYSQLINC"; Index: globals.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/globals.h,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** globals.h 7 Jan 2004 03:09:09 -0000 1.79 --- globals.h 11 Jan 2004 05:03:16 -0000 1.80 *************** *** 43,50 **** #include <list> - #if defined(__unix__) - #include <termios.h> - #endif - // Forward Class Declaration class QDateTime; --- 43,46 ---- Index: platform.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/platform.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** platform.h 6 Jan 2004 22:30:06 -0000 1.12 --- platform.h 11 Jan 2004 05:03:18 -0000 1.13 *************** *** 83,95 **** #endif #endif - // Determine os we are one - #if defined(__unix__) - #define _POSIX - #else - #if !defined(WIN32) - #define WIN32 - #endif - #endif - //======================================================================== --- 83,86 ---- |
|
From: <thi...@us...> - 2004-01-11 04:54:10
|
Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv30342
Modified Files:
commands.cpp commands.h makemenus.cpp
Log Message:
Small code clean up, makes gcc happier.
Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.210
retrieving revision 1.211
diff -C2 -d -r1.210 -r1.211
*** commands.cpp 8 Jan 2004 23:43:57 -0000 1.210
--- commands.cpp 11 Jan 2004 04:54:07 -0000 1.211
***************
*** 90,94 ****
// Selects the right command Stub
! bool cCommands::dispatch( cUOSocket *socket, const QString &command, QStringList &arguments )
{
// Just in case we have been called directly
--- 90,94 ----
// Selects the right command Stub
! bool cCommands::dispatch( cUOSocket *socket, const QString &command, const QStringList &arguments )
{
// Just in case we have been called directly
***************
*** 117,121 ****
}
! for( UINT32 index = 0; commands[index].command; ++index )
if( command == commands[index].name )
{
--- 117,121 ----
}
! for( uint index = 0; commands[index].command; ++index )
if( command == commands[index].name )
{
***************
*** 200,204 ****
// .go x,y,z,[map] >> Go to those coordinates
// .go placename >> Go to that specific place
! void commandGo( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 200,204 ----
// .go x,y,z,[map] >> Go to those coordinates
// .go placename >> Go to that specific place
! void commandGo( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 253,257 ****
}
! void commandResurrect( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 253,257 ----
}
! void commandResurrect( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 261,265 ****
}
! void commandKill( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 261,265 ----
}
! void commandKill( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 269,273 ****
}
! void commandFix( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 269,273 ----
}
! void commandFix( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 277,281 ****
}
! void commandAddItem( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 277,281 ----
}
! void commandAddItem( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 293,297 ****
}
! void commandAddNpc( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 293,297 ----
}
! void commandAddNpc( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 309,313 ****
}
! void commandAdd( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 309,313 ----
}
! void commandAdd( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 341,345 ****
}
! void commandSet( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 341,345 ----
}
! void commandSet( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 351,356 ****
QString key = args[0];
- args.erase( args.begin() );
QString value = args.join( " " );
socket->sysMessage( tr( "Please select a target to 'set %1 %2' " ).arg( key ).arg( value ) );
--- 351,356 ----
QString key = args[0];
QString value = args.join( " " );
+ value = value.right( value.length() - key.length() - 1); // -1 because of the join() separator character
socket->sysMessage( tr( "Please select a target to 'set %1 %2' " ).arg( key ).arg( value ) );
***************
*** 358,362 ****
}
! void commandResend( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 358,362 ----
}
! void commandResend( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 367,371 ****
! void commandRemove( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(socket);
--- 367,371 ----
! void commandRemove( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(socket);
***************
*** 375,379 ****
}
! void commandAccount( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 375,379 ----
}
! void commandAccount( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 563,567 ****
! void commandTele( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(socket);
--- 563,567 ----
! void commandTele( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(socket);
***************
*** 571,575 ****
}
! void commandSave( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 571,575 ----
}
! void commandSave( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 579,583 ****
}
! void commandServerTime( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 579,583 ----
}
! void commandServerTime( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 586,590 ****
}
! void commandShow( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 586,590 ----
}
! void commandShow( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 593,597 ****
}
! void commandSpawnRegion( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 593,597 ----
}
! void commandSpawnRegion( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 738,742 ****
}
! void commandTags( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 738,742 ----
}
! void commandTags( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 804,808 ****
}
! void commandWho( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 804,808 ----
}
! void commandWho( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 813,817 ****
}
! void commandPages( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 813,817 ----
}
! void commandPages( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 832,836 ****
}
! void commandShutDown( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(socket);
--- 832,836 ----
}
! void commandShutDown( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(socket);
***************
*** 842,846 ****
}
! void commandStaff( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 842,846 ----
}
! void commandStaff( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 857,861 ****
}
! void commandReload( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 857,861 ----
}
! void commandReload( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 947,951 ****
}
! void commandMakeMenu( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 947,951 ----
}
! void commandMakeMenu( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 961,965 ****
}
! void commandAddEvent( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 961,965 ----
}
! void commandAddEvent( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 983,987 ****
}
! void commandRemoveEvent( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 983,987 ----
}
! void commandRemoveEvent( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 998,1002 ****
}
! void commandMove( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 998,1002 ----
}
! void commandMove( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1030,1034 ****
}
! void commandTile( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1030,1034 ----
}
! void commandTile( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1056,1060 ****
}
! void commandAllShow( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1056,1060 ----
}
! void commandAllShow( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1077,1081 ****
}
! void commandAllMove( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1077,1081 ----
}
! void commandAllMove( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1091,1097 ****
if( socket->player()->account()->isAllMove() )
! socket->sysMessage( tr( "AllMove = '1'" ) );
else
! socket->sysMessage( tr( "AllMove = '0'" ) );
// Resend the world to us
--- 1091,1097 ----
if( socket->player()->account()->isAllMove() )
! socket->sysMessage( tr( "AllMove is [enabled]" ) );
else
! socket->sysMessage( tr( "AllMove is [disabled]" ) );
// Resend the world to us
***************
*** 1099,1103 ****
}
! void commandShowSerials( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1099,1103 ----
}
! void commandShowSerials( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1118,1122 ****
}
! void commandRestock( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(args);
--- 1118,1122 ----
}
! void commandRestock( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(args);
***************
*** 1126,1130 ****
}
! void commandAllSkills( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1126,1130 ----
}
! void commandAllSkills( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1151,1155 ****
}
! void commandBroadcast( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(socket);
--- 1151,1155 ----
}
! void commandBroadcast( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(socket);
***************
*** 1158,1162 ****
}
! void commandInvis( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1158,1162 ----
}
! void commandInvis( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1177,1181 ****
}
! void commandPageNotify( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1177,1181 ----
}
! void commandPageNotify( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1193,1197 ****
// Change password for current account
! void commandPassword( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1193,1197 ----
// Change password for current account
! void commandPassword( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
***************
*** 1213,1217 ****
}
! void commandGmtalk( cUOSocket *socket, const QString &command, QStringList &args ) throw()
{
Q_UNUSED(command);
--- 1213,1217 ----
}
! void commandGmtalk( cUOSocket *socket, const QString &command, const QStringList &args ) throw()
{
Q_UNUSED(command);
Index: commands.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** commands.h 7 Jan 2004 05:01:30 -0000 1.15
--- commands.h 11 Jan 2004 04:54:07 -0000 1.16
***************
*** 46,50 ****
{
const char *name;
! void (*command)( cUOSocket*, const QString&, QStringList& );
};
--- 46,50 ----
{
const char *name;
! void (*command)( cUOSocket*, const QString&, const QStringList& );
};
***************
*** 67,71 ****
// Command processing system
void process( cUOSocket *socket, const QString &command );
! bool dispatch( cUOSocket *socket, const QString &command, QStringList &arguments );
QMap< QString, cAcl* >::const_iterator aclbegin() const { return _acls.begin(); }
--- 67,71 ----
// Command processing system
void process( cUOSocket *socket, const QString &command );
! bool dispatch( cUOSocket *socket, const QString &command, const QStringList &arguments );
QMap< QString, cAcl* >::const_iterator aclbegin() const { return _acls.begin(); }
Index: makemenus.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v
retrieving revision 1.61
retrieving revision 1.62
diff -C2 -d -r1.61 -r1.62
*** makemenus.cpp 8 Jan 2004 23:43:57 -0000 1.61
--- makemenus.cpp 11 Jan 2004 04:54:07 -0000 1.62
***************
*** 785,789 ****
else if ( name_ == "go" )
{
! void commandGo( cUOSocket *socket, const QString &command, QStringList &args ) throw();
commandGo( socket, "go", QStringList::split(" ", params) );
}
--- 785,789 ----
else if ( name_ == "go" )
{
! void commandGo( cUOSocket *socket, const QString &command, const QStringList &args ) throw();
commandGo( socket, "go", QStringList::split(" ", params) );
}
|
