wpdev-commits Mailing List for Wolfpack Emu (Page 162)
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: <dar...@us...> - 2004-02-05 00:24:28
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6856 Modified Files: basechar.cpp items.cpp npc.cpp player.cpp Log Message: Added scripted lockpicks, fixed the invulnerable notoriety and added two python properties for chars (npc, player). Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** basechar.cpp 4 Feb 2004 14:26:18 -0000 1.63 --- basechar.cpp 5 Feb 2004 00:22:00 -0000 1.64 *************** *** 2289,2293 **** if (item) { ! return canSee(item, lineOfSight); } --- 2289,2293 ---- if (item) { ! return canSeeItem(item, lineOfSight); } *************** *** 2295,2299 **** if (character) { ! return canSee(character, lineOfSight); } --- 2295,2299 ---- if (character) { ! return canSeeChar(character, lineOfSight); } Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.373 retrieving revision 1.374 diff -C2 -d -r1.373 -r1.374 *** items.cpp 4 Feb 2004 00:13:16 -0000 1.373 --- items.cpp 5 Feb 2004 00:22:00 -0000 1.374 *************** *** 1941,1959 **** P_CHAR cItem::getOutmostChar() { ! if( container_ && container_->isChar() ) ! { ! return dynamic_cast< P_CHAR >( container_ ); ! } ! else if( container_ && container_->isItem() ) ! { ! P_ITEM pCont = dynamic_cast< P_ITEM >( container_ ); ! if( pCont ) ! return pCont->getOutmostChar(); ! else ! return 0; } ! else ! return 0; } --- 1941,1959 ---- P_CHAR cItem::getOutmostChar() { ! P_CHAR result = 0; ! if (container_) { ! result = dynamic_cast<P_CHAR>(container_); ! ! if (!result) { ! P_ITEM container = dynamic_cast<P_ITEM>(container_); ! ! if (container) { ! result = container->getOutmostChar(); ! } ! } } ! ! return result; } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** npc.cpp 4 Feb 2004 14:26:18 -0000 1.64 --- npc.cpp 5 Feb 2004 00:22:00 -0000 1.65 *************** *** 371,380 **** 5 = enemy (orange) 6 = murderer (red) ! 7 = unknown use (translucent (like 0x4000 hue)) */ UINT8 result; if (isInvulnerable()) { ! return 0; } --- 371,381 ---- 5 = enemy (orange) 6 = murderer (red) ! 7 = invulnerable (yellow) ! //7 = unknown use (translucent (like 0x4000 hue)) */ UINT8 result; if (isInvulnerable()) { ! return 7; } Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.65 retrieving revision 1.66 diff -C2 -d -r1.65 -r1.66 *** player.cpp 4 Feb 2004 14:26:18 -0000 1.65 --- player.cpp 5 Feb 2004 00:22:00 -0000 1.66 *************** *** 319,327 **** UINT8 cPlayer::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char { ! // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red UINT8 result; if (isInvulnerable()) { ! return 0; } --- 319,327 ---- UINT8 cPlayer::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char { ! // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red, 0x07 Yellow UINT8 result; if (isInvulnerable()) { ! return 7; } |
|
From: <dar...@us...> - 2004-02-05 00:24:28
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6856/network Modified Files: uotxpackets.cpp Log Message: Added scripted lockpicks, fixed the invulnerable notoriety and added two python properties for chars (npc, player). Index: uotxpackets.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v retrieving revision 1.78 retrieving revision 1.79 diff -C2 -d -r1.78 -r1.79 *** uotxpackets.cpp 3 Feb 2004 18:13:18 -0000 1.78 --- uotxpackets.cpp 5 Feb 2004 00:22:00 -0000 1.79 *************** *** 280,286 **** setFlag( 0x40 ); ! if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! } if( pChar->isHidden() ) --- 280,286 ---- setFlag( 0x40 ); ! /*if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! }*/ if( pChar->isHidden() ) *************** *** 334,340 **** setFlag( 0x40 ); ! if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! } if( pChar->isHidden() || ( pChar->objectType() == enPlayer && !dynamic_cast<P_PLAYER>(pChar)->socket() ) ) --- 334,340 ---- setFlag( 0x40 ); ! /*if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! }*/ if( pChar->isHidden() || ( pChar->objectType() == enPlayer && !dynamic_cast<P_PLAYER>(pChar)->socket() ) ) *************** *** 407,413 **** setFlag( 0x40 ); ! if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! } if( pChar->isHidden() ) --- 407,413 ---- setFlag( 0x40 ); ! /*if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! }*/ if( pChar->isHidden() ) *************** *** 514,520 **** setFlag( 0x40 ); ! if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! } if( pChar->isHidden() ) --- 514,520 ---- setFlag( 0x40 ); ! /*if (pChar->isInvulnerable()) { setFlag(flag() | 0x08); ! }*/ if( pChar->isHidden() ) |
|
From: <dar...@us...> - 2004-02-05 00:23:19
|
Update of /cvsroot/wpdev/xmlscripts/definitions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6617 Modified Files: scripts.xml Log Message: Added scripted lockpicks. Index: scripts.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/scripts.xml,v retrieving revision 1.79 retrieving revision 1.80 diff -C2 -d -r1.79 -r1.80 *** scripts.xml 2 Feb 2004 04:54:01 -0000 1.79 --- scripts.xml 5 Feb 2004 00:20:52 -0000 1.80 *************** *** 36,39 **** --- 36,40 ---- <script>keyring</script> <script>ore</script> + <script>lockpick</script> <!-- Deeds --> |
|
From: <dar...@us...> - 2004-02-05 00:23:18
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6617/items/professions Modified Files: thieve.xml Log Message: Added scripted lockpicks. Index: thieve.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/thieve.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** thieve.xml 12 Jan 2004 05:00:48 -0000 1.2 --- thieve.xml 5 Feb 2004 00:20:51 -0000 1.3 *************** *** 13,16 **** --- 13,17 ---- <id>0x14fb</id> <category>Professions\Thieve\Lockpick (W/E)</category> + <events>lockpick</events> </item> *************** *** 24,30 **** --- 25,33 ---- <id>0x14fd</id> <category>Professions\Thieve\Lockpicks (W/E)</category> + <events>lockpick</events> </item> <item id="14fe"> + <inherit id="14fd" /> <id>0x14fe</id> <category>Professions\Thieve\Lockpicks (N/S)</category> |
|
From: <dar...@us...> - 2004-02-05 00:23:08
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6544 Modified Files: tooltip.py Added Files: lockpick.py Log Message: Several tooltip updates. Added scripted lockpicks. --- NEW FILE: lockpick.py --- import wolfpack from wolfpack.consts import * import random def response(char, args, target): lockpick = wolfpack.finditem(args[0]) if lockpick.getoutmostchar() != char: char.socket.clilocmessage(500364) elif not char.cansee(lockpick) or not char.canpickup(lockpick): char.socket.clilocmessage(500312) else: if not target.item or 'lock' not in target.item.events: char.socket.clilocmessage(502069) elif not char.canreach(target.item, 3): char.socket.clilocmessage(502070) else: lock = None if target.item.hastag('lock'): lock = str(target.item.gettag('lock')) if target.item.secured: char.socket.clilocmessage(502071) # That is secure elif lock == 'magic': char.socket.clilocmessage(502073) # This lock cannot be picked by normal means. elif lock != 'lockpick': char.socket.clilocmessage(502072) # You don't see how that lock can be manipulated. else: if char.checkskill(LOCKPICKING, 0, 1200): # SUCCESS: Remove lockpick and the lock events = target.item.events while 'lock' in events: events.remove('lock') target.item.events = events target.item.deltag('lock') target.item.deltag('locked') if lockpick.amount == 1: lockpick.remove() else: lockpick.amount = lockpick.amount - 1 lockpick.update() char.socket.clilocmessage(502076) char.soundeffect(0x241) else: # FAILURE: 50% chance of loosing item if random.randint(0,1): # Lost the lockpick if lockpick.amount == 1: lockpick.remove() else: lockpick.amount = lockpick.amount - 1 lockpick.update() char.socket.clilocmessage(502074) else: char.socket.clilocmessage(502075) def onUse(char, lockpick): if lockpick.getoutmostchar() != char: char.socket.clilocmessage(500364) elif not char.cansee(lockpick) or not char.canpickup(lockpick): char.socket.clilocmessage(500312) else: char.message(502067) char.socket.clilocmessage(502068) char.socket.attachtarget("lockpick.response", [lockpick.serial]) return 1 Index: tooltip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/tooltip.py,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** tooltip.py 4 Feb 2004 14:40:23 -0000 1.17 --- tooltip.py 5 Feb 2004 00:20:40 -0000 1.18 *************** *** 63,67 **** tooltip.add(1050039, str(target.amount) + "\t" + labelname) else: ! tooltip.add(1050039, " \t" + labelname) if target.visible == 0 and sender.gm: --- 63,67 ---- tooltip.add(1050039, str(target.amount) + "\t" + labelname) else: ! tooltip.add(1042971, labelname) if target.visible == 0 and sender.gm: *************** *** 77,86 **** lock = str(target.gettag('lock')) ! tooltip.add(1050045, " \t" + "Lock: " + lock + "\t ") if isspellbook( target ): ! tooltip.add( 1042886, str( target.spellscount() ) ) else: ! tooltip.add(1050045, " \t%s\t " % target.name) # Tame = 502006 --- 77,99 ---- lock = str(target.gettag('lock')) ! if target.hastag('locked') and int(target.gettag('locked')) != 0: ! suffix = '<br>Locked' ! else: ! suffix = '<br>Unlocked' ! ! tooltip.add(1050045, " \tLock: " + lock + suffix + "\t ") if isspellbook( target ): ! tooltip.add(1042886, str(target.spellscount())) else: ! affix = [] ! ! if target.npc and len(target.title) > 0: ! affix.append(target.title) ! ! if target.frozen: ! affix.append('(frozen)') ! ! tooltip.add(1050045, " \t%s\t %s" % (target.name, " ".join(affix))) # Tame = 502006 *************** *** 90,104 **** additional = [] ! if target.invulnerable and sender.gm: ! additional.append('(invulnerable)') ! ! if target.frozen: ! additional.append('(frozen)') ! ! if target.iscriminal(): ! additional.append('(criminal)') ! ! if target.ismurderer(): ! additional.append('(murderer)') if len(additional) > 0: --- 103,116 ---- additional = [] ! # These are only available to GMs ! if sender.gm: ! if target.invulnerable: ! additional.append('(invulnerable)') ! ! if target.iscriminal(): ! additional.append('(criminal)') ! ! if target.ismurderer(): ! additional.append('(murderer)') if len(additional) > 0: *************** *** 169,172 **** --- 181,185 ---- "dmg_poison" : [1060406,1], "dmg_energy" : [1060407,1], + "remaining_uses" : [1060584,1], } |
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19475 Modified Files: dbl_single_click.cpp wolfpack.pro wolfpack.vcproj Removed Files: targetactions.cpp targetactions.h wolf.sln wolf.vcproj Log Message: Removed superfluous files. Index: dbl_single_click.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbl_single_click.cpp,v retrieving revision 1.230 retrieving revision 1.231 diff -C2 -d -r1.230 -r1.231 *** dbl_single_click.cpp 3 Feb 2004 18:13:17 -0000 1.230 --- dbl_single_click.cpp 4 Feb 2004 23:06:31 -0000 1.231 *************** *** 45,49 **** #include "resources.h" #include "multis.h" - #include "targetactions.h" #include "boats.h" #include "chars.h" --- 45,48 ---- *************** *** 608,621 **** // } // return; // alchemy - case 0x14FB: - case 0x14FC: - case 0x14FD: - case 0x14FE: // lockpicks - { - cSkLockpicking* target = new cSkLockpicking( pi->serial() ); - socket->attachTarget( target ); - socket->sysMessage( tr("What lock would you like to pick?") ); - } - return; default: break; --- 607,610 ---- Index: wolfpack.pro =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v retrieving revision 1.170 retrieving revision 1.171 diff -C2 -d -r1.170 -r1.171 *** wolfpack.pro 28 Jan 2004 20:08:41 -0000 1.170 --- wolfpack.pro 4 Feb 2004 23:06:31 -0000 1.171 *************** *** 208,212 **** spawnregions.cpp \ srvparams.cpp \ - targetactions.cpp \ targetrequests.cpp \ territories.cpp \ --- 208,211 ---- Index: wolfpack.vcproj =================================================================== RCS file: /cvsroot/wpdev/wolfpack/wolfpack.vcproj,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** wolfpack.vcproj 1 Feb 2004 22:02:16 -0000 1.10 --- wolfpack.vcproj 4 Feb 2004 23:06:31 -0000 1.11 *************** *** 404,413 **** </File> <File - RelativePath=".\targetactions.cpp"> - </File> - <File - RelativePath=".\targetactions.h"> - </File> - <File RelativePath=".\targetrequests.cpp"> </File> --- 404,407 ---- --- targetactions.cpp DELETED --- --- targetactions.h DELETED --- --- wolf.sln DELETED --- --- wolf.vcproj DELETED --- |
|
From: <thi...@us...> - 2004-02-04 21:25:45
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306/items/weaponry/swordsmanship Modified Files: butcher_knife.xml cleaver.xml Log Message: added prices and items to Carpenters Index: butcher_knife.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/butcher_knife.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** butcher_knife.xml 26 Jan 2004 07:02:30 -0000 1.3 --- butcher_knife.xml 3 Feb 2004 20:46:45 -0000 1.4 *************** *** 9,14 **** <decay /> <nodye /> ! <sellprice>6</sellprice> ! <buyprice>13</buyprice> <attack min="9" max="11" /> <durability><random min="30" max="50" /></durability> --- 9,14 ---- <decay /> <nodye /> ! <sellprice>13</sellprice> ! <buyprice>21</buyprice> <attack min="9" max="11" /> <durability><random min="30" max="50" /></durability> Index: cleaver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/weaponry/swordsmanship/cleaver.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cleaver.xml 26 Jan 2004 07:02:30 -0000 1.3 --- cleaver.xml 3 Feb 2004 20:46:45 -0000 1.4 *************** *** 9,14 **** <decay /> <nodye /> ! <sellprice>8</sellprice> ! <buyprice>16</buyprice> <attack min="11" max="13" /> <durability><random min="30" max="46" /></durability> --- 9,14 ---- <decay /> <nodye /> ! <sellprice>12</sellprice> ! <buyprice>24</buyprice> <attack min="11" max="13" /> <durability><random min="30" max="46" /></durability> |
|
From: <thi...@us...> - 2004-02-04 21:25:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306/items/buildings Modified Files: chairs.xml furniture.xml Log Message: added prices and items to Carpenters Index: chairs.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/chairs.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** chairs.xml 21 Jan 2004 04:04:57 -0000 1.9 --- chairs.xml 3 Feb 2004 20:46:44 -0000 1.10 *************** *** 35,38 **** --- 35,40 ---- <item id="a2a"> <id>0x0a2a</id> <nodecay /> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Decoration\Chairs\Stool\Stool 1</category> </item> *************** *** 46,49 **** --- 48,53 ---- <item id="b2c"> <id>0x0b2c</id> <nodecay /> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Decoration\Chairs\Wooden Bench\Wooden Bench 1 (W/E)</category> </item> *************** *** 62,65 **** --- 66,71 ---- <item id="b2f"> <id>0x0b2f</id> <nodecay /> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Decoration\Chairs\Wooden Chair\Wooden Chair 2</category> </item> *************** *** 83,86 **** --- 89,94 ---- <item id="b33"> <id>0x0b33</id> <nodecay /> + <buyprice>58</buyprice> + <sellprice>24</sellprice> <category>Decoration\Chairs\Wooden Throne\Wooden Throne 2</category> </item> *************** *** 89,92 **** --- 97,102 ---- <item id="b4e"> <id>0x0b4e</id> <nodecay /> + <buyprice>24</buyprice> + <sellprice>12</sellprice> <category>Decoration\Chairs\Wooden Chair\Fancy Wooden Chair 1</category> </item> *************** *** 109,112 **** --- 119,124 ---- <item id="b52"> <id>0x0b52</id> <nodecay /> + <buyprice>20</buyprice> + <sellprice>10</sellprice> <category>Decoration\Chairs\Wooden Chair\Simple Wooden Chair 1</category> </item> *************** *** 129,132 **** --- 141,146 ---- <item id="b56"> <id>0x0b56</id> <nodecay /> + <buyprice>16</buyprice> + <sellprice>8</sellprice> <category>Decoration\Chairs\Wooden Chair\Plain Wooden Chair 1</category> </item> *************** *** 149,152 **** --- 163,168 ---- <item id="b5a"> <id>0x0b5a</id> <nodecay /> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Decoration\Chairs\Wooden Chair\Rustic Wooden Chair 1</category> </item> *************** *** 170,173 **** --- 186,191 ---- <item id="b5e"> <id>0x0b5e</id> <nodecay /> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Decoration\Chairs\Misc\Foot Stool</category> </item> Index: furniture.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/furniture.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** furniture.xml 21 Jan 2004 22:45:25 -0000 1.9 --- furniture.xml 3 Feb 2004 20:46:44 -0000 1.10 *************** *** 951,954 **** --- 951,956 ---- <item id="b34"> <id>0x0b34</id> <nodecay /> + <buyprice>15</buyprice> + <sellprice>7</sellprice> <category>Decoration\Tables\Nightstand\Nightstand (N/S) (1/2)</category> </item> *************** *** 1100,1103 **** --- 1102,1107 ---- <item id="b7c"> <id>0x0b7c</id> <nodecay /> + <buyprice>20</buyprice> + <sellprice>10</sellprice> <category>Decoration\Tables\Wooden Table\Wooden Table 5 (W/E)</category> </item> *************** *** 1105,1108 **** --- 1109,1114 ---- <item id="b7d"> <id>0x0b7d</id> <nodecay /> + <buyprice>20</buyprice> + <sellprice>10</sellprice> <category>Decoration\Tables\Wooden Table\Wooden Table 6 (W/E)</category> </item> |
|
From: <dar...@us...> - 2004-02-04 14:42:48
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32204 Modified Files: tooltip.py Log Message: Fixed extra tooltips for characters. Index: tooltip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/tooltip.py,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** tooltip.py 4 Feb 2004 14:26:35 -0000 1.16 --- tooltip.py 4 Feb 2004 14:40:23 -0000 1.17 *************** *** 88,101 **** tooltip.add(502006, "") ! # Seems to break it ?? ! #if target.invulnerable and sender.gm: ! # tooltip.add(1050045, " \t(invulnerable)\t ") ! # tooltip.add(502006, "") ! if target.frozen: ! tooltip.add(1050045, " \t(frozen)\t ") if target.iscriminal(): ! tooltip.add(1050045, " \t(criminal)\t ") tooltip.send(sender) --- 88,107 ---- tooltip.add(502006, "") ! additional = [] ! if target.invulnerable and sender.gm: ! additional.append('(invulnerable)') + if target.frozen: + additional.append('(frozen)') + if target.iscriminal(): ! additional.append('(criminal)') ! ! if target.ismurderer(): ! additional.append('(murderer)') ! ! if len(additional) > 0: ! tooltip.add(1042971, "<br>".join(additional)) tooltip.send(sender) |
|
From: <dar...@us...> - 2004-02-04 14:28:59
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29131 Modified Files: tooltip.py Log Message: Tooltip adjustments. Index: tooltip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/tooltip.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** tooltip.py 4 Feb 2004 00:17:02 -0000 1.15 --- tooltip.py 4 Feb 2004 14:26:35 -0000 1.16 *************** *** 20,24 **** if target.id == 0x2006 and len(target.name) > 0: ! tooltip.add(1046414, target.name) elif isarmor ( target ): --- 20,44 ---- if target.id == 0x2006 and len(target.name) > 0: ! notoriety = 0x00 ! ! if target.hastag('notoriety'): ! notoriety = int(target.gettag('notoriety')) ! ! color = '#FFFFFF' ! ! # 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red ! colors = { ! 0x01 : '#00FFFF', ! 0x02 : '#10d010', ! 0x03 : '#d0d0d0', ! 0x04 : '#d0d0d0', ! 0x05 : '#ff9900', ! 0x06 : '#d01010' ! } ! ! if not colors.has_key(notoriety): ! tooltip.add(1050045, " \tThe Remains Of \t" + target.name) ! else: ! tooltip.add(1050045, '<basefont color="%s">' % colors[notoriety] + " \tThe Remains Of \t<h3>" + target.name) elif isarmor ( target ): *************** *** 62,69 **** tooltip.add( 1042886, str( target.spellscount() ) ) else: ! name = target.name ! tooltip.add( 1050045, " \t" + name + "\t " ) ! tooltip.send( sender ) return 1 --- 82,103 ---- tooltip.add( 1042886, str( target.spellscount() ) ) else: ! tooltip.add(1050045, " \t%s\t " % target.name) ! ! # Tame = 502006 ! if target.tamed: ! tooltip.add(502006, "") ! # Seems to break it ?? ! #if target.invulnerable and sender.gm: ! # tooltip.add(1050045, " \t(invulnerable)\t ") ! # tooltip.add(502006, "") ! ! if target.frozen: ! tooltip.add(1050045, " \t(frozen)\t ") ! ! if target.iscriminal(): ! tooltip.add(1050045, " \t(criminal)\t ") ! ! tooltip.send(sender) return 1 *************** *** 75,79 **** def container( target, tooltip ): ! tooltip.add( 1050045, "Bag" ) tooltip.add( 1050044, "1000\t10000" ) #$count items, $weight stones --- 109,113 ---- def container( target, tooltip ): ! tooltip.add( 1050045, " \tBag\t " ) tooltip.add( 1050044, "1000\t10000" ) #$count items, $weight stones *************** *** 137,141 **** params = str( target.gettag( tagname ) ) tooltip.add( modifiers[ tagname ][0], params ) - - - --- 171,172 ---- |
|
From: <dar...@us...> - 2004-02-04 14:28:57
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29109 Modified Files: basechar.cpp npc.cpp player.cpp Log Message: fixes Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.62 retrieving revision 1.63 diff -C2 -d -r1.62 -r1.63 *** basechar.cpp 3 Feb 2004 20:47:34 -0000 1.62 --- basechar.cpp 4 Feb 2004 14:26:18 -0000 1.63 *************** *** 2152,2161 **** // So a singleclick on the corpse // Will display the right color ! if( isInnocent() ) ! corpse->setTag("notoriety", cVariant(1)); ! else if( isCriminal() ) ! corpse->setTag("notoriety", cVariant(2)); ! else if( isMurderer() ) ! corpse->setTag("notoriety", cVariant(3)); if (npc) { --- 2152,2156 ---- // So a singleclick on the corpse // Will display the right color ! corpse->setTag("notoriety", cVariant(notoriety(this))); if (npc) { Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.63 retrieving revision 1.64 diff -C2 -d -r1.63 -r1.64 *** npc.cpp 3 Feb 2004 20:47:34 -0000 1.63 --- npc.cpp 4 Feb 2004 14:26:18 -0000 1.64 *************** *** 467,474 **** charName.append( QString( " [0x%1]" ).arg( serial(), 4, 16 ) ); - // Invulnerability - if( isInvulnerable() && socket->player()->isGMorCounselor() ) - charName.append( tr(" [invul]") ); - // Frozen if (isFrozen()) --- 467,470 ---- *************** *** 483,502 **** charName.append( tr(" [guarding]") ); - // Tamed - if( isTamed() ) - charName.append( tr(" [tamed]") ); - - // WarMode ? - if( isAtWar() ) - charName.append( tr(" [war mode]") ); - - // Criminal ? - if( ( criminalTime() > uiCurrentTime ) && ( kills_ < SrvParams->maxkills() ) ) - charName.append( tr(" [criminal]") ); - - // Murderer - if( kills_ >= SrvParams->maxkills() ) - charName.append( tr(" [murderer]") ); - Q_UINT16 speechColor; --- 479,482 ---- Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.64 retrieving revision 1.65 diff -C2 -d -r1.64 -r1.65 *** player.cpp 3 Feb 2004 21:23:00 -0000 1.64 --- player.cpp 4 Feb 2004 14:26:18 -0000 1.65 *************** *** 544,555 **** charName.append( tr(" [offline]") ); - // Invulnerability - if( isInvulnerable() ) - charName.append( tr(" [invul]") ); - - // Frozen - if( isFrozen() ) - charName.append( tr(" [frozen]") ); - // Guarded if( guardedby_.size() > 0 ) --- 544,547 ---- *************** *** 560,579 **** charName.append( tr(" [guarding]") ); - // Tamed - if( isTamed() ) - charName.append( tr(" [tamed]") ); - - // WarMode ? - if( isAtWar() ) - charName.append( tr(" [war mode]") ); - - // Criminal ? - if( ( criminalTime_ > uiCurrentTime ) && ( kills_ < SrvParams->maxkills() ) ) - charName.append( tr(" [criminal]") ); - - // Murderer - if( kills_ >= SrvParams->maxkills() ) - charName.append( tr(" [murderer]") ); - Q_UINT16 speechColor; --- 552,555 ---- |
|
From: <thi...@us...> - 2004-02-04 07:36:19
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/professions In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306/items/professions Modified Files: carpenter.xml fletcher.xml musician.xml Log Message: added prices and items to Carpenters Index: carpenter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/carpenter.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** carpenter.xml 31 Jan 2004 18:12:52 -0000 1.4 --- carpenter.xml 3 Feb 2004 20:46:44 -0000 1.5 *************** *** 258,263 **** <item id="1028"> <id>0x1028</id> <category>Professions\Carpenter\Dovetail Saw (N/S)</category> ! <events>skills.carpentry</events> </item> --- 258,265 ---- <item id="1028"> <id>0x1028</id> + <buyprice>14</buyprice> + <sellprice>7</sellprice> <category>Professions\Carpenter\Dovetail Saw (N/S)</category> ! <events>skills.carpentry</events> </item> *************** *** 269,274 **** <item id="102a"> <id>0x102a</id> <category>Professions\Carpenter\Hammer 1</category> ! <events>skills.carpentry</events> </item> --- 271,278 ---- <item id="102a"> <id>0x102a</id> + <buyprice>28</buyprice> + <sellprice>14</sellprice> <category>Professions\Carpenter\Hammer 1</category> ! <events>skills.carpentry</events> </item> *************** *** 280,285 **** <item id="102c"> <id>0x102c</id> <category>Professions\Carpenter\Moulding Planes (N/S)</category> ! <events>skills.carpentry</events> </item> --- 284,291 ---- <item id="102c"> <id>0x102c</id> + <buyprice>13</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Moulding Planes (N/S)</category> ! <events>skills.carpentry</events> </item> *************** *** 292,296 **** <id>0x102e</id> <category>Professions\Carpenter\Nails (W/E)</category> ! <events>skills.carpentry</events> </item> --- 298,302 ---- <id>0x102e</id> <category>Professions\Carpenter\Nails (W/E)</category> ! <events>skills.carpentry</events> </item> *************** *** 302,307 **** <item id="1030"> <id>0x1030</id> <category>Professions\Carpenter\Jointing Plane (N/S)</category> ! <events>skills.carpentry</events> </item> --- 308,315 ---- <item id="1030"> <id>0x1030</id> + <buyprice>13</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Jointing Plane (N/S)</category> ! <events>skills.carpentry</events> </item> *************** *** 313,318 **** <item id="1032"> <id>0x1032</id> <category>Professions\Carpenter\Smoothing Plane (N/S)</category> ! <events>skills.carpentry</events> </item> --- 321,328 ---- <item id="1032"> <id>0x1032</id> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Smoothing Plane (N/S)</category> ! <events>skills.carpentry</events> </item> *************** *** 324,329 **** <item id="1034"> <id>0x1034</id> <category>Professions\Carpenter\Saw (N/S)</category> ! <events>skills.carpentry</events> </item> --- 334,341 ---- <item id="1034"> <id>0x1034</id> + <buyprice>18</buyprice> + <sellprice>9</sellprice> <category>Professions\Carpenter\Saw (N/S)</category> ! <events>skills.carpentry</events> </item> *************** *** 335,358 **** <item id="10e4"> <id>0x10e4</id> <category>Professions\Carpenter\Draw Knife</category> ! <events>skills.carpentry</events> </item> <item id="10e5"> <id>0x10e5</id> <category>Professions\Carpenter\Froe</category> ! <events>skills.carpentry</events> </item> <item id="10e6"> <id>0x10e6</id> <category>Professions\Carpenter\Inshave</category> ! <events>skills.carpentry</events> </item> <item id="10e7"> <id>0x10e7</id> <category>Professions\Carpenter\Scorp</category> ! <events>skills.carpentry</events> </item> --- 347,378 ---- <item id="10e4"> <id>0x10e4</id> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Draw Knife</category> ! <events>skills.carpentry</events> </item> <item id="10e5"> <id>0x10e5</id> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Froe</category> ! <events>skills.carpentry</events> </item> <item id="10e6"> <id>0x10e6</id> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Inshave</category> ! <events>skills.carpentry</events> </item> <item id="10e7"> <id>0x10e7</id> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Professions\Carpenter\Scorp</category> ! <events>skills.carpentry</events> </item> Index: fletcher.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/fletcher.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fletcher.xml 26 Dec 2002 00:21:34 -0000 1.2 --- fletcher.xml 3 Feb 2004 20:46:44 -0000 1.3 *************** *** 42,45 **** --- 42,47 ---- <item id="1022"> <id>0x1022</id> + <buyprice>20</buyprice> + <sellprice>10</sellprice> <category>Professions\Fletcher\Arrow Fletching 1</category> </item> Index: musician.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/professions/musician.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** musician.xml 20 Aug 2003 18:12:37 -0000 1.3 --- musician.xml 3 Feb 2004 20:46:44 -0000 1.4 *************** *** 74,77 **** --- 74,79 ---- <id>0xe9c</id> <decay/> + <buyprice>50</buyprice> + <sellprice>25</sellprice> <value>25</value> <category>Professions\Musician\Drum</category> *************** *** 92,95 **** --- 94,99 ---- <id>0xe9e</id> <decay/> + <buyprice>60</buyprice> + <sellprice>30</sellprice> <value>25</value> <category>Professions\Musician\Tamberine with Ribbon</category> *************** *** 101,104 **** --- 105,110 ---- <id>0xeb1</id> <decay/> + <buyprice>90</buyprice> + <sellprice>45</sellprice> <value>25</value> <category>Professions\Musician\Standing Harp</category> *************** *** 110,113 **** --- 116,121 ---- <id>0xeb2</id> <decay/> + <buyprice>30</buyprice> + <sellprice>15</sellprice> <value>25</value> <category>Professions\Musician\Harp</category> *************** *** 119,122 **** --- 127,132 ---- <id>0xeb3</id> <decay/> + <buyprice>40</buyprice> + <sellprice>20</sellprice> <value>25</value> <category>Professions\Musician\Lute (N/S)</category> |
|
From: <dar...@us...> - 2004-02-04 06:12:04
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20552/python Modified Files: char.cpp utilities.h Log Message: Added summoned flag to npcs. (Accesible via .summoned=1/0) Added char.notoriety() to the python interface Rewrote cBaseChar::kill() (not yet finished) Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -C2 -d -r1.120 -r1.121 *** char.cpp 31 Jan 2004 04:36:20 -0000 1.120 --- char.cpp 3 Feb 2004 18:13:18 -0000 1.121 *************** *** 1489,1492 **** --- 1489,1510 ---- } + static PyObject* wpChar_notoriety( wpChar* self, PyObject* args ) + { + if (self->pChar->free) { + return PyFalse; + } + + P_CHAR target = 0; + + if (!PyArg_ParseTuple( args, "|O&:char.notoriety([char])", PyConvertChar, &target)) + return 0; + + if (!target) { + target = self->pChar; + } + + return PyInt_FromLong(self->pChar->notoriety(target)); + } + /*! Checks if a certain character is able to reach another object. *************** *** 1711,1714 **** --- 1729,1733 ---- { "disturb", (getattrofunc)wpChar_disturb, METH_VARARGS, "Disturbs whatever this character is doing right now." }, { "canreach", (getattrofunc)wpChar_canreach, METH_VARARGS, "Checks if this character can reach a certain object." }, + { "notoriety", (getattrofunc)wpChar_notoriety, METH_VARARGS, "Returns the notoriety of a character toward another character." }, { "canpickup", (getattrofunc)wpChar_canpickup, METH_VARARGS, NULL }, { "cansee", (getattrofunc)wpChar_cansee, METH_VARARGS, NULL }, *************** *** 2019,2020 **** --- 2038,2048 ---- return !( pA == pB ); } + int PyConvertChar( PyObject *object, P_CHAR* character) { + if (object->ob_type != &wpCharType) { + PyErr_BadArgument(); + return 0; + } + + *character = ((wpChar*)object)->pChar; + return 1; + } Index: utilities.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/utilities.h,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** utilities.h 22 Dec 2003 11:01:55 -0000 1.25 --- utilities.h 3 Feb 2004 18:13:18 -0000 1.26 *************** *** 91,94 **** --- 91,95 ---- PyObject* PyGetCharObject( P_CHAR ); P_CHAR getWpChar( PyObject* ); + int PyConvertChar( PyObject *object, P_CHAR* character); bool checkWpAccount( PyObject *object ); |
|
From: <dar...@us...> - 2004-02-04 03:26:55
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20552 Modified Files: basechar.cpp basechar.h basedef.h boats.cpp chars.cpp dbl_single_click.cpp dragdrop.cpp items.cpp npc.cpp npc.h player.cpp player.h targetrequests.cpp uobject.cpp Log Message: Added summoned flag to npcs. (Accesible via .summoned=1/0) Added char.notoriety() to the python interface Rewrote cBaseChar::kill() (not yet finished) Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.60 retrieving revision 1.61 diff -C2 -d -r1.60 -r1.61 *** basechar.cpp 2 Feb 2004 04:54:02 -0000 1.60 --- basechar.cpp 3 Feb 2004 18:13:06 -0000 1.61 *************** *** 32,35 **** --- 32,36 ---- #include "basechar.h" #include "basedef.h" + #include "corpse.h" #include "npc.h" #include "player.h" *************** *** 510,516 **** void cBaseChar::playDeathSound() { - if( !orgBodyID_ ) - orgBodyID_ = bodyID_; - if( orgBodyID_ == 0x0191 ) { --- 511,514 ---- *************** *** 522,528 **** case 3: soundEffect( 0x0153 ); break;// Female Death } ! } ! else if( orgBodyID_ == 0x0190 ) ! { switch( RandomNum(0, 3) ) { --- 520,524 ---- case 3: soundEffect( 0x0153 ); break;// Female Death } ! } else if( orgBodyID_ == 0x0190 ) { switch( RandomNum(0, 3) ) { *************** *** 532,539 **** case 3: soundEffect( 0x015D ); break;// Male Death } ! } ! else ! { ! bark( Bark_Death ); } } --- 528,533 ---- case 3: soundEffect( 0x015D ); break;// Male Death } ! } else { ! bark(Bark_Death); } } *************** *** 1658,1672 **** } - // Invulnerable Targets don't take any damage at all - if( isInvulnerable() ) - amount = 0; - // The damage has been resisted or scripts have taken care of the damage otherwise ! if( !amount ) return 0; // Would we die? if( amount >= hitpoints_ ) { ! kill(); } else { hitpoints_ -= amount; --- 1652,1664 ---- } // The damage has been resisted or scripts have taken care of the damage otherwise ! // Invulnerable Targets don't take any damage at all ! if (amount == 0 || isInvulnerable()) { return 0; + } // Would we die? if( amount >= hitpoints_ ) { ! kill(source); } else { hitpoints_ -= amount; *************** *** 1959,1963 **** } ! bool cBaseChar::onDeath() { bool result = false; --- 1951,1955 ---- } ! bool cBaseChar::onDeath(cUObject *source, P_ITEM corpse) { bool result = false; *************** *** 1965,1969 **** if( scriptChain ) { ! PyObject *args = Py_BuildValue( "O&", PyGetCharObject, this ); result = cPythonScript::callChainedEventHandler( EVENT_DEATH, scriptChain, args ); Py_DECREF( args ); --- 1957,1961 ---- if( scriptChain ) { ! PyObject *args = Py_BuildValue( "(O&O&O&)", PyGetCharObject, this, PyGetObjectObject, source, PyGetItemObject, corpse ); result = cPythonScript::callChainedEventHandler( EVENT_DEATH, scriptChain, args ); Py_DECREF( args ); *************** *** 2060,2064 **** } ! bool cBaseChar::kill() { ! return false; } --- 2052,2277 ---- } ! bool cBaseChar::kill(cUObject *source) { ! if (free || isDead()) { ! return false; ! } ! ! changed(TOOLTIP); ! changed_ = true; ! setDead(true); ! hitpoints_ = 0; ! setPoisoned(0); ! setPoison(0); ! ! if (isPolymorphed()) { ! setBodyID(orgBodyID_); ! setSkin(orgSkin_); ! setPolymorphed(false); ! } ! ! P_CHAR pKiller = dynamic_cast<P_CHAR>(source); ! P_ITEM pTool = dynamic_cast<P_ITEM>(source); ! ! // If we were killed by some sort of tool (explosion potions) ! // the owner is responsible for the murder ! if (pTool && pTool->owner()) { ! pKiller = pTool->owner(); ! } ! ! // Only trigger the reputation system if we can find someone responsible ! // for the murder ! if (pKiller) { ! // Only award karma and fame in unguarded areas ! if (!pKiller->inGuardedArea()) { ! pKiller->awardFame(fame_); ! pKiller->awardKarma(this, 0 - karma_); ! } ! ! P_PLAYER pPlayer = dynamic_cast<P_PLAYER>(pKiller); ! ! // Only players can become criminal ! if (pPlayer && isInnocent()) { ! pPlayer->makeCriminal(); ! pPlayer->setKills(pPlayer->kills() + 1); ! setMurdererSerial(pPlayer->serial()); ! ! // Report the number of slain people to the player ! if (pPlayer->socket()) { ! pPlayer->socket()->sysMessage(tr("You have killed %1 innocent people.").arg(pPlayer->kills())); ! } ! ! // The player became a murderer ! if (pPlayer->kills() >= SrvParams->maxkills()) { ! pPlayer->setMurdererTime(getNormalizedTime() + SrvParams->murderdecay() * MY_CLOCKS_PER_SEC); ! ! if (pPlayer->socket()) { ! pPlayer->socket()->clilocMessage(502134); ! } ! } ! } ! } ! ! // Fame is reduced by 10% upon death ! fame_ *= 0.90; ! ! ! // Create the corpse ! cCorpse *corpse = 0; ! bool summoned = false; ! ! P_ITEM backpack = getBackpack(); ! P_NPC npc = dynamic_cast<P_NPC>(this); ! P_PLAYER player = dynamic_cast<P_PLAYER>(this); ! ! if (player) { ! player->unmount(); ! } ! ! if (npc && npc->summoned()) { ! summoned = true; ! } ! ! cCharBaseDef *basedef = BaseDefManager::instance()->getCharBaseDef(bodyID_); ! ! // If we are a creature type with a corpse and if we are not summoned ! // we create a corpse ! if (!summoned && basedef && !basedef->noCorpse()) { ! corpse = new cCorpse(true); ! ! const cElement *elem = DefManager->getDefinition(WPDT_ITEM, "2006"); ! if (elem) { ! corpse->applyDefinition(elem); ! } ! ! corpse->setName(name_); ! corpse->setColor(skin_); ! corpse->setBodyId(bodyID_); ! corpse->setTag("human", cVariant(isHuman() ? 1 : 0 )); ! corpse->setTag("name", cVariant(name_)); ! ! // Storing the player's notoriety ! // So a singleclick on the corpse ! // Will display the right color ! if( isInnocent() ) ! corpse->setTag("notoriety", cVariant(1)); ! else if( isCriminal() ) ! corpse->setTag("notoriety", cVariant(2)); ! else if( isMurderer() ) ! corpse->setTag("notoriety", cVariant(3)); ! ! if (npc) { ! corpse->setCarve(npc->carve()); ! } ! ! corpse->setOwner(this); ! corpse->moveTo(pos_); ! corpse->setDirection(direction()); ! ! // stores the time and the murderer's name ! if (pKiller) { ! corpse->setMurderer(pKiller->name()); ! corpse->setMurderTime(uiCurrentTime); ! } ! ! // Move possible equipment to the corpse ! for (unsigned char layer = SingleHandedWeapon; layer <= InnerLegs; ++layer) { ! P_ITEM item = GetItemOnLayer(layer); ! ! if (item) { ! if (layer != Backpack && layer != Hair && layer != FacialHair) { ! // Put into the backpack ! if (item->newbie()) { ! backpack->addItem(item); ! } else { ! corpse->addItem(item); ! corpse->addEquipment(layer, item->serial()); ! } ! } else if (layer == Hair) { ! corpse->setHairStyle(item->id()); ! corpse->setHairColor(item->color()); ! } else if (layer == FacialHair) { ! corpse->setBeardStyle(item->id()); ! corpse->setBeardColor(item->color()); ! } ! } ! } ! ! corpse->setDecayTime(uiCurrentTime + SrvParams->corpseDecayTime() * MY_CLOCKS_PER_SEC); ! corpse->update(); ! } ! ! // Create Loot - Either on the corpse or on the ground ! QPtrList<cItem> posessions = backpack->getContainment(); ! ! for (P_ITEM item = posessions.first(); item; item = posessions.next()) { ! if (!item->newbie()) { ! if (corpse) { ! corpse->addItem(item); ! } else { ! item->moveTo(pos_); ! item->update(); ! } ! } ! } ! ! // Create Loot ! if (npc && !npc->lootList().isEmpty()) { ! ! } ! ! // Summoned monsters simply disappear ! if (summoned) { ! // Display a nice smoke puff where we disappear ! ! onDeath(source, corpse); ! cCharStuff::DeleteChar(this); ! return true; ! } ! ! playDeathSound(); ! ! cUOTxDeathAction dAction; ! dAction.setSerial(serial_); ! ! if (corpse) { ! dAction.setCorpse(corpse->serial()); ! } ! ! cUOTxRemoveObject rObject; ! rObject.setSerial(serial_); ! ! for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) { ! if (mSock->player() && mSock->player()->inRange( this, mSock->player()->visualRange())) { ! mSock->send(&dAction); ! ! if (mSock->player() != this) { ! mSock->send(&rObject); ! } ! } ! } ! ! onDeath(source, corpse); ! ! if (npc) { ! cCharStuff::DeleteChar(this); ! } ! ! if (player) { ! // Create a death shroud for the player ! P_ITEM shroud = cItem::createFromScript("204e"); ! if (shroud) { ! addItem(OuterTorso, shroud); ! shroud->update(); ! } ! ! if (player->socket()) { ! player->socket()->resendPlayer(true); ! ! // Notify the player of his death ! cUOTxCharDeath death; ! player->socket()->send(&death); ! } ! } ! ! return true; } Index: basechar.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.h,v retrieving revision 1.42 retrieving revision 1.43 diff -C2 -d -r1.42 -r1.43 *** basechar.h 31 Jan 2004 23:55:08 -0000 1.42 --- basechar.h 3 Feb 2004 18:13:17 -0000 1.43 *************** *** 76,80 **** typedef QValueVector< cBaseChar* > CharContainer; typedef QValueVector< cTempEffect* > EffectContainer; ! enum enLayer { TradeWindow, SingleHandedWeapon, DualHandedWeapon, Shoes, Pants, Shirt, Hat, Gloves, Ring, Neck = 0xA, Hair, Waist, InnerTorso, Bracelet, FacialHair = 0x10, MiddleTorso, Earrings, Arms, Back, Backpack, OuterTorso, OuterLegs, InnerLegs, Mount, BuyRestockContainer, --- 76,80 ---- typedef QValueVector< cBaseChar* > CharContainer; typedef QValueVector< cTempEffect* > EffectContainer; ! enum enLayer { TradeWindow = 0, SingleHandedWeapon, DualHandedWeapon, Shoes, Pants, Shirt, Hat, Gloves, Ring, Neck = 0xA, Hair, Waist, InnerTorso, Bracelet, FacialHair = 0x10, MiddleTorso, Earrings, Arms, Back, Backpack, OuterTorso, OuterLegs, InnerLegs, Mount, BuyRestockContainer, *************** *** 101,105 **** virtual void resend( bool clean = true, bool excludeself = false ) = 0; // other methods ! virtual uchar notority( P_CHAR pChar ) = 0; // Gets the notority towards another char /*! --- 101,105 ---- virtual void resend( bool clean = true, bool excludeself = false ) = 0; // other methods ! virtual uchar notoriety( P_CHAR pChar ) = 0; // Gets the notoriety towards another char /*! *************** *** 107,111 **** \returns True if the character was really killed and false if nothing changed. */ ! virtual bool kill(); virtual void showName( cUOSocket *socket ) = 0; virtual void fight(P_CHAR pOpponent) = 0; --- 107,112 ---- \returns True if the character was really killed and false if nothing changed. */ ! virtual bool kill(cUObject *source); ! virtual void showName( cUOSocket *socket ) = 0; virtual void fight(P_CHAR pOpponent) = 0; *************** *** 115,119 **** virtual void log( eLogLevel, const QString &string ) = 0; virtual void log( const QString &string ) = 0; ! unsigned int damage( eDamageType type, unsigned int amount, cUObject *source = 0 ); void createTooltip(cUOTxTooltipList &tooltip, cPlayer *player); --- 116,120 ---- virtual void log( eLogLevel, const QString &string ) = 0; virtual void log( const QString &string ) = 0; ! unsigned int damage(eDamageType type, unsigned int amount, cUObject *source = 0); void createTooltip(cUOTxTooltipList &tooltip, cPlayer *player); *************** *** 174,178 **** virtual bool onShowSkillGump(); //Show Skillgump virtual bool onSkillUse( UI08 Skill ); // The character uses %Skill ! virtual bool onDeath(); virtual bool onDropOnChar( P_ITEM pItem ); virtual QString onShowPaperdollName( P_CHAR pOrigin ); // only change the viewed name --- 175,179 ---- virtual bool onShowSkillGump(); //Show Skillgump virtual bool onSkillUse( UI08 Skill ); // The character uses %Skill ! virtual bool onDeath(cUObject *source, P_ITEM corpse); virtual bool onDropOnChar( P_ITEM pItem ); virtual QString onShowPaperdollName( P_CHAR pOrigin ); // only change the viewed name Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** basedef.h 7 Sep 2003 19:07:46 -0000 1.3 --- basedef.h 3 Feb 2004 18:13:17 -0000 1.4 *************** *** 61,64 **** --- 61,76 ---- unsigned int flags() const { return flags_; } unsigned char type() const { return type_; } + + inline bool canFly() const { + return flags_ & 0x01 != 0; + } + + inline bool antiBlink() const { + return flags_ & 0x02 != 0; + } + + inline bool noCorpse() const { + return flags_ & 0x04 != 0; + } }; Index: boats.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/boats.cpp,v retrieving revision 1.119 retrieving revision 1.120 diff -C2 -d -r1.119 -r1.120 *** boats.cpp 30 Jan 2004 23:28:34 -0000 1.119 --- boats.cpp 3 Feb 2004 18:13:17 -0000 1.120 *************** *** 543,547 **** else if( !( ( pc->isHidden() || ( pc->isDead() && !pc->isAtWar() ) ) && !iter_sock.current()->player()->isGMorCounselor() ) ) { ! drawChar.setHighlight( pc->notority( iter_sock.current()->player() ) ); sendTooltip( iter_sock.current() ); iter_sock.current()->send( &drawChar ); --- 543,547 ---- else if( !( ( pc->isHidden() || ( pc->isDead() && !pc->isAtWar() ) ) && !iter_sock.current()->player()->isGMorCounselor() ) ) { ! drawChar.setHighlight( pc->notoriety( iter_sock.current()->player() ) ); sendTooltip( iter_sock.current() ); iter_sock.current()->send( &drawChar ); *************** *** 771,775 **** if( !( ( pc->isHidden() || ( pc->isDead() && !pc->isAtWar() ) ) && !iter_sock.current()->player()->isGMorCounselor() ) ) { ! drawChar.setHighlight( pc->notority( iter_sock.current()->player() ) ); sendTooltip( iter_sock.current() ); iter_sock.current()->send( &drawChar ); --- 771,775 ---- if( !( ( pc->isHidden() || ( pc->isDead() && !pc->isAtWar() ) ) && !iter_sock.current()->player()->isGMorCounselor() ) ) { ! drawChar.setHighlight( pc->notoriety( iter_sock.current()->player() ) ); sendTooltip( iter_sock.current() ); iter_sock.current()->send( &drawChar ); Index: chars.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/chars.cpp,v retrieving revision 1.332 retrieving revision 1.333 diff -C2 -d -r1.332 -r1.333 *** chars.cpp 30 Jan 2004 22:11:52 -0000 1.332 --- chars.cpp 3 Feb 2004 18:13:17 -0000 1.333 *************** *** 130,133 **** --- 130,137 ---- pChar->applyDefinition( DefSection ); + // OrgBody and OrgSkin are often not set in the scripts + pChar->setOrgBodyID(pChar->bodyID()); + pChar->setOrgSkin(pChar->skin()); + // Now we call onCreate pChar->onCreate( section ); Index: dbl_single_click.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbl_single_click.cpp,v retrieving revision 1.229 retrieving revision 1.230 diff -C2 -d -r1.229 -r1.230 *** dbl_single_click.cpp 30 Jan 2004 23:28:34 -0000 1.229 --- dbl_single_click.cpp 3 Feb 2004 18:13:17 -0000 1.230 *************** *** 119,123 **** { // Innocent Corpse? ! if( pi->hasTag( "notority" ) && pi->getTag( "notority" ).toInt() == 1 ) { pc_currchar->makeCriminal(); --- 119,123 ---- { // Innocent Corpse? ! if( pi->hasTag( "notoriety" ) && pi->getTag( "notoriety" ).toInt() == 1 ) { pc_currchar->makeCriminal(); Index: dragdrop.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v retrieving revision 1.212 retrieving revision 1.213 diff -C2 -d -r1.212 -r1.213 *** dragdrop.cpp 31 Jan 2004 01:38:29 -0000 1.212 --- dragdrop.cpp 3 Feb 2004 18:13:17 -0000 1.213 *************** *** 130,134 **** bool sameGuild = true;//( GuildCompare( pChar, outmostCont->owner() ) != 0 ); ! if( outmostCont->hasTag( "notority" ) && outmostCont->getTag( "notority" ).toInt() == 1 && !pChar->Owns( outmostCont ) && !sameGuild ) { --- 130,134 ---- bool sameGuild = true;//( GuildCompare( pChar, outmostCont->owner() ) != 0 ); ! if( outmostCont->hasTag( "notoriety" ) && outmostCont->getTag( "notoriety" ).toInt() == 1 && !pChar->Owns( outmostCont ) && !sameGuild ) { Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.369 retrieving revision 1.370 diff -C2 -d -r1.369 -r1.370 *** items.cpp 31 Jan 2004 01:38:29 -0000 1.369 --- items.cpp 3 Feb 2004 18:13:17 -0000 1.370 *************** *** 1403,1415 **** // Show RepSys Settings of Victim when killed ! if( corpse() && hasTag( "notority" ) ) { ! int notority = getTag( "notority" ).toInt(); ! if( notority == 1 ) socket->showSpeech( this, tr( "[Innocent]" ), 0x005A ); ! else if( notority == 2 ) socket->showSpeech( this, tr( "[Criminal]" ), 0x03B2 ); ! else if( notority == 3 ) socket->showSpeech( this, tr( "[Murderer]" ), 0x0026 ); } --- 1403,1415 ---- // Show RepSys Settings of Victim when killed ! if( corpse() && hasTag( "notoriety" ) ) { ! int notoriety = getTag( "notoriety" ).toInt(); ! if( notoriety == 1 ) socket->showSpeech( this, tr( "[Innocent]" ), 0x005A ); ! else if( notoriety == 2 ) socket->showSpeech( this, tr( "[Criminal]" ), 0x03B2 ); ! else if( notoriety == 3 ) socket->showSpeech( this, tr( "[Murderer]" ), 0x0026 ); } Index: npc.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** npc.cpp 1 Feb 2004 01:21:27 -0000 1.61 --- npc.cpp 3 Feb 2004 18:13:17 -0000 1.62 *************** *** 248,252 **** if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) ) { ! updatePlayer->setHighlight( notority( pChar ) ); mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) ); } --- 248,252 ---- if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) ) { ! updatePlayer->setHighlight( notoriety( pChar ) ); mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) ); } *************** *** 287,291 **** continue; ! drawChar.setHighlight( notority( pChar ) ); sendTooltip( mSock ); --- 287,291 ---- continue; ! drawChar.setHighlight( notoriety( pChar ) ); sendTooltip( mSock ); *************** *** 381,385 **** } ! UINT8 cNPC::notority( P_CHAR pChar ) // Gets the notority toward another char { /* --- 381,385 ---- } ! UINT8 cNPC::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char { /* *************** *** 406,411 **** // return 0x06; // 6 = Red -> Monster ! if( ai_ && ai_->notorityOverride() ) ! return ai_->notorityOverride(); if( !pChar ) --- 406,411 ---- // return 0x06; // 6 = Red -> Monster ! if( ai_ && ai_->notorietyOverride() ) ! return ai_->notorietyOverride(); if( !pChar ) *************** *** 448,689 **** } - bool cNPC::kill() - { - changed( TOOLTIP ); - changed_ = true; - int ele; - - if( free ) - return false; - - if( isDead() || isInvulnerable() ) - return false; - - // Do this in the beginning - setDead( true ); - hitpoints_ = 0; // With no hp left - - if( isPolymorphed() ) - { - setBodyID( orgBodyID_ ); - setPolymorphed( false ); - } - - orgBodyID_ = bodyID(); - setOrgSkin( skin() ); - setMurdererSerial( INVALID_SERIAL ); // Reset previous murderer serial # to zero - - QString murderer( "" ); - - P_CHAR pAttacker = FindCharBySerial( attackerSerial_ ); - if( pAttacker ) - { - pAttacker->setCombatTarget(INVALID_SERIAL); - murderer = pAttacker->name(); - } - - // We do know our murderer here (or if there is none it's null) - // So here it's time to kall onKilled && onKill - // And give them a chance to return true - // But take care. You would need to create the corpse etc. etc. - // Which is *hard* work - // TODO: Call onKilled/onKill events - - // Reputation system ( I dont like the idea of this loop ) - cCharIterator iter_char; - P_CHAR pc_t; - - for( pc_t = iter_char.first(); pc_t; pc_t = iter_char.next() ) - { - if( ( pc_t->swingTarget() == serial() || pc_t->combatTarget() == serial() ) && !pc_t->free ) - { - /* if( pc_t->npcaitype() == 4 ) - { - pc_t->setSummonTimer( ( uiCurrentTime + ( MY_CLOCKS_PER_SEC * 20 ) ) ); - pc_t->setNpcWander(2); - pc_t->setNextMoveTime(); - pc_t->talk( tr( "Thou have suffered thy punishment, scoundrel." ), -1, 0, true ); - }*/ - - pc_t->setCombatTarget( INVALID_SERIAL ); - pc_t->setNextHitTime(0); - pc_t->setSwingTarget( INVALID_SERIAL ); - - if( pc_t->attackerSerial() != INVALID_SERIAL ) - { - P_CHAR pc_attacker = FindCharBySerial( pc_t->attackerSerial() ); - pc_attacker->setAttackFirst( false ); - pc_attacker->setAttackerSerial( INVALID_SERIAL ); - } - - pc_t->setAttackerSerial(INVALID_SERIAL); - pc_t->setAttackFirst( false ); - - if( pc_t->objectType() == enPlayer && !pc_t->inGuardedArea() ) - { - pc_t->awardKarma( this, ( 0 - ( karma_ ) ) ); - pc_t->awardFame( fame_ ); - } - - if( pc_t->objectType() == enNPC && pc_t->isAtWar() ) - dynamic_cast<P_NPC>(pc_t)->toggleCombat(); - - } - } - - // Now for the corpse - P_ITEM pi_backpack = getBackpack(); - - #pragma message(__FILE__ Reminder "Implement here tradewindow closing and disposal of it's cItem*") - // Close here the trade window... we still not sure how this will work, so I took out - //the old code - ele = 0; - - // I would *NOT* do that but instead replace several *send* things - // We have ->dead already so there shouldn't be any checks regarding - // 0x192-0x193 to see if the char is dead or not - if( orgBodyID_ == 0x0191 ) - setBodyID( 0x0193 ); // Male or Female - else - setBodyID( 0x0192 ); - - playDeathSound(); - - setSkin( 0x0000 ); // Undyed - - // Reset poison - setPoisoned(0); - setPoison(0); - - // Create our Corpse - cCorpse *corpse = new cCorpse( true ); - - const cElement *elem = DefManager->getDefinition( WPDT_ITEM, "2006" ); - - if( elem ) - corpse->applyDefinition( elem ); - - corpse->setName( tr( "corpse of %1" ).arg( name() ) ); - corpse->setColor( orgSkin() ); - - // Check for the player hair/beard - P_ITEM pHair = GetItemOnLayer( 11 ); - - if( pHair ) - { - corpse->setHairColor( pHair->color() ); - corpse->setHairStyle( pHair->id() ); - } - - P_ITEM pBeard = GetItemOnLayer( 16 ); - - if( pBeard ) - { - corpse->setBeardColor( pBeard->color() ); - corpse->setBeardStyle( pBeard->id() ); - } - - corpse->setBodyId( orgBodyID_ ); - corpse->setCarve( carve() ); //store carve section - corpse->setTag( "human", cVariant( isHuman() ? 1 : 0 ) ); - corpse->setTag( "name", cVariant( name() ) ); - - corpse->moveTo( pos() ); - corpse->setDirection( direction() ); - - // stores the time and the murderer's name - corpse->setMurderer( murderer ); - corpse->setMurderTime(uiCurrentTime); - - // create loot - QStringList lootItemSections = DefManager->getList( lootList_ ); - QStringList::const_iterator it = lootItemSections.begin(); - - while( it != lootItemSections.end() ) - { - P_ITEM pi_loot = cItem::createFromScript( (*it) ); - if( pi_loot ) - corpse->addItem( pi_loot ); - it++; - } - - std::vector< P_ITEM > equipment; - - // Check the Equipment and Unequip if neccesary - cBaseChar::ItemContainer::const_iterator iter; - for ( iter = content_.begin(); iter != content_.end(); iter++ ) - { - P_ITEM pi_j = iter.data(); - - if( pi_j ) - equipment.push_back( pi_j ); - } - - for( std::vector< P_ITEM >::iterator iit = equipment.begin(); iit != equipment.end(); ++iit ) - { - P_ITEM pi_j = *iit; - - if( pi_j->layer() <= 0x18 && pi_j->layer() != 0x0B && pi_j->layer() != 0x10 ) - { // Let's check all items, except HAIRS and BEARD - - // if this is a pack but it's not a VendorContainer(like the buy container) or a bankbox - if (pi_j->type() == 1) { - cItem::ContainerContent container = pi_j->content(); - cItem::ContainerContent::const_iterator it2 = container.begin(); - for ( ; it2 != container.end(); ++it2 ) - { - P_ITEM pi_k = *it2; - - if( !pi_k ) - continue; - - // put the item in the corpse only of we're sure it's not a newbie item or a spellbook - if( !pi_k->newbie() && ( pi_k->type() != 9 ) ) - { - corpse->addItem( pi_k ); - } - } - - // if it's a normal item but ( not newbie and not bank items ) - } else if (!pi_j->newbie()) { - if (pi_j != pi_backpack) { - pi_j->removeFromView(); - corpse->addEquipment(pi_j->layer(), pi_j->serial()); - corpse->addItem(pi_j); - } - } else if (pi_j != pi_backpack) { - // else if the item is newbie put it into char's backpack - pi_j->removeFromView(); - pi_backpack->addItem( pi_j ); - } - - //if( ( pi_j->layer() == 0x15 ) && ( shop == 0 ) ) - // pi_j->setLayer( 0x1A ); - } - } - - corpse->update(); - - cUOTxDeathAction dAction; - dAction.setSerial( serial() ); - dAction.setCorpse( corpse->serial() ); - - cUOTxRemoveObject rObject; - rObject.setSerial( serial() ); - - for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) - if( mSock->player() && mSock->player()->inRange( this, mSock->player()->visualRange() ) ) - { - mSock->send( &dAction ); - mSock->send( &rObject ); - } - - // trigger the event - onDeath(); - - cCharStuff::DeleteChar( this ); - return true; - } - /*! If this character is in a guarded area, it checks the surroundings for criminals --- 448,451 ---- *************** *** 725,732 **** charName.append( ", " + title_ ); - // Lord & Lady Title - if( fame_ == 10000 ) - charName.prepend( ( gender_ ) ? tr( "Lady " ) : tr( "Lord " ) ); - // Append serial for GMs if( socket->player()->showSerials() ) --- 487,490 ---- *************** *** 738,742 **** // Frozen ! if( isFrozen() ) charName.append( tr(" [frozen]") ); --- 496,500 ---- // Frozen ! if (isFrozen()) charName.append( tr(" [frozen]") ); *************** *** 768,772 **** // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red ! switch( notority( socket->player() ) ) { case 0x01: speechColor = 0x59; break; //blue --- 526,530 ---- // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red ! switch( notoriety( socket->player() ) ) { case 0x01: speechColor = 0x59; break; //blue *************** *** 1083,1087 **** else SET_INT_PROPERTY( "nextmovetime", nextMoveTime_ ) else SET_INT_PROPERTY( "npcmovetime", nextMoveTime_ ) ! else if( name == "wandertype" ) { setWanderType( (enWanderTypes)value.toInt() ); --- 841,847 ---- else SET_INT_PROPERTY( "nextmovetime", nextMoveTime_ ) else SET_INT_PROPERTY( "npcmovetime", nextMoveTime_ ) ! else if (name == "summoned") { ! setSummoned(value.toInt() != 0); ! } else if( name == "wandertype" ) { setWanderType( (enWanderTypes)value.toInt() ); *************** *** 1193,1197 **** else GET_PROPERTY( "spellslow", (int)spellsLow_ ) else GET_PROPERTY( "spellshigh", (int)spellsHigh_ ) ! else if( "name" == "spell" ) { UINT8 spell = name.right( name.length() - 6 ).toShort(); --- 953,958 ---- else GET_PROPERTY( "spellslow", (int)spellsLow_ ) else GET_PROPERTY( "spellshigh", (int)spellsHigh_ ) ! else GET_PROPERTY( "summoned", (int)(summoned() ? 1 : 0)) ! else if(name == "spell" ) { UINT8 spell = name.right( name.length() - 6 ).toShort(); Index: npc.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/npc.h,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** npc.h 31 Jan 2004 23:55:08 -0000 1.32 --- npc.h 3 Feb 2004 18:13:17 -0000 1.33 *************** *** 94,99 **** virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 ); ! virtual UINT8 notority( P_CHAR pChar = NULL ); ! virtual bool kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); --- 94,98 ---- virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); void talk( const UINT32 MsgID, const QString& params = 0, const QString& affix = 0, bool prepend = false, UI16 color = 0xFFFF, cUOSocket* socket = 0 ); ! virtual UINT8 notoriety( P_CHAR pChar = NULL ); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); *************** *** 137,140 **** --- 136,140 ---- UINT16 aiCheckInterval() const; UINT8 criticalHealth() const; + bool summoned() const; // bit flag getters bool hasSpell( UINT8 spell ) const; *************** *** 167,170 **** --- 167,171 ---- void setOwner(P_PLAYER data, bool nochecks = false); void setCarve(const QString &data); + void setSummoned(bool data); void setSpawnregion(const QString &data); void setStablemasterSerial(SERIAL data); *************** *** 175,178 **** --- 176,180 ---- void setAICheckInterval( UINT16 data ); void setCriticalHealth( UINT8 data ); + // bit flag setters void setSpell( UINT8 spell, bool data ); *************** *** 247,250 **** --- 249,253 ---- // // Bits: + // 0x00000001 Creature is summoned UINT32 additionalFlags_; *************** *** 594,598 **** inline bool cNPC::isInnocent() { ! return notority() == 1; } --- 597,614 ---- inline bool cNPC::isInnocent() { ! return notoriety() == 1; ! } ! ! inline bool cNPC::summoned() const { ! return additionalFlags_ & 0x01 != 0; ! } ! ! inline void cNPC::setSummoned(bool data) { ! if (data) { ! additionalFlags_ &= ~0x01; ! } else { ! additionalFlags_ |= 0x01; ! } ! changed_ = true; } Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.61 retrieving revision 1.62 diff -C2 -d -r1.61 -r1.62 *** player.cpp 1 Feb 2004 01:21:27 -0000 1.61 --- player.cpp 3 Feb 2004 18:13:17 -0000 1.62 *************** *** 198,202 **** if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) ) { ! updatePlayer->setHighlight( notority( pChar ) ); mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) ); } --- 198,202 ---- if( pChar && pChar->socket() && pChar->inRange( this, pChar->visualRange() ) ) { ! updatePlayer->setHighlight( notoriety( pChar ) ); mSock->send( new cUOTxUpdatePlayer( *updatePlayer ) ); } *************** *** 255,259 **** continue; ! drawChar.setHighlight( notority( pChar ) ); sendTooltip( mSock ); --- 255,259 ---- continue; ! drawChar.setHighlight( notoriety( pChar ) ); sendTooltip( mSock ); *************** *** 348,352 **** } ! UINT8 cPlayer::notority( P_CHAR pChar ) // Gets the notority toward another char { // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red --- 348,352 ---- } ! UINT8 cPlayer::notoriety( P_CHAR pChar ) // Gets the notoriety toward another char { // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red *************** *** 389,660 **** } - bool cPlayer::kill() - { - changed( TOOLTIP ); - changed_ = true; - int ele; - - if (free || isDead() || isInvulnerable()) { - return false; - } - - // Do this in the beginning - setDead(true); - hitpoints_ = 0; - - if (isPolymorphed()) { - setBodyID(orgBodyID_); - setSkin(orgSkin_); - setPolymorphed(false); - } - - setMurdererSerial( INVALID_SERIAL ); // Reset previous murderer serial # to zero - - QString murderer( "" ); - - P_CHAR pAttacker = FindCharBySerial( attackerSerial_ ); - if( pAttacker ) - { - pAttacker->setCombatTarget(INVALID_SERIAL); - murderer = pAttacker->name(); - } - - // We do know our murderer here (or if there is none it's null) - // So here it's time to kall onKilled && onKill - // And give them a chance to return true - // But take care. You would need to create the corpse etc. etc. - // Which is *hard* work - // TODO: Call onKilled/onKill events - - // Reputation system ( I dont like the idea of this loop ) - cCharIterator iter_char; - P_CHAR pc_t; - - for( pc_t = iter_char.first(); pc_t; pc_t = iter_char.next() ) - { - if( ( pc_t->swingTarget() == serial() || pc_t->combatTarget() == serial() ) && !pc_t->free ) - { - /* if( pc_t->npcaitype() == 4 ) - { - pc_t->setSummonTimer( ( uiCurrentTime + ( MY_CLOCKS_PER_SEC * 20 ) ) ); - pc_t->setNpcWander(2); - pc_t->setNextMoveTime(); - pc_t->talk( tr( "Thou have suffered thy punishment, scoundrel." ), -1, 0, true ); - }*/ - - pc_t->setCombatTarget( INVALID_SERIAL ); - pc_t->setNextHitTime(0); - pc_t->setSwingTarget( INVALID_SERIAL ); - - if( pc_t->attackerSerial() != INVALID_SERIAL ) - { - P_CHAR pc_attacker = FindCharBySerial( pc_t->attackerSerial() ); - pc_attacker->setAttackFirst( false ); - pc_attacker->setAttackerSerial( INVALID_SERIAL ); - } - - pc_t->setAttackerSerial(INVALID_SERIAL); - pc_t->setAttackFirst( false ); - - if( ( pc_t->objectType() == enPlayer ) && !pc_t->inGuardedArea() ) - { - P_PLAYER pp_t = dynamic_cast<P_PLAYER>(pc_t); - pp_t->awardKarma( this, ( 0 - ( karma_ ) ) ); - pp_t->awardFame( fame_ ); - - if( isInnocent() && pp_t->attackFirst() ) - { - setMurdererSerial( pp_t->serial() ); - pp_t->kills_++; - - // Notify the user of reputation changes - if( pp_t->socket() ) - { - pp_t->socket()->sysMessage( tr( "You have killed %1 innocent people." ).arg( pp_t->kills_ ) ); - - if( pp_t->kills_ >= SrvParams->maxkills() ) - { - pp_t->socket()->sysMessage( tr( "You are now a murderer!" ) ); - - // Set the Murder Decay Time - pp_t->setMurdererTime( getNormalizedTime() + SrvParams->murderdecay() * MY_CLOCKS_PER_SEC ); - } - } - } - } - - Log::instance()->print( LOG_NOTICE, QString( "%1 was killed by %2\n" ).arg( name() ).arg( pc_t->name() ) ); - - if( pc_t->objectType() == enNPC && pc_t->isAtWar() ) - { - dynamic_cast<P_NPC>(pc_t)->toggleCombat(); - } - } - } - - // Now for the corpse - P_ITEM pi_backpack = getBackpack(); - - unmount(); - - #pragma message(__FILE__ Reminder "Implement here tradewindow closing and disposal of it's cItem*") - // Close here the trade window... we still not sure how this will work, so I took out - //the old code - ele = 0; - - // I would *NOT* do that but instead replace several *send* things - // We have ->dead already so there shouldn't be any checks regarding - // 0x192-0x193 to see if the char is dead or not - if( orgBodyID_ == 0x0191 ) - setBodyID( 0x0193 ); // Male or Female - else - setBodyID( 0x0192 ); - - playDeathSound(); - - setSkin( 0x0000 ); // Undyed - - // Reset poison - setPoisoned(0); - setPoison(0); - - // Create our Corpse - cCorpse *corpse = new cCorpse( true ); - - const cElement *elem = DefManager->getDefinition( WPDT_ITEM, "2006" ); - - if( elem ) - corpse->applyDefinition( elem ); - - corpse->setName( tr( "corpse of %1" ).arg( name() ) ); - corpse->setColor( orgSkin() ); - - // Check for the player hair/beard - P_ITEM pHair = GetItemOnLayer( 11 ); - - if (pHair) { - corpse->setHairColor(pHair->color()); - corpse->setHairStyle(pHair->id()); - } - - P_ITEM pBeard = GetItemOnLayer( 16 ); - - if (pBeard) { - corpse->setBeardColor( pBeard->color() ); - corpse->setBeardStyle( pBeard->id() ); - } - - // Storing the player's notority - // So a singleclick on the corpse - // Will display the right color - if( isInnocent() ) - corpse->setTag("notority", cVariant(1)); - else if( isCriminal() ) - corpse->setTag("notority", cVariant(2)); - else if( isMurderer() ) - corpse->setTag("notority", cVariant(3)); - - corpse->setOwner(this); - - corpse->setBodyId( orgBodyID_ ); - corpse->setTag("human", cVariant(isHuman() ? 1 : 0)); - corpse->setTag("name", cVariant(name())); - - corpse->moveTo(pos()); - - corpse->setDirection(direction()); - - // Set the ownerserial to the player's - corpse->SetOwnSerial(serial()); - - // stores the time and the murderer's name - corpse->setMurderer(murderer); - corpse->setMurderTime(uiCurrentTime); - - std::vector<P_ITEM> equipment; - - // Check the Equipment and Unequip if neccesary - cBaseChar::ItemContainer::const_iterator iter; - for (iter = content_.begin(); iter != content_.end(); iter++) { - equipment.push_back(iter.data()); - } - - for( std::vector< P_ITEM >::iterator iit = equipment.begin(); iit != equipment.end(); ++iit ) - { - P_ITEM pi_j = *iit; - - // unequip trigger... - if( pi_j->layer() != 0x0B && pi_j->layer() != 0x10 ) - { // Let's check all items, except HAIRS and BEARD - - if( pi_j->type() == 1 && pi_j->layer() != 0x1A && pi_j->layer() != 0x1B && pi_j->layer() != 0x1C && pi_j->layer() != 0x1D ) - { // if this is a pack but it's not a VendorContainer(like the buy container) or a bankbox - cItem::ContainerContent container = pi_j->content(); - cItem::ContainerContent::const_iterator it2 = container.begin(); - for ( ; it2 != container.end(); ++it2 ) { - P_ITEM pi_k = *it2; - - // put the item in the corpse only of we're sure it's not a newbie item or a spellbook - if (!pi_k->newbie() && (pi_k->type() != 9)) { - corpse->addItem( pi_k ); - } - } - } - // if it's a normal item but ( not newbie and not bank items ) - else if ( !pi_j->newbie() && pi_j->layer() != 0x1D ) - { - if( pi_j != pi_backpack ) - { - pi_j->removeFromView(); - corpse->addEquipment( pi_j->layer(), pi_j->serial() ); - corpse->addItem( pi_j ); - } - } - else if( ( pi_j != pi_backpack ) && ( pi_j->layer() != 0x1D ) ) - { - // else if the item is newbie put it into char's backpack - pi_j->removeFromView(); - pi_backpack->addItem( pi_j ); - } - - //if( ( pi_j->layer() == 0x15 ) && ( shop == 0 ) ) - // pi_j->setLayer( 0x1A ); - } - } - - corpse->update(); - - cUOTxDeathAction dAction; - dAction.setSerial(serial()); - dAction.setCorpse(corpse->serial()); - - cUOTxRemoveObject rObject; - rObject.setSerial( serial() ); - - for( cUOSocket *mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() ) - if( mSock->player() && mSock->player()->inRange( this, mSock->player()->visualRange() ) && ( mSock != socket_ ) ) - { - mSock->send( &dAction ); - mSock->send( &rObject ); - } - - resend(false); - - P_ITEM pItem = cItem::createFromScript("204e"); - if (pItem) { - this->addItem(cBaseChar::OuterTorso, pItem); - pItem->update(); - } - - if(socket_) { - cUOTxCharDeath cDeath; - socket_->send(&cDeath); - } - - // trigger the event now - onDeath(); - return true; - } - void cPlayer::turnTo( cUObject *object ) { --- 389,392 ---- *************** *** 878,882 **** // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red ! switch( notority( socket->player() ) ) { case 0x01: speechColor = 0x59; break; //blue --- 610,614 ---- // 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red ! switch( notoriety( socket->player() ) ) { case 0x01: speechColor = 0x59; break; //blue Index: player.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** player.h 31 Jan 2004 23:55:08 -0000 1.27 --- player.h 3 Feb 2004 18:13:17 -0000 1.28 *************** *** 72,77 **** virtual void resend( bool clean = true, bool excludeself = false ); virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); ! virtual UINT8 notority( P_CHAR pChar ); ! virtual bool kill(); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); --- 72,76 ---- virtual void resend( bool clean = true, bool excludeself = false ); virtual void talk( const QString &message, UI16 color = 0xFFFF, UINT8 type = 0, bool autospam = false, cUOSocket* socket = NULL ); ! virtual UINT8 notoriety( P_CHAR pChar ); virtual void showName( cUOSocket *socket ); virtual void fight(P_CHAR pOpponent); Index: targetrequests.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v retrieving revision 1.84 retrieving revision 1.85 diff -C2 -d -r1.84 -r1.85 *** targetrequests.cpp 31 Jan 2004 18:12:42 -0000 1.84 --- targetrequests.cpp 3 Feb 2004 18:13:17 -0000 1.85 *************** *** 154,160 **** pChar->setName("Character"); pChar->setBodyID( hex2dec( npc_ ).toULong() ); - pChar->setOrgBodyID( pChar->bodyID() ); } // Send the char to it's surroundings pChar->resend( false ); // It's new so no need to remove it first --- 154,162 ---- pChar->setName("Character"); pChar->setBodyID( hex2dec( npc_ ).toULong() ); } + pChar->setOrgBodyID(pChar->bodyID()); + pChar->setOrgSkin(pChar->skin()); + // Send the char to it's surroundings pChar->resend( false ); // It's new so no need to remove it first Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** uobject.cpp 3 Feb 2004 15:39:05 -0000 1.133 --- uobject.cpp 3 Feb 2004 18:13:17 -0000 1.134 *************** *** 91,96 **** void cUObject::moveTo( const Coord_cl& newpos, bool noRemove ) { ! if( !noRemove ) MapObjects::instance()->remove( this ); pos_ = newpos; --- 91,97 ---- void cUObject::moveTo( const Coord_cl& newpos, bool noRemove ) { ! if( !noRemove ) { MapObjects::instance()->remove( this ); + } pos_ = newpos; |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2535/npcs/humans/vendors Modified Files: banker.xml bard.xml cobbler.xml cook.xml fishermen.xml healer.xml innkeeper.xml Log Message: added some buy/sell items to vendors... and some prices added as well. Index: banker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/banker.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** banker.xml 31 Jan 2004 22:48:45 -0000 1.1 --- banker.xml 4 Feb 2004 03:04:09 -0000 1.2 *************** *** 11,23 **** <!-- Banker --> <npc id="banker_male"> ! <inherit>base_male</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> - <ai>Human_Vendor</ai> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1541" /> <!-- Sash --> </equipped> <category>Vendors\Banker (Male)</category> <invulnerable /> --- 11,29 ---- <!-- Banker --> <npc id="banker_male"> ! <inherit>vendor_male</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1541" /> <!-- Sash --> </equipped> + <shopkeeper> + <restockable> + <item id="commodity_deed"><amount>20</amount></item> + </restockable> + <sellable> + </sellable> + </shopkeeper> <category>Vendors\Banker (Male)</category> <invulnerable /> *************** *** 25,37 **** <npc id="banker_female"> ! <inherit>base_female</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> - <ai>Human_Vendor</ai> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1719" /> <!-- Bonnet --> </equipped> <category>Vendors\Banker (Female)</category> <invulnerable /> --- 31,49 ---- <npc id="banker_female"> ! <inherit>vendor_female</inherit> <title>the Banker</title> <events>speech_banker</events> <bindmenu>banker_menu</bindmenu> <equipped> <item id="1515" /> <!-- Cloak --> <item id="1719" /> <!-- Bonnet --> </equipped> + <shopkeeper> + <restockable> + <item id="commodity_deed"><amount>20</amount></item> + </restockable> + <sellable> + </sellable> + </shopkeeper> <category>Vendors\Banker (Female)</category> <invulnerable /> Index: bard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bard.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bard.xml 3 Feb 2004 20:46:45 -0000 1.3 --- bard.xml 4 Feb 2004 03:04:09 -0000 1.4 *************** *** 11,17 **** <!-- A bard vendor --> <npc id="bard_male"> ! <inherit>base_male</inherit> <title>the Bard</title> - <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 11,16 ---- <!-- A bard vendor --> <npc id="bard_male"> ! <inherit>vendor_male</inherit> <title>the Bard</title> <shopkeeper> <restockable> *************** *** 37,47 **** <swordsmanship><random min="360" max="680" /></swordsmanship> <category>Vendors\Bard (Male)</category> - <invulnerable /> </npc> <npc id="bard_female"> ! <inherit>base_female</inherit> <title>the Bard</title> - <ai>Human_Vendor</ai> <shopkeeper> <restockable> --- 36,44 ---- <swordsmanship><random min="360" max="680" /></swordsmanship> <category>Vendors\Bard (Male)</category> </npc> <npc id="bard_female"> ! <inherit>vendor_female</inherit> <title>the Bard</title> <shopkeeper> <restockable> *************** *** 67,71 **** <swordsmanship><random min="360" max="680" /></swordsmanship> <category>Vendors\Bard (Female)</category> - <invulnerable /> </npc> --- 64,67 ---- Index: cobbler.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cobbler.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cobbler.xml 3 Feb 2004 18:19:12 -0000 1.3 --- cobbler.xml 4 Feb 2004 03:04:09 -0000 1.4 *************** *** 15,20 **** --- 15,28 ---- <shopkeeper> <restockable> + <item id="170f"><amount>20</amount></item> + <item id="170b"><amount>20</amount></item> + <item id="1711"><amount>20</amount></item> + <item id="170d"><amount>20</amount></item> </restockable> <sellable> + <item id="170f" /> + <item id="170b" /> + <item id="1711" /> + <item id="170d" /> </sellable> </shopkeeper> *************** *** 28,33 **** --- 36,49 ---- <shopkeeper> <restockable> + <item id="170f"><amount>20</amount></item> + <item id="170b"><amount>20</amount></item> + <item id="1711"><amount>20</amount></item> + <item id="170d"><amount>20</amount></item> </restockable> <sellable> + <item id="170f" /> + <item id="170b" /> + <item id="1711" /> + <item id="170d" /> </sellable> </shopkeeper> Index: cook.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cook.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** cook.xml 3 Feb 2004 18:19:12 -0000 1.3 --- cook.xml 4 Feb 2004 03:04:09 -0000 1.4 *************** *** 14,18 **** <title>the Cook</title> <shopkeeper> ! <restockable/> </shopkeeper> <cooking><random min="900" max="1000" /></cooking> --- 14,45 ---- <title>the Cook</title> <shopkeeper> ! <restockable> ! <item id="97e"><amount>20</amount></item> ! <item id="97f"><amount>20</amount></item> ! <item id="9b7"><amount>20</amount></item> ! <item id="9bb"><amount>20</amount></item> ! <item id="9e9"><amount>20</amount></item> ! <item id="9ec"><amount>20</amount></item> ! <item id="1039"><amount>20</amount></item> ! <item id="103b"><amount>20</amount></item> ! <item id="1041"><amount>20</amount></item> ! <item id="1043"><amount>20</amount></item> ! <item id="1608"><amount>20</amount></item> ! <item id="1609"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="97e" /> ! <item id="97f" /> ! <item id="9b7" /> ! <item id="9bb" /> ! <item id="9e9" /> ! <item id="9ec" /> ! <item id="1039" /> ! <item id="103b" /> ! <item id="1041" /> ! <item id="1043" /> ! <item id="1608" /> ! <item id="1609" /> ! </sellable> </shopkeeper> <cooking><random min="900" max="1000" /></cooking> *************** *** 25,29 **** <title>the Cook</title> <shopkeeper> ! <restockable/> </shopkeeper> <cooking><random min="900" max="1000" /></cooking> --- 52,83 ---- <title>the Cook</title> <shopkeeper> ! <restockable> ! <item id="97e"><amount>20</amount></item> ! <item id="97f"><amount>20</amount></item> ! <item id="9b7"><amount>20</amount></item> ! <item id="9bb"><amount>20</amount></item> ! <item id="9e9"><amount>20</amount></item> ! <item id="9ec"><amount>20</amount></item> ! <item id="1039"><amount>20</amount></item> ! <item id="103b"><amount>20</amount></item> ! <item id="1041"><amount>20</amount></item> ! <item id="1043"><amount>20</amount></item> ! <item id="1608"><amount>20</amount></item> ! <item id="1609"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="97e" /> ! <item id="97f" /> ! <item id="9b7" /> ! <item id="9bb" /> ! <item id="9e9" /> ! <item id="9ec" /> ! <item id="1039" /> ! <item id="103b" /> ! <item id="1041" /> ! <item id="1043" /> ! <item id="1608" /> ! <item id="1609" /> ! </sellable> </shopkeeper> <cooking><random min="900" max="1000" /></cooking> Index: fishermen.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/fishermen.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** fishermen.xml 3 Feb 2004 18:19:12 -0000 1.3 --- fishermen.xml 4 Feb 2004 03:04:09 -0000 1.4 *************** *** 15,20 **** --- 15,26 ---- <shopkeeper> <restockable> + <item id="97a"><amount>20</amount></item> + <item id="9cc"><amount>20</amount></item> + <item id="dc0"><amount>20</amount></item> </restockable> <sellable> + <item id="97a" /> + <item id="9cc" /> + <item id="dc0" /> </sellable> </shopkeeper> *************** *** 29,34 **** --- 35,46 ---- <shopkeeper> <restockable> + <item id="97a"><amount>20</amount></item> + <item id="9cc"><amount>20</amount></item> + <item id="dc0"><amount>20</amount></item> </restockable> <sellable> + <item id="97a" /> + <item id="9cc" /> + <item id="dc0" /> </sellable> </shopkeeper> Index: healer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/healer.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** healer.xml 2 Feb 2004 19:20:25 -0000 1.2 --- healer.xml 4 Feb 2004 03:04:09 -0000 1.3 *************** *** 48,51 **** --- 48,54 ---- </sellable> </shopkeeper> + <forensics><random min="800" max="1000" /></forensics> + <spiritspeak><random min="800" max="1000" /></spiritspeak> + <swordsmanship><random min="800" max="1000" /></swordsmanship> <category>Vendors\Healer (Male)</category> <events>npc.healer</events> *************** *** 90,93 **** --- 93,99 ---- </sellable> </shopkeeper> + <forensics><random min="800" max="1000" /></forensics> + <spiritspeak><random min="800" max="1000" /></spiritspeak> + <swordsmanship><random min="800" max="1000" /></swordsmanship> <category>Vendors\Healer (Female)</category> <events>npc.healer</events> Index: innkeeper.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/innkeeper.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** innkeeper.xml 2 Feb 2004 19:20:25 -0000 1.2 --- innkeeper.xml 4 Feb 2004 03:04:09 -0000 1.3 *************** *** 15,20 **** --- 15,78 ---- <shopkeeper> <restockable> + <item id="99f"><amount>20</amount></item> + <item id="9c7"><amount>20</amount></item> + <item id="99b"><amount>20</amount></item> + <item id="9c8"><amount>20</amount></item> + <item id="9f0"><amount>20</amount></item> + <item id="1f95"><amount>20</amount></item> + <item id="1f97"><amount>20</amount></item> + <item id="1f99"><amount>20</amount></item> + <item id="1f9b"><amount>20</amount></item> + <item id="1f9d"><amount>20</amount></item> + <item id="103b"><amount>10</amount></item> + <item id="97e"><amount>10</amount></item> + <item id="9b7"><amount>20</amount></item> + <item id="16a0"><amount>20</amount></item> + <item id="1608"><amount>20</amount></item> + <item id="9f2"><amount>20</amount></item> + <item id="9d2"><amount>20</amount></item> + <item id="994"><amount>20</amount></item> + <item id="9d1"><amount>20</amount></item> + <item id="9d0"><amount>20</amount></item> + <item id="171f"><amount>20</amount></item> + <item id="f6b"><amount>20</amount></item> + <item id="a28"><amount>20</amount></item> + <item id="1422"><amount>20</amount></item> + <item id="9b2"><amount>20</amount></item> + <item id="chessboard"><amount>20</amount></item> + <item id="checkerboard"><amount>20</amount></item> + <item id="e1c"><amount>20</amount></item> + <item id="fa7"><amount>20</amount></item> </restockable> <sellable> + <item id="99f" /> + <item id="9c7" /> + <item id="99b" /> + <item id="9c8" /> + <item id="9f0" /> + <item id="1f95" /> + <item id="1f97" /> + <item id="1f99" /> + <item id="1f9b" /> + <item id="1f9d" /> + <item id="103b" /> + <item id="97e" /> + <item id="9b7" /> + <item id="16a0" /> + <item id="1608" /> + <item id="9f2" /> + <item id="9d2" /> + <item id="994" /> + <item id="9d1" /> + <item id="9d0" /> + <item id="171f" /> + <item id="f6b" /> + <item id="a28" /> + <item id="1422" /> + <item id="9b2" /> + <item id="chessboard" /> + <item id="checkerboard" /> + <item id="e1c" /> + <item id="fa7" /> </sellable> </shopkeeper> *************** *** 27,32 **** --- 85,148 ---- <shopkeeper> <restockable> + <item id="99f"><amount>20</amount></item> + <item id="9c7"><amount>20</amount></item> + <item id="99b"><amount>20</amount></item> + <item id="9c8"><amount>20</amount></item> + <item id="9f0"><amount>20</amount></item> + <item id="1f95"><amount>20</amount></item> + <item id="1f97"><amount>20</amount></item> + <item id="1f99"><amount>20</amount></item> + <item id="1f9b"><amount>20</amount></item> + <item id="1f9d"><amount>20</amount></item> + <item id="103b"><amount>10</amount></item> + <item id="97e"><amount>10</amount></item> + <item id="9b7"><amount>20</amount></item> + <item id="16a0"><amount>20</amount></item> + <item id="1608"><amount>20</amount></item> + <item id="9f2"><amount>20</amount></item> + <item id="9d2"><amount>20</amount></item> + <item id="994"><amount>20</amount></item> + <item id="9d1"><amount>20</amount></item> + <item id="9d0"><amount>20</amount></item> + <item id="171f"><amount>20</amount></item> + <item id="f6b"><amount>20</amount></item> + <item id="a28"><amount>20</amount></item> + <item id="1422"><amount>20</amount></item> + <item id="9b2"><amount>20</amount></item> + <item id="chessboard"><amount>20</amount></item> + <item id="checkerboard"><amount>20</amount></item> + <item id="e1c"><amount>20</amount></item> + <item id="fa7"><amount>20</amount></item> </restockable> <sellable> + <item id="99f" /> + <item id="9c7" /> + <item id="99b" /> + <item id="9c8" /> + <item id="9f0" /> + <item id="1f95" /> + <item id="1f97" /> + <item id="1f99" /> + <item id="1f9b" /> + <item id="1f9d" /> + <item id="103b" /> + <item id="97e" /> + <item id="9b7" /> + <item id="16a0" /> + <item id="1608" /> + <item id="9f2" /> + <item id="9d2" /> + <item id="994" /> + <item id="9d1" /> + <item id="9d0" /> + <item id="171f" /> + <item id="f6b" /> + <item id="a28" /> + <item id="1422" /> + <item id="9b2" /> + <item id="chessboard" /> + <item id="checkerboard" /> + <item id="e1c" /> + <item id="fa7" /> </sellable> </shopkeeper> |
|
From: <thi...@us...> - 2004-02-04 03:06:28
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/misc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2535/items/misc Modified Files: deeds.xml misc.xml Log Message: added some buy/sell items to vendors... and some prices added as well. Index: deeds.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/deeds.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** deeds.xml 15 Sep 2003 16:19:45 -0000 1.2 --- deeds.xml 4 Feb 2004 03:04:08 -0000 1.3 *************** *** 17,20 **** --- 17,21 ---- <color>0x47</color> <newbie /> + <buyprice>5</buyprice> <events>commoditydeed</events> </item> Index: misc.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/misc/misc.xml,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** misc.xml 26 Jan 2004 03:21:06 -0000 1.9 --- misc.xml 4 Feb 2004 03:04:08 -0000 1.10 *************** *** 131,134 **** --- 131,146 ---- </item> + <item id="chessboard"> + <id>0xfa6</id> + <buyprice>2</buyprice> + <sellprice>1</sellprice> + </item> + + <item id="checkerboard"> + <id>0xfa6</id> + <buyprice>2</buyprice> + <sellprice>1</sellprice> + </item> + <!-- Archery Butte --> <item id="100a"> |
|
From: <thi...@us...> - 2004-02-04 03:01:58
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25413 Modified Files: civilists.xml Log Message: Vendors now have skills ( required for train to work ) Index: civilists.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/civilists.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** civilists.xml 2 Feb 2004 19:20:25 -0000 1.10 --- civilists.xml 3 Feb 2004 18:19:12 -0000 1.11 *************** *** 74,83 **** <ai>Human_Vendor</ai> <bindmenu>train_menu</bindmenu> <invulnerable /> </npc> <npc id="vendor_female"> ! <inherit>base_male</inherit> <ai>Human_Vendor</ai> <bindmenu>train_menu</bindmenu> <invulnerable /> </npc> --- 74,85 ---- <ai>Human_Vendor</ai> <bindmenu>train_menu</bindmenu> + <events>trainmenu</events> <invulnerable /> </npc> <npc id="vendor_female"> ! <inherit>base_female</inherit> <ai>Human_Vendor</ai> <bindmenu>train_menu</bindmenu> + <events>trainmenu</events> <invulnerable /> </npc> |
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25413/vendors Modified Files: alchemist.xml armorer.xml baker.xml bard.xml blacksmith.xml bowyer.xml butcher.xml carpenter.xml cobbler.xml cook.xml fishermen.xml herbalist.xml jeweler.xml mage.xml provisioner.xml shipwright.xml stablemaster.xml tailor.xml tanner.xml tinker.xml veterinarian.xml weaponsmith.xml weaver.xml Log Message: Vendors now have skills ( required for train to work ) Index: alchemist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/alchemist.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** alchemist.xml 2 Feb 2004 19:20:25 -0000 1.2 --- alchemist.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 251,254 **** --- 251,256 ---- </sellable> </shopkeeper> + <alchemy><random min="850" max="1000" /></alchemy> + <tasteidentification><random min="650" max="880" /></tasteidentification> <category>Vendors\Alchemist (Male)</category> </npc> *************** *** 495,498 **** --- 497,502 ---- </sellable> </shopkeeper> + <alchemy><random min="850" max="1000" /></alchemy> + <tasteidentification><random min="650" max="880" /></tasteidentification> <category>Vendors\Alchemist (Female)</category> </npc> Index: armorer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/armorer.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** armorer.xml 2 Feb 2004 19:20:25 -0000 1.2 --- armorer.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 107,110 **** --- 107,112 ---- </sellable> </shopkeeper> + <armslore><random min="640" max="1000" /></armslore> + <blacksmithing><random min="600" max="830" /></blacksmithing> <category>Vendors\Armorer (Male)</category> </npc> *************** *** 207,210 **** --- 209,214 ---- </sellable> </shopkeeper> + <armslore><random min="640" max="1000" /></armslore> + <blacksmithing><random min="600" max="830" /></blacksmithing> <category>Vendors\Armorer (Female)</category> </npc> Index: baker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/baker.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** baker.xml 2 Feb 2004 19:20:25 -0000 1.2 --- baker.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 67,70 **** --- 67,72 ---- </sellable> </shopkeeper> + <cooking><random min="750" max="980" /></cooking> + <tasteidentification><random min="360" max="680" /></tasteidentification> <category>Vendors\Baker (Male)</category> </npc> *************** *** 127,130 **** --- 129,134 ---- </sellable> </shopkeeper> + <cooking><random min="750" max="980" /></cooking> + <tasteidentification><random min="360" max="680" /></tasteidentification> <category>Vendors\Baker (Female)</category> </npc> Index: bard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bard.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** bard.xml 31 Jan 2004 22:48:45 -0000 1.1 --- bard.xml 3 Feb 2004 18:19:12 -0000 1.2 *************** *** 20,23 **** --- 20,29 ---- </sellable> </shopkeeper> + <discordance><random min="640" max="1000" /></discordance> + <musicianship><random min="640" max="1000" /></musicianship> + <peacemaking><random min="650" max="880" /></peacemaking> + <provocation><random min="600" max="830" /></provocation> + <archery><random min="360" max="680" /></archery> + <swordsmanship><random min="360" max="680" /></swordsmanship> <category>Vendors\Bard (Male)</category> <invulnerable /> *************** *** 34,37 **** --- 40,49 ---- </sellable> </shopkeeper> + <discordance><random min="640" max="1000" /></discordance> + <musicianship><random min="640" max="1000" /></musicianship> + <peacemaking><random min="650" max="880" /></peacemaking> + <provocation><random min="600" max="830" /></provocation> + <archery><random min="360" max="680" /></archery> + <swordsmanship><random min="360" max="680" /></swordsmanship> <category>Vendors\Bard (Female)</category> <invulnerable /> Index: blacksmith.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/blacksmith.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** blacksmith.xml 2 Feb 2004 19:20:25 -0000 1.2 --- blacksmith.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 143,146 **** --- 143,153 ---- </sellable> </shopkeeper> + <armslore><random min="360" max="680" /></armslore> + <blacksmithing><random min="650" max="880" /></blacksmithing> + <fencing><random min="600" max="830" /></fencing> + <macefighting><random min="610" max="930" /></macefighting> + <tactics><random min="600" max="830" /></tactics> + <swordsmanship><random min="600" max="830" /></swordsmanship> + <parrying><random min="610" max="930" /></parrying> <category>Vendors\blacksmith (Male)</category> </npc> *************** *** 279,282 **** --- 286,296 ---- </sellable> </shopkeeper> + <armslore><random min="360" max="680" /></armslore> + <blacksmithing><random min="650" max="880" /></blacksmithing> + <fencing><random min="600" max="830" /></fencing> + <macefighting><random min="610" max="930" /></macefighting> + <tactics><random min="600" max="830" /></tactics> + <swordsmanship><random min="600" max="830" /></swordsmanship> + <parrying><random min="610" max="930" /></parrying> <category>Vendors\Blacksmith (Female)</category> </npc> Index: bowyer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bowyer.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bowyer.xml 2 Feb 2004 19:20:25 -0000 1.2 --- bowyer.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 19,22 **** --- 19,24 ---- </sellable> </shopkeeper> + <archery><random min="600" max="830" /></archery> + <bowcrafting><random min="900" max="1000" /></bowcrafting> <category>Vendors\Bowyer (Male)</category> </npc> *************** *** 31,34 **** --- 33,38 ---- </sellable> </shopkeeper> + <archery><random min="600" max="830" /></archery> + <bowcrafting><random min="900" max="1000" /></bowcrafting> <category>Vendors\Bowyer (Female)</category> </npc> Index: butcher.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/butcher.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** butcher.xml 2 Feb 2004 19:20:25 -0000 1.2 --- butcher.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <restockable/> </shopkeeper> + <anatomy><random min="450" max="680" /></anatomy> <category>Vendors\Butcher (Male)</category> </npc> *************** *** 25,28 **** --- 26,30 ---- <restockable/> </shopkeeper> + <anatomy><random min="450" max="680" /></anatomy> <category>Vendors\Butcher (Female)</category> </npc> Index: carpenter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/carpenter.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** carpenter.xml 2 Feb 2004 19:20:25 -0000 1.2 --- carpenter.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- <restockable/> </shopkeeper> + <carpentry><random min="850" max="1000" /></carpentry> + <lumberjacking><random min="600" max="830" /></lumberjacking> <category>Vendors\Carpenter (Male)</category> </npc> *************** *** 25,28 **** --- 27,32 ---- <restockable/> </shopkeeper> + <carpentry><random min="850" max="1000" /></carpentry> + <lumberjacking><random min="600" max="830" /></lumberjacking> <category>Vendors\Carpenter (Female)</category> </npc> Index: cobbler.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cobbler.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cobbler.xml 2 Feb 2004 19:20:25 -0000 1.2 --- cobbler.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- </sellable> </shopkeeper> + <tailoring><random min="600" max="830" /></tailoring> <category>Vendors\Cobbler (Male)</category> </npc> *************** *** 31,34 **** --- 32,36 ---- </sellable> </shopkeeper> + <tailoring><random min="600" max="830" /></tailoring> <category>Vendors\Cobbler (Female)</category> </npc> Index: cook.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/cook.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cook.xml 2 Feb 2004 19:20:25 -0000 1.2 --- cook.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- <restockable/> </shopkeeper> + <cooking><random min="900" max="1000" /></cooking> + <tasteidentification><random min="750" max="980" /></tasteidentification> <category>Vendors\Cook (Male)</category> </npc> *************** *** 25,28 **** --- 27,32 ---- <restockable/> </shopkeeper> + <cooking><random min="900" max="1000" /></cooking> + <tasteidentification><random min="750" max="980" /></tasteidentification> <category>Vendors\Cook (Female)</category> </npc> Index: fishermen.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/fishermen.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** fishermen.xml 2 Feb 2004 19:20:25 -0000 1.2 --- fishermen.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 19,22 **** --- 19,23 ---- </sellable> </shopkeeper> + <fishing><random min="750" max="980" /></fishing> <category>Vendors\Fisherman (Male)</category> </npc> *************** *** 32,35 **** --- 33,37 ---- </sellable> </shopkeeper> + <fishing><random min="750" max="980" /></fishing> <category>Vendors\Fisherlady (Female)</category> </npc> Index: herbalist.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/herbalist.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** herbalist.xml 2 Feb 2004 19:20:25 -0000 1.2 --- herbalist.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 51,54 **** --- 51,57 ---- </sellable> </shopkeeper> + <alchemy><random min="800" max="1000" /></alchemy> + <cooking><random min="800" max="1000" /></cooking> + <tasteidentification><random min="800" max="1000" /></tasteidentification> <category>Vendors\Herbalist (Male)</category> </npc> *************** *** 95,98 **** --- 98,104 ---- </sellable> </shopkeeper> + <alchemy><random min="800" max="1000" /></alchemy> + <cooking><random min="800" max="1000" /></cooking> + <tasteidentification><random min="800" max="1000" /></tasteidentification> <category>Vendors\Herbalist (Female)</category> </npc> Index: jeweler.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/jeweler.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jeweler.xml 2 Feb 2004 19:20:25 -0000 1.2 --- jeweler.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 179,182 **** --- 179,183 ---- </sellable> </shopkeeper> + <itemidentification><random min="640" max="1000" /></itemidentification> <category>Vendors\Jeweler (Male)</category> </npc> *************** *** 351,354 **** --- 352,356 ---- </sellable> </shopkeeper> + <itemidentification><random min="640" max="1000" /></itemidentification> <category>Vendors\Jeweler (Femele)</category> </npc> Index: mage.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/mage.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** mage.xml 2 Feb 2004 19:20:25 -0000 1.2 --- mage.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 123,126 **** --- 123,132 ---- </sellable> </shopkeeper> + <evaluatinginteligence><random min="650" max="880" /></evaluatinginteligence> + <inscription><random min="600" max="830" /></inscription> + <magery><random min="640" max="1000" /></magery> + <meditation><random min="600" max="830" /></meditation> + <magicresist><random min="650" max="880" /></magicresist> + <wrestling><random min="360" max="680" /></wrestling> <category>Vendors\Mage (Male)</category> </npc> *************** *** 239,242 **** --- 245,254 ---- </sellable> </shopkeeper> + <evaluatinginteligence><random min="650" max="880" /></evaluatinginteligence> + <inscription><random min="600" max="830" /></inscription> + <magery><random min="640" max="1000" /></magery> + <meditation><random min="600" max="830" /></meditation> + <magicresist><random min="650" max="880" /></magicresist> + <wrestling><random min="360" max="680" /></wrestling> <category>Vendors\Mage (Female)</category> </npc> Index: provisioner.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/provisioner.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** provisioner.xml 2 Feb 2004 19:20:25 -0000 1.2 --- provisioner.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,21 ---- <restockable/> </shopkeeper> + <camping><random min="450" max="680" /></camping> + <tactics><random min="450" max="680" /></tactics> <category>Vendors\Provisioner (Male)</category> </npc> *************** *** 25,28 **** --- 27,32 ---- <restockable/> </shopkeeper> + <camping><random min="450" max="680" /></camping> + <tactics><random min="450" max="680" /></tactics> <category>Vendors\Provisioner (Female)</category> </npc> Index: shipwright.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/shipwright.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** shipwright.xml 2 Feb 2004 19:20:25 -0000 1.2 --- shipwright.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 19,22 **** --- 19,24 ---- </sellable> </shopkeeper> + <carpentry><random min="600" max="830" /></carpentry> + <macefighting><random min="360" max="680" /></macefighting> <category>Vendors\Shipwright (Male)</category> </npc> *************** *** 31,34 **** --- 33,38 ---- </sellable> </shopkeeper> + <carpentry><random min="600" max="830" /></carpentry> + <macefighting><random min="360" max="680" /></macefighting> <category>Vendors\Shipwright (Female)</category> </npc> Index: stablemaster.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/stablemaster.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stablemaster.xml 2 Feb 2004 19:20:25 -0000 1.2 --- stablemaster.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 13,37 **** <inherit>vendor_male</inherit> <title>the Stablemaster</title> ! <fencing> ! <random min="150" max="380"/> ! </fencing> ! <parrying> ! <random min="450" max="680"/> ! </parrying> ! <swordsmanship> ! <random min="150" max="380"/> ! </swordsmanship> ! <wrestling> ! <random min="150" max="380"/> ! </wrestling> ! <macefighting> ! <random min="150" max="380"/> ! </macefighting> ! <magicresistance> ! <random min="450" max="680"/> ! </magicresistance> ! <tactics> ! <random min="450" max="680"/> ! </tactics> <category>Vendors\Stablemaster (Male)</category> </npc> --- 13,19 ---- <inherit>vendor_male</inherit> <title>the Stablemaster</title> ! <animallore><random min="640" max="1000"/></animallore> ! <animaltaming><random min="900" max="1000"/></animaltaming> ! <veterinary><random min="650" max="880"/></veterinary> <category>Vendors\Stablemaster (Male)</category> </npc> *************** *** 40,64 **** <inherit>vendor_female</inherit> <title>the Stablemaster</title> ! <fencing> ! <random min="150" max="380"/> ! </fencing> ! <parrying> ! <random min="450" max="680"/> ! </parrying> ! <swordsmanship> ! <random min="150" max="380"/> ! </swordsmanship> ! <wrestling> ! <random min="150" max="380"/> ! </wrestling> ! <macefighting> ! <random min="150" max="380"/> ! </macefighting> ! <magicresistance> ! <random min="450" max="680"/> ! </magicresistance> ! <tactics> ! <random min="450" max="680"/> ! </tactics> <category>Vendors\Stablemaster (Female)</category> </npc> --- 22,28 ---- <inherit>vendor_female</inherit> <title>the Stablemaster</title> ! <animallore><random min="640" max="1000"/></animallore> ! <animaltaming><random min="900" max="1000"/></animaltaming> ! <veterinary><random min="650" max="880"/></veterinary> <category>Vendors\Stablemaster (Female)</category> </npc> Index: tailor.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tailor.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tailor.xml 2 Feb 2004 19:20:25 -0000 1.2 --- tailor.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 32,35 **** --- 32,36 ---- </restockable> </shopkeeper> + <tailoring><random min="640" max="1000"/></tailoring> <category>Vendors\Tailor (Male)</category> </npc> *************** *** 57,60 **** --- 58,62 ---- </restockable> </shopkeeper> + <tailoring><random min="640" max="1000"/></tailoring> <category>Vendors\Tailor (Female)</category> </npc> Index: tanner.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tanner.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tanner.xml 2 Feb 2004 19:20:25 -0000 1.2 --- tanner.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 27,30 **** --- 27,31 ---- </sellable> </shopkeeper> + <tailoring><random min="360" max="680"/></tailoring> <category>Vendors\Tanner (Male)</category> </npc> *************** *** 47,50 **** --- 48,52 ---- </sellable> </shopkeeper> + <tailoring><random min="360" max="680"/></tailoring> <category>Vendors\Tanner (Female)</category> </npc> Index: tinker.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/tinker.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** tinker.xml 2 Feb 2004 19:20:25 -0000 1.2 --- tinker.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,22 ---- <restockable/> </shopkeeper> + <lockpicking><random min="600" max="830"/></lockpicking> + <removetraps><random min="750" max="980"/></removetraps> + <tinkering><random min="640" max="1000"/></tinkering> <category>Vendors\Tinker (Male)</category> </npc> *************** *** 26,29 **** --- 29,35 ---- <restockable/> </shopkeeper> + <lockpicking><random min="600" max="830"/></lockpicking> + <removetraps><random min="750" max="980"/></removetraps> + <tinkering><random min="640" max="1000"/></tinkering> <category>Vendors\Tinker (Female)</category> </npc> Index: veterinarian.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/veterinarian.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** veterinarian.xml 2 Feb 2004 19:20:25 -0000 1.2 --- veterinarian.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 13,16 **** --- 13,18 ---- <inherit>vendor_male</inherit> <title>the Veterinarian</title> + <veterinary><random min="900" max="1000"/></veterinary> + <animallore><random min="850" max="1000"/></animallore> <category>Vendors\Veterinarian (Male)</category> </npc> *************** *** 19,22 **** --- 21,26 ---- <inherit>vendor_female</inherit> <title>the Veterinarian</title> + <veterinary><random min="900" max="1000"/></veterinary> + <animallore><random min="850" max="1000"/></animallore> <category>Vendors\Veterinarian (Female)</category> </npc> Index: weaponsmith.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/weaponsmith.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weaponsmith.xml 2 Feb 2004 19:20:25 -0000 1.2 --- weaponsmith.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 19,22 **** --- 19,28 ---- </sellable> </shopkeeper> + <armslore><random min="640" max="1000" /></armslore> + <blacksmithing><random min="650" max="880" /></blacksmithing> + <fencing><random min="450" max="680" /></fencing> + <macefighting><random min="450" max="680" /></macefighting> + <tactics><random min="360" max="680" /></tactics> + <swordsmanship><random min="450" max="680" /></swordsmanship> <category>Vendors\Weaponsmith (Male)</category> </npc> *************** *** 31,34 **** --- 37,46 ---- </sellable> </shopkeeper> + <armslore><random min="640" max="1000" /></armslore> + <blacksmithing><random min="650" max="880" /></blacksmithing> + <fencing><random min="450" max="680" /></fencing> + <macefighting><random min="450" max="680" /></macefighting> + <tactics><random min="360" max="680" /></tactics> + <swordsmanship><random min="450" max="680" /></swordsmanship> <category>Vendors\Weaponsmith (Female)</category> </npc> Index: weaver.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/weaver.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** weaver.xml 2 Feb 2004 19:20:25 -0000 1.2 --- weaver.xml 3 Feb 2004 18:19:12 -0000 1.3 *************** *** 16,19 **** --- 16,20 ---- <restockable/> </shopkeeper> + <tailoring><random min="650" max="880" /></tailoring> <category>Vendors\Weaver (Male)</category> </npc> *************** *** 25,28 **** --- 26,30 ---- <restockable/> </shopkeeper> + <tailoring><random min="650" max="880" /></tailoring> <category>Vendors\Weaver (Female)</category> </npc> |
|
From: <dar...@us...> - 2004-02-04 03:01:13
|
Update of /cvsroot/wpdev/wolfpack/ai In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20552/ai Modified Files: ai.h ai_humans.cpp Log Message: Added summoned flag to npcs. (Accesible via .summoned=1/0) Added char.notoriety() to the python interface Rewrote cBaseChar::kill() (not yet finished) Index: ai.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ai.h 30 Jan 2004 22:11:52 -0000 1.3 --- ai.h 3 Feb 2004 18:13:05 -0000 1.4 *************** *** 91,98 **** { protected: ! AbstractAI() : m_npc( NULL ), m_currentAction( NULL ), notorityOverride_( 0 ) { m_actions.setAutoDelete( true ); } public: ! AbstractAI( P_NPC npc ) : m_npc( npc ), m_currentAction( NULL ), notorityOverride_( 0 ) { m_actions.setAutoDelete( true ); } virtual ~AbstractAI() {} // virtual destructor. --- 91,98 ---- { protected: ! AbstractAI() : m_npc( NULL ), m_currentAction( NULL ), notorietyOverride_( 0 ) { m_actions.setAutoDelete( true ); } public: ! AbstractAI( P_NPC npc ) : m_npc( npc ), m_currentAction( NULL ), notorietyOverride_( 0 ) { m_actions.setAutoDelete( true ); } virtual ~AbstractAI() {} // virtual destructor. *************** *** 108,113 **** void setNPC( P_NPC npc ) { m_npc = npc; } ! unsigned char notorityOverride() const { return notorityOverride_; } ! void setNotorityOverride( unsigned char value ) { notorityOverride_ = value; } // This is for creating AI interfaces through the AIFactory --- 108,113 ---- void setNPC( P_NPC npc ) { m_npc = npc; } ! unsigned char notorietyOverride() const { return notorietyOverride_; } ! void setnotorietyOverride( unsigned char value ) { notorietyOverride_ = value; } // This is for creating AI interfaces through the AIFactory *************** *** 126,130 **** AbstractAction* m_currentAction; QPtrList< AbstractAction > m_actions; ! unsigned char notorityOverride_; }; --- 126,130 ---- AbstractAction* m_currentAction; QPtrList< AbstractAction > m_actions; ! unsigned char notorietyOverride_; }; *************** *** 221,225 **** Monster_Aggressive() : AbstractAI(), m_currentVictim( NULL ) { ! notorityOverride_ = 3; } --- 221,225 ---- Monster_Aggressive() : AbstractAI(), m_currentVictim( NULL ) { ! notorietyOverride_ = 3; } *************** *** 227,231 **** Monster_Aggressive( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL ) { ! notorityOverride_ = 3; } --- 227,231 ---- Monster_Aggressive( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL ) { ! notorietyOverride_ = 3; } *************** *** 285,289 **** Human_Vendor() : AbstractAI() { ! notorityOverride_ = 1; } --- 285,289 ---- Human_Vendor() : AbstractAI() { ! notorietyOverride_ = 1; } *************** *** 291,295 **** Human_Vendor( P_NPC npc ) : AbstractAI( npc ) { ! notorityOverride_ = 1; m_actions.append( new Action_Wander( npc, this ) ); m_actions.append( new Action_FleeAttacker( npc, this ) ); --- 291,295 ---- Human_Vendor( P_NPC npc ) : AbstractAI( npc ) { ! notorietyOverride_ = 1; m_actions.append( new Action_Wander( npc, this ) ); m_actions.append( new Action_FleeAttacker( npc, this ) ); *************** *** 309,313 **** Human_Stablemaster() : AbstractAI() { ! notorityOverride_ = 1; } --- 309,313 ---- Human_Stablemaster() : AbstractAI() { ! notorietyOverride_ = 1; } *************** *** 466,470 **** Human_Guard_Called() : AbstractAI() { ! notorityOverride_ = 1; } --- 466,470 ---- Human_Guard_Called() : AbstractAI() { ! notorietyOverride_ = 1; } *************** *** 516,520 **** Human_Guard() : AbstractAI(), m_currentVictim( NULL ) { ! notorityOverride_ = 1; } --- 516,520 ---- Human_Guard() : AbstractAI(), m_currentVictim( NULL ) { ! notorietyOverride_ = 1; } Index: ai_humans.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ai_humans.cpp 28 Jan 2004 02:18:13 -0000 1.3 --- ai_humans.cpp 3 Feb 2004 18:13:05 -0000 1.4 *************** *** 98,102 **** Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : AbstractAI( npc ) { ! notorityOverride_ = 1; m_actions.append( new Action_Wander( npc, this ) ); m_actions.append( new Action_FleeAttacker( npc, this ) ); --- 98,102 ---- Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : AbstractAI( npc ) { ! notorietyOverride_ = 1; m_actions.append( new Action_Wander( npc, this ) ); m_actions.append( new Action_FleeAttacker( npc, this ) ); *************** *** 236,240 **** Human_Guard_Called::Human_Guard_Called( P_NPC npc ) : AbstractAI( npc ) { ! notorityOverride_ = 1; m_actions.append( new Human_Guard_Called_Fight( npc, this ) ); m_actions.append( new Human_Guard_Called_TeleToTarget( npc, this ) ); --- 236,240 ---- Human_Guard_Called::Human_Guard_Called( P_NPC npc ) : AbstractAI( npc ) { ! notorietyOverride_ = 1; m_actions.append( new Human_Guard_Called_Fight( npc, this ) ); m_actions.append( new Human_Guard_Called_TeleToTarget( npc, this ) ); *************** *** 352,356 **** Human_Guard::Human_Guard( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL ) { ! notorityOverride_ = 1; m_actions.append( new Human_Guard_Wander( npc, this ) ); m_actions.append( new Human_Guard_MoveToTarget( npc, this ) ); --- 352,356 ---- Human_Guard::Human_Guard( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL ) { ! notorietyOverride_ = 1; m_actions.append( new Human_Guard_Wander( npc, this ) ); m_actions.append( new Human_Guard_MoveToTarget( npc, this ) ); |
|
From: <dar...@us...> - 2004-02-04 00:19:28
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3732 Modified Files: tooltip.py Log Message: Changed the default tooltip for items. Index: tooltip.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/tooltip.py,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** tooltip.py 3 Feb 2004 21:47:38 -0000 1.14 --- tooltip.py 4 Feb 2004 00:17:02 -0000 1.15 *************** *** 19,23 **** name = target.getname() ! if isarmor ( target ): armor( target, tooltip ) --- 19,26 ---- name = target.getname() ! if target.id == 0x2006 and len(target.name) > 0: ! tooltip.add(1046414, target.name) ! ! elif isarmor ( target ): armor( target, tooltip ) *************** *** 33,46 **** else: if target.name == '#' or target.name == '': ! if target.amount > 1: ! tooltip.add( 1050045, " \t#" + str( 0xF9060 + target.id ) + "\t`s: " + str( target.amount ) ) ! else: ! tooltip.add( 0xF9060 + target.id, '' ) ! else: ! if target.amount > 1: ! tooltip.add( 1050045, " \t" + name + "\t: " + str( target.amount ) ) ! else: ! tooltip.add( 1050045, " \t" + name + "\t " ) if target.visible == 0 and sender.gm: --- 36,47 ---- else: if target.name == '#' or target.name == '': ! labelname = '#' + str(0xf9060 + target.id) else: ! labelname = target.name ! ! if target.amount > 1: ! tooltip.add(1050039, str(target.amount) + "\t" + labelname) ! else: ! tooltip.add(1050039, " \t" + labelname) if target.visible == 0 and sender.gm: |
|
From: <dar...@us...> - 2004-02-04 00:15:34
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943 Modified Files: items.cpp Log Message: Changed the default tooltip for items. Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.372 retrieving revision 1.373 diff -C2 -d -r1.372 -r1.373 *** items.cpp 3 Feb 2004 21:23:00 -0000 1.372 --- items.cpp 4 Feb 2004 00:13:16 -0000 1.373 *************** *** 2322,2332 **** if (name_.isNull() || name_.isEmpty()) { if (amount_ > 1) { ! tooltip.addLine(0x1005bd, " \t#" + QString::number( 0xF9060 + id_ ) + "\t: " + QString::number(amount_)); } else { ! tooltip.addLine(0xF9060 + id_, ""); } } else ! tooltip.addLine( 0x1005bd, " \t" + name_ + "\t " ); } } --- 2322,2340 ---- if (name_.isNull() || name_.isEmpty()) { if (amount_ > 1) { ! //tooltip.addLine(0x1005bd, " \t#" + QString::number( 0xF9060 + id_ ) + "\t: " + QString::number(amount_)); ! tooltip.addLine(1050039, QString::number(amount_) + "\t#" + QString::number(0xf9060 + id_)); } else { ! //tooltip.addLine(0xF9060 + id_, ""); ! tooltip.addLine(1050039, " \t#" + QString::number(0xf9060 + id_)); } } else ! if (amount_ > 1) { ! //tooltip.addLine(0x1005bd, " \t#" + QString::number( 0xF9060 + id_ ) + "\t: " + QString::number(amount_)); ! tooltip.addLine(1050039, QString::number(amount_) + "\t" + name_); ! } else { ! //tooltip.addLine(0xF9060 + id_, ""); ! tooltip.addLine(1050039, " \t" + name_); ! } } } |
|
From: <dar...@us...> - 2004-02-04 00:15:34
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2943/network Modified Files: uotxpackets.h Log Message: Changed the default tooltip for items. Index: uotxpackets.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v retrieving revision 1.93 retrieving revision 1.94 diff -C2 -d -r1.93 -r1.94 *** uotxpackets.h 3 Feb 2004 18:13:18 -0000 1.93 --- uotxpackets.h 4 Feb 2004 00:13:16 -0000 1.94 *************** *** 1275,1278 **** --- 1275,1281 ---- } + void setUnknown1( ushort data ) { setShort( 3, data ); } + void setUnknown2( uchar data ) { (*this)[9] = data; } + void setUnknown3( uchar data ) { (*this)[10] = data; } void setSerial( uint data ) { setInt( 5, data ); } void setId( uint data ) { setInt( 11, data ); } |
|
From: <thi...@us...> - 2004-02-04 00:04:38
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14757 Modified Files: items.cpp Log Message: Fix definition parsing, not recognizing amounts on vendor buy/sell containers. Index: items.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v retrieving revision 1.370 retrieving revision 1.371 diff -C2 -d -r1.370 -r1.371 *** items.cpp 3 Feb 2004 18:13:17 -0000 1.370 --- items.cpp 3 Feb 2004 20:09:31 -0000 1.371 *************** *** 1350,1353 **** --- 1350,1355 ---- cItem* nItem = cItem::createFromScript( element->getAttribute("id") ); addItem( nItem, true, false ); + for ( unsigned int j = 0; j < element->childCount(); ++j ) + nItem->processNode( element->getChild( j ) ); } else if( element->hasAttribute( "list" ) ) |
|
From: <thi...@us...> - 2004-02-03 22:41:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306/npcs/humans/vendors Modified Files: bard.xml bowyer.xml butcher.xml carpenter.xml Log Message: added prices and items to Carpenters Index: bard.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bard.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bard.xml 3 Feb 2004 18:19:12 -0000 1.2 --- bard.xml 3 Feb 2004 20:46:45 -0000 1.3 *************** *** 16,21 **** --- 16,31 ---- <shopkeeper> <restockable> + <item id="eb2"><amount>10</amount></item> + <item id="eb3"><amount>10</amount></item> + <item id="e9c"><amount>10</amount></item> + <item id="eb1"><amount>10</amount></item> + <item id="e9e"><amount>10</amount></item> </restockable> <sellable> + <item id="eb2" /> + <item id="eb3" /> + <item id="e9c" /> + <item id="eb1" /> + <item id="e9e" /> </sellable> </shopkeeper> *************** *** 36,41 **** --- 46,61 ---- <shopkeeper> <restockable> + <item id="eb2"><amount>10</amount></item> + <item id="eb3"><amount>10</amount></item> + <item id="e9c"><amount>10</amount></item> + <item id="eb1"><amount>10</amount></item> + <item id="e9e"><amount>10</amount></item> </restockable> <sellable> + <item id="eb2" /> + <item id="eb3" /> + <item id="e9c" /> + <item id="eb1" /> + <item id="e9e" /> </sellable> </shopkeeper> Index: bowyer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/bowyer.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** bowyer.xml 3 Feb 2004 18:19:12 -0000 1.3 --- bowyer.xml 3 Feb 2004 20:46:45 -0000 1.4 *************** *** 15,20 **** --- 15,22 ---- <shopkeeper> <restockable> + <item id="1022"><amount>20</amount></item> </restockable> <sellable> + <item id="1022" /> </sellable> </shopkeeper> *************** *** 29,34 **** --- 31,38 ---- <shopkeeper> <restockable> + <item id="1022"><amount>20</amount></item> </restockable> <sellable> + <item id="1022" /> </sellable> </shopkeeper> Index: butcher.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/butcher.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** butcher.xml 3 Feb 2004 18:19:12 -0000 1.3 --- butcher.xml 3 Feb 2004 20:46:45 -0000 1.4 *************** *** 14,18 **** <title>the butcher</title> <shopkeeper> ! <restockable/> </shopkeeper> <anatomy><random min="450" max="680" /></anatomy> --- 14,39 ---- <title>the butcher</title> <shopkeeper> ! <restockable> ! <item id="9f1"><amount>20</amount></item> ! <item id="1609"><amount>20</amount></item> ! <item id="1607"><amount>20</amount></item> ! <item id="9b9"><amount>20</amount></item> ! <item id="979"><amount>20</amount></item> ! <item id="9c0"><amount>20</amount></item> ! <item id="13f6"><amount>20</amount></item> ! <item id="ec3"><amount>20</amount></item> ! <item id="ec4"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="9f1" /> ! <item id="1609" /> ! <item id="1607" /> ! <item id="9b9" /> ! <item id="979" /> ! <item id="9c0" /> ! <item id="13f6" /> ! <item id="ec3" /> ! <item id="ec4" /> ! </sellable> </shopkeeper> <anatomy><random min="450" max="680" /></anatomy> *************** *** 24,28 **** <title>the butcher</title> <shopkeeper> ! <restockable/> </shopkeeper> <anatomy><random min="450" max="680" /></anatomy> --- 45,70 ---- <title>the butcher</title> <shopkeeper> ! <restockable> ! <item id="9f1"><amount>20</amount></item> ! <item id="1609"><amount>20</amount></item> ! <item id="1607"><amount>20</amount></item> ! <item id="9b9"><amount>20</amount></item> ! <item id="979"><amount>20</amount></item> ! <item id="9c0"><amount>20</amount></item> ! <item id="13f6"><amount>20</amount></item> ! <item id="ec3"><amount>20</amount></item> ! <item id="ec4"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="9f1" /> ! <item id="1609" /> ! <item id="1607" /> ! <item id="9b9" /> ! <item id="979" /> ! <item id="9c0" /> ! <item id="13f6" /> ! <item id="ec3" /> ! <item id="ec4" /> ! </sellable> </shopkeeper> <anatomy><random min="450" max="680" /></anatomy> Index: carpenter.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/carpenter.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** carpenter.xml 3 Feb 2004 18:19:12 -0000 1.3 --- carpenter.xml 3 Feb 2004 20:46:45 -0000 1.4 *************** *** 14,18 **** <title>the Carpenter</title> <shopkeeper> ! <restockable/> </shopkeeper> <carpentry><random min="850" max="1000" /></carpentry> --- 14,75 ---- <title>the Carpenter</title> <shopkeeper> ! <restockable> ! <item id="e7d"><amount>20</amount></item> ! <item id="e7e"><amount>20</amount></item> ! <item id="e3e"><amount>20</amount></item> ! <item id="e3c"><amount>20</amount></item> ! <item id="e43"><amount>20</amount></item> ! <item id="b7d"><amount>20</amount></item> ! <item id="b34"><amount>20</amount></item> ! <item id="b7c"><amount>20</amount></item> ! <item id="b33"><amount>20</amount></item> ! <item id="b2f"><amount>20</amount></item> ! <item id="a2a"><amount>20</amount></item> ! <item id="b5e"><amount>20</amount></item> ! <item id="b4e"><amount>20</amount></item> ! <item id="b52"><amount>20</amount></item> ! <item id="b56"><amount>20</amount></item> ! <item id="b5a"><amount>20</amount></item> ! <item id="b2c"><amount>20</amount></item> ! <item id="1034"><amount>20</amount></item> ! <item id="10e7"><amount>20</amount></item> ! <item id="1032"><amount>20</amount></item> ! <item id="10e4"><amount>20</amount></item> ! <item id="10e5"><amount>20</amount></item> ! <item id="102a"><amount>20</amount></item> ! <item id="10e6"><amount>20</amount></item> ! <item id="1030"><amount>20</amount></item> ! <item id="102c"><amount>20</amount></item> ! <item id="1028"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="e7d" /> ! <item id="e7e" /> ! <item id="e3e" /> ! <item id="e3c" /> ! <item id="e43" /> ! <item id="b7d" /> ! <item id="b34" /> ! <item id="b7c" /> ! <item id="b33" /> ! <item id="b2f" /> ! <item id="a2a" /> ! <item id="b5e" /> ! <item id="b4e" /> ! <item id="b52" /> ! <item id="b56" /> ! <item id="b5a" /> ! <item id="b2c" /> ! <item id="1034" /> ! <item id="10e7" /> ! <item id="1032" /> ! <item id="10e4" /> ! <item id="10e5" /> ! <item id="102a" /> ! <item id="10e6" /> ! <item id="1030" /> ! <item id="102c" /> ! <item id="1028" /> ! </sellable> </shopkeeper> <carpentry><random min="850" max="1000" /></carpentry> *************** *** 25,29 **** <title>the Carpenter</title> <shopkeeper> ! <restockable/> </shopkeeper> <carpentry><random min="850" max="1000" /></carpentry> --- 82,143 ---- <title>the Carpenter</title> <shopkeeper> ! <restockable> ! <item id="e7d"><amount>20</amount></item> ! <item id="e7e"><amount>20</amount></item> ! <item id="e3e"><amount>20</amount></item> ! <item id="e3c"><amount>20</amount></item> ! <item id="e43"><amount>20</amount></item> ! <item id="b7d"><amount>20</amount></item> ! <item id="b34"><amount>20</amount></item> ! <item id="b7c"><amount>20</amount></item> ! <item id="b33"><amount>20</amount></item> ! <item id="b2f"><amount>20</amount></item> ! <item id="a2a"><amount>20</amount></item> ! <item id="b5e"><amount>20</amount></item> ! <item id="b4e"><amount>20</amount></item> ! <item id="b52"><amount>20</amount></item> ! <item id="b56"><amount>20</amount></item> ! <item id="b5a"><amount>20</amount></item> ! <item id="b2c"><amount>20</amount></item> ! <item id="1034"><amount>20</amount></item> ! <item id="10e7"><amount>20</amount></item> ! <item id="1032"><amount>20</amount></item> ! <item id="10e4"><amount>20</amount></item> ! <item id="10e5"><amount>20</amount></item> ! <item id="102a"><amount>20</amount></item> ! <item id="10e6"><amount>20</amount></item> ! <item id="1030"><amount>20</amount></item> ! <item id="102c"><amount>20</amount></item> ! <item id="1028"><amount>20</amount></item> ! </restockable> ! <sellable> ! <item id="e7d" /> ! <item id="e7e" /> ! <item id="e3e" /> ! <item id="e3c" /> ! <item id="e43" /> ! <item id="b7d" /> ! <item id="b34" /> ! <item id="b7c" /> ! <item id="b33" /> ! <item id="b2f" /> ! <item id="a2a" /> ! <item id="b5e" /> ! <item id="b4e" /> ! <item id="b52" /> ! <item id="b56" /> ! <item id="b5a" /> ! <item id="b2c" /> ! <item id="1034" /> ! <item id="10e7" /> ! <item id="1032" /> ! <item id="10e4" /> ! <item id="10e5" /> ! <item id="102a" /> ! <item id="10e6" /> ! <item id="1030" /> ! <item id="102c" /> ! <item id="1028" /> ! </sellable> </shopkeeper> <carpentry><random min="850" max="1000" /></carpentry> |
|
From: <thi...@us...> - 2004-02-03 22:41:01
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12306/items/equipment Modified Files: containers.xml food.xml Log Message: added prices and items to Carpenters Index: containers.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/containers.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** containers.xml 5 Feb 2003 21:32:01 -0000 1.7 --- containers.xml 3 Feb 2004 20:46:44 -0000 1.8 *************** *** 43,46 **** --- 43,48 ---- <id>0xe7d</id> <type>1</type> + <buyprice>14</buyprice> + <sellprice>7</sellprice> <category>Equipment\Containers\Wooden Box (W/E)</category> <weight>4.0</weight> *************** *** 120,123 **** --- 122,127 ---- <id>0x0e3c</id> <type>1</type> + <buyprice>14</buyprice> + <sellprice>7</sellprice> <category>Equipment\Containers\Big Crate (W/E)</category> </item> *************** *** 132,135 **** --- 136,141 ---- <id>0x0e3e</id> <type>1</type> + <buyprice>12</buyprice> + <sellprice>6</sellprice> <category>Equipment\Containers\Small Crate 2 (W/E)</category> </item> *************** *** 162,165 **** --- 168,173 ---- <id>0x0e43</id> <type>1</type> + <buyprice>30</buyprice> + <sellprice>15</sellprice> <category>Equipment\Containers\Wooden Metal Chest (N/S)</category> </item> *************** *** 194,197 **** --- 202,207 ---- <item id="e7e"> <id>0x0e7e</id> + <buyprice>10</buyprice> + <sellprice>5</sellprice> <category>Equipment\Containers\Small Crate 1 (W/E)</category> </item> Index: food.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/food.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** food.xml 20 Sep 2003 01:07:50 -0000 1.7 --- food.xml 3 Feb 2004 20:46:44 -0000 1.8 *************** *** 398,401 **** --- 398,403 ---- <category>Equipment\Food\Fried Eggs</category> <id>0x09b6</id> + <buyprice>8</buyprice> + <sellprice>4</sellprice> <type>14</type> <weight>1</weight> *************** *** 482,487 **** <category>Equipment\Food\Sausage (W/E)</category> <id>0x09c0</id> ! <buyprice>20</buyprice> ! <sellprice>10</sellprice> <type>14</type> <weight>1</weight> --- 484,489 ---- <category>Equipment\Food\Sausage (W/E)</category> <id>0x09c0</id> ! <buyprice>17</buyprice> ! <sellprice>8</sellprice> <type>14</type> <weight>1</weight> *************** *** 556,561 **** <category>Equipment\Food\Ham (w/e)</category> <id>0x09c9</id> ! <buyprice>24</buyprice> ! <sellprice>12</sellprice> <type>14</type> <weight>0.1</weight> --- 558,563 ---- <category>Equipment\Food\Ham (w/e)</category> <id>0x09c9</id> ! <buyprice>20</buyprice> ! <sellprice>10</sellprice> <type>14</type> <weight>0.1</weight> *************** *** 846,851 **** <category>Equipment\Food\Cut of Raw Rips</category> <id>0x09f1</id> ! <buyprice>8</buyprice> ! <sellprice>4</sellprice> <weight>0.2</weight> <events>cooking</events> --- 848,853 ---- <category>Equipment\Food\Cut of Raw Rips</category> <id>0x09f1</id> ! <buyprice>7</buyprice> ! <sellprice>3</sellprice> <weight>0.2</weight> <events>cooking</events> *************** *** 1291,1296 **** <item id="1609"> <id>0x1609</id> ! <buyprice>9</buyprice> ! <sellprice>4</sellprice> <weight>0.2</weight> <category>Equipment\Food\Raw Leg of Lamb</category> --- 1293,1298 ---- <item id="1609"> <id>0x1609</id> ! <buyprice>5</buyprice> ! <sellprice>2</sellprice> <weight>0.2</weight> <category>Equipment\Food\Raw Leg of Lamb</category> *************** *** 1489,1492 **** --- 1491,1496 ---- <item id="160b"> <id>0x160b</id> + <buyprice>6</buyprice> + <sellprice>3</sellprice> <category>Equipment\Food\Pan of Cookies</category> </item> |
