wpdev-commits Mailing List for Wolfpack Emu (Page 13)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-10-16 00:43:51
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19353/npcs/animals Modified Files: animal_list.xml Log Message: updated sounds Index: animal_list.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/animal_list.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** animal_list.xml 6 Jun 2004 01:38:42 -0000 1.5 --- animal_list.xml 16 Oct 2004 00:43:34 -0000 1.6 *************** *** 53,56 **** --- 53,57 ---- <include file="definitions/npcs/animals/mounts/giant_beetle.xml" /> <include file="definitions/npcs/animals/mounts/horse.xml" /> + <include file="definitions/npcs/animals/mounts/hiryu.xml" /> <include file="definitions/npcs/animals/mounts/kirin.xml" /> <include file="definitions/npcs/animals/mounts/nightmare.xml" /> |
|
From: Incanus <inc...@us...> - 2004-10-15 22:35:06
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18860/documentation/webroot Modified Files: ChangeLog.wolfpack Log Message: victims of harmfull spells will now defend themself Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.157 retrieving revision 1.158 diff -C2 -d -r1.157 -r1.158 *** ChangeLog.wolfpack 15 Oct 2004 20:13:36 -0000 1.157 --- ChangeLog.wolfpack 15 Oct 2004 22:34:54 -0000 1.158 *************** *** 74,77 **** --- 74,78 ---- - Fixed a bug in trainmenus (training above skillcap) - Invis GMs are not shown on server status anymore. + - Victims of harmfull spells will now defend themself. * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Correa <thi...@us...> - 2004-10-15 20:21:42
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19061 Added Files: mapmaker.xml Log Message: Fixed bug #0000242 (Missing Vendor: Cartographer) --- NEW FILE: mapmaker.xml --- <!-- ================================================================= | ) (\_ | WOLFPACK 13.0.0 Scripts | | (( _/{ "-; | Created by: DarkStorm | | )).-' {{ ;'` | Revised by: White Wolf | | ( ( ;._ \\ ctr | Last Modification: 12/16/02 | ================================================================= --> <definitions> <npc id="mapmaker_inventory"> <shopkeeper> <restockable> <item id="ef3"><amount>40</amount></item> <!-- Empty Scrool --> <item id="mapmakers_pen"><amount>20</amount></item> <!-- Mapmaker's Pen --> <item id="14ec"><amount>20</amount></item> <!-- Blank Map --> </restockable> </shopkeeper> </npc> <!-- A mapmaker vendor --> <npc id="mapmaker_male"> <inherit>vendor_male</inherit> <title context="Vendor Male Titles">the Mapmaker</title> <cartography><random min="900" max="1000" /></cartography> <category>Vendors\MapMaker (Male)</category> <inherit id="mapmaker_inventory" /> </npc> <npc id="mapmaker_female"> <inherit>vendor_female</inherit> <title context="Vendor Female Titles">the Mapmaker</title> <cartography><random min="900" max="1000" /></cartography> <category>Vendors\MapMaker (Female)</category> <inherit id="mapmaker_inventory" /> </npc> </definitions> |
|
From: Correa <thi...@us...> - 2004-10-15 20:13:47
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17358 Modified Files: ChangeLog.wolfpack Log Message: Fixed bug #0000242 (Missing Vendor: Cartographer) Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.156 retrieving revision 1.157 diff -C2 -d -r1.156 -r1.157 *** ChangeLog.wolfpack 15 Oct 2004 16:03:24 -0000 1.156 --- ChangeLog.wolfpack 15 Oct 2004 20:13:36 -0000 1.157 *************** *** 22,25 **** --- 22,26 ---- - Added mountids for all known mountables. - Fixed a lot of the monster sounds. + - Fixed bug #0000242 (Missing Vendor: Mapmaker) * Python Script Changes: - Fixed BONUS* properties. |
|
From: Correa <thi...@us...> - 2004-10-15 20:07:08
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16195/npcs/humans Modified Files: vendors.xml Log Message: Fixed bug #0000242 (Missing Vendor: Cartographer) Index: vendors.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors.xml,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** vendors.xml 31 Jan 2004 22:48:28 -0000 1.29 --- vendors.xml 15 Oct 2004 20:06:57 -0000 1.30 *************** *** 30,33 **** --- 30,34 ---- <include file="definitions/npcs/humans/vendors/leatherworker.xml"/> <include file="definitions/npcs/humans/vendors/mage.xml"/> + <include file="definitions/npcs/humans/vendors/mapmaker.xml"/> <include file="definitions/npcs/humans/vendors/provisioner.xml"/> <include file="definitions/npcs/humans/vendors/shipwright.xml"/> |
|
From: Incanus <inc...@us...> - 2004-10-15 17:29:29
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14725/scripts/magic Modified Files: spell.py Log Message: victims of harmfull spells will now defend themself Index: spell.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/spell.py,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** spell.py 27 Sep 2004 22:33:22 -0000 1.29 --- spell.py 15 Oct 2004 17:29:15 -0000 1.30 *************** *** 446,450 **** # def harmchar(self, char, victim): ! pass class TargetWrapper: --- 446,452 ---- # def harmchar(self, char, victim): ! # Let the victim defend himself, if he isn't fighting yet ! if not( victim.attacktarget ): ! victim.fight(char) class TargetWrapper: |
|
From: Incanus <inc...@us...> - 2004-10-15 16:59:52
|
Update of /cvsroot/wpdev/xmlscripts/web In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8193/web Modified Files: status_template.html Log Message: Invis GMs are not shown on server status anymore (fix) Index: status_template.html =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/web/status_template.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** status_template.html 14 Oct 2004 22:51:42 -0000 1.4 --- status_template.html 15 Oct 2004 16:59:04 -0000 1.5 *************** *** 80,85 **** <table width="530" border="0" align="center" cellpadding="5" cellspacing="0"> <tr> - <td width="520"><strong>Connected Accounts:</strong> <%=wolfpack.sockets.count()%> of <%=wolfpack.accounts.count()%><br /> - <br /> <% socket = wolfpack.sockets.first() --- 80,83 ---- *************** *** 92,95 **** --- 90,95 ---- nextsocket = wolfpack.sockets.next() %> + <td width="520"><strong>Connected Accounts:</strong> <%=count_players%> of <%=wolfpack.accounts.count()%><br /> + <br /> <strong>Player Characters:</strong> <%=count_players%> <br /> <strong>NPCs:</strong> <%=wolfpack.npccount()%> <br /> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:39:33
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3823/npcs/animals/mounts Modified Files: ethereals.xml Log Message: etheral color for etherals Index: ethereals.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/animals/mounts/ethereals.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** ethereals.xml 10 Sep 2004 17:08:25 -0000 1.9 --- ethereals.xml 15 Oct 2004 16:39:23 -0000 1.10 *************** *** 11,14 **** --- 11,15 ---- <npc id="ETHEREAL_STATS" inherit="animal_base"> <ai>Animal_Wild</ai> + <color>0x4001</color> <karma>0</karma> <fame>0</fame> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:36:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3286/commands Modified Files: edit.py Log Message: kindling fix Index: edit.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/edit.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** edit.py 1 Oct 2004 16:34:10 -0000 1.3 --- edit.py 15 Oct 2004 16:36:38 -0000 1.4 *************** *** 24,32 **** command = (response.button >> 28) & 0xC item = wolfpack.finditem((response.button & 0x3FFFFFFF) | 0x40000000) ! # Delete Item if command == 0x04: player.log(LOG_MESSAGE, 'Deleting item 0x%x from character 0x%x.\n' % (item.serial, item.container.serial)) item.delete() # Bounce Item --- 24,35 ---- command = (response.button >> 28) & 0xC item = wolfpack.finditem((response.button & 0x3FFFFFFF) | 0x40000000) ! target = item.container ! # Delete Item if command == 0x04: player.log(LOG_MESSAGE, 'Deleting item 0x%x from character 0x%x.\n' % (item.serial, item.container.serial)) item.delete() + + showEditGump(player, target) # Bounce Item *************** *** 36,39 **** --- 39,44 ---- if not tobackpack(item, player): item.update() + + showEditGump(player, target) # Show Info For Item *************** *** 51,55 **** --- 56,66 ---- if not target.char: return + + showEditGump(player, target.char) + # + # Show the edit gump + # + def showEditGump(player, target): dialog = wolfpack.gumps.cGump() dialog.setCallback("commands.edit.response") *************** *** 58,62 **** for layer in range(LAYER_RIGHTHAND, LAYER_TRADING+1): ! item = target.char.itemonlayer(layer) if item: items.append(item) --- 69,73 ---- for layer in range(LAYER_RIGHTHAND, LAYER_TRADING+1): ! item = target.itemonlayer(layer) if item: items.append(item) |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:36:54
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3286 Modified Files: kindling.py Log Message: kindling fix Index: kindling.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/kindling.py,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** kindling.py 3 Oct 2004 13:57:09 -0000 1.8 --- kindling.py 15 Oct 2004 16:36:38 -0000 1.9 *************** *** 48,53 **** # Create the campfire campfire = wolfpack.additem( "de3" ) - campfire.moveto( pos ) campfire.decay = True campfire.update() --- 48,53 ---- # Create the campfire campfire = wolfpack.additem( "de3" ) campfire.decay = True + campfire.moveto( pos ) campfire.update() |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:29:23
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1497 Modified Files: timing.cpp Log Message: hunger fix for pets Index: timing.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** timing.cpp 14 Oct 2004 02:02:28 -0000 1.19 --- timing.cpp 15 Oct 2004 16:29:07 -0000 1.20 *************** *** 444,448 **** } ! npc->setHungerTime( time + Config::instance()->hungerRate() * MY_CLOCKS_PER_SEC ); switch ( npc->hunger() ) --- 444,448 ---- } ! npc->setHungerTime( time + Config::instance()->hungerRate() * 60 * MY_CLOCKS_PER_SEC ); switch ( npc->hunger() ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:03:39
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28196/webroot Modified Files: ChangeLog.wolfpack Log Message: monster sounds Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.155 retrieving revision 1.156 diff -C2 -d -r1.155 -r1.156 *** ChangeLog.wolfpack 15 Oct 2004 00:55:19 -0000 1.155 --- ChangeLog.wolfpack 15 Oct 2004 16:03:24 -0000 1.156 *************** *** 21,24 **** --- 21,25 ---- - Fixed a carpentry resource bug. - Added mountids for all known mountables. + - Fixed a lot of the monster sounds. * Python Script Changes: - Fixed BONUS* properties. |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:03:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28061/system Modified Files: bodyinfo.xml Log Message: Defined many new monster sounds Index: bodyinfo.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/bodyinfo.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** bodyinfo.xml 15 Oct 2004 14:00:43 -0000 1.4 --- bodyinfo.xml 15 Oct 2004 16:03:02 -0000 1.5 *************** *** 36,149 **** Omit if body is unmountable. --> ! <body id="0x1" basesound="0x1ab" figurine="0x20df" type="1" /> ! <body id="0x2" basesound="0x16f" figurine="0x20d8" type="1" /> ! <body id="0x3" basesound="0x1d7" figurine="0x20ec" type="1" /> ! <body id="0x4" basesound="0x174" figurine="0x20d9" flags="0x1" type="1" /> ! <body id="0x5" basesound="0x8f" figurine="0x20f2" flags="0x3" type="3" /> ! <body id="0x6" basesound="0x7d" figurine="0x20ee" soundmode="1" flags="0x1" type="3" /> ! <body id="0x7" basesound="0x1b0" figurine="0x20e0" type="1" /> ! <body id="0x8" basesound="0x1ba" figurine="0x20d2" soundmode="3" type="1" /> ! <body id="0x9" basesound="0x165" figurine="0x20d3" flags="0x1" type="1" /> ! <body id="0xa" basesound="0x165" figurine="0x20d3" flags="0x1" type="1" /> ! <body id="0xb" basesound="0x183" figurine="0x20fd" type="1" /> ! <body id="0xc" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0xd" basesound="0x107" figurine="0x20ed" flags="0x04" type="1" /> ! <body id="0xe" basesound="0x10c" figurine="0x20d7" type="1" /> ! <body id="0xf" basesound="0x111" figurine="0x20f3" flags="0x04" type="1" /> ! <body id="0x10" basesound="0x116" figurine="0x210b" flags="0x04" type="1" /> ! <body id="0x11" basesound="0x1b0" figurine="0x20e0" type="1" /> ! <body id="0x12" basesound="0x16f" figurine="0x20d8" type="1" /> ! <body id="0x13" basesound="0x183" figurine="0x20fd" type="1" /> ! <body id="0x14" basesound="0x388" figurine="0x20fd" type="1" /> ! <body id="0x15" basesound="0xdb" figurine="0x20fe" type="1" /> ! <body id="0x16" basesound="0x179" figurine="0x20ea" type="1" /> ! <body id="0x17" basesound="0xe5" figurine="0x211c" type="3" /> ! <body id="0x18" basesound="0x19c" figurine="0x20f8" type="1" /> ! <body id="0x19" basesound="0xe5" figurine="0x211c" type="3" /> ! <body id="0x1a" basesound="0x17e" figurine="0x2109" type="1" /> ! <body id="0x1b" basesound="0xe5" figurine="0x211c" type="3" /> ! <body id="0x1c" basesound="0x183" figurine="0x20fd" type="1" /> ! <body id="0x1d" basesound="0x9e" figurine="0x20f5" type="3" /> ! <body id="0x1e" basesound="0x192" figurine="0x20dc" type="1" /> ! <body id="0x1f" basesound="0x197" figurine="0x210a" type="1" /> ! <body id="0x21" basesound="0x1a1" figurine="0x20de" type="1" /> ! <body id="0x22" basesound="0xe5" figurine="0x211c" type="3" /> ! <body id="0x23" basesound="0x1a1" figurine="0x20de" type="1" /> ! <body id="0x24" basesound="0x1a1" figurine="0x20de" type="1" /> ! <body id="0x25" basesound="0xe5" figurine="0x211c" type="3" /> <body id="0x26" basesound="0x2b8" figurine="0x2585" flags="0x1" type="1" /> ! <body id="0x27" basesound="0x1a6" figurine="0x20f9" flags="0x1" type="1" /> ! <body id="0x28" basesound="0x2b8" figurine="0x2586" flags="0x1" type="1" /> ! <body id="0x29" basesound="0x1b0" figurine="0x20e0" type="1" /> ! <body id="0x2a" basesound="0x1b5" figurine="0x20e3" type="1" /> ! <body id="0x2b" basesound="0x2b8" figurine="0x2587" flags="0x1" type="1" /> ! <body id="0x2c" basesound="0x1b5" figurine="0x20e3" type="1" /> ! <body id="0x2d" basesound="0x1b5" figurine="0x20e3" type="1" /> ! <body id="0x2e" basesound="0x16a" figurine="0x2104" flags="0x1" type="1" /> ! <body id="0x2f" basesound="0x1ba" figurine="0x20fa" type="1" /> ! <body id="0x30" basesound="0x18d" figurine="0x20e4" type="1" /> ! <body id="0x31" basesound="0x16a" figurine="0x2104" flags="0x1" type="1" /> ! <body id="0x32" basesound="0x1c4" figurine="0x20e7" type="1" /> ! <body id="0x33" basesound="0x1c8" figurine="0x20e8" flags="0x2" type="1" /> ! <body id="0x34" basesound="0xdb" figurine="0x20fc" type="3" /> ! <body id="0x35" basesound="0x1cd" figurine="0x20e9" type="1" /> ! <body id="0x36" basesound="0x1cd" figurine="0x20e9" type="1" /> ! <body id="0x37" basesound="0x1cd" figurine="0x20e9" type="1" /> ! <body id="0x38" basesound="0x1c4" figurine="0x20e7" type="1" /> ! <body id="0x39" basesound="0x1c4" figurine="0x20e7" type="1" /> ! <body id="0x3a" basesound="0x1d2" figurine="0x2100" type="1" /> ! <body id="0x3b" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3c" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3d" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3e" basesound="0x16a" figurine="0x25d4" flags="0x1" type="1" /> ! <body id="0x3f" basesound="0x73" figurine="0x2583" type="3" /> ! <body id="0x40" basesound="0x73" figurine="0x25a3" type="3" /> ! <body id="0x41" basesound="0x73" figurine="0x25a3" type="3" /> ! <body id="0x42" basesound="0x27f" figurine="0x25c8" type="1" /> ! <body id="0x43" basesound="0x174" figurine="0x258e" type="1" /> ! <body id="0x44" basesound="0x179" figurine="0x258f" type="1" /> ! <body id="0x45" basesound="0x36b" figurine="0x20f4" type="1" /> ! <body id="0x46" basesound="0x24e" figurine="0x25c9" type="1" /> ! <body id="0x47" basesound="0x24e" figurine="0x25ca" type="1" /> ! <body id="0x48" basesound="0x258" figurine="0x25cb" type="1" /> ! <body id="0x49" basesound="0x192" figurine="0x2594" flags="0x1" type="1" /> ! <body id="0x4a" basesound="0x3bf" figurine="0x259f" flags="0x1" type="1" /> ! <body id="0x4b" basesound="0x25c" figurine="0x212d" type="1" /> ! <body id="0x4c" basesound="0x261" figurine="0x25cd" type="1" /> ! <body id="0x4d" basesound="0x44c" figurine="0x25a2" type="1" /> ! <body id="0x4e" basesound="0x19c" figurine="0x20f8" type="1" /> ! <body id="0x4f" basesound="0x1a1" figurine="0x20f8" type="1" /> ! <body id="0x50" basesound="0x35a" figurine="0x212f" type="1" /> ! <body id="0x51" basesound="0x35f" figurine="0x2130" type="3" /> ! <body id="0x52" basesound="0x1a1" figurine="0x20f8" type="1" /> ! <body id="0x53" basesound="0x1ab" figurine="0x20cb" type="1" /> ! <body id="0x54" basesound="0x1ab" figurine="0x20cb" type="1" /> ! <body id="0x55" basesound="0x280" figurine="0x25ab" type="1" /> ! <body id="0x56" basesound="0x27b" figurine="0x25ac" type="1" /> ! <body id="0x57" basesound="0x285" figurine="0x25ad" type="1" /> ! <body id="0x58" basesound="0x99" figurine="0x2580" type="3" /> ! <body id="0x59" basesound="0x183" figurine="0x25c0" type="1" /> ! <body id="0x5a" basesound="0x183" figurine="0x25c1" type="1" /> ! <body id="0x5b" basesound="0x388" figurine="0x25c2" type="1" /> ! <body id="0x5c" basesound="0x388" figurine="0x25c2" type="1" /> ! <body id="0x5d" basesound="0x388" figurine="0x25c2" type="1" /> ! <body id="0x5e" basesound="0x1c8" figurine="0x20e8" type="1" /> ! <body id="0x60" basesound="0x1c8" figurine="0x20e8" type="1" /> ! <body id="0x61" basesound="0x85" figurine="0x2596" type="3" /> ! <body id="0x62" basesound="0x85" figurine="0x2596" type="3" /> ! <body id="0x63" basesound="0xe5" figurine="0x25cf" type="3" /> ! <body id="0x64" basesound="0xe5" figurine="0x25cf" type="3" /> ! <body id="0x65" basesound="0x2a7" figurine="0x2581" type="1" /> ! <body id="0x66" basesound="0x300" figurine="0x2105" flags="0x1" type="1" /> ! <body id="0x67" basesound="0x2c0" figurine="0x2593" flags="0x1" type="1" /> ! <body id="0x68" basesound="0x488" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x69" basesound="0x2d2" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x6a" basesound="0x2cd" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x6b" basesound="0x10c" figurine="0x25d9" type="1" /> ! <body id="0x6c" basesound="0x10c" figurine="0x25d9" type="1" /> ! <body id="0x6d" basesound="0x10c" figurine="0x25d9" type="1" /> ! <body id="0x6e" basesound="0x10c" figurine="0x20d7" type="1" /> ! <body id="0x6f" basesound="0x10c" figurine="0x20d7" type="1" /> ! <body id="0x70" basesound="0x10c" figurine="0x20d7" type="1" /> <body id="0x71" basesound="0xa8" figurine="0x2121" type="1" /> <body id="0x72" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea9" /> <!-- Dark Steed --> --- 36,150 ---- Omit if body is unmountable. --> ! <body id="0x1" basesound="427" figurine="0x20df" type="1" /> ! <body id="0x2" basesound="367" figurine="0x20d8" type="1" /> ! <body id="0x3" basesound="471" figurine="0x20ec" type="1" /> ! <body id="0x4" basesound="372" figurine="0x20d9" flags="0x1" type="1" /> ! <body id="0x5" basesound="750" figurine="0x20f2" flags="0x3" type="3" /> ! <body id="0x6" basesound="27" figurine="0x20ee" flags="0x1" type="3" /> ! <!-- There is another base sound for tropical birds: 191 --> ! <body id="0x7" basesound="1114" figurine="0x20e0" type="1" /> ! <body id="0x8" basesound="684" figurine="0x20d2" type="1" /> ! <body id="0x9" basesound="357" figurine="0x20d3" flags="0x1" type="1" /> ! <body id="0xa" basesound="357" figurine="0x20d3" flags="0x1" type="1" /> ! <body id="0xb" basesound="1170" figurine="0x20fd" type="1" /> ! <body id="0xc" basesound="362" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0xd" basesound="655" figurine="0x20ed" flags="0x04" type="1" /> ! <body id="0xe" basesound="268" figurine="0x20d7" type="1" /> ! <body id="0xf" basesound="838" figurine="0x20f3" flags="0x04" type="1" /> ! <body id="0x10" basesound="278" figurine="0x210b" flags="0x04" type="1" /> ! <body id="0x11" basesound="1114" figurine="0x20e0" type="1" /> ! <body id="0x12" basesound="367" figurine="0x20d8" type="1" /> ! <body id="0x13" basesound="1170" figurine="0x20fd" type="1" /> ! <body id="0x14" basesound="904" figurine="0x20fd" type="1" /> ! <body id="0x15" basesound="219" figurine="0x20fe" type="1" /> ! <body id="0x16" basesound="377" figurine="0x20ea" type="1" /> ! <body id="0x17" basesound="229" figurine="0x211c" type="3" /> ! <body id="0x18" basesound="1001" figurine="0x20f8" type="1" /> ! <body id="0x19" basesound="229" figurine="0x211c" type="3" /> ! <body id="0x1a" basesound="1154" figurine="0x2109" type="1" /> ! <body id="0x1b" basesound="229" figurine="0x211c" type="3" /> ! <body id="0x1c" basesound="904" figurine="0x20fd" type="1" /> ! <body id="0x1d" basesound="158" figurine="0x20f5" type="3" /> ! <body id="0x1e" figurine="0x20dc" type="1" hitsound="916" attacksound="916" deathsound="917" gethitsound="919" idlesound="918" /> ! <body id="0x1f" basesound="925" figurine="0x210a" type="1" /> ! <body id="0x21" basesound="417" figurine="0x20de" type="1" /> ! <body id="0x22" basesound="229" figurine="0x211c" type="3" /> ! <body id="0x23" basesound="417" figurine="0x20de" type="1" /> ! <body id="0x24" basesound="417" figurine="0x20de" type="1" /> ! <body id="0x25" basesound="229" figurine="0x211c" type="3" /> <body id="0x26" basesound="0x2b8" figurine="0x2585" flags="0x1" type="1" /> ! <body id="0x27" basesound="0x1a6" figurine="0x20f9" flags="0x1" type="1" /> <!-- Black Gate Daemon --> ! <body id="0x28" basesound="422" figurine="0x2586" flags="0x1" type="1" /> <!-- Mongbat --> ! <body id="0x29" basesound="1114" figurine="0x20e0" type="1" /> ! <body id="0x2a" basesound="437" figurine="0x20e3" type="1" /> ! <body id="0x2b" basesound="357" figurine="0x2587" flags="0x1" type="1" /> ! <body id="0x2c" basesound="437" figurine="0x20e3" type="1" /> ! <body id="0x2d" basesound="437" figurine="0x20e3" type="1" /> ! <body id="0x2e" basesound="362" figurine="0x2104" flags="0x1" type="1" idlesound="723" gethitsound="721" /> ! <body id="0x2f" basesound="442" figurine="0x20fa" type="1" /> ! <body id="0x30" basesound="397" figurine="0x20e4" type="1" /> ! <body id="0x31" basesound="362" figurine="0x2104" flags="0x1" type="1" /> ! <body id="0x32" basesound="1165" figurine="0x20e7" type="1" /> ! <body id="0x33" basesound="456" figurine="0x20e8" flags="0x2" type="1" /> ! <body id="0x34" basesound="219" figurine="0x20fc" type="3" /> ! <body id="0x35" basesound="461" figurine="0x20e9" type="1" /> ! <body id="0x36" basesound="461" figurine="0x20e9" type="1" /> ! <body id="0x37" basesound="461" figurine="0x20e9" type="1" /> ! <body id="0x38" basesound="1165" figurine="0x20e7" type="1" /> ! <body id="0x39" basesound="1165" figurine="0x20e7" type="1" /> ! <body id="0x3a" basesound="466" figurine="0x2100" type="1" /> ! <body id="0x3b" basesound="362" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3c" basesound="362" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3d" basesound="362" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x3e" basesound="362" figurine="0x25d4" flags="0x1" type="1" /> ! <body id="0x3f" basesound="115" figurine="0x2583" type="3" /> ! <body id="0x40" basesound="115" figurine="0x25a3" type="3" /> ! <body id="0x41" basesound="115" figurine="0x25a3" type="3" /> ! <body id="0x42" basesound="352" figurine="0x25c8" type="1" /> ! <body id="0x43" basesound="372" figurine="0x258e" type="1" /> ! <body id="0x44" basesound="377" figurine="0x258f" type="1" /> ! <body id="0x45" basesound="377" figurine="0x20f4" type="1" /> ! <body id="0x46" basesound="589" figurine="0x25c9" type="1" /> ! <body id="0x47" basesound="594" figurine="0x25ca" type="1" /> ! <body id="0x48" basesound="599" figurine="0x25cb" type="1" /> ! <body id="0x49" basesound="402" figurine="0x2594" flags="0x1" type="1" /> ! <body id="0x4a" basesound="422" figurine="0x259f" flags="0x1" type="1" /> ! <body id="0x4b" basesound="604" figurine="0x212d" type="1" /> ! <body id="0x4c" basesound="609" figurine="0x25cd" type="1" /> ! <body id="0x4d" basesound="353" figurine="0x25a2" type="1" /> ! <body id="0x4e" basesound="412" figurine="0x20f8" type="1" /> ! <body id="0x4f" basesound="412" figurine="0x20f8" type="1" /> ! <body id="0x50" basesound="619" figurine="0x212f" type="1" /> ! <body id="0x51" basesound="614" figurine="0x2130" type="3" /> ! <body id="0x52" basesound="412" figurine="0x20f8" type="1" /> ! <body id="0x53" basesound="427" figurine="0x20cb" type="1" /> ! <body id="0x54" basesound="427" figurine="0x20cb" type="1" /> ! <body id="0x55" basesound="639" figurine="0x25ab" type="1" /> ! <body id="0x56" basesound="634" figurine="0x25ac" type="1" /> ! <body id="0x57" basesound="644" figurine="0x25ad" type="1" /> ! <body id="0x58" basesound="153" figurine="0x2580" type="3" /> ! <body id="0x59" basesound="219" figurine="0x25c0" type="1" /> ! <body id="0x5a" basesound="219" figurine="0x25c1" type="1" /> ! <body id="0x5b" basesound="219" figurine="0x25c2" type="1" /> ! <body id="0x5c" basesound="219" figurine="0x25c2" type="1" /> ! <body id="0x5d" basesound="219" figurine="0x25c2" type="1" /> ! <body id="0x5e" basesound="456" figurine="0x20e8" type="1" /> ! <body id="0x60" basesound="456" figurine="0x20e8" type="1" /> ! <body id="0x61" basesound="229" figurine="0x2596" type="3" /> ! <body id="0x62" basesound="229" figurine="0x2596" type="3" /> ! <body id="0x63" basesound="229" figurine="0x25cf" type="3" /> ! <body id="0x64" basesound="229" figurine="0x25cf" type="3" /> ! <body id="0x65" basesound="679" figurine="0x2581" type="1" /> ! <body id="0x66" basesound="0x300" figurine="0x2105" flags="0x1" type="1" /> <!-- Exodus Daemon --> ! <body id="0x67" basesound="362" figurine="0x2593" flags="0x1" type="1" /> ! <body id="0x68" basesound="1160" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x69" basesound="0x2d2" figurine="0x20d6" flags="0x1" type="1" /> <!-- Dark Dragon --> ! <body id="0x6a" basesound="362" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x6b" basesound="268" figurine="0x25d9" type="1" /> <!-- Agapite Elemental --> ! <body id="0x6c" basesound="268" figurine="0x25d9" type="1" /> ! <body id="0x6d" basesound="268" figurine="0x25d9" type="1" /> ! <body id="0x6e" basesound="268" figurine="0x20d7" type="1" /> ! <body id="0x6f" basesound="268" figurine="0x20d7" type="1" /> ! <body id="0x70" basesound="268" figurine="0x20d7" type="1" /> <body id="0x71" basesound="0xa8" figurine="0x2121" type="1" /> <body id="0x72" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea9" /> <!-- Dark Steed --> *************** *** 156,185 **** <body id="0x79" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eb0" /> <!-- Green Steed --> <body id="0x7a" basesound="0x4bc" figurine="0x25ce" type="3" mountid="0x3eb4" /> <!-- Unicorn --> ! <body id="0x7b" basesound="0x2f5" figurine="0x2589" flags="0x1" type="1" /> ! <body id="0x7c" basesound="0x24d" figurine="0x258a" type="1" /> ! <body id="0x7d" basesound="0x27f" figurine="0x258b" type="1" /> ! <body id="0x7e" basesound="0x257" figurine="0x258b" type="1" /> ! <body id="0x7f" basesound="0x69" figurine="0x2597" type="3" /> ! <body id="0x80" basesound="0x46d" figurine="0x25b6" type="1" /> ! <body id="0x81" basesound="0x34e" figurine="0x25c8" type="1" /> ! <body id="0x82" basesound="0x174" figurine="0x20d9" type="1" /> ! <body id="0x83" basesound="0x370" figurine="0x2590" type="1" /> <body id="0x84" basesound="0x3c5" figurine="0x25a0" type="3" mountid="0x3ead" /> <!-- Kirin --> ! <body id="0x85" basesound="0x5a" figurine="0x211f" type="3" /> ! <body id="0x86" basesound="0x2c7" figurine="0x25a1" flags="0x1" type="3" /> ! <body id="0x87" basesound="0x1ab" figurine="0x25a8" type="1" /> ! <body id="0x88" basesound="0x280" figurine="0x25a9" type="1" /> ! <body id="0x89" basesound="0x27b" figurine="0x25aa" type="1" /> ! <body id="0x8a" basesound="0x459" figurine="0x25b0" type="1" /> ! <body id="0x8b" basesound="0x459" figurine="0x25b0" type="1" /> ! <body id="0x8c" basesound="0x1ab" figurine="0x25b1" type="1" /> ! <body id="0x8d" basesound="0x447" figurine="0x2106" type="1" /> ! <body id="0x8e" basesound="0x1b5" figurine="0x25b7" type="1" /> <body id="0x8f" basesound="0x1b5" figurine="0x25b7" type="1" /> ! <body id="0x90" basesound="0x478" figurine="0x25ba" type="2" mountid="0x3eb3" /> <!-- Light Blue Steed --> ! <body id="0x91" basesound="0x3" figurine="0x20fb" type="2" /> <body id="0x92" basesound="0x47d" figurine="0x258a" type="1" /> ! <body id="0x93" basesound="0x48d" figurine="0x25bd" type="1" /> ! <body id="0x94" basesound="0x48d" figurine="0x25be" type="1" /> <body id="0x95" basesound="0x4b0" figurine="0x259f" type="1" /> <body id="0x96" basesound="0x3" figurine="0x20fb" type="2" /> --- 157,186 ---- <body id="0x79" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eb0" /> <!-- Green Steed --> <body id="0x7a" basesound="0x4bc" figurine="0x25ce" type="3" mountid="0x3eb4" /> <!-- Unicorn --> ! <body id="0x7b" basesound="0x2f5" figurine="0x2589" flags="0x1" type="1" attacksound="760" idlesound="760" hitsound="757" gethitsound="761" deathsound="759"/> ! <body id="0x7c" basesound="0x24d" figurine="0x258a" type="1" /> <!-- Evil Mage --> ! <body id="0x7d" basesound="0x27f" figurine="0x258b" type="1" /> <!-- Evil Mage --> ! <body id="0x7e" basesound="0x27f" figurine="0x258b" type="1" /> <!-- Evil Mage --> ! <body id="0x7f" basesound="0xBA" figurine="0x2597" type="3" /> ! <body id="0x80" basesound="0x467" figurine="0x25b6" type="1" /> ! <body id="0x81" basesound="352" figurine="0x25c8" type="1" /> <!-- Tentacles of the Harrower --> ! <body id="0x82" basesound="372" figurine="0x20d9" type="1" /> ! <body id="0x83" basesound="768" figurine="0x2590" type="1" /> <body id="0x84" basesound="0x3c5" figurine="0x25a0" type="3" mountid="0x3ead" /> <!-- Kirin --> ! <body id="0x85" basesound="660" figurine="0x211f" type="3" /> ! <body id="0x86" basesound="660" figurine="0x25a1" flags="0x1" type="3" /> ! <body id="0x87" basesound="427" figurine="0x25a8" type="1" /> ! <body id="0x88" basesound="639" figurine="0x25a9" type="1" /> <!-- Ophidian Mage --> ! <body id="0x89" basesound="0x27b" figurine="0x25aa" type="1" /> <!-- Ophidian Warrior --> ! <body id="0x8a" basesound="1114" figurine="0x25b0" type="1" /> ! <body id="0x8b" basesound="1114" figurine="0x25b0" type="1" /> ! <body id="0x8c" basesound="1114" figurine="0x25b1" type="1" /> ! <body id="0x8d" basesound="0x447" figurine="0x2106" type="1" /> <!-- Human ?? --> ! <body id="0x8e" basesound="0x1b5" figurine="0x25b7" type="1" /> <!-- blue ratman --> <body id="0x8f" basesound="0x1b5" figurine="0x25b7" type="1" /> ! <body id="0x90" basesound="0x478" figurine="0x25ba" type="2" mountid="0x3eb3" /> <!-- Sea Horse --> ! <body id="0x91" basesound="447" figurine="0x20fb" type="2" /> <!-- Sea Serpent --> <body id="0x92" basesound="0x47d" figurine="0x258a" type="1" /> ! <body id="0x93" basesound="451" figurine="0x25bd" type="1" /> ! <body id="0x94" basesound="451" figurine="0x25be" type="1" /> <!-- Bone Magi --> <body id="0x95" basesound="0x4b0" figurine="0x259f" type="1" /> <body id="0x96" basesound="0x3" figurine="0x20fb" type="2" /> *************** *** 190,198 **** <body id="0x9b" basesound="0x1d7" figurine="0x25a7" type="1" /> <body id="0x9d" basesound="0x388" figurine="0x25c3" type="1" /> ! <body id="0x9e" basesound="0x205" figurine="0x25d6" soundmode="2" type="1" /> ! <body id="0x9f" basesound="0x205" figurine="0x25d8" soundmode="2" type="1" /> ! <body id="0xa0" basesound="0x205" figurine="0x25d8" soundmode="2" type="1" /> ! <body id="0xa1" basesound="0x107" figurine="0x25da" type="1" /> ! <body id="0xa2" basesound="0x205" figurine="0x25db" soundmode="2" type="1" /> <body id="0xa3" basesound="0x10c" figurine="0x25dc" type="1" /> <body id="0xa4" basesound="0x107" figurine="0x25d8" type="1" /> --- 191,199 ---- <body id="0x9b" basesound="0x1d7" figurine="0x25a7" type="1" /> <body id="0x9d" basesound="0x388" figurine="0x25c3" type="1" /> ! <body id="0x9e" basesound="278" figurine="0x25d6" type="1" /> ! <body id="0x9f" basesound="278" figurine="0x25d8" type="1" /> ! <body id="0xa0" basesound="278" figurine="0x25d8" type="1" /> ! <body id="0xa1" basesound="268" figurine="0x25da" type="1" /> ! <body id="0xa2" basesound="263" figurine="0x25db" type="1" /> <body id="0xa3" basesound="0x10c" figurine="0x25dc" type="1" /> <body id="0xa4" basesound="0x107" figurine="0x25d8" type="1" /> *************** *** 380,385 **** <body id="0x342" basesound="0x2a2" figurine="0x2597" /> <body id="0x343" basesound="0xc9" figurine="0x2125" soundmode="2" /> ! <body id="0x345" basesound="0xdb" figurine="0x25c0" /> ! <body id="0x346" basesound="0xdb" figurine="0x25c1" /> <body id="0x347" basesound="0x365" figurine="0x25b2" /> <body id="0x348" basesound="0x365" figurine="0x25b2" /> --- 381,386 ---- <body id="0x342" basesound="0x2a2" figurine="0x2597" /> <body id="0x343" basesound="0xc9" figurine="0x2125" soundmode="2" /> ! <body id="0x345" basesound="219" figurine="0x25c0" /> ! <body id="0x346" basesound="219" figurine="0x25c1" /> <body id="0x347" basesound="0x365" figurine="0x25b2" /> <body id="0x348" basesound="0x365" figurine="0x25b2" /> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:03:24
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28061/npcs/monsters/undead Modified Files: ethereal_warrior.xml headless_one.xml Log Message: Defined many new monster sounds Index: ethereal_warrior.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/ethereal_warrior.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** ethereal_warrior.xml 10 Oct 2004 18:24:31 -0000 1.11 --- ethereal_warrior.xml 15 Oct 2004 16:03:01 -0000 1.12 *************** *** 35,38 **** --- 35,39 ---- <lootpacks>lootpack_rich;lootpack_rich;lootpack_rich;gems</lootpacks> <category>Monsters\Undead\Ethereal Warrior</category> + <hitsound>757,758</hitsound> <!-- Carve --> Index: headless_one.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/undead/headless_one.xml,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** headless_one.xml 10 Oct 2004 18:24:31 -0000 1.18 --- headless_one.xml 15 Oct 2004 16:03:02 -0000 1.19 *************** *** 10,13 **** --- 10,14 ---- <npc id="headless" inherit="undead_base"> <name>headless one</name> + <skin><random list="SKINS_HUMAN" /></skin> <id>31</id> <inherit id="KARMA_L0" /> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:03:20
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28061/npcs/monsters/champions Modified Files: the_harrower.xml the_true_harrower.xml Log Message: Defined many new monster sounds Index: the_harrower.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/the_harrower.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** the_harrower.xml 28 Sep 2004 13:02:20 -0000 1.5 --- the_harrower.xml 15 Oct 2004 16:03:00 -0000 1.6 *************** *** 19,23 **** <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints><random min="39000" max="39000"/></maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> --- 19,23 ---- <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints>30000</maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> Index: the_true_harrower.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/champions/the_true_harrower.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** the_true_harrower.xml 28 Sep 2004 13:02:20 -0000 1.6 --- the_true_harrower.xml 15 Oct 2004 16:03:00 -0000 1.7 *************** *** 19,23 **** <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints><random min="39000" max="39000"/></maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> --- 19,23 ---- <dex><random min="126" max="140"/></dex> <int><random min="1001" max="1200"/></int> ! <maxhitpoints><random min="65000" max="65000"/></maxhitpoints> <!-- Skills --> <magicresistance><random min="1202" max="1600"/></magicresistance> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 16:03:20
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28061/npcs/monsters/elemental Modified Files: air_elemental.xml Log Message: Defined many new monster sounds Index: air_elemental.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/monsters/elemental/air_elemental.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** air_elemental.xml 10 Oct 2004 18:24:30 -0000 1.15 --- air_elemental.xml 15 Oct 2004 16:03:01 -0000 1.16 *************** *** 12,15 **** --- 12,16 ---- <npc id="air_elemental" inherit="monster_base"> <id>13</id> + <skin>0x4001</skin> <name>air elemental</name> <!-- Attributes --> |
|
From: Incanus <inc...@us...> - 2004-10-15 15:01:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12232/scripts Modified Files: archery_butte.py Log Message: archery butte now allows yumi (samurai bow) Index: archery_butte.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/archery_butte.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** archery_butte.py 27 Sep 2004 16:28:31 -0000 1.12 --- archery_butte.py 15 Oct 2004 15:01:16 -0000 1.13 *************** *** 165,169 **** def ammoType( char ): # Bows & Crossbows are on layer 1 ! # Composite Bow and Repeating Crossbow on layer 2 item = char.getweapon() --- 165,169 ---- def ammoType( char ): # Bows & Crossbows are on layer 1 ! # Yumi, Composite Bow and Repeating Crossbow on layer 2 item = char.getweapon() *************** *** 190,193 **** --- 190,197 ---- return 0x1bfb + # Yumi + if( item.id == 0x27a5 or item.id == 0x27f0 ): + return 0xf3f + # Unknown Weapon return -1 |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 14:38:52
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6361 Modified Files: ChangeLog basechar.cpp basechar.h basedef.cpp basedef.h npc.cpp player.cpp Log Message: sound update Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** basedef.cpp 15 Oct 2004 00:53:10 -0000 1.26 --- basedef.cpp 15 Oct 2004 14:38:22 -0000 1.27 *************** *** 119,123 **** cBaseDef::reset(); basesound_ = 0; - soundmode_ = 0; figurine_ = 0; minDamage_ = 0; --- 119,122 ---- *************** *** 128,131 **** --- 127,136 ---- wanderSpeed_ = 400; actionSpeed_ = 200; + // Initialize the overrides to not override... + attackSound_.clear(); + idleSound_.clear(); + hitSound_.clear(); + gethitSound_.clear(); + deathSound_.clear(); } *************** *** 136,142 **** basesound_ = node->value().toInt(); } ! else if ( node->name() == "soundmode" ) { ! soundmode_ = node->value().toInt(); } else if ( node->name() == "figurine" ) --- 141,183 ---- basesound_ = node->value().toInt(); } ! else if ( node->name() == "attacksound" ) { ! QStringList parts = QStringList::split(",", node->text()); ! for (int i = 0; i < parts.size(); ++i) { ! unsigned short value = hex2dec(hex2dec(parts[i])).toUShort(); ! attackSound_.append(value); ! } ! } ! else if ( node->name() == "idlesound" ) ! { ! QStringList parts = QStringList::split(",", node->text()); ! for (int i = 0; i < parts.size(); ++i) { ! unsigned short value = hex2dec(hex2dec(parts[i])).toUShort(); ! idleSound_.append(value); ! } ! } ! else if ( node->name() == "hitsound" ) ! { ! QStringList parts = QStringList::split(",", node->text()); ! for (int i = 0; i < parts.size(); ++i) { ! unsigned short value = hex2dec(hex2dec(parts[i])).toUShort(); ! hitSound_.append(value); ! } ! } ! else if ( node->name() == "gethitsound" ) ! { ! QStringList parts = QStringList::split(",", node->text()); ! for (int i = 0; i < parts.size(); ++i) { ! unsigned short value = hex2dec(hex2dec(parts[i])).toUShort(); ! gethitSound_.append(value); ! } ! } ! else if ( node->name() == "deathsound" ) ! { ! QStringList parts = QStringList::split(",", node->text()); ! for (int i = 0; i < parts.size(); ++i) { ! unsigned short value = hex2dec(hex2dec(parts[i])).toUShort(); ! deathSound_.append(value); ! } } else if ( node->name() == "figurine" ) *************** *** 242,245 **** --- 283,295 ---- memset(bodyinfo, 0, sizeof(bodyinfo)); + // Manually initialize the sounds to -1... + for(int i = 0; i < 0x400; ++i) { + bodyinfo[i].attackSound = -1; + bodyinfo[i].deathSound = -1; + bodyinfo[i].gethitSound = -1; + bodyinfo[i].hitSound = -1; + bodyinfo[i].idleSound = -1; + } + QString filename = Config::instance()->getString("General", "Bodyinfo File", "definitions/system/bodyinfo.xml", true); QFile file(filename); *************** *** 294,319 **** } ! // Load the mount item for mounting ! QString mountid = hex2dec(element.attribute("mountid")); ! if (!mountid.isNull()) { ! bodyinfo.mountid = mountid.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid mountid in bodyinfo file: %1.\n").arg(mountid)); continue; } } else { ! bodyinfo.mountid = 0; } ! // Soundmode for skipping non existing sounds ! QString soundmode = hex2dec(element.attribute("soundmode")); ! if (!soundmode.isNull()) { ! bodyinfo.soundmode = soundmode.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid soundmode in bodyinfo file: %1.\n").arg(soundmode)); continue; } } else { ! bodyinfo.soundmode = 0; } --- 344,413 ---- } ! // Load the override sounds ! QString attacksound = hex2dec(element.attribute("attacksound")); ! if (!attacksound.isNull()) { ! bodyinfo.attackSound = attacksound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid attacksound in bodyinfo file: %1.\n").arg(attacksound)); continue; } } else { ! bodyinfo.attackSound = -1; } ! QString idlesound = hex2dec(element.attribute("idlesound")); ! if (!idlesound.isNull()) { ! bodyinfo.idleSound = idlesound.toUShort(&ok); if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid idlesound in bodyinfo file: %1.\n").arg(idlesound)); continue; } } else { ! bodyinfo.idleSound = -1; ! } ! ! QString hitsound = hex2dec(element.attribute("hitsound")); ! if (!hitsound.isNull()) { ! bodyinfo.hitSound = hitsound.toUShort(&ok); ! if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid hitsound in bodyinfo file: %1.\n").arg(hitsound)); ! continue; ! } ! } else { ! bodyinfo.hitSound = -1; ! } ! ! QString gethitsound = hex2dec(element.attribute("gethitsound")); ! if (!gethitsound.isNull()) { ! bodyinfo.gethitSound = gethitsound.toUShort(&ok); ! if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid gethitsound in bodyinfo file: %1.\n").arg(gethitsound)); ! continue; ! } ! } else { ! bodyinfo.gethitSound = -1; ! } ! ! QString deathsound = hex2dec(element.attribute("deathsound")); ! if (!deathsound.isNull()) { ! bodyinfo.deathSound = deathsound.toUShort(&ok); ! if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid deathsound in bodyinfo file: %1.\n").arg(deathsound)); ! continue; ! } ! } else { ! bodyinfo.deathSound = -1; ! } ! ! // Load the mount item for mounting ! QString mountid = hex2dec(element.attribute("mountid")); ! if (!mountid.isNull()) { ! bodyinfo.mountid = mountid.toUShort(&ok); ! if (!ok) { ! Console::instance()->log(LOG_WARNING, tr("Invalid mountid in bodyinfo file: %1.\n").arg(mountid)); ! continue; ! } ! } else { ! bodyinfo.mountid = 0; } Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.162 retrieving revision 1.163 diff -C2 -d -r1.162 -r1.163 *** basechar.cpp 15 Oct 2004 00:53:10 -0000 1.162 --- basechar.cpp 15 Oct 2004 14:38:22 -0000 1.163 *************** *** 750,788 **** } - void cBaseChar::playDeathSound() - { - if ( orgBody_ == 0x0191 ) - { - switch ( RandomNum( 0, 3 ) ) - { - case 0: - soundEffect( 0x0150 ); break;// Female Death - case 1: - soundEffect( 0x0151 ); break;// Female Death - case 2: - soundEffect( 0x0152 ); break;// Female Death - case 3: - soundEffect( 0x0153 ); break;// Female Death - } - } - else if ( orgBody_ == 0x0190 ) - { - switch ( RandomNum( 0, 3 ) ) - { - case 0: - soundEffect( 0x015A ); break;// Male Death - case 1: - soundEffect( 0x015B ); break;// Male Death - case 2: - soundEffect( 0x015C ); break;// Male Death - case 3: - soundEffect( 0x015D ); break;// Male Death - } - } - else - { - bark( Bark_Death ); - } - } // This should check soon if we are standing above our --- 750,753 ---- *************** *** 2096,2111 **** PY_PROPERTY( "basesound", basesound() ) - /* \rproperty char.soundmode Which sounds are available for this creature. See basesound for the offset. - Possible values: - <code>0: normal, 5 sounds (attack-started, idle, attack, defence, dying) - 1: birds .. only one "bird-shape" and zillions of sounds ... - 2: only 3 sounds -> (attack,defence,dying) - 3: only 4 sounds -> (attack-started,attack,defense,dying) - 4: only 1 sound</code> - - This property is inherited from the definition referenced by the baseid property. - */ - PY_PROPERTY( "soundmode", soundmode() ) - /* \rproperty char.canfly Indicates whether the creature can fly. --- 2061,2064 ---- *************** *** 2433,2486 **** void cBaseChar::bark( enBark type ) { ! if ( body() == 0x190 || body() == 0x192 ) ! { ! if ( type == Bark_GetHit ) ! { ! unsigned short sound = hex2dec( Definitions::instance()->getRandomListEntry( "SOUNDS_COMBAT_HIT_HUMAN_MALE" ) ).toUShort(); ! ! if ( sound > 0 ) ! soundEffect( sound ); ! else ! soundEffect( 0x156 ); ! ! return; ! } ! } ! else if ( body() == 0x191 || body() == 0x193 ) ! { ! unsigned short sound = hex2dec( Definitions::instance()->getRandomListEntry( "SOUNDS_COMBAT_HIT_HUMAN_FEMALE" ) ).toUShort(); ! if ( sound > 0 ) ! soundEffect( sound ); ! else ! soundEffect( 0x14b ); ! } ! ! if ( !basesound() ) // Nothing known about this creature ! return; ! ! switch ( soundmode() ) ! { ! // Only Attack, Hit and Death sounds available (Falltrough!) ! case 2: ! if ( type == Bark_GetHit ) ! return; ! ! // Only Attack, Hit, GetHit and Death ! case 3: ! if ( type == Bark_Idle ) ! return; ! ! break; ! ! // Only the first sound is available ! case 4: ! if ( type != Bark_Attacking ) ! return; ! ! default: ! break; ! } ! ! soundEffect( basesound() + ( unsigned char ) type ); } --- 2386,2408 ---- void cBaseChar::bark( enBark type ) { ! switch (type) { ! case Bark_Attacking: ! playAttackSound(); ! break; ! case Bark_Idle: ! playIdleSound(); ! break; ! case Bark_Hit: ! playHitSound(); ! break; ! case Bark_GetHit: ! playGetHitSound(); ! break; ! case Bark_Death: ! playDeathSound(); ! break; ! default: ! break; ! }; } *************** *** 3594,3595 **** --- 3516,3620 ---- return cUObject::hasScript(name); } + + void cBaseChar::playAttackSound() { + stBodyInfo bodyinfo = CharBaseDefs::instance()->getBodyInfo(body_); + int sound = -1; + + if (basedef_ && basedef_->attackSound().size() != 0) { + sound = basedef_->attackSound()[RandomNum(0, basedef_->attackSound().size() - 1)]; + } else if (basedef_ && basedef_->basesound() != 0) { + sound = basedef_->basesound(); + } else if (bodyinfo.attackSound != -1) { + sound = bodyinfo.attackSound; + } else if (bodyinfo.basesound != 0) { + sound = bodyinfo.basesound; + } + + if (sound >= 0) { + soundEffect((unsigned short)sound); + } + } + + void cBaseChar::playIdleSound() { + stBodyInfo bodyinfo = CharBaseDefs::instance()->getBodyInfo(body_); + int sound = -1; + + if (basedef_ && basedef_->idleSound().size() != 0) { + sound = basedef_->idleSound()[RandomNum(0, basedef_->idleSound().size() - 1)]; + } else if (basedef_ && basedef_->basesound() != 0) { + sound = basedef_->basesound() + 1; + } else if (bodyinfo.idleSound != -1) { + sound = bodyinfo.idleSound; + } else if (bodyinfo.basesound != 0) { + sound = bodyinfo.basesound + 1; + } + + if (sound >= 0) { + soundEffect((unsigned short)sound); + } + } + + void cBaseChar::playHitSound() { + stBodyInfo bodyinfo = CharBaseDefs::instance()->getBodyInfo(body_); + int sound = -1; + + if (basedef_ && basedef_->hitSound().size() != 0) { + sound = basedef_->hitSound()[RandomNum(0, basedef_->hitSound().size() - 1)]; + } else if (basedef_ && basedef_->basesound() != 0) { + sound = basedef_->basesound() + 2; + } else if (bodyinfo.hitSound != -1) { + sound = bodyinfo.hitSound; + } else if (bodyinfo.basesound != 0) { + sound = bodyinfo.basesound + 2; + } + + if (sound >= 0) { + soundEffect((unsigned short)sound); + } + } + + void cBaseChar::playGetHitSound() { + stBodyInfo bodyinfo = CharBaseDefs::instance()->getBodyInfo(body_); + int sound = -1; + + if (basedef_ && basedef_->gethitSound().size() != 0) { + sound = basedef_->gethitSound()[RandomNum(0, basedef_->gethitSound().size() - 1)]; + } else if (basedef_ && basedef_->basesound() != 0) { + sound = basedef_->basesound() + 3; + } else if (bodyinfo.gethitSound != -1) { + sound = bodyinfo.gethitSound; + } else if (bodyinfo.basesound != 0) { + sound = bodyinfo.basesound + 3; + } + + if (sound >= 0) { + soundEffect((unsigned short)sound); + } + } + + void cBaseChar::playDeathSound() { + if (isHuman()) { + if (isFemale()) { + soundEffect( 0x150 + RandomNum(0, 3) ); + } else { + soundEffect( 0x15A + RandomNum(0, 3) ); + } + } else { + stBodyInfo bodyinfo = CharBaseDefs::instance()->getBodyInfo(body_); + int sound = -1; + + if (basedef_ && basedef_->deathSound().size() != 0) { + sound = basedef_->deathSound()[RandomNum(0, basedef_->deathSound().size() - 1)]; + } else if (basedef_ && basedef_->basesound() != 0) { + sound = basedef_->basesound() + 4; + } else if (bodyinfo.deathSound != -1) { + sound = bodyinfo.deathSound; + } else if (bodyinfo.basesound != 0) { + sound = bodyinfo.basesound + 4; + } + + if (sound >= 0) { + soundEffect((unsigned short)sound); + } + } + } Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** basedef.h 15 Oct 2004 00:53:10 -0000 1.21 --- basedef.h 15 Oct 2004 14:38:22 -0000 1.22 *************** *** 128,132 **** // Sounds unsigned short basesound_; - unsigned char soundmode_; unsigned char type_; unsigned short figurine_; --- 128,131 ---- *************** *** 141,144 **** --- 140,150 ---- unsigned int wanderSpeed_; // ms between moves + // Override the override... ;) + QValueVector<unsigned short> attackSound_; + QValueVector<unsigned short> idleSound_; + QValueVector<unsigned short> hitSound_; + QValueVector<unsigned short> gethitSound_; + QValueVector<unsigned short> deathSound_; + // Misc Properties void load(); *************** *** 156,159 **** --- 162,190 ---- } + inline const QValueVector<unsigned short> &attackSound() { + load(); + return attackSound_; + } + + inline const QValueVector<unsigned short> &idleSound() { + load(); + return idleSound_; + } + + inline const QValueVector<unsigned short> &hitSound() { + load(); + return hitSound_; + } + + inline const QValueVector<unsigned short> &gethitSound() { + load(); + return gethitSound_; + } + + inline const QValueVector<unsigned short> &deathSound() { + load(); + return deathSound_; + } + inline unsigned int wanderSpeed() { *************** *** 180,189 **** } - inline unsigned char soundmode() - { - load(); - return soundmode_; - } - inline unsigned short figurine() { --- 211,214 ---- *************** *** 237,243 **** unsigned short figurine; unsigned char flags; - unsigned char soundmode; unsigned char type; unsigned short mountid; }; --- 262,274 ---- unsigned short figurine; unsigned char flags; unsigned char type; unsigned short mountid; + + // These sounds override the basesound + soundtype if neccesary + int attackSound; + int idleSound; + int hitSound; + int gethitSound; + int deathSound; }; Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.139 retrieving revision 1.140 diff -C2 -d -r1.139 -r1.140 *** player.cpp 15 Oct 2004 00:53:10 -0000 1.139 --- player.cpp 15 Oct 2004 14:38:22 -0000 1.140 *************** *** 486,490 **** pMountItem->setColor( pMount->skin() ); ! this->setDirection( pMount->direction() ); this->addItem( cBaseChar::Mount, pMountItem ); pMountItem->setTag( "pet", cVariant( pMount->serial() ) ); --- 486,494 ---- pMountItem->setColor( pMount->skin() ); ! if (direction() != pMount->direction()) { ! setDirection( pMount->direction() ); ! update(); ! } ! this->addItem( cBaseChar::Mount, pMountItem ); pMountItem->setTag( "pet", cVariant( pMount->serial() ) ); Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.111 retrieving revision 1.112 diff -C2 -d -r1.111 -r1.112 *** ChangeLog 15 Oct 2004 00:53:10 -0000 1.111 --- ChangeLog 15 Oct 2004 14:38:22 -0000 1.112 *************** *** 52,55 **** --- 52,57 ---- - Fix bug #302 ( Char should face mount's direction after mouting ) - Moved the mount item information from the core to the bodyinfo file. + - Overhauled the body sound system. Now allows for every sound to be overriden individually in the bodyinfo or + in the base definition. Wolfpack 12.9.11 Beta (26. September 2004) Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.90 retrieving revision 1.91 diff -C2 -d -r1.90 -r1.91 *** basechar.h 15 Oct 2004 00:53:10 -0000 1.90 --- basechar.h 15 Oct 2004 14:38:22 -0000 1.91 *************** *** 279,283 **** void setBeardColor( ushort d ); void setBeardStyle( ushort d ); - void playDeathSound(); double getHitpointRate(); double getStaminaRate(); --- 279,282 ---- *************** *** 289,292 **** --- 288,292 ---- void wear( P_ITEM ); bool isHuman() const; + bool isFemale() const; bool isMurderer() const; bool isCriminal() const; *************** *** 552,555 **** --- 552,562 ---- } + // Get the body specific sounds + void playAttackSound(); + void playIdleSound(); + void playHitSound(); + void playGetHitSound(); + void playDeathSound(); + // Base Definition Getters inline unsigned short basesound() *************** *** 576,588 **** } - inline unsigned char soundmode() - { - unsigned char result = basedef_ ? basedef_->soundmode() : 0; - if (!result) { - result = CharBaseDefs::instance()->getBodyInfo(body()).soundmode; - } - return result; - } - inline unsigned int wanderSpeed() { --- 583,586 ---- *************** *** 1572,1578 **** } inline bool cBaseChar::isHuman() const { ! return ( body_ == 0x190 || body_ == 0x191 ); } --- 1570,1589 ---- } + inline bool cBaseChar::isFemale() const + { + return ( body_ == 0x191 || body_ == 0x193 ); + } + inline bool cBaseChar::isHuman() const { ! if ( body_ >= 0x190 && body_ <= 0x193 ) { ! return true; // Human female, Human male + ghosts ! } ! ! if ( body_ == 0x3df || body_ == 0x3db || body_ == 0x3e2) { ! return true; // Blackthorne, GM, Dupree ! } ! ! return false; } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** npc.cpp 11 Oct 2004 19:03:41 -0000 1.122 --- npc.cpp 15 Oct 2004 14:38:22 -0000 1.123 *************** *** 1468,1472 **** cDelayedOnCreateCall* onCreateCall = new cDelayedOnCreateCall( pChar, section ); Timers::instance()->insert( onCreateCall ); ! pChar->resend( false ); return pChar; } --- 1468,1472 ---- cDelayedOnCreateCall* onCreateCall = new cDelayedOnCreateCall( pChar, section ); Timers::instance()->insert( onCreateCall ); ! pChar->resend(true); return pChar; } |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 14:38:51
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6361/python Modified Files: global.cpp Log Message: sound update Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.165 retrieving revision 1.166 diff -C2 -d -r1.165 -r1.166 *** global.cpp 15 Oct 2004 00:53:11 -0000 1.165 --- global.cpp 15 Oct 2004 14:38:23 -0000 1.166 *************** *** 1744,1748 **** \return A dictionary with the following keys:<code> - basesound - - soundmode - flags - figurine --- 1744,1747 ---- *************** *** 1769,1773 **** PyDict_SetItemString( dict, "mountid", PyInt_FromLong( info.mountid ) ); PyDict_SetItemString( dict, "flags", PyInt_FromLong( info.flags ) ); - PyDict_SetItemString( dict, "soundmode", PyInt_FromLong( info.soundmode ) ); PyDict_SetItemString( dict, "type", PyInt_FromLong( info.type ) ); return dict; --- 1768,1771 ---- |
|
From: Incanus <inc...@us...> - 2004-10-15 14:00:56
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28783/definitions/system Modified Files: bodyinfo.xml Log Message: fixes Index: bodyinfo.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/bodyinfo.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bodyinfo.xml 15 Oct 2004 00:53:19 -0000 1.3 --- bodyinfo.xml 15 Oct 2004 14:00:43 -0000 1.4 *************** *** 225,240 **** <body id="0xbd" basesound="0x45a" figurine="0x25b0" type="1" /> ! <!-- be type=3 mountid="0x3e9e" --> <!-- Fire Steed --> ! <!-- bf type=3 mountid="0x3e9c" --> <!-- Kirin --> ! <!-- c0 type=3 mountid="0x3e9b" --> <!-- Unicorn --> ! <!-- c1 type=3 mountid="0x3e9a" --> <!-- Ridgeback --> ! <!-- c2 type=3 mountid="0x3e98" --> <!-- Swamp Dragon --> ! <!-- c3 type=3 mountid="0x3e97" --> <!-- Beetle --> ! <body id="0xc8" basesound="0xa8" figurine="0x211f" type="3" mountid="0x3e9f" /> <body id="0xc9" basesound="0x69" figurine="0x211b" flags="0x2" type="3" /> <body id="0xca" basesound="0x5a" figurine="0x20da" type="3" /> <body id="0xcb" basesound="0xc4" figurine="0x2101" type="3" /> ! <body id="0xcc" basesound="0xa8" figurine="0x2121" type="3" /> <body id="0xcd" basesound="0xc9" figurine="0x2125" soundmode="2" type="3" /> --- 225,240 ---- <body id="0xbd" basesound="0x45a" figurine="0x25b0" type="1" /> ! <body id="0xbe" basesound="0xa8" figurine="0x2124" type="3" mountid="0x3e9e" /> <!-- Fire Steed --> ! <body id="0xbf" basesound="0x3c5" figurine="0x25a0" type="3" mountid="0x3e9c" /> <!-- Kirin --> ! <body id="0xc0" basesound="0x4bc" figurine="0x25ce" type="3" mountid="0x3e9b" /> <!-- Unicorn --> ! <body id="0xc1" basesound="0x365" figurine="0x25b2" type="1" mountid="0x3e9a" /> <!-- Ridgeback --> ! <body id="0xc2" basesound="0x16a" figurine="0x2593" flags="0x1" type="3" mountid="0x3e98" /> <!-- Swamp Dragon --> ! <body id="0xc3" basesound="0x2bd" figurine="0x25c3" type="3" mountid="0x3e97" /> <!-- Beetle --> ! <body id="0xc8" basesound="0xa8" figurine="0x2124" type="3" mountid="0x3e9f" /> <body id="0xc9" basesound="0x69" figurine="0x211b" flags="0x2" type="3" /> <body id="0xca" basesound="0x5a" figurine="0x20da" type="3" /> <body id="0xcb" basesound="0xc4" figurine="0x2101" type="3" /> ! <body id="0xcc" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3ea2" /> <body id="0xcd" basesound="0xc9" figurine="0x2125" soundmode="2" type="3" /> *************** *** 260,264 **** <body id="0xdf" basesound="0xd8" figurine="0x20e6" soundmode="2" type="3" /> <body id="0xe1" basesound="0xe5" figurine="0x20ea" flags="0x2" type="3" /> ! <body id="0xe2" basesound="0xa8" figurine="0x2124" type="3" mountid="0x3ea0" /> <body id="0xe4" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea1" /> <body id="0xe7" basesound="0x78" figurine="0x20f0" flags="0x2" type="3" /> --- 260,264 ---- <body id="0xdf" basesound="0xd8" figurine="0x20e6" soundmode="2" type="3" /> <body id="0xe1" basesound="0xe5" figurine="0x20ea" flags="0x2" type="3" /> ! <body id="0xe2" basesound="0xa8" figurine="0x211f" type="3" mountid="0x3ea0" /> <body id="0xe4" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea1" /> <body id="0xe7" basesound="0x78" figurine="0x20f0" flags="0x2" type="3" /> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 00:55:29
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28381/webroot Modified Files: ChangeLog.wolfpack Log Message: fixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.154 retrieving revision 1.155 diff -C2 -d -r1.154 -r1.155 *** ChangeLog.wolfpack 14 Oct 2004 22:51:41 -0000 1.154 --- ChangeLog.wolfpack 15 Oct 2004 00:55:19 -0000 1.155 *************** *** 18,21 **** --- 18,24 ---- - Fiexd bug #0000347. (Campfires not disappearing, wrong light id) - Added different NPC speeds. + - Added encryption keys for 4.0.5 + - Fixed a carpentry resource bug. + - Added mountids for all known mountables. * Python Script Changes: - Fixed BONUS* properties. |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 00:53:32
|
Update of /cvsroot/wpdev/xmlscripts/definitions/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28005/system Modified Files: bodyinfo.xml Log Message: fixes Index: bodyinfo.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/system/bodyinfo.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bodyinfo.xml 14 Sep 2004 00:01:00 -0000 1.2 --- bodyinfo.xml 15 Oct 2004 00:53:19 -0000 1.3 *************** *** 31,34 **** --- 31,38 ---- 3: Animal 4: Human + + MOUNTID: + The id of the item that should be equipped when this body is mounted. + Omit if body is unmountable. --> <body id="0x1" basesound="0x1ab" figurine="0x20df" type="1" /> *************** *** 143,155 **** <body id="0x70" basesound="0x10c" figurine="0x20d7" type="1" /> <body id="0x71" basesound="0xa8" figurine="0x2121" type="1" /> ! <body id="0x72" basesound="0xa8" figurine="0x2120" type="3" /> ! <body id="0x73" basesound="0xa8" figurine="0x259c" type="3" /> ! <body id="0x74" basesound="0xa8" figurine="0x259d" type="3" /> ! <body id="0x75" basesound="0xa8" figurine="0x2121" type="3" /> ! <body id="0x76" basesound="0xa8" figurine="0x2121" type="3" /> ! <body id="0x77" basesound="0xa8" figurine="0x2121" type="3" /> ! <body id="0x78" basesound="0xa8" figurine="0x2121" type="3" /> ! <body id="0x79" basesound="0xa8" figurine="0x2121" type="3" /> ! <body id="0x7a" basesound="0x4bc" figurine="0x25ce" type="3" /> <body id="0x7b" basesound="0x2f5" figurine="0x2589" flags="0x1" type="1" /> <body id="0x7c" basesound="0x24d" figurine="0x258a" type="1" /> --- 147,159 ---- <body id="0x70" basesound="0x10c" figurine="0x20d7" type="1" /> <body id="0x71" basesound="0xa8" figurine="0x2121" type="1" /> ! <body id="0x72" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea9" /> <!-- Dark Steed --> ! <body id="0x73" basesound="0xa8" figurine="0x259c" type="3" mountid="0x3eaa" /> <!-- Etheral Horse --> ! <body id="0x74" basesound="0xa8" figurine="0x259d" type="3" mountid="0x3ea7" /> <!-- Dark Steed --> ! <body id="0x75" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3ea8" /> <!-- White Steed --> ! <body id="0x76" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eb2" /> <!-- Violet Steed --> ! <body id="0x77" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eb1" /> <!-- Blue Steed --> ! <body id="0x78" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eaf" /> <!-- Dark Red Steed --> ! <body id="0x79" basesound="0xa8" figurine="0x2121" type="3" mountid="0x3eb0" /> <!-- Green Steed --> ! <body id="0x7a" basesound="0x4bc" figurine="0x25ce" type="3" mountid="0x3eb4" /> <!-- Unicorn --> <body id="0x7b" basesound="0x2f5" figurine="0x2589" flags="0x1" type="1" /> <body id="0x7c" basesound="0x24d" figurine="0x258a" type="1" /> *************** *** 161,165 **** <body id="0x82" basesound="0x174" figurine="0x20d9" type="1" /> <body id="0x83" basesound="0x370" figurine="0x2590" type="1" /> ! <body id="0x84" basesound="0x3c5" figurine="0x25a0" type="3" /> <body id="0x85" basesound="0x5a" figurine="0x211f" type="3" /> <body id="0x86" basesound="0x2c7" figurine="0x25a1" flags="0x1" type="3" /> --- 165,169 ---- <body id="0x82" basesound="0x174" figurine="0x20d9" type="1" /> <body id="0x83" basesound="0x370" figurine="0x2590" type="1" /> ! <body id="0x84" basesound="0x3c5" figurine="0x25a0" type="3" mountid="0x3ead" /> <!-- Kirin --> <body id="0x85" basesound="0x5a" figurine="0x211f" type="3" /> <body id="0x86" basesound="0x2c7" figurine="0x25a1" flags="0x1" type="3" /> *************** *** 173,177 **** <body id="0x8e" basesound="0x1b5" figurine="0x25b7" type="1" /> <body id="0x8f" basesound="0x1b5" figurine="0x25b7" type="1" /> ! <body id="0x90" basesound="0x478" figurine="0x25ba" type="2" /> <body id="0x91" basesound="0x3" figurine="0x20fb" type="2" /> <body id="0x92" basesound="0x47d" figurine="0x258a" type="1" /> --- 177,181 ---- <body id="0x8e" basesound="0x1b5" figurine="0x25b7" type="1" /> <body id="0x8f" basesound="0x1b5" figurine="0x25b7" type="1" /> ! <body id="0x90" basesound="0x478" figurine="0x25ba" type="2" mountid="0x3eb3" /> <!-- Light Blue Steed --> <body id="0x91" basesound="0x3" figurine="0x20fb" type="2" /> <body id="0x92" basesound="0x47d" figurine="0x258a" type="1" /> *************** *** 197,202 **** <body id="0xa7" basesound="0x4c2" figurine="0x211e" type="3" /> <body id="0xa8" basesound="0x3bf" figurine="0x259f" type="1" /> ! <body id="0xaa" basesound="0x3f3" figurine="0x20f6" type="3" /> ! <body id="0xab" basesound="0xb7" figurine="0x25b4" soundmode="2" type="3" /> <body id="0xac" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> <body id="0xad" basesound="0x388" figurine="0x25c3" type="1" /> --- 201,207 ---- <body id="0xa7" basesound="0x4c2" figurine="0x211e" type="3" /> <body id="0xa8" basesound="0x3bf" figurine="0x259f" type="1" /> ! <body id="0xa9" mountid="0x3e95" /> <!-- Beetle --> ! <body id="0xaa" basesound="0x3f3" figurine="0x20f6" type="3" mountid="0x3eab" /> <!-- Etheral Llama --> ! <body id="0xab" basesound="0xb7" figurine="0x25b4" soundmode="2" type="3" mountid="0x3eac" /> <!-- Etheral Ostard --> <body id="0xac" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> <body id="0xad" basesound="0x388" figurine="0x25c3" type="1" /> *************** *** 204,209 **** <body id="0xaf" basesound="0x2fa" figurine="0x2589" type="1" /> <body id="0xb0" basesound="0x46c" figurine="0x25b6" flags="0x1" type="1" /> ! <body id="0xb2" basesound="0xa8" figurine="0x259c" type="3" /> ! <body id="0xb3" basesound="0xa8" figurine="0x259c" type="3" /> <body id="0xb4" basesound="0x2c0" figurine="0x20d6" flags="0x1" type="3" /> <body id="0xb5" basesound="0x1b0" figurine="0x25af" type="1" /> --- 209,215 ---- <body id="0xaf" basesound="0x2fa" figurine="0x2589" type="1" /> <body id="0xb0" basesound="0x46c" figurine="0x25b6" flags="0x1" type="1" /> ! <body id="0xb1" mountid="0x3eb5" /> <!-- Dark Steed --> ! <body id="0xb2" basesound="0xa8" figurine="0x259c" type="3" mountid="0x3eb6" /> <!-- Dark Steed --> ! <body id="0xb3" basesound="0xa8" figurine="0x259c" type="3" mountid="0x3eb7" /> <!-- Dark Steed --> <body id="0xb4" basesound="0x2c0" figurine="0x20d6" flags="0x1" type="3" /> <body id="0xb5" basesound="0x1b0" figurine="0x25af" type="1" /> *************** *** 215,230 **** <!-- ba type=4 --> ! <body id="0xbb" basesound="0x365" figurine="0x25b2" type="1" /> ! <body id="0xbc" basesound="0x365" figurine="0x25b2" type="3" /> <body id="0xbd" basesound="0x45a" figurine="0x25b0" type="1" /> ! <!-- be type=3 --> ! <!-- bf type=3 --> ! <!-- c0 type=3 --> ! <!-- c1 type=3 --> ! <!-- c2 type=3 --> ! <!-- c3 type=3 --> ! <body id="0xc8" basesound="0xa8" figurine="0x211f" type="3" /> <body id="0xc9" basesound="0x69" figurine="0x211b" flags="0x2" type="3" /> <body id="0xca" basesound="0x5a" figurine="0x20da" type="3" /> --- 221,236 ---- <!-- ba type=4 --> ! <body id="0xbb" basesound="0x365" figurine="0x25b2" type="1" mountid="0x3eba" /> <!-- Ridgeback --> ! <body id="0xbc" basesound="0x365" figurine="0x25b2" type="3" mountid="0x3eb8" /> <!-- Savage Ridgeback --> <body id="0xbd" basesound="0x45a" figurine="0x25b0" type="1" /> ! <!-- be type=3 mountid="0x3e9e" --> <!-- Fire Steed --> ! <!-- bf type=3 mountid="0x3e9c" --> <!-- Kirin --> ! <!-- c0 type=3 mountid="0x3e9b" --> <!-- Unicorn --> ! <!-- c1 type=3 mountid="0x3e9a" --> <!-- Ridgeback --> ! <!-- c2 type=3 mountid="0x3e98" --> <!-- Swamp Dragon --> ! <!-- c3 type=3 mountid="0x3e97" --> <!-- Beetle --> ! <body id="0xc8" basesound="0xa8" figurine="0x211f" type="3" mountid="0x3e9f" /> <body id="0xc9" basesound="0x69" figurine="0x211b" flags="0x2" type="3" /> <body id="0xca" basesound="0x5a" figurine="0x20da" type="3" /> *************** *** 248,259 **** <body id="0xd8" basesound="0x78" figurine="0x20f0" type="3" /> <body id="0xd9" basesound="0x85" figurine="0x20d5" type="3" /> ! <body id="0xda" basesound="0x3f5" figurine="0x25b3" type="3" /> ! <body id="0xdb" basesound="0x3f5" figurine="0x25b4" type="3" /> ! <body id="0xdc" basesound="0xb7" figurine="0x20f6" soundmode="2" type="3" /> <body id="0xdd" basesound="0xe0" figurine="0x20ff" type="3" /> <body id="0xdf" basesound="0xd8" figurine="0x20e6" soundmode="2" type="3" /> <body id="0xe1" basesound="0xe5" figurine="0x20ea" flags="0x2" type="3" /> ! <body id="0xe2" basesound="0xa8" figurine="0x2124" type="3" /> ! <body id="0xe4" basesound="0xa8" figurine="0x2120" type="3" /> <body id="0xe7" basesound="0x78" figurine="0x20f0" flags="0x2" type="3" /> <body id="0xe8" basesound="0x64" figurine="0x20ef" flags="0x2" type="3" /> --- 254,265 ---- <body id="0xd8" basesound="0x78" figurine="0x20f0" type="3" /> <body id="0xd9" basesound="0x85" figurine="0x20d5" type="3" /> ! <body id="0xda" basesound="0x3f5" figurine="0x25b3" type="3" mountid="0x3ea4" /> ! <body id="0xdb" basesound="0x3f5" figurine="0x25b4" type="3" mountid="0x3ea5" /> ! <body id="0xdc" basesound="0xb7" figurine="0x20f6" soundmode="2" type="3" mountid="0x3ea6" /> <body id="0xdd" basesound="0xe0" figurine="0x20ff" type="3" /> <body id="0xdf" basesound="0xd8" figurine="0x20e6" soundmode="2" type="3" /> <body id="0xe1" basesound="0xe5" figurine="0x20ea" flags="0x2" type="3" /> ! <body id="0xe2" basesound="0xa8" figurine="0x2124" type="3" mountid="0x3ea0" /> ! <body id="0xe4" basesound="0xa8" figurine="0x2120" type="3" mountid="0x3ea1" /> <body id="0xe7" basesound="0x78" figurine="0x20f0" flags="0x2" type="3" /> <body id="0xe8" basesound="0x64" figurine="0x20ef" flags="0x2" type="3" /> *************** *** 261,265 **** <body id="0xea" basesound="0x82" figurine="0x20d4" soundmode="2" type="3" /> <body id="0xed" basesound="0x82" figurine="0x20d4" soundmode="2" type="3" /> ! <body id="0xee" basesound="0xcc" figurine="0x2123" type="3" /> <body id="0x122" basesound="0xc4" figurine="0x2101" type="3" /> <body id="0x123" basesound="0xa8" figurine="0x2126" type="3" /> --- 267,276 ---- <body id="0xea" basesound="0x82" figurine="0x20d4" soundmode="2" type="3" /> <body id="0xed" basesound="0x82" figurine="0x20d4" soundmode="2" type="3" /> ! <body id="0xee" basesound="0xcc" figurine="0x2123" type="3" mountid="0x3ea2" /> ! ! <!-- <body id="0xd2" mountid="0x3ea3" /> --> ! ! <body id="0xf3" basesound="0" figurine="0" type="3" mountid="0x3e94" /> <!-- New Asian Ridable --> ! <body id="0x122" basesound="0xc4" figurine="0x2101" type="3" /> <body id="0x123" basesound="0xa8" figurine="0x2126" type="3" /> *************** *** 342,354 **** <body id="0x315" basesound="0x451" figurine="0x25c4" type="1" /> <body id="0x316" basesound="0x28f" figurine="0x25d9" type="1" /> ! <body id="0x317" basesound="0x2bd" figurine="0x25c3" type="3" /> <body id="0x318" basesound="0x165" figurine="0x2584" type="1" /> ! <body id="0x319" basesound="0xa8" figurine="0x259b" type="3" /> ! <body id="0x31a" basesound="0x16a" figurine="0x2593" flags="0x1" type="3" /> <body id="0x31b" basesound="0x2b9" figurine="0x2584" type="1" /> <body id="0x31c" basesound="0x2b9" figurine="0x2584" type="1" /> <body id="0x31d" basesound="0x111" figurine="0x20d6" flags="0x1" type="1" /> <body id="0x31e" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x31f" basesound="0x16a" figurine="0x20d6" flags="0x1" type="3" /> <!-- 324 type=1 --> --- 353,365 ---- <body id="0x315" basesound="0x451" figurine="0x25c4" type="1" /> <body id="0x316" basesound="0x28f" figurine="0x25d9" type="1" /> ! <body id="0x317" basesound="0x2bd" figurine="0x25c3" type="3" mountid="0x3ebc" /> <!-- Beetle --> <body id="0x318" basesound="0x165" figurine="0x2584" type="1" /> ! <body id="0x319" basesound="0xa8" figurine="0x259b" type="3" mountid="0x3ebb" /> <!-- Skeletal Steed --> ! <body id="0x31a" basesound="0x16a" figurine="0x2593" flags="0x1" type="3" mountid="0x3ebd" /> <!-- Swamp Dragon --> <body id="0x31b" basesound="0x2b9" figurine="0x2584" type="1" /> <body id="0x31c" basesound="0x2b9" figurine="0x2584" type="1" /> <body id="0x31d" basesound="0x111" figurine="0x20d6" flags="0x1" type="1" /> <body id="0x31e" basesound="0x16a" figurine="0x20d6" flags="0x1" type="1" /> ! <body id="0x31f" basesound="0x16a" figurine="0x20d6" flags="0x1" type="3" mountid="0x3ebe" /> <!-- Armored Swamp Dragon --> <!-- 324 type=1 --> |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 00:53:21
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27943 Modified Files: ChangeLog basechar.cpp basechar.h basedef.cpp basedef.h gumps.cpp player.cpp player.h res.rc serverconfig.cpp serverconfig.h verinfo.h Log Message: Mounting updates. Index: verinfo.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** verinfo.h 9 Sep 2004 23:31:10 -0000 1.45 --- verinfo.h 15 Oct 2004 00:53:10 -0000 1.46 *************** *** 36,40 **** inline const char* productVersion() { ! return "12.9.11"; } --- 36,40 ---- inline const char* productVersion() { ! return "12.9.12"; } Index: player.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.h,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** player.h 24 Sep 2004 04:47:37 -0000 1.60 --- player.h 15 Oct 2004 00:53:10 -0000 1.61 *************** *** 106,110 **** PyObject* getProperty( const QString& name ); P_NPC unmount(); ! void mount( P_NPC pMount ); bool isGM() const; bool isCounselor() const; --- 106,110 ---- PyObject* getProperty( const QString& name ); P_NPC unmount(); ! bool mount( P_NPC pMount ); bool isGM() const; bool isCounselor() const; Index: res.rc =================================================================== RCS file: /cvsroot/wpdev/wolfpack/res.rc,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** res.rc 9 Sep 2004 23:31:10 -0000 1.34 --- res.rc 15 Oct 2004 00:53:10 -0000 1.35 *************** *** 36,40 **** 1 VERSIONINFO ! FILEVERSION 12,9,11,0 PRODUCTVERSION 13,0,0,0 FILEFLAGSMASK 0x3fL --- 36,40 ---- 1 VERSIONINFO ! FILEVERSION 12,9,12,0 PRODUCTVERSION 13,0,0,0 FILEFLAGSMASK 0x3fL *************** *** 55,59 **** VALUE "CompanyName", "Wolfpack Development Team" VALUE "FileDescription", "Ultima Online Server Emulator" ! VALUE "FileVersion", "12.9.11 Beta" VALUE "LegalCopyright", "© 2001-2004 Wolfpack Dev. Team" VALUE "OriginalFilename", "wolfpack.exe" --- 55,59 ---- VALUE "CompanyName", "Wolfpack Development Team" VALUE "FileDescription", "Ultima Online Server Emulator" ! VALUE "FileVersion", "12.9.12 Beta" VALUE "LegalCopyright", "© 2001-2004 Wolfpack Dev. Team" VALUE "OriginalFilename", "wolfpack.exe" Index: serverconfig.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** serverconfig.cpp 14 Oct 2004 18:02:16 -0000 1.15 --- serverconfig.cpp 15 Oct 2004 00:53:10 -0000 1.16 *************** *** 176,179 **** --- 176,180 ---- logPath_ = QDir::convertSeparators( getString( "General", "LogPath", "./logs/", true ) ); logRotate_ = getBool( "General", "LogRotate", true, true ); + mountRange_ = getNumber( "General", "Mount Range", 2, true ); // Network Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.161 retrieving revision 1.162 diff -C2 -d -r1.161 -r1.162 *** basechar.cpp 12 Oct 2004 23:59:27 -0000 1.161 --- basechar.cpp 15 Oct 2004 00:53:10 -0000 1.162 *************** *** 2526,2596 **** } ! // Is that faster ?? ! switch ( body_ ) ! { ! case 0x003A: ! case 0x0039: ! case 0x003B: ! case 0x0074: ! case 0x0075: ! case 0x0072: ! case 0x007A: ! case 0x0084: ! case 0x0073: ! case 0x0076: ! case 0x0077: ! case 0x0078: ! case 0x0079: ! case 0x00AA: ! case 0x00AB: ! case 0x00BB: ! case 0x0090: ! case 0x00C8: ! case 0x00E2: ! case 0x00E4: ! case 0x00CC: ! case 0x00DC: ! case 0x00D2: ! case 0x00DA: ! case 0x00DB: ! case 0x0317: ! case 0x0319: ! case 0x031A: ! case 0x031F: ! // Try to mount the rideable animal ! if ( dist( pChar ) < 2 || pChar->isGM() ) ! { ! if ( !pChar->isHuman() ) ! { ! source->clilocMessage( 1061628 ); // You can't do that while polymorphed ! return; ! } ! if ( pChar->isDead() ) ! { ! source->clilocMessage( 500949 ); ! return; } ! ! if ( isAtWar() ) ! source->sysMessage( tr( "Your pet is in battle right now!" ) ); ! else ! pChar->mount( dynamic_cast<P_NPC>( this ) ); ! } ! else ! { ! source->clilocMessage( 500206 ); } ! ! break; ! case 0x123: ! case 0x124: ! if ( objectType() == enNPC && dynamic_cast<P_NPC>( this )->owner() == pChar ) ! source->sendContainer( getBackpack() ); ! break; ! ! default: ! break; ! }; } --- 2526,2541 ---- } ! P_NPC npc = dynamic_cast<P_NPC>(this); ! // Mounting and pack animals ! if (npc) { ! if (body_ == 0x123 || body_ == 0x124) { ! if ( npc->owner() == pChar || pChar->isGM() ) { ! source->sendContainer( getBackpack() ); } ! } else { ! pChar->mount(npc); // Try mounting this } ! } } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.110 retrieving revision 1.111 diff -C2 -d -r1.110 -r1.111 *** ChangeLog 14 Oct 2004 16:30:40 -0000 1.110 --- ChangeLog 15 Oct 2004 00:53:10 -0000 1.111 *************** *** 51,54 **** --- 51,55 ---- - Fix for items on very high z values interfering with walking. - Fix bug #302 ( Char should face mount's direction after mouting ) + - Moved the mount item information from the core to the bodyinfo file. Wolfpack 12.9.11 Beta (26. September 2004) Index: serverconfig.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/serverconfig.h,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** serverconfig.h 9 Oct 2004 14:28:59 -0000 1.7 --- serverconfig.h 15 Oct 2004 00:53:10 -0000 1.8 *************** *** 90,93 **** --- 90,94 ---- unsigned int statsAdvanceModifier_; unsigned short objectDelay_; + unsigned char mountRange_; bool stealing_; bool guardsActive_; *************** *** 236,239 **** --- 237,241 ---- unsigned int itemDecayTime() const; unsigned int corpseDecayTime() const; + unsigned char mountRange() const; bool lootdecayswithcorpse() const; float invisTimer() const; *************** *** 773,776 **** --- 775,783 ---- } + inline unsigned char cConfig::mountRange() const + { + return mountRange_; + } + inline unsigned int cConfig::maxCharsPerAccount() const { Index: gumps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v retrieving revision 1.175 retrieving revision 1.176 diff -C2 -d -r1.175 -r1.176 *** gumps.cpp 14 Oct 2004 01:14:57 -0000 1.175 --- gumps.cpp 15 Oct 2004 00:53:10 -0000 1.176 *************** *** 150,154 **** unsigned int nextRespawn = 0; if (region->nextTime() > Server::instance()->time()) { ! (region->nextTime() - Server::instance()->time()) / 1000; } addText( 50, 220, tr("Next Respawn: %1 seconds").arg(nextRespawn), 0x834); --- 150,154 ---- unsigned int nextRespawn = 0; if (region->nextTime() > Server::instance()->time()) { ! nextRespawn = (region->nextTime() - Server::instance()->time()) / 1000; } addText( 50, 220, tr("Next Respawn: %1 seconds").arg(nextRespawn), 0x834); Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** basedef.h 10 Oct 2004 17:51:24 -0000 1.20 --- basedef.h 15 Oct 2004 00:53:10 -0000 1.21 *************** *** 239,242 **** --- 239,243 ---- unsigned char soundmode; unsigned char type; + unsigned short mountid; }; Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.138 retrieving revision 1.139 diff -C2 -d -r1.138 -r1.139 *** player.cpp 14 Oct 2004 16:30:40 -0000 1.138 --- player.cpp 15 Oct 2004 00:53:10 -0000 1.139 *************** *** 454,468 **** } ! void cPlayer::mount( P_NPC pMount ) { if ( !pMount ) ! return; cUOSocket* socket = this->socket(); ! if ( !inRange( pMount, 2 ) && !isGM() ) { if ( socket ) socket->sysMessage( tr( "You are too far away to mount!" ) ); ! return; } --- 454,478 ---- } ! bool cPlayer::mount( P_NPC pMount ) { if ( !pMount ) ! return false; ! ! if (isDead()) { ! return false; ! } ! ! unsigned short mountId = pMount->mountId(); ! ! if (!mountId) { ! return false; // Not mountable ! } cUOSocket* socket = this->socket(); ! if ( !inRange( pMount, Config::instance()->mountRange() ) && !isGM() ) { if ( socket ) socket->sysMessage( tr( "You are too far away to mount!" ) ); ! return true; // Mountable, but not in range } *************** *** 473,547 **** P_ITEM pMountItem = new cItem; pMountItem->Init(); ! pMountItem->setId( 0x915 ); pMountItem->setColor( pMount->skin() ); - switch ( pMount->body() ) - { - case 0xC8: - pMountItem->setId( 0x3E9F ); break; // Horse - case 0xE2: - pMountItem->setId( 0x3EA0 ); break; // Horse - case 0xE4: - pMountItem->setId( 0x3EA1 ); break; // Horse - case 0xCC: - pMountItem->setId( 0x3EA2 ); break; // Horse - case 0xD2: - pMountItem->setId( 0x3EA3 ); break; // Desert Ostard - case 0xDA: - pMountItem->setId( 0x3EA4 ); break; // Frenzied Ostard - case 0xDB: - pMountItem->setId( 0x3EA5 ); break; // Forest Ostard - case 0xDC: - pMountItem->setId( 0x3EA6 ); break; // LLama - case 0x34: - pMountItem->setId( 0x3E9F ); break; // Brown Horse - case 0x4E: - pMountItem->setId( 0x3EA0 ); break; // Grey Horse - case 0x50: - pMountItem->setId( 0x3EA1 ); break; // Tan Horse - case 0x74: - pMountItem->setId( 0x3EB5 ); break; // Nightmare - case 0x75: - pMountItem->setId( 0x3EA8 ); break; // Silver Steed - case 0x72: - pMountItem->setId( 0x3EA9 ); break; // Dark Steed - case 0x7A: - pMountItem->setId( 0x3EB4 ); break; // Unicorn - case 0x84: - pMountItem->setId( 0x3EAD ); break; // Kirin - case 0x73: - pMountItem->setId( 0x3EAA ); break; // Etheral - case 0x76: - pMountItem->setId( 0x3EB2 ); break; // War Horse-Brit - case 0x77: - pMountItem->setId( 0x3EB1 ); break; // War Horse-Mage Council - case 0x78: - pMountItem->setId( 0x3EAF ); break; // War Horse-Minax - case 0x79: - pMountItem->setId( 0x3EB0 ); break; // War Horse-Shadowlord - case 0xAA: - pMountItem->setId( 0x3EAB ); break; // Etheral LLama - case 0x3A: - pMountItem->setId( 0x3EA4 ); break; // Forest Ostard - case 0x39: - pMountItem->setId( 0x3EA3 ); break; // Desert Ostard - case 0x3B: - pMountItem->setId( 0x3EA5 ); break; // Frenzied Ostard - case 0x90: - pMountItem->setId( 0x3EB3 ); break; // Seahorse - case 0xAB: - pMountItem->setId( 0x3EAC ); break; // Etheral Ostard - case 0xBB: - pMountItem->setId( 0x3EB8 ); break; // Ridgeback - case 0x17: - pMountItem->setId( 0x3EBC ); break; // giant beetle - case 0x19: - pMountItem->setId( 0x3EBB ); break; // skeletal mount - case 0x1a: - pMountItem->setId( 0x3EBD ); break; // swamp dragon - case 0x1f: - pMountItem->setId( 0x3EBE ); break; // armor dragon - } - this->setDirection( pMount->direction() ); this->addItem( cBaseChar::Mount, pMountItem ); --- 483,489 ---- P_ITEM pMountItem = new cItem; pMountItem->Init(); ! pMountItem->setId( mountId ); pMountItem->setColor( pMount->skin() ); this->setDirection( pMount->direction() ); this->addItem( cBaseChar::Mount, pMountItem ); *************** *** 550,555 **** // if this is a gm lets tame the animal in the process ! if ( isGM() ) ! { pMount->setOwner( this ); } --- 492,496 ---- // if this is a gm lets tame the animal in the process ! if ( isGM() ) { pMount->setOwner( this ); } *************** *** 563,566 **** --- 504,509 ---- else socket->sysMessage( tr( "You dont own that creature." ) ); + + return true; } Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** basedef.cpp 10 Oct 2004 17:51:24 -0000 1.25 --- basedef.cpp 15 Oct 2004 00:53:10 -0000 1.26 *************** *** 294,297 **** --- 294,309 ---- } + // Load the mount item for mounting + QString mountid = hex2dec(element.attribute("mountid")); + if (!mountid.isNull()) { + bodyinfo.mountid = mountid.toUShort(&ok); + if (!ok) { + Console::instance()->log(LOG_WARNING, tr("Invalid mountid in bodyinfo file: %1.\n").arg(mountid)); + continue; + } + } else { + bodyinfo.mountid = 0; + } + // Soundmode for skipping non existing sounds QString soundmode = hex2dec(element.attribute("soundmode")); Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** basechar.h 10 Oct 2004 17:51:24 -0000 1.89 --- basechar.h 15 Oct 2004 00:53:10 -0000 1.90 *************** *** 562,565 **** --- 562,569 ---- } + inline unsigned short mountId() { + return CharBaseDefs::instance()->getBodyInfo(body()).mountid; + } + virtual QCString bindmenu() { |
|
From: Sebastian H. <dar...@us...> - 2004-10-15 00:53:20
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27943/python Modified Files: global.cpp Log Message: Mounting updates. Index: global.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/global.cpp,v retrieving revision 1.164 retrieving revision 1.165 diff -C2 -d -r1.164 -r1.165 *** global.cpp 13 Oct 2004 14:45:20 -0000 1.164 --- global.cpp 15 Oct 2004 00:53:11 -0000 1.165 *************** *** 1749,1752 **** --- 1749,1753 ---- - type - body + - mountid </code> \description Retrieve information about a given character body. *************** *** 1766,1769 **** --- 1767,1771 ---- PyDict_SetItemString( dict, "body", PyInt_FromLong( info.body ) ); PyDict_SetItemString( dict, "figurine", PyInt_FromLong( info.figurine ) ); + PyDict_SetItemString( dict, "mountid", PyInt_FromLong( info.mountid ) ); PyDict_SetItemString( dict, "flags", PyInt_FromLong( info.flags ) ); PyDict_SetItemString( dict, "soundmode", PyInt_FromLong( info.soundmode ) ); |
|
From: Sebastian H. <dar...@us...> - 2004-10-14 23:54:54
|
Update of /cvsroot/wpdev/xmlscripts/definitions/menus/crafting In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16189/menus/crafting Modified Files: carpentry.xml Log Message: Fix for carpentry Index: carpentry.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/menus/crafting/carpentry.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** carpentry.xml 29 Sep 2004 01:43:55 -0000 1.15 --- carpentry.xml 14 Oct 2004 23:54:41 -0000 1.16 *************** *** 172,178 **** <craft definition="e7f" name="Keg"> <carpentry min="578" max="1078" /> ! <materials id="1eb1" amount="3" name="Barrel Staves" /> <!-- Barrel Staves --> ! <materials id="10e1;10e2" amount="1" name="Barrel Hoops" /> <!-- Barrel Hoops --> ! <materials id="1bd8" amount="1" name="Barrel Lid" /> <!-- Barrel Lid --> </craft> </menu> --- 172,178 ---- <craft definition="e7f" name="Keg"> <carpentry min="578" max="1078" /> ! <material id="1eb1" amount="3" name="Barrel Staves" /> <!-- Barrel Staves --> ! <material id="10e1;10e2" amount="1" name="Barrel Hoops" /> <!-- Barrel Hoops --> ! <material id="1bd8" amount="1" name="Barrel Lid" /> <!-- Barrel Lid --> </craft> </menu> |
