wpdev-commits Mailing List for Wolfpack Emu (Page 164)
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...@pr...> - 2004-02-02 01:00:45
|
Update of /cvsroot/wpdev/xmlscripts/definitions/lists In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14496 Modified Files: names.xml Log Message: This should be more accurate in names, based off of http://www.zoope.com/about/about_names.html Index: names.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/lists/names.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** names.xml 20 Sep 2003 12:00:09 -0000 1.11 --- names.xml 2 Feb 2004 00:58:46 -0000 1.12 *************** *** 281,321 **** <list id="NAMES_MALE"> <item>Aaron</item> - <item>Aasin</item> - <item>Abbot</item> <item>Abbott</item> - <item>Abby</item> <item>Abdel</item> <item>Abdiel</item> - <item>Abel</item> - <item>Abella</item> [...7650 lines suppressed...] <item>Zia</item> <item>Ziazan</item> <item>Zigana</item> <item>Zila</item> <item>Zina</item> <item>Zinnia</item> <item>Zita</item> ! <item>Zizi</item> <item>Zoe</item> <item>Zola</item> <item>Zona</item> <item>Zora</item> <item>Zosia</item> <item>Zuleika</item> <item>Zulema</item> <item>Zuza</item> <item>Zuzanny</item> </list> <list id="NAMES_PIRATE_FEMALE"> <item>Aruj Barbarossa</item> |
|
From: <dar...@pr...> - 2004-02-02 00:25:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16459/deeds Modified Files: hairstyle.py Log Message: Adjusted cliloc messages. Index: hairstyle.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/hairstyle.py,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** hairstyle.py 2 Feb 2004 00:19:46 -0000 1.4 --- hairstyle.py 2 Feb 2004 00:23:07 -0000 1.5 *************** *** 10,13 **** --- 10,14 ---- def response(char, args, response): if response.button == 0: + char.socket.clilocmessage(1013009) return *************** *** 20,26 **** oldcolor = 0 if oldhair: oldcolor = oldhair.color ! oldhair.delete() newhair = None --- 21,31 ---- oldcolor = 0 + if not oldhair and response.button == 1: + char.socket.clilocmessage(1013010) + return + if oldhair: oldcolor = oldhair.color ! oldhair.delete() newhair = None *************** *** 51,54 **** --- 56,62 ---- def onUse(char, deed): + if char.id != 0x190 or char.id != 0x191: + char.socket.clilocmessage(1042298) + return 1 if not deed.container == char.getbackpack(): |
|
From: <dar...@pr...> - 2004-02-02 00:21:44
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13631/deeds Modified Files: hairstyle.py Log Message: Finished the barber script. Index: hairstyle.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/hairstyle.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** hairstyle.py 1 Feb 2004 23:55:51 -0000 1.3 --- hairstyle.py 2 Feb 2004 00:19:46 -0000 1.4 *************** *** 1,4 **** --- 1,5 ---- from wolfpack.gumps import cGump + from wolfpack.consts import * import wolfpack *************** *** 7,10 **** --- 8,53 ---- return 1 + def response(char, args, response): + if response.button == 0: + return + + deed = wolfpack.finditem(args[0]) + + if not deed or deed.container != char.getbackpack(): + char.socket.clilocmessage(1042001) + else: + oldhair = char.itemonlayer(LAYER_HAIR) + oldcolor = 0 + + if oldhair: + oldcolor = oldhair.color + oldhair.delete() + + newhair = None + + if response.button == 2: + newhair = wolfpack.additem("203b") + elif response.button == 3: + newhair = wolfpack.additem("203c") + elif response.button == 4: + newhair = wolfpack.additem("203d") + elif response.button == 5: + newhair = wolfpack.additem("2044") + elif response.button == 6: + newhair = wolfpack.additem("2045") + elif response.button == 7: + newhair = wolfpack.additem("2048") + elif response.button == 8: + newhair = wolfpack.additem("2049") + elif response.button == 9: + newhair = wolfpack.additem("204a") + + if newhair: + newhair.color = oldcolor + char.additem(LAYER_HAIR, newhair) + newhair.update() + + deed.delete() + def onUse(char, deed): *************** *** 12,16 **** char.socket.clilocmessage(1042001) else: ! gump = cGump(x=50, y=50) gump.addResizeGump(100, 10, 0xA28, 400, 385) --- 55,63 ---- char.socket.clilocmessage(1042001) else: ! char.socket.closegump(0x12feab08) ! ! gump = cGump(x=50, y=50, callback="deeds.hairstyle.response") ! gump.typeid = 0x12feab08 ! gump.setArgs([deed.serial]) gump.addResizeGump(100, 10, 0xA28, 400, 385) |
|
From: <dar...@pr...> - 2004-02-02 00:21:43
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13631/wolfpack Modified Files: gumps.py Log Message: Finished the barber script. Index: gumps.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/gumps.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** gumps.py 1 Feb 2004 23:57:23 -0000 1.13 --- gumps.py 2 Feb 2004 00:19:47 -0000 1.14 *************** *** 10,15 **** from types import * - - class cGump: def __init__(self, noclose=0, nomove=0, nodispose=0, x=0, y=0, callback="", args = [], type = 0, serial = 0): --- 10,13 ---- |
|
From: <dar...@pr...> - 2004-02-02 00:19:41
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11900/python Modified Files: gump.h Log Message: Fixed error reporting in gump callbacks. Index: gump.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/gump.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** gump.h 12 Jan 2004 04:58:15 -0000 1.10 --- gump.h 2 Feb 2004 00:17:45 -0000 1.11 *************** *** 144,152 **** PyTuple_SetItem( p_args, 1, args ); PyTuple_SetItem( p_args, 2, PyGetGumpResponse( choice ) ); - PyEval_CallObject( pFunc, p_args ); ! ! if( PyErr_Occurred() ) ! PyErr_Print(); } } --- 144,149 ---- PyTuple_SetItem( p_args, 1, args ); PyTuple_SetItem( p_args, 2, PyGetGumpResponse( choice ) ); PyEval_CallObject( pFunc, p_args ); ! reportPythonError( sModule ); } } |
|
From: <dar...@pr...> - 2004-02-01 23:59:20
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27648/wolfpack Modified Files: gumps.py Log Message: Barber changes. Index: gumps.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/gumps.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** gumps.py 1 Feb 2004 23:55:51 -0000 1.12 --- gumps.py 1 Feb 2004 23:57:23 -0000 1.13 *************** *** 10,13 **** --- 10,15 ---- from types import * + + class cGump: def __init__(self, noclose=0, nomove=0, nodispose=0, x=0, y=0, callback="", args = [], type = 0, serial = 0): *************** *** 37,48 **** # Dump the gump data ! file = open( 'dump.txt', 'w' ) ! file.write( "--------\nLayout:\n" ) ! for line in self.layout: ! file.write( line + "\n" ) ! file.write( "--------\nText:\n" ) ! for line in self.texts: ! file.write( line + "\n" ) ! file.close() if( self.noclose == 1 ): --- 39,50 ---- # Dump the gump data ! #file = open( 'dump.txt', 'w' ) ! #file.write( "--------\nLayout:\n" ) ! #for line in self.layout: ! # file.write( line + "\n" ) ! #file.write( "--------\nText:\n" ) ! #for line in self.texts: ! # file.write( line + "\n" ) ! #file.close() if( self.noclose == 1 ): |
|
From: <dar...@pr...> - 2004-02-01 23:57:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26222/deeds Modified Files: hairstyle.py Log Message: Barber changes. Index: hairstyle.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/hairstyle.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** hairstyle.py 1 Feb 2004 23:47:13 -0000 1.2 --- hairstyle.py 1 Feb 2004 23:55:51 -0000 1.3 *************** *** 16,62 **** gump.addResizeGump(100, 10, 0xA28, 400, 385) ! #gump.addXmfHtmlGump(100, 25, 400, 35, 1013008, 0, 0) ! #gump.addButton(175, 340, 0xFA5, 0xFA7, 0) ! #gump.addXmfHtmlGump(210, 342, 90, 35, 1011012, 0, 0) ! #gump.addResizeGump(220, 60, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 115, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 170, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 225, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 60, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 115, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 170, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 225, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 280, 0xA3C, 50, 50) ! #gump.addXmfHtmlGump( 150, 75, 80, 35, 1011052, 0, 0 ) # Short ! #gump.addXmfHtmlGump( 150, 130, 80, 35, 1011053, 0, 0 ) # Long ! #gump.addXmfHtmlGump( 150, 185, 80, 35, 1011054, 0, 0 ) # Ponytail ! #gump.addXmfHtmlGump( 150, 240, 80, 35, 1011055, 0, 0 ) # Mohawk ! #gump.addXmfHtmlGump( 355, 75, 80, 35, 1011047, 0, 0 ) # Pageboy ! #gump.addXmfHtmlGump( 355, 130, 80, 35, 1011048, 0, 0 ) # Receding ! #gump.addXmfHtmlGump( 355, 185, 80, 35, 1011049, 0, 0 ) # 2-tails ! #gump.addXmfHtmlGump( 355, 240, 80, 35, 1011050, 0, 0 ) # Topknot ! #gump.addXmfHtmlGump( 355, 295, 80, 35, 1011064, 0, 0 ) # Bald ! gump.addTilePic( 153, 20, 0xC60C ) ! #gump.addTilePic( 153, 65, 0xED24 ) ! #gump.addTilePic( 153, 120, 0xED1E ) ! #gump.addTilePic( 153, 185, 0xC60F ) ! #gump.addTilePic( 358, 18, 0xED26 ) ! #gump.addTilePic( 358, 75, 0xEDE5 ) ! #gump.addTilePic( 358, 120, 0xED23 ) ! #gump.addTilePic( 362, 190, 0xED29 ) ! #gump.addButton(118, 73, 0xFA5, 0xFA7, 2) ! #gump.addButton(118, 128, 0xFA5, 0xFA7, 3) ! #gump.addButton(118, 183, 0xFA5, 0xFA7, 4) ! #gump.addButton(118, 238, 0xFA5, 0xFA7, 5) ! #gump.addButton(323, 73, 0xFA5, 0xFA7, 6) ! #gump.addButton(323, 128, 0xFA5, 0xFA7, 7) ! #gump.addButton(323, 183, 0xFA5, 0xFA7, 8) ! #gump.addButton(323, 238, 0xFA5, 0xFA7, 9) ! #gump.addButton(323, 292, 0xFA5, 0xFA7, 1) gump.send(char) --- 16,62 ---- gump.addResizeGump(100, 10, 0xA28, 400, 385) ! gump.addXmfHtmlGump(100, 25, 400, 35, 1013008, 0, 0) ! gump.addButton(175, 340, 0xFA5, 0xFA7, 0) ! gump.addXmfHtmlGump(210, 342, 90, 35, 1011012, 0, 0) ! gump.addResizeGump(220, 60, 0xA3C, 50, 50) ! gump.addResizeGump(220, 115, 0xA3C, 50, 50) ! gump.addResizeGump(220, 170, 0xA3C, 50, 50) ! gump.addResizeGump(220, 225, 0xA3C, 50, 50) ! gump.addResizeGump(425, 60, 0xA3C, 50, 50) ! gump.addResizeGump(425, 115, 0xA3C, 50, 50) ! gump.addResizeGump(425, 170, 0xA3C, 50, 50) ! gump.addResizeGump(425, 225, 0xA3C, 50, 50) ! gump.addResizeGump(425, 280, 0xA3C, 50, 50) ! gump.addXmfHtmlGump( 150, 75, 80, 35, 1011052, 0, 0 ) # Short ! gump.addXmfHtmlGump( 150, 130, 80, 35, 1011053, 0, 0 ) # Long ! gump.addXmfHtmlGump( 150, 185, 80, 35, 1011054, 0, 0 ) # Ponytail ! gump.addXmfHtmlGump( 150, 240, 80, 35, 1011055, 0, 0 ) # Mohawk ! gump.addXmfHtmlGump( 355, 75, 80, 35, 1011047, 0, 0 ) # Pageboy ! gump.addXmfHtmlGump( 355, 130, 80, 35, 1011048, 0, 0 ) # Receding ! gump.addXmfHtmlGump( 355, 185, 80, 35, 1011049, 0, 0 ) # 2-tails ! gump.addXmfHtmlGump( 355, 240, 80, 35, 1011050, 0, 0 ) # Topknot ! gump.addXmfHtmlGump( 355, 295, 80, 35, 1011064, 0, 0 ) # Bald ! gump.addGump( 153, 20, 0xC60C ) ! gump.addGump( 153, 65, 0xED24 ) ! gump.addGump( 153, 120, 0xED1E ) ! gump.addGump( 153, 185, 0xC60F ) ! gump.addGump( 358, 18, 0xED26 ) ! gump.addGump( 358, 75, 0xEDE5 ) ! gump.addGump( 358, 120, 0xED23 ) ! gump.addGump( 362, 190, 0xED29 ) ! gump.addButton(118, 73, 0xFA5, 0xFA7, 2) ! gump.addButton(118, 128, 0xFA5, 0xFA7, 3) ! gump.addButton(118, 183, 0xFA5, 0xFA7, 4) ! gump.addButton(118, 238, 0xFA5, 0xFA7, 5) ! gump.addButton(323, 73, 0xFA5, 0xFA7, 6) ! gump.addButton(323, 128, 0xFA5, 0xFA7, 7) ! gump.addButton(323, 183, 0xFA5, 0xFA7, 8) ! gump.addButton(323, 238, 0xFA5, 0xFA7, 9) ! gump.addButton(323, 292, 0xFA5, 0xFA7, 1) gump.send(char) |
|
From: <dar...@pr...> - 2004-02-01 23:57:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26222/wolfpack Modified Files: gumps.py Log Message: Barber changes. Index: gumps.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/wolfpack/gumps.py,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** gumps.py 28 Aug 2003 04:22:16 -0000 1.11 --- gumps.py 1 Feb 2004 23:55:51 -0000 1.12 *************** *** 37,48 **** # Dump the gump data ! #file = open( 'dump.txt', 'w' ) ! #file.write( "--------\nLayout:\n" ) ! #for line in self.layout: ! # file.write( line + "\n" ) ! #file.write( "--------\nText:\n" ) ! #for line in self.texts: ! # file.write( line + "\n" ) ! #file.close() if( self.noclose == 1 ): --- 37,48 ---- # Dump the gump data ! file = open( 'dump.txt', 'w' ) ! file.write( "--------\nLayout:\n" ) ! for line in self.layout: ! file.write( line + "\n" ) ! file.write( "--------\nText:\n" ) ! for line in self.texts: ! file.write( line + "\n" ) ! file.close() if( self.noclose == 1 ): |
|
From: <dar...@pr...> - 2004-02-01 23:49:10
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19200/deeds Modified Files: hairstyle.py Log Message: Barber changes. Index: hairstyle.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/deeds/hairstyle.py,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** hairstyle.py 1 Feb 2004 23:29:52 -0000 1.1 --- hairstyle.py 1 Feb 2004 23:47:13 -0000 1.2 *************** *** 16,43 **** gump.addResizeGump(100, 10, 0xA28, 400, 385) ! gump.addXmfHtmlGump(100, 25, 400, 35, 1013008, 0, 0) ! gump.addButton(175, 340, 0xFA5, 0xFA7, 0) ! gump.addXmfHtmlGump(210, 342, 90, 35, 1011012, 0, 0) ! gump.addResizeGump(220, 60, 0xA3C, 50, 50) ! gump.addResizeGump(220, 115, 0xA3C, 50, 50) ! gump.addResizeGump(220, 170, 0xA3C, 50, 50) ! gump.addResizeGump(220, 225, 0xA3C, 50, 50) ! gump.addResizeGump(425, 60, 0xA3C, 50, 50) ! gump.addResizeGump(425, 115, 0xA3C, 50, 50) ! gump.addResizeGump(425, 170, 0xA3C, 50, 50) ! gump.addResizeGump(425, 225, 0xA3C, 50, 50) ! gump.addResizeGump(425, 280, 0xA3C, 50, 50) ! gump.addXmfHtmlGump( 150, 75, 80, 35, 1011052, 0, 0 ) # Short ! gump.addXmfHtmlGump( 150, 130, 80, 35, 1011053, 0, 0 ) # Long ! gump.addXmfHtmlGump( 150, 185, 80, 35, 1011054, 0, 0 ) # Ponytail ! gump.addXmfHtmlGump( 150, 240, 80, 35, 1011055, 0, 0 ) # Mohawk ! gump.addXmfHtmlGump( 355, 75, 80, 35, 1011047, 0, 0 ) # Pageboy ! gump.addXmfHtmlGump( 355, 130, 80, 35, 1011048, 0, 0 ) # Receding ! gump.addXmfHtmlGump( 355, 185, 80, 35, 1011049, 0, 0 ) # 2-tails ! gump.addXmfHtmlGump( 355, 240, 80, 35, 1011050, 0, 0 ) # Topknot ! gump.addXmfHtmlGump( 355, 295, 80, 35, 1011064, 0, 0 ) # Bald gump.addTilePic( 153, 20, 0xC60C ) --- 16,43 ---- gump.addResizeGump(100, 10, 0xA28, 400, 385) ! #gump.addXmfHtmlGump(100, 25, 400, 35, 1013008, 0, 0) ! #gump.addButton(175, 340, 0xFA5, 0xFA7, 0) ! #gump.addXmfHtmlGump(210, 342, 90, 35, 1011012, 0, 0) ! #gump.addResizeGump(220, 60, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 115, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 170, 0xA3C, 50, 50) ! #gump.addResizeGump(220, 225, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 60, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 115, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 170, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 225, 0xA3C, 50, 50) ! #gump.addResizeGump(425, 280, 0xA3C, 50, 50) ! #gump.addXmfHtmlGump( 150, 75, 80, 35, 1011052, 0, 0 ) # Short ! #gump.addXmfHtmlGump( 150, 130, 80, 35, 1011053, 0, 0 ) # Long ! #gump.addXmfHtmlGump( 150, 185, 80, 35, 1011054, 0, 0 ) # Ponytail ! #gump.addXmfHtmlGump( 150, 240, 80, 35, 1011055, 0, 0 ) # Mohawk ! #gump.addXmfHtmlGump( 355, 75, 80, 35, 1011047, 0, 0 ) # Pageboy ! #gump.addXmfHtmlGump( 355, 130, 80, 35, 1011048, 0, 0 ) # Receding ! #gump.addXmfHtmlGump( 355, 185, 80, 35, 1011049, 0, 0 ) # 2-tails ! #gump.addXmfHtmlGump( 355, 240, 80, 35, 1011050, 0, 0 ) # Topknot ! #gump.addXmfHtmlGump( 355, 295, 80, 35, 1011064, 0, 0 ) # Bald gump.addTilePic( 153, 20, 0xC60C ) *************** *** 50,62 **** #gump.addTilePic( 362, 190, 0xED29 ) ! gump.addButton(118, 73, 0xFA5, 0xFA7, 2) ! gump.addButton(118, 128, 0xFA5, 0xFA7, 3) ! gump.addButton(118, 183, 0xFA5, 0xFA7, 4) ! gump.addButton(118, 238, 0xFA5, 0xFA7, 5) ! gump.addButton(323, 73, 0xFA5, 0xFA7, 6) ! gump.addButton(323, 128, 0xFA5, 0xFA7, 7) ! gump.addButton(323, 183, 0xFA5, 0xFA7, 8) ! gump.addButton(323, 238, 0xFA5, 0xFA7, 9) ! gump.addButton(323, 292, 0xFA5, 0xFA7, 1) gump.send(char) --- 50,62 ---- #gump.addTilePic( 362, 190, 0xED29 ) ! #gump.addButton(118, 73, 0xFA5, 0xFA7, 2) ! #gump.addButton(118, 128, 0xFA5, 0xFA7, 3) ! #gump.addButton(118, 183, 0xFA5, 0xFA7, 4) ! #gump.addButton(118, 238, 0xFA5, 0xFA7, 5) ! #gump.addButton(323, 73, 0xFA5, 0xFA7, 6) ! #gump.addButton(323, 128, 0xFA5, 0xFA7, 7) ! #gump.addButton(323, 183, 0xFA5, 0xFA7, 8) ! #gump.addButton(323, 238, 0xFA5, 0xFA7, 9) ! #gump.addButton(323, 292, 0xFA5, 0xFA7, 1) gump.send(char) |
|
From: <dr...@pr...> - 2004-02-01 23:35:10
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7026/definitions Modified Files: scripts.xml Log Message: two <definitions> Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.76 retrieving revision 1.77 diff -C2 -d -r1.76 -r1.77 *** scripts.xml 1 Feb 2004 23:29:09 -0000 1.76 --- scripts.xml 1 Feb 2004 23:33:11 -0000 1.77 *************** *** 6,10 **** --> <definitions> - <definitions> <script>trading</script> <script>npc.healer</script> --- 6,9 ---- |
|
From: <dar...@pr...> - 2004-02-01 23:31:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4305/deeds Added Files: __init__.py hairstyle.py Log Message: Barber changes. --- NEW FILE: __init__.py --- --- NEW FILE: hairstyle.py --- from wolfpack.gumps import cGump import wolfpack def onShowTooltip(char, item, tooltip): tooltip.add(1041061, '') return 1 def onUse(char, deed): if not deed.container == char.getbackpack(): char.socket.clilocmessage(1042001) else: gump = cGump(x=50, y=50) gump.addResizeGump(100, 10, 0xA28, 400, 385) gump.addXmfHtmlGump(100, 25, 400, 35, 1013008, 0, 0) gump.addButton(175, 340, 0xFA5, 0xFA7, 0) gump.addXmfHtmlGump(210, 342, 90, 35, 1011012, 0, 0) gump.addResizeGump(220, 60, 0xA3C, 50, 50) gump.addResizeGump(220, 115, 0xA3C, 50, 50) gump.addResizeGump(220, 170, 0xA3C, 50, 50) gump.addResizeGump(220, 225, 0xA3C, 50, 50) gump.addResizeGump(425, 60, 0xA3C, 50, 50) gump.addResizeGump(425, 115, 0xA3C, 50, 50) gump.addResizeGump(425, 170, 0xA3C, 50, 50) gump.addResizeGump(425, 225, 0xA3C, 50, 50) gump.addResizeGump(425, 280, 0xA3C, 50, 50) gump.addXmfHtmlGump( 150, 75, 80, 35, 1011052, 0, 0 ) # Short gump.addXmfHtmlGump( 150, 130, 80, 35, 1011053, 0, 0 ) # Long gump.addXmfHtmlGump( 150, 185, 80, 35, 1011054, 0, 0 ) # Ponytail gump.addXmfHtmlGump( 150, 240, 80, 35, 1011055, 0, 0 ) # Mohawk gump.addXmfHtmlGump( 355, 75, 80, 35, 1011047, 0, 0 ) # Pageboy gump.addXmfHtmlGump( 355, 130, 80, 35, 1011048, 0, 0 ) # Receding gump.addXmfHtmlGump( 355, 185, 80, 35, 1011049, 0, 0 ) # 2-tails gump.addXmfHtmlGump( 355, 240, 80, 35, 1011050, 0, 0 ) # Topknot gump.addXmfHtmlGump( 355, 295, 80, 35, 1011064, 0, 0 ) # Bald gump.addTilePic( 153, 20, 0xC60C ) #gump.addTilePic( 153, 65, 0xED24 ) #gump.addTilePic( 153, 120, 0xED1E ) #gump.addTilePic( 153, 185, 0xC60F ) #gump.addTilePic( 358, 18, 0xED26 ) #gump.addTilePic( 358, 75, 0xEDE5 ) #gump.addTilePic( 358, 120, 0xED23 ) #gump.addTilePic( 362, 190, 0xED29 ) gump.addButton(118, 73, 0xFA5, 0xFA7, 2) gump.addButton(118, 128, 0xFA5, 0xFA7, 3) gump.addButton(118, 183, 0xFA5, 0xFA7, 4) gump.addButton(118, 238, 0xFA5, 0xFA7, 5) gump.addButton(323, 73, 0xFA5, 0xFA7, 6) gump.addButton(323, 128, 0xFA5, 0xFA7, 7) gump.addButton(323, 183, 0xFA5, 0xFA7, 8) gump.addButton(323, 238, 0xFA5, 0xFA7, 9) gump.addButton(323, 292, 0xFA5, 0xFA7, 1) gump.send(char) return 1 |
|
From: <dar...@pr...> - 2004-02-01 23:31:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4305/speech Removed Files: barber.py Log Message: Barber changes. --- barber.py DELETED --- |
|
From: <dar...@pr...> - 2004-02-01 23:31:22
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3656/npcs/humans/vendors Modified Files: barber.xml Log Message: Changes to the barber. Index: barber.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/barber.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** barber.xml 31 Jan 2004 22:48:45 -0000 1.1 --- barber.xml 1 Feb 2004 23:29:09 -0000 1.2 *************** *** 12,16 **** <inherit>base_male</inherit> <title>the Barber</title> ! <events>speech_barber</events> <category>Vendors\Barber (Male)</category> <invulnerable /> --- 12,16 ---- <inherit>base_male</inherit> <title>the Barber</title> ! <events>speech.barber</events> <category>Vendors\Barber (Male)</category> <invulnerable /> *************** *** 20,27 **** <inherit>base_female</inherit> <title>the Barber</title> ! <events>speech_barber</events> <category>Vendors\Barber (Female)</category> <invulnerable /> </npc> - </definitions> \ No newline at end of file --- 20,26 ---- <inherit>base_female</inherit> <title>the Barber</title> ! <events>speech.barber</events> <category>Vendors\Barber (Female)</category> <invulnerable /> </npc> </definitions> \ No newline at end of file |
|
From: <dar...@pr...> - 2004-02-01 23:31:21
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3656 Modified Files: scripts.xml Log Message: Changes to the barber. Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.75 retrieving revision 1.76 diff -C2 -d -r1.75 -r1.76 *** scripts.xml 26 Jan 2004 13:48:49 -0000 1.75 --- scripts.xml 1 Feb 2004 23:29:09 -0000 1.76 *************** *** 38,41 **** --- 38,44 ---- <script>ore</script> + <!-- Deeds --> + <script>deeds.hairstyle</script> + <!-- Commands --> <script>wolfpack.commands</script> *************** *** 98,102 **** <script>speech.pets</script> <script>speech.banker</script> - <script>speech.barber</script> <script>speech.stablemaster</script> --- 101,104 ---- |
|
From: <dar...@pr...> - 2004-02-01 23:31:08
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3656/items/professions Modified Files: barber.xml Log Message: Changes to the barber. Index: barber.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/barber.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** barber.xml 26 Dec 2002 00:04:35 -0000 1.1 --- barber.xml 1 Feb 2004 23:29:09 -0000 1.2 *************** *** 105,107 **** --- 105,113 ---- </item> + <item id="hairstyle_deed"> + <id>0x14f0</id> + <category>Professions\Barber\Hairstyle Deed</category> + <events>deeds.hairstyle</events> + </item> + </definitions> \ No newline at end of file |
|
From: <dar...@pr...> - 2004-02-01 23:09:45
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18264 Modified Files: console_win.cpp Log Message: Forgot something. Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** console_win.cpp 1 Feb 2004 22:02:13 -0000 1.27 --- console_win.cpp 1 Feb 2004 23:07:35 -0000 1.28 *************** *** 551,555 **** cServerThread serverThread(lpCmdLine); ! //serverThread.start(); MSG msg; --- 551,555 ---- cServerThread serverThread(lpCmdLine); ! serverThread.start(); MSG msg; |
|
From: <dar...@pr...> - 2004-02-01 22:18:47
|
Update of /cvsroot/wpdev/xmlscripts/scripts/deeds In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9329/deeds Log Message: Directory /cvsroot/wpdev/xmlscripts/scripts/deeds added to the repository |
|
From: <dar...@pr...> - 2004-02-01 22:04:11
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29146 Modified Files: console_win.cpp res.rc resource.h wolfpack.cpp wolfpack.vcproj Log Message: The windows version now automatically creates an about box out of the AUTHORS.txt. Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** console_win.cpp 1 Feb 2004 17:25:21 -0000 1.26 --- console_win.cpp 1 Feb 2004 22:02:13 -0000 1.27 *************** *** 123,200 **** } bool handleMenuSelect( unsigned int id ) { bool result = true; ! if( serverState != RUNNING ) ! { ! result = false; ! } ! else ! { ! cUOSocket *mSock; ! unsigned int i; ! switch( id ) ! { ! case IDC_EXIT: ! keeprun = 0; ! if( canClose ) ! DestroyWindow( mainWindow ); ! break; ! case ID_HELP_ABOUT: ! MessageBox(mainWindow, "???", "Credits", MB_OK|MB_ICONINFORMATION); ! break; ! case ID_HELP_WOLFPACKHOMEPAGE: ! ShellExecute(mainWindow, "open", "http://www.wpdev.org", 0, 0, SW_NORMAL); ! break; ! case ID_RELOAD_ACCOUNTS: ! queueAction( RELOAD_ACCOUNTS ); ! break; ! case ID_RELOAD_PYTHON: ! queueAction( RELOAD_PYTHON ); ! break; ! case ID_RELOAD_SCRIPTS: ! queueAction( RELOAD_SCRIPTS ); ! break; ! case ID_RELOAD_CONFIGURATION: ! queueAction( RELOAD_CONFIGURATION ); ! break; ! case ID_SERVER_SAVEWORLD: ! queueAction( SAVE_WORLD ); ! break; ! case ID_SERVER_LISTUSERS: ! // We simply do our thread safety manually here ! cNetwork::instance()->lock(); ! // Generate a list of Users ! mSock = cNetwork::instance()->first(); ! i = 0; ! ! for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) ! { ! if( mSock->player() ) ! Console::instance()->send( QString("%1) %2 [%3]\n").arg(++i).arg(mSock->player()->name()).arg(QString::number( mSock->player()->serial(), 16) ) ); ! } ! cNetwork::instance()->unlock(); ! Console::instance()->send( QString( "Total Users Online: %1\n" ).arg( i ) ); ! break; ! default: ! result = false; ! } } --- 123,232 ---- } + LRESULT CALLBACK DialogProc(HWND hwnd, unsigned int msg, WPARAM wparam, LPARAM lparam) { + HWND richtext; + + switch (msg) { + case WM_COMMAND: + if (HIWORD(wparam) == BN_CLICKED && (HWND) lparam == GetDlgItem(hwnd, IDOK)) { + EndDialog(hwnd, 0); + } + break; + + case WM_CLOSE: + EndDialog(hwnd, 0); + break; + + case WM_INITDIALOG: + richtext = GetDlgItem(hwnd, IDC_RICHEDIT); + + if (richtext) { + HRSRC resource = FindResource(appInstance, MAKEINTRESOURCE(IDD_CREDITS), RT_RCDATA); + HGLOBAL rData = LoadResource(appInstance, resource); + + const char *data = (const char*)LockResource(rData); + QStringList creditList = QStringList::split(",", data); + QString credits = "This is an unsorted not neccesarily complete list of people who contributed to Wolfpack:\n\n"; + + for (unsigned int i = 0; i < creditList.size(); ++i) { + credits.append(creditList[i]); + } + + SetWindowText(richtext, credits.latin1()); + + UnlockResource(rData); + FreeResource(rData); + } + } + + return FALSE; + } + bool handleMenuSelect( unsigned int id ) { bool result = true; ! cUOSocket *mSock; ! unsigned int i; ! switch( id ) ! { ! case IDC_EXIT: ! keeprun = 0; ! if( canClose ) ! DestroyWindow( mainWindow ); ! break; ! case ID_HELP_ABOUT: ! DialogBox(appInstance, MAKEINTRESOURCE(IDD_DIALOGABOUT), mainWindow, (DLGPROC)DialogProc); ! break; ! case ID_HELP_WOLFPACKHOMEPAGE: ! ShellExecute(mainWindow, "open", "http://www.wpdev.org", 0, 0, SW_NORMAL); ! break; ! case ID_RELOAD_ACCOUNTS: ! queueAction( RELOAD_ACCOUNTS ); ! break; ! case ID_RELOAD_PYTHON: ! queueAction( RELOAD_PYTHON ); ! break; ! case ID_RELOAD_SCRIPTS: ! queueAction( RELOAD_SCRIPTS ); ! break; ! case ID_RELOAD_CONFIGURATION: ! queueAction( RELOAD_CONFIGURATION ); ! break; ! case ID_SERVER_SAVEWORLD: ! queueAction( SAVE_WORLD ); ! break; ! case ID_SERVER_LISTUSERS: ! // We simply do our thread safety manually here ! cNetwork::instance()->lock(); ! // Generate a list of Users ! mSock = cNetwork::instance()->first(); ! i = 0; ! ! for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) ! { ! if( mSock->player() ) ! Console::instance()->send( QString("%1) %2 [%3]\n").arg(++i).arg(mSock->player()->name()).arg(QString::number( mSock->player()->serial(), 16) ) ); ! } ! cNetwork::instance()->unlock(); ! Console::instance()->send( QString( "Total Users Online: %1\n" ).arg( i ) ); ! break; ! default: ! result = false; } *************** *** 368,373 **** keeprun = 0; ! if( canClose ) DestroyWindow( mainWindow ); return 1; --- 400,406 ---- keeprun = 0; ! if (canClose) { DestroyWindow( mainWindow ); + } return 1; *************** *** 518,522 **** cServerThread serverThread(lpCmdLine); ! serverThread.start(); MSG msg; --- 551,555 ---- cServerThread serverThread(lpCmdLine); ! //serverThread.start(); MSG msg; Index: res.rc =================================================================== RCS file: /cvsroot/wpdev/wolfpack/res.rc,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** res.rc 1 Feb 2004 17:25:21 -0000 1.21 --- res.rc 1 Feb 2004 22:02:15 -0000 1.22 *************** *** 35,38 **** --- 35,45 ---- ///////////////////////////////////////////////////////////////////////////// // + // Data + // + + IDD_CREDITS RCDATA "AUTHORS.txt" + + ///////////////////////////////////////////////////////////////////////////// + // // Menu // *************** *** 135,138 **** --- 142,182 ---- IDB_LOGO BITMAP "logo.bmp" + + ///////////////////////////////////////////////////////////////////////////// + // + // Dialog + // + + IDD_DIALOGABOUT DIALOGEX 0, 0, 291, 175 + STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | + WS_SYSMENU + CAPTION "Wolfpack Credits" + FONT 8, "MS Shell Dlg", 400, 0, 0x1 + BEGIN + DEFPUSHBUTTON "OK",IDOK,7,154,50,14,BS_CENTER + CONTROL "",IDC_RICHEDIT,"RichEdit20A",ES_MULTILINE | ES_READONLY | + ES_NUMBER | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,7,277, + 143,WS_EX_TRANSPARENT + END + + + ///////////////////////////////////////////////////////////////////////////// + // + // DESIGNINFO + // + + #ifdef APSTUDIO_INVOKED + GUIDELINES DESIGNINFO + BEGIN + IDD_DIALOGABOUT, DIALOG + BEGIN + LEFTMARGIN, 7 + RIGHTMARGIN, 284 + TOPMARGIN, 7 + BOTTOMMARGIN, 168 + END + END + #endif // APSTUDIO_INVOKED + #endif // German (Germany) resources ///////////////////////////////////////////////////////////////////////////// Index: resource.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/resource.h,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** resource.h 1 Feb 2004 17:25:21 -0000 1.13 --- resource.h 1 Feb 2004 22:02:15 -0000 1.14 *************** *** 3,6 **** --- 3,8 ---- // Used by res.rc // + #define IDD_TEXT 4 + #define IDD_CREDITS 4 #define IDI_ICON1 101 #define IDR_MAINMENU 102 *************** *** 9,12 **** --- 11,16 ---- #define IDI_ICON3 106 #define IDI_ICONRED 106 + #define IDD_DIALOGABOUT 107 + #define IDC_RICHEDIT 1000 #define IDC_EXIT 40001 #define ID_RELOAD_ACCOUNTS 40002 *************** *** 24,30 **** #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 107 #define _APS_NEXT_COMMAND_VALUE 40011 ! #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 #endif --- 28,34 ---- #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 ! #define _APS_NEXT_RESOURCE_VALUE 109 #define _APS_NEXT_COMMAND_VALUE 40011 ! #define _APS_NEXT_CONTROL_VALUE 1001 #define _APS_NEXT_SYMED_VALUE 101 #endif Index: wolfpack.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v retrieving revision 1.483 retrieving revision 1.484 diff -C2 -d -r1.483 -r1.484 *** wolfpack.cpp 29 Jan 2004 23:20:09 -0000 1.483 --- wolfpack.cpp 1 Feb 2004 22:02:15 -0000 1.484 *************** *** 253,258 **** void queueAction( eActionType type ) { ! QMutexLocker lock( &actionMutex ); ! actionQueue.push_back( type ); } --- 253,260 ---- void queueAction( eActionType type ) { ! if (serverState == RUNNING) { ! QMutexLocker lock( &actionMutex ); ! actionQueue.push_back( type ); ! } } Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** wolfpack.vcproj 30 Jan 2004 03:21:39 -0000 1.9 --- wolfpack.vcproj 1 Feb 2004 22:02:16 -0000 1.10 *************** *** 533,536 **** --- 533,539 ---- UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"> <File + RelativePath=".\AUTHORS.txt"> + </File> + <File RelativePath=".\icon2.ico"> </File> |
|
From: <dr...@pr...> - 2004-02-01 19:19:15
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16137 Modified Files: AUTHORS.txt Log Message: < Dark-Storm> Dreoth, if you want, add your name to the authors.txt in the src directory < Dreoth> kk sure :D Index: AUTHORS.txt =================================================================== RCS file: /cvsroot/wpdev/wolfpack/AUTHORS.txt,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** AUTHORS.txt 1 Feb 2004 17:25:21 -0000 1.9 --- AUTHORS.txt 1 Feb 2004 19:17:20 -0000 1.10 *************** *** 3,6 **** --- 3,7 ---- Thiago Correa (Correa), Sebastian Hartte (DarkStorm), + Richard Meyer (Dreoth), Ki Hong Pae (Khpae), Charles Kerr (Punt), |
|
From: <dar...@pr...> - 2004-02-01 17:27:22
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17273 Modified Files: AUTHORS.txt console_win.cpp res.rc resource.h Log Message: Added aszlig to the authors list and changed the resources for the windows version a little. Index: AUTHORS.txt =================================================================== RCS file: /cvsroot/wpdev/wolfpack/AUTHORS.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** AUTHORS.txt 9 Jul 2003 01:20:47 -0000 1.8 --- AUTHORS.txt 1 Feb 2004 17:25:21 -0000 1.9 *************** *** 1,12 **** ! -- Not a complete list, in Alphabetic (nickname) order -- ! ! Real Name aka ! ---------------------------------------- ! ! Anton Meshkov (Codex) ! Thiago Correa (Correa) ! Sebastian Hartte (DarkStorm) ! Ki Hong Pae (Khpae) ! Charles Kerr (Punt) ! Fred Robinson (Ripper) ! Jörg Stückler (Sereg) --- 1,8 ---- ! Michael Biehunko (Aszlig), ! Anton Meshkov (Codex), ! Thiago Correa (Correa), ! Sebastian Hartte (DarkStorm), ! Ki Hong Pae (Khpae), ! Charles Kerr (Punt), ! Fred Robinson (Ripper), ! Jörg Stückler (Sereg) Index: console_win.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/console_win.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** console_win.cpp 30 Jan 2004 22:51:32 -0000 1.25 --- console_win.cpp 1 Feb 2004 17:25:21 -0000 1.26 *************** *** 146,149 **** --- 146,157 ---- break; + case ID_HELP_ABOUT: + MessageBox(mainWindow, "???", "Credits", MB_OK|MB_ICONINFORMATION); + break; + + case ID_HELP_WOLFPACKHOMEPAGE: + ShellExecute(mainWindow, "open", "http://www.wpdev.org", 0, 0, SW_NORMAL); + break; + case ID_RELOAD_ACCOUNTS: queueAction( RELOAD_ACCOUNTS ); Index: res.rc =================================================================== RCS file: /cvsroot/wpdev/wolfpack/res.rc,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** res.rc 30 Jan 2004 03:21:39 -0000 1.20 --- res.rc 1 Feb 2004 17:25:21 -0000 1.21 *************** *** 56,59 **** --- 56,64 ---- MENUITEM "&List Users", ID_SERVER_LISTUSERS END + POPUP "&Help" + BEGIN + MENUITEM "Wolfpack &Homepage", ID_HELP_WOLFPACKHOMEPAGE + MENUITEM "&About", ID_HELP_ABOUT + END END Index: resource.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/resource.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** resource.h 30 Jan 2004 03:21:39 -0000 1.12 --- resource.h 1 Feb 2004 17:25:21 -0000 1.13 *************** *** 16,19 **** --- 16,21 ---- #define ID_SERVER_SAVEWORLD 40006 #define ID_SERVER_LISTUSERS 40007 + #define ID_HELP_ABOUT 40009 + #define ID_HELP_WOLFPACKHOMEPAGE 40010 // Next default values for new objects *************** *** 23,27 **** #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 107 ! #define _APS_NEXT_COMMAND_VALUE 40009 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 --- 25,29 ---- #define _APS_NO_MFC 1 #define _APS_NEXT_RESOURCE_VALUE 107 ! #define _APS_NEXT_COMMAND_VALUE 40011 #define _APS_NEXT_CONTROL_VALUE 1000 #define _APS_NEXT_SYMED_VALUE 101 |
|
From: <dar...@pr...> - 2004-02-01 15:55:11
|
Update of /cvsroot/wpdev/xmlscripts/scripts/weapons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1449/weapons Modified Files: blades.py Log Message: Started redoing barbers and fixed intendation bug in blades.py Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** blades.py 1 Feb 2004 15:13:24 -0000 1.13 --- blades.py 1 Feb 2004 15:53:10 -0000 1.14 *************** *** 27,109 **** def response( char, args, target ): ! item = wolfpack.finditem( args[0] ) ! ! if not item: ! return ! # Check reach if target.item and not char.canreach(target.item, 5): char.socket.clilocmessage(500312) return ! elif target.char and not char.canreach(target.char, 5): char.socket.clilocmessage(500312) return ! elif target.pos and not char.canreach(target.pos, 5): char.socket.clilocmessage(500312) return ! ! # Corpse => Carve ! # Wood => Kindling/Logs ! model = 0 ! ! if target.item: ! if target.item.id == 0x2006 and target.item.corpse: ! carve_corpse( char, target.item ) ! return ! else: ! model = target.item.id ! ! # For cutting fish ! if model in fish: ! cut_fish( char, target.item ) ! return ! ! # This is for sheering only ! elif target.char: ! if ( target.char.id == 0xcf ): ! target.char.id = 0xdf ! target.char.carve = "carve_sheep_sheered" ! target.char.update() ! ! elif target.char.id == 0xdf: ! char.socket.clilocmessage( 0x7A2E1 ) # This sheep is not yet ready to be shorn. ! return ! ! else: ! char.socket.clilocmessage( 0x7A2E2 ) # You can only skin dead creatures. ! return ! ! wool = wolfpack.additem( "df8" ) ! wool.amount = 2 ! if not wolfpack.utilities.tocontainer( wool, char.getbackpack() ): ! wool.update() ! ! char.socket.clilocmessage( 0x7A2E4 ) # You place the gathered wool into your backpack. ! return ! ! else: ! model = target.model ! ! # Check for Trees ! if not skills.lumberjacking.is_tree( model ): ! char.socket.clilocmessage( 0x7A30E ) # You can't use a bladed item on that ! else: ! if not skills.lumberjacking.check_wood( target.pos ): ! char.clilocmessage( 0x7A7C4 ) # Cheaters never win. ! return ! ! # Axes/Polearms get Logs, Swords get kindling. ! # Also allows a mace's war axe to be use. 0x13af and 0x13b0 ! if item.type == 1002 or item.id == 0x13af or item.id == 0x13b0: ! if not item or not item.container == char: ! char.message( "You must equip this item to use it on this target!" ) ! return ! else: ! skills.lumberjacking.hack_logs( char, target.pos ) ! # Swords and Fencing Weapons: Get kindling ! elif item.type == 1001 or item.type == 1005: ! skills.lumberjacking.hack_kindling( char, target.pos ) # CARVE CORPSE --- 27,109 ---- def response( char, args, target ): ! item = wolfpack.finditem( args[0] ) ! ! if not item: ! return ! # Check reach if target.item and not char.canreach(target.item, 5): char.socket.clilocmessage(500312) return ! elif target.char and not char.canreach(target.char, 5): char.socket.clilocmessage(500312) return ! elif target.pos and not char.canreach(target.pos, 5): char.socket.clilocmessage(500312) return ! ! # Corpse => Carve ! # Wood => Kindling/Logs ! model = 0 ! ! if target.item: ! if target.item.id == 0x2006 and target.item.corpse: ! carve_corpse( char, target.item ) ! return ! else: ! model = target.item.id ! ! # For cutting fish ! if model in fish: ! cut_fish( char, target.item ) ! return ! ! # This is for sheering only ! elif target.char: ! if ( target.char.id == 0xcf ): ! target.char.id = 0xdf ! target.char.carve = "carve_sheep_sheered" ! target.char.update() ! ! elif target.char.id == 0xdf: ! char.socket.clilocmessage( 0x7A2E1 ) # This sheep is not yet ready to be shorn. ! return ! ! else: ! char.socket.clilocmessage( 0x7A2E2 ) # You can only skin dead creatures. ! return ! ! wool = wolfpack.additem( "df8" ) ! wool.amount = 2 ! if not wolfpack.utilities.tocontainer( wool, char.getbackpack() ): ! wool.update() ! ! char.socket.clilocmessage( 0x7A2E4 ) # You place the gathered wool into your backpack. ! return ! ! else: ! model = target.model ! ! # Check for Trees ! if not skills.lumberjacking.is_tree( model ): ! char.socket.clilocmessage( 0x7A30E ) # You can't use a bladed item on that ! else: ! if not skills.lumberjacking.check_wood( target.pos ): ! char.clilocmessage( 0x7A7C4 ) # Cheaters never win. ! return ! ! # Axes/Polearms get Logs, Swords get kindling. ! # Also allows a mace's war axe to be use. 0x13af and 0x13b0 ! if item.type == 1002 or item.id == 0x13af or item.id == 0x13b0: ! if not item or not item.container == char: ! char.message( "You must equip this item to use it on this target!" ) ! return ! else: ! skills.lumberjacking.hack_logs( char, target.pos ) ! # Swords and Fencing Weapons: Get kindling ! elif item.type == 1001 or item.type == 1005: ! skills.lumberjacking.hack_kindling( char, target.pos ) # CARVE CORPSE |
|
From: <dar...@pr...> - 2004-02-01 15:55:11
|
Update of /cvsroot/wpdev/xmlscripts/scripts/speech In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1449/speech Modified Files: barber.py Log Message: Started redoing barbers and fixed intendation bug in blades.py Index: barber.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/speech/barber.py,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** barber.py 12 Jan 2004 23:25:23 -0000 1.9 --- barber.py 1 Feb 2004 15:53:09 -0000 1.10 *************** *** 39,100 **** def onSpeech( listener, speaker, text, keywords ): ! # Check if our name is in the beginning of the string ! if not text.lower().startswith( listener.name.lower() ): ! return 0 ! ! if speaker.id != 0x190 and speaker.id != 0x191: ! listener.say( "I can't cut your hair!",5 ) ! return 1 ! ! # We only have one keyword ! gump = cGump( 0, 0, 0, 50, 50 ) ! gump.addBackground( 0x24a4, 425, 400 ) ! gump.startPage( 0 ) ! gump.addHtmlGump( 10, 30, 450, 20, '<basefont size="7" color="#336699"><center>Barber shop</center></basefont>' ) ! gump.addTilePic( 155, 31, 0xDFD ) ! ! # Page Switches (only for men) ! if speaker.id == 0x190: ! gump.addPageButton( 40, 61, 0x4B9, 0x4BA, 0x11 ) ! gump.addHtmlGump( 60, 60, 100, 20, '<basefont color="#333333"><u>Hair</u></basefont>' ) ! ! gump.addPageButton( 190, 61, 0x4B9, 0x4BA, 0x21 ) ! gump.addHtmlGump( 210, 60, 100, 20, '<basefont color="#333333"><u>Beard</u></basefont>' ) ! ! # Hair ! addHairPage( speaker, gump, 0x11, 0x203B ) # Short Hair ! addHairPage( speaker, gump, 0x12, 0x203C ) # Long Hair ! addHairPage( speaker, gump, 0x13, 0x203D ) # Ponytail ! addHairPage( speaker, gump, 0x14, 0x2044 ) # Mohawk ! addHairPage( speaker, gump, 0x15, 0x2045 ) # Pageboy ! addHairPage( speaker, gump, 0x16, 0x2046 ) # Buns hair ! addHairPage( speaker, gump, 0x17, 0x2047 ) # Afro ! addHairPage( speaker, gump, 0x18, 0x2048 ) # Receding hair ! addHairPage( speaker, gump, 0x19, 0x2049 ) # 2 pig-tails ! addHairPage( speaker, gump, 0x1A, 0x204a ) # Krisna Hair ! addHairPage( speaker, gump, 0x1B, 0x0000 ) # None ! ! if speaker.id == 0x190: ! # Beard ! gump.startPage( 0x21 ) ! ! # BEARDS ! addBeardPage( speaker, gump, 0x21, 0x203E ) # Long Beard ! addBeardPage( speaker, gump, 0x22, 0x203F ) # Short Beard ! addBeardPage( speaker, gump, 0x23, 0x2040 ) # Goatee ! addBeardPage( speaker, gump, 0x24, 0x2041 ) # Mustache ! addBeardPage( speaker, gump, 0x25, 0x204B ) # Med Short Beard ! addBeardPage( speaker, gump, 0x26, 0x204C ) # Med Long Beard ! addBeardPage( speaker, gump, 0x27, 0x204D ) # Vandyke ! addBeardPage( speaker, gump, 0x28, 0x0000 ) # None ! ! gump.startPage( 0 ) ! gump.addButton( 350, 335, 2119, 2120, 0 ) # Cancel ! ! gump.setCallback( "speech.barber.gump_callback" ) ! gump.setArgs( [ listener.serial ] ) ! gump.send( speaker ) ! ! return 1 def addHairPage( char, gump, page, id ): --- 39,100 ---- def onSpeech( listener, speaker, text, keywords ): ! # Check if our name is in the beginning of the string ! if not text.lower().startswith( listener.name.lower() ): ! return 0 ! ! if speaker.id != 0x190 and speaker.id != 0x191: ! listener.say(1042298) ! return 1 ! ! # We only have one keyword ! gump = cGump( 0, 0, 0, 50, 50 ) ! gump.addBackground( 0x24a4, 425, 400 ) ! gump.startPage( 0 ) ! gump.addHtmlGump( 10, 30, 450, 20, '<basefont size="7" color="#336699"><center>Barber shop</center></basefont>' ) ! gump.addTilePic( 155, 31, 0xDFD ) ! ! # Page Switches (only for men) ! if speaker.id == 0x190: ! gump.addPageButton( 40, 61, 0x4B9, 0x4BA, 0x11 ) ! gump.addHtmlGump( 60, 60, 100, 20, '<basefont color="#333333"><u>Hair</u></basefont>' ) ! ! gump.addPageButton( 190, 61, 0x4B9, 0x4BA, 0x21 ) ! gump.addHtmlGump( 210, 60, 100, 20, '<basefont color="#333333"><u>Beard</u></basefont>' ) ! ! # Hair ! addHairPage( speaker, gump, 0x11, 0x203B ) # Short Hair ! addHairPage( speaker, gump, 0x12, 0x203C ) # Long Hair ! addHairPage( speaker, gump, 0x13, 0x203D ) # Ponytail ! addHairPage( speaker, gump, 0x14, 0x2044 ) # Mohawk ! addHairPage( speaker, gump, 0x15, 0x2045 ) # Pageboy ! addHairPage( speaker, gump, 0x16, 0x2046 ) # Buns hair ! addHairPage( speaker, gump, 0x17, 0x2047 ) # Afro ! addHairPage( speaker, gump, 0x18, 0x2048 ) # Receding hair ! addHairPage( speaker, gump, 0x19, 0x2049 ) # 2 pig-tails ! addHairPage( speaker, gump, 0x1A, 0x204a ) # Krisna Hair ! addHairPage( speaker, gump, 0x1B, 0x0000 ) # None ! ! if speaker.id == 0x190: ! # Beard ! gump.startPage( 0x21 ) ! ! # BEARDS ! addBeardPage( speaker, gump, 0x21, 0x203E ) # Long Beard ! addBeardPage( speaker, gump, 0x22, 0x203F ) # Short Beard ! addBeardPage( speaker, gump, 0x23, 0x2040 ) # Goatee ! addBeardPage( speaker, gump, 0x24, 0x2041 ) # Mustache ! addBeardPage( speaker, gump, 0x25, 0x204B ) # Med Short Beard ! addBeardPage( speaker, gump, 0x26, 0x204C ) # Med Long Beard ! addBeardPage( speaker, gump, 0x27, 0x204D ) # Vandyke ! addBeardPage( speaker, gump, 0x28, 0x0000 ) # None ! ! gump.startPage( 0 ) ! gump.addButton( 350, 335, 2119, 2120, 0 ) # Cancel ! ! gump.setCallback( "speech.barber.gump_callback" ) ! gump.setArgs( [ listener.serial ] ) ! gump.send( speaker ) ! ! return 1 def addHairPage( char, gump, page, id ): |
|
From: <dar...@pr...> - 2004-02-01 15:54:39
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1070 Modified Files: speech.cpp Log Message: Fixed a crashbug when talking to ai-less NPCs. Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.163 retrieving revision 1.164 diff -C2 -d -r1.163 -r1.164 *** speech.cpp 1 Feb 2004 15:23:45 -0000 1.163 --- speech.cpp 1 Feb 2004 15:52:46 -0000 1.164 *************** *** 664,675 **** continue; - // Check if the NPC has a script that can handle - // speech events and then check if it can handle everything - // or just certain things cPythonScript **events = pNpc->getEvents(); ! if( events ) ! { ! PyObject *pkeywords = PyList_New( keywords.size() ); // Set Items --- 664,671 ---- continue; cPythonScript **events = pNpc->getEvents(); ! if (events) { ! PyObject *pkeywords = PyList_New(keywords.size()); // Set Items |
|
From: <dar...@pr...> - 2004-02-01 15:25:40
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8550 Modified Files: speech.cpp Log Message: Fixed a crashbug when talking to ai-less NPCs. Index: speech.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** speech.cpp 30 Jan 2004 09:37:24 -0000 1.162 --- speech.cpp 1 Feb 2004 15:23:45 -0000 1.163 *************** *** 423,427 **** return false;*/ ! if ( pBanker->ai()->name() != "Banker") return false; --- 423,427 ---- return false;*/ ! if ( !pBanker->ai() || pBanker->ai()->name() != "Banker") return false; |
|
From: <dar...@pr...> - 2004-02-01 15:15:17
|
Update of /cvsroot/wpdev/xmlscripts/scripts/weapons In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32262/weapons Modified Files: blades.py Log Message: Added distance check to blades.py Index: blades.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/weapons/blades.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** blades.py 26 Jan 2004 13:48:50 -0000 1.12 --- blades.py 1 Feb 2004 15:13:24 -0000 1.13 *************** *** 31,35 **** if not item: return ! # Corpse => Carve # Wood => Kindling/Logs --- 31,48 ---- if not item: return ! ! # Check reach ! if target.item and not char.canreach(target.item, 5): ! char.socket.clilocmessage(500312) ! return ! ! elif target.char and not char.canreach(target.char, 5): ! char.socket.clilocmessage(500312) ! return ! ! elif target.pos and not char.canreach(target.pos, 5): ! char.socket.clilocmessage(500312) ! return ! # Corpse => Carve # Wood => Kindling/Logs *************** *** 100,104 **** return ! if char.distanceto( corpse ) > 3: char.socket.clilocmessage( 0x7A258, "", 0x3b2, 3, corpse ) # You cannot reach that return --- 113,117 ---- return ! if not char.canreach(corpse, 3): char.socket.clilocmessage( 0x7A258, "", 0x3b2, 3, corpse ) # You cannot reach that return |
