wpdev-commits Mailing List for Wolfpack Emu (Page 26)
Brought to you by:
rip,
thiagocorrea
Menu
▾
▴
wpdev-commits — Wolfpack CVS commit info
You can subscribe to this list here.
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(14) |
Aug
(121) |
Sep
(256) |
Oct
(59) |
Nov
(73) |
Dec
(120) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2004 |
Jan
(259) |
Feb
(381) |
Mar
(501) |
Apr
(355) |
May
(427) |
Jun
(270) |
Jul
(394) |
Aug
(412) |
Sep
(724) |
Oct
(578) |
Nov
(65) |
Dec
|
|
From: Sebastian H. <dar...@us...> - 2004-10-01 19:45:16
|
Update of /cvsroot/wpdev/wolfpack/muls In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15956/muls Modified Files: maps.cpp maps.h Log Message: teleporter fixes added color for static tiles Index: maps.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/maps.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** maps.cpp 25 Sep 2004 21:15:46 -0000 1.14 --- maps.cpp 1 Oct 2004 19:43:56 -0000 1.15 *************** *** 731,736 **** staticStream >> r.yoff; staticStream >> r.zoff; ! Q_UINT16 unknown; ! staticStream >> unknown; if ( exact ) { --- 731,735 ---- staticStream >> r.yoff; staticStream >> r.zoff; ! staticStream >> r.color; if ( exact ) { Index: maps.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/muls/maps.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** maps.h 16 Sep 2004 01:40:17 -0000 1.4 --- maps.h 1 Oct 2004 19:43:56 -0000 1.5 *************** *** 57,60 **** --- 57,61 ---- Q_UINT8 yoff; Q_INT8 zoff; + Q_UINT16 color; }; #pragma pack() |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 19:45:15
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15956 Modified Files: ChangeLog definitions.cpp definitions.h server.cpp territories.cpp territories.h Log Message: teleporter fixes added color for static tiles Index: territories.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.cpp,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** territories.cpp 25 Sep 2004 02:03:20 -0000 1.55 --- territories.cpp 1 Oct 2004 19:43:56 -0000 1.56 *************** *** 313,317 **** // Make sure that there is one top level region for each map // Insert it at the beginning (last overrides first). ! for ( unsigned char i = 0; i <= 3; ++i ) { if ( Maps::instance()->hasMap( i ) ) --- 313,317 ---- // Make sure that there is one top level region for each map // Insert it at the beginning (last overrides first). ! for ( unsigned char i = 0; i <= 4; ++i ) { if ( Maps::instance()->hasMap( i ) ) *************** *** 356,359 **** --- 356,399 ---- } + // Get the toplevel teleporters and insert them + const QValueVector<cElement*> &teleporters = Definitions::instance()->getDefinitions(WPDT_TELEPORTER); + QValueVector<cElement*>::const_iterator tit; + for (tit = teleporters.begin(); tit != teleporters.end(); ++tit) { + cElement *element = *tit; + + // Source + Destination + QString source = element->getAttribute("source"); + QString destination = element->getAttribute("destination"); + + if (source.isEmpty() || destination.isEmpty()) { + continue; // Skip broken teleporters + } + + // Convert into coordinates + Coord_cl clSource, clDestination; + if (!parseCoordinates(source, clSource) || !parseCoordinates(destination, clDestination)) { + continue; // Skip broken coordinates + } + + // Search the region for the source spot + cTerritory *rSource = region(clSource); + if (rSource) { + rSource->addTeleporter(clSource, clDestination); // Add the teleportation spot + } else { + Console::instance()->log(LOG_WARNING, tr("Couldn't find source region for teleporter at %1.").arg(source)); + } + + // Add another teleportation spot at the destination coordinate if this is a two-way teleporter + QString bothways = element->getAttribute("bothways", "false"); + if (bothways == "true" || bothways == "1" || bothways == "on") { + cTerritory *rDestination = region(clDestination); + if (rDestination) { + rDestination->addTeleporter(clDestination, clSource); // Add the teleportation spot + } else { + Console::instance()->log(LOG_WARNING, tr("Couldn't find destination region for two-way teleporter at %1.").arg(destination)); + } + } + } + cComponent::load(); } Index: territories.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/territories.h,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** territories.h 24 Sep 2004 04:47:38 -0000 1.31 --- territories.h 1 Oct 2004 19:43:56 -0000 1.32 *************** *** 248,251 **** --- 248,258 ---- public: std::map<UI32, good_st> tradesystem_; + + inline void addTeleporter(const Coord_cl &from, const Coord_cl &to) { + teleporters_st t; + t.source = from; + t.destination = to; + teleporters.append(t); + } }; Index: server.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/server.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** server.cpp 25 Sep 2004 22:57:09 -0000 1.29 --- server.cpp 1 Oct 2004 19:43:56 -0000 1.30 *************** *** 214,217 **** --- 214,222 ---- //registerComponent(PythonEngine::instance(), "python", false, true, "configuration"); + registerComponent( Maps::instance(), QT_TR_NOOP("maps"), true, false, "configuration" ); + registerComponent( SectorMaps::instance(), QT_TR_NOOP("sectormaps"), false, true, "maps" ); + registerComponent( TileCache::instance(), QT_TR_NOOP("tiledata"), true, false, "configuration" ); + registerComponent( MultiCache::instance(), QT_TR_NOOP("multis"), true, false, "configuration" ); + registerComponent( Definitions::instance(), QT_TR_NOOP("definitions"), true, false, "configuration" ); registerComponent( ScriptManager::instance(), QT_TR_NOOP("scripts"), true, false, "definitions" ); *************** *** 220,228 **** registerComponent( Territories::instance(), QT_TR_NOOP("territories"), true, false, "definitions" ); - registerComponent( Maps::instance(), QT_TR_NOOP("maps"), true, false, "configuration" ); - registerComponent( SectorMaps::instance(), QT_TR_NOOP("sectormaps"), false, true, "maps" ); - registerComponent( TileCache::instance(), QT_TR_NOOP("tiledata"), true, false, "configuration" ); - registerComponent( MultiCache::instance(), QT_TR_NOOP("multis"), true, false, "configuration" ); - // Accounts come before world registerComponent( Accounts::instance(), QT_TR_NOOP("accounts"), true, false ); --- 225,228 ---- Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.89 retrieving revision 1.90 diff -C2 -d -r1.89 -r1.90 *** ChangeLog 1 Oct 2004 16:32:52 -0000 1.89 --- ChangeLog 1 Oct 2004 19:43:56 -0000 1.90 *************** *** 16,19 **** --- 16,21 ---- - Fixed bug #0000335. (Riding liches + toads) - Fixed bug #0000340. (Showing unicode properties crashes the server) + - Allowed global teleporter tags. + - Static tile color can now be retrieved via wolfpack.statics() Wolfpack 12.9.11 Beta (26. September 2004) Index: definitions.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** definitions.cpp 25 Sep 2004 02:03:19 -0000 1.19 --- definitions.cpp 1 Oct 2004 19:43:56 -0000 1.20 *************** *** 89,92 **** --- 89,93 ---- { "contextmenu", WPDT_CONTEXTMENU }, { "ai", WPDT_AI }, + { "teleporter", WPDT_TELEPORTER }, { 0, WPDT_COUNT }, }; Index: definitions.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/definitions.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** definitions.h 2 Jun 2004 15:04:04 -0000 1.4 --- definitions.h 1 Oct 2004 19:43:56 -0000 1.5 *************** *** 70,73 **** --- 70,74 ---- WPDT_CONTEXTMENU, WPDT_AI, + WPDT_TELEPORTER, WPDT_COUNT }; |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 19:43:43
|
Update of /cvsroot/wpdev/xmlscripts/definitions/teleports In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15978/teleports Modified Files: felucca.xml ilshenar.xml index.xml malas.xml trammel.xml Log Message: weaponsmith in kronforst Index: index.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/index.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.xml 27 Sep 2004 14:14:58 -0000 1.4 --- index.xml 1 Oct 2004 19:43:31 -0000 1.5 *************** *** 8,12 **** --> <definitions> - <!-- <include file="definitions/teleports/felucca.xml"/> <include file="definitions/teleports/trammel.xml"/> --- 8,11 ---- *************** *** 14,17 **** <include file="definitions/teleports/malas.xml"/> <include file="definitions/teleports/tokuno.xml"/> - --> </definitions> --- 13,15 ---- Index: malas.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/malas.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** malas.xml 10 Jul 2004 11:46:18 -0000 1.3 --- malas.xml 1 Oct 2004 19:43:31 -0000 1.4 *************** *** 8,20 **** --> <!-- ! <teleport source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! ! <region name="malas_teleports"> ! <!-- The World --> ! <rectangle x1="1" y1="1" x2="2560" y2="2048" map="3" /> ! <!-- Teleports --> ! </region> </definitions> --- 8,26 ---- --> <!-- ! <teleporter source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! ! <!-- Doom Dungeon --> ! <teleporter source="2317,1269,-110,3" destination="381,132,33,3" /> ! <teleporter source="2317,1268,-110,3" destination="381,132,33,3" /> ! <teleporter source="2317,1267,-110,3" destination="381,132,33,3" /> ! <teleporter source="2317,1266,-110,3" destination="381,132,33,3" /> ! <teleporter source="2316,1269,-110,3" destination="381,132,33,3" /> ! <teleporter source="2315,1269,-110,3" destination="381,132,33,3" /> ! <teleporter source="2315,1268,-110,3" destination="381,132,33,3" /> ! <teleporter source="2315,1267,-109,3" destination="381,132,33,3" /> ! <teleporter source="2316,1267,-110,3" destination="381,132,33,3" /> ! <teleporter source="496,49,6,3" destination="2350,1270,-85,3" /> </definitions> Index: ilshenar.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/ilshenar.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ilshenar.xml 10 Jul 2004 11:46:18 -0000 1.3 --- ilshenar.xml 1 Oct 2004 19:43:31 -0000 1.4 *************** *** 8,20 **** --> <!-- ! <teleport source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! ! <region name="ilshenar_teleports"> ! <!-- The World --> ! <rectangle x1="1" y1="1" x2="2304" y2="1600" map="2" /> ! <!-- Teleports --> ! </region> ! </definitions> --- 8,317 ---- --> <!-- ! <teleporter source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! <teleporter source="2186,294,-27,2" destination="2186,33,-27,2" bothways="true" /> ! <teleporter source="2187,294,-27,2" destination="2187,33,-27,2" bothways="true" /> ! <teleporter source="2188,294,-27,2" destination="2188,33,-27,2" bothways="true" /> ! <teleporter source="2189,294,-27,2" destination="2189,33,-27,2" bothways="true" /> ! <teleporter source="2189,320,-7,2" destination="1788,569,74,2" bothways="true" /> ! <teleporter source="2188,320,-7,2" destination="1787,569,74,2" bothways="true" /> ! <teleporter source="2187,320,-7,2" destination="1787,569,74,2" /> ! <teleporter source="1419,909,-10,2" destination="1784,994,-28,2" bothways="true" /> ! <teleporter source="1420,909,-10,2" destination="1785,994,-28,2" bothways="true" /> ! <teleporter source="1421,909,-10,2" destination="1786,994,-28,2" bothways="true" /> ! <teleporter source="1787,994,-28,2" destination="1421,909,-10,2" /> ! <teleporter source="1788,994,-28,2" destination="1421,909,-10,2" /> ! <teleporter source="1783,994,-28,2" destination="1419,909,-10,2" /> ! <teleporter source="1861,980,-28,2" destination="1490,877,10,2" bothways="true" /> ! <teleporter source="1861,981,-28,2" destination="1490,878,10,2" bothways="true" /> ! <teleporter source="1861,982,-28,2" destination="1490,879,10,2" bothways="true" /> ! <teleporter source="1861,983,-28,2" destination="1490,880,10,2" bothways="true" /> ! <teleporter source="1861,984,-28,2" destination="1490,880,10,2" /> ! <teleporter source="1516,879,10,2" destination="1363,1105,-26,2" bothways="true" /> ! <teleporter source="1362,1031,-13,2" destination="1981,1107,-16,2" bothways="true" /> ! <teleporter source="1363,1031,-13,2" destination="1982,1107,-16,2" bothways="true" /> ! <teleporter source="1364,1031,-13,2" destination="1983,1107,-16,2" bothways="true" /> ! <teleporter source="1980,1107,-16,2" destination="1362,1031,-13,2" /> ! <teleporter source="1984,1107,-16,2" destination="1364,1031,-13,2" /> ! <teleporter source="1745,1236,-30,2" destination="2112,829,-11,2" bothways="true" /> ! <teleporter source="1746,1236,-30,2" destination="2113,829,-11,2" bothways="true" /> ! <teleporter source="1747,1236,-30,2" destination="2114,829,-11,2" bothways="true" /> ! <teleporter source="1748,1236,-30,2" destination="2115,829,-11,2" bothways="true" /> ! <teleporter source="2116,829,-11,2" destination="1748,1236,-30,2" /> ! <teleporter source="1456,1328,-27,2" destination="1479,1494,-28,2" bothways="true" /> ! <teleporter source="1456,1329,-27,2" destination="1479,1495,-28,2" bothways="true" /> ! <teleporter source="1456,1330,-27,2" destination="1479,1496,-28,2" bothways="true" /> ! <teleporter source="1479,1493,-28,2" destination="1456,1328,-27,2" /> ! <teleporter source="1479,1497,-28,2" destination="1456,1330,-27,2" /> ! <teleporter source="1029,1155,-24,2" destination="1349,1512,-3,2" bothways="true" /> ! <teleporter source="1029,1154,-24,2" destination="1349,1511,-3,2" bothways="true" /> ! <teleporter source="1029,1153,-24,2" destination="1349,1510,-3,2" bothways="true" /> ! <teleporter source="1349,1509,-3,2" destination="1030,1153,-24,2" /> ! <teleporter source="1268,1508,-28,2" destination="1250,1508,-28,2" bothways="true" /> ! <teleporter source="1268,1509,-28,2" destination="1250,1509,-28,2" bothways="true" /> ! <teleporter source="1268,1510,-28,2" destination="1250,1510,-28,2" bothways="true" /> ! <teleporter source="1250,1511,-28,2" destination="1268,1510,-28,2" /> ! <teleporter source="1250,1512,-28,2" destination="1268,1510,-28,2" /> ! <teleporter source="810,874,-39,2" destination="532,1532,-7,2" /> ! <teleporter source="811,874,-39,2" destination="533,1532,-7,2" /> ! <teleporter source="812,874,-39,2" destination="534,1532,-7,2" /> ! <teleporter source="531,1533,-4,2" destination="810,875,-40,2" /> ! <teleporter source="532,1533,-4,2" destination="811,875,-39,2" /> ! <teleporter source="533,1533,-4,2" destination="812,875,-39,2" /> ! <teleporter source="534,1533,-4,2" destination="813,875,-40,2" /> ! <teleporter source="393,1587,-13,2" destination="78,1366,-36,2" /> ! <teleporter source="394,1587,-13,2" destination="79,1366,-36,2" /> ! <teleporter source="395,1587,-13,2" destination="80,1366,-36,2" /> ! <teleporter source="396,1587,-13,2" destination="81,1366,-36,2" /> ! <teleporter source="78,1365,-41,2" destination="393,1586,-16,2" /> ! <teleporter source="79,1365,-41,2" destination="394,1586,-16,2" /> ! <teleporter source="80,1365,-41,2" destination="395,1586,-16,2" /> ! <teleporter source="81,1365,-41,2" destination="396,1586,-16,2" /> ! <teleporter source="668,928,-84,2" destination="3,1267,-8,2" bothways="true" /> ! <teleporter source="668,929,-84,2" destination="3,1268,-8,2" bothways="true" /> ! <teleporter source="668,930,-82,2" destination="3,1269,-8,2" bothways="true" /> ! <teleporter source="575,1156,-121,2" destination="154,1473,-8,2" /> ! <teleporter source="576,1156,-121,2" destination="155,1473,-8,2" /> ! <teleporter source="577,1156,-121,2" destination="156,1473,-8,2" /> ! <teleporter source="154,1472,-8,2" destination="575,1155,-121,2" /> ! <teleporter source="155,1472,-8,2" destination="576,1155,-120,2" /> ! <teleporter source="156,1472,-8,2" destination="577,1155,-120,2" /> ! <teleporter source="10,872,-28,2" destination="10,1518,-27,2" /> ! <teleporter source="11,872,-28,2" destination="11,1518,-28,2" /> ! <teleporter source="12,872,-27,2" destination="12,1518,-28,2" /> ! <teleporter source="10,1519,-28,2" destination="10,873,-28,2" /> ! <teleporter source="11,1519,-27,2" destination="11,873,-28,2" /> ! <teleporter source="12,1519,-27,2" destination="12,873,-27,2" /> ! <teleporter source="636,813,-62,2" destination="164,743,-28,2" /> ! <teleporter source="164,746,-16,2" destination="636,815,-52,2" /> ! <teleporter source="348,1427,15,2" destination="18,1198,-5,2" bothways="true" /> ! <teleporter source="349,1427,15,2" destination="19,1198,-5,2" bothways="true" /> ! <teleporter source="350,1427,15,2" destination="20,1198,-5,2" bothways="true" /> ! <teleporter source="351,1427,15,2" destination="21,1198,-5,2" bothways="true" /> ! <teleporter source="712,1490,-3,2" destination="686,1490,-28,2" /> ! <teleporter source="712,1491,-3,2" destination="686,1491,-28,2" /> ! <teleporter source="712,1492,-3,2" destination="686,1492,-28,2" /> ! <teleporter source="712,1493,-3,2" destination="686,1493,-28,2" /> ! <teleporter source="694,1490,-53,2" destination="719,1490,-28,2" /> ! <teleporter source="694,1491,-53,2" destination="719,1491,-28,2" /> ! <teleporter source="694,1492,-53,2" destination="719,1492,-28,2" /> ! <teleporter source="694,1493,-53,2" destination="719,1493,-28,2" /> ! <teleporter source="775,1467,-28,2" destination="658,1498,-28,2" /> ! <teleporter source="838,1550,-6,2" destination="728,1505,-28,2" /> ! <teleporter source="838,1551,-6,2" destination="728,1506,-28,2" /> ! <teleporter source="838,1552,-6,2" destination="728,1507,-28,2" /> ! <teleporter source="838,1553,-6,2" destination="728,1508,-28,2" /> ! <teleporter source="722,1505,-53,2" destination="833,1550,-28,2" /> ! <teleporter source="722,1506,-53,2" destination="833,1551,-28,2" /> ! <teleporter source="722,1507,-53,2" destination="833,1552,-28,2" /> ! <teleporter source="722,1508,-53,2" destination="833,1553,-28,2" /> ! <teleporter source="954,1425,-53,2" destination="874,1490,2,2" /> ! <teleporter source="954,1426,-53,2" destination="874,1491,2,2" /> ! <teleporter source="954,1427,-53,2" destination="874,1492,2,2" /> ! <teleporter source="954,1428,-53,2" destination="874,1493,2,2" /> ! <teleporter source="954,1429,-53,2" destination="874,1493,2,2" /> ! <teleporter source="879,1490,24,2" destination="960,1425,-28,2" /> ! <teleporter source="879,1491,24,2" destination="960,1426,-28,2" /> ! <teleporter source="879,1492,24,2" destination="960,1427,-28,2" /> ! <teleporter source="879,1493,24,2" destination="960,1428,-28,2" /> ! <teleporter source="948,1464,-56,2" destination="951,1442,-6,2" bothways="true" /> ! <teleporter source="948,1465,-56,2" destination="951,1443,-6,2" bothways="true" /> ! <teleporter source="948,1466,-56,2" destination="951,1444,-6,2" bothways="true" /> ! <teleporter source="948,1467,-56,2" destination="951,1445,-6,2" bothways="true" /> ! <teleporter source="871,1433,-6,2" destination="897,1449,-28,2" /> ! <teleporter source="871,1434,-6,2" destination="897,1450,-28,2" /> ! <teleporter source="871,1435,-6,2" destination="897,1451,-28,2" /> ! <teleporter source="871,1436,-6,2" destination="897,1452,-28,2" /> ! <teleporter source="871,1437,-6,2" destination="897,1453,-28,2" /> ! <teleporter source="892,1449,-51,2" destination="866,1433,-28,2" /> ! <teleporter source="892,1450,-51,2" destination="866,1434,-28,2" /> ! <teleporter source="892,1451,-51,2" destination="866,1435,-28,2" /> ! <teleporter source="892,1452,-51,2" destination="866,1436,-28,2" /> ! <teleporter source="892,1453,-51,2" destination="866,1437,-28,2" /> ! <teleporter source="812,1546,-6,2" destination="848,1434,-28,2" /> ! <teleporter source="812,1547,-6,2" destination="848,1435,-28,2" /> ! <teleporter source="812,1548,-6,2" destination="848,1436,-28,2" /> ! <teleporter source="812,1549,-6,2" destination="848,1437,-28,2" /> ! <teleporter source="843,1434,-51,2" destination="807,1546,-28,2" /> ! <teleporter source="843,1435,-51,2" destination="807,1547,-28,2" /> ! <teleporter source="843,1436,-51,2" destination="807,1548,-28,2" /> ! <teleporter source="843,1437,-51,2" destination="807,1549,-28,2" /> ! <teleporter source="751,1473,-28,2" destination="763,1479,-28,2" /> ! <teleporter source="751,1479,-28,2" destination="763,1555,-28,2" /> ! <teleporter source="752,1549,-28,2" destination="751,1484,-28,2" /> ! <teleporter source="775,1492,-28,2" destination="827,1515,-28,2" /> ! <teleporter source="904,1360,-21,2" destination="1014,1506,0,2" bothways="true" /> ! <teleporter source="904,1361,-21,2" destination="1014,1507,0,2" bothways="true" /> ! <teleporter source="904,1362,-21,2" destination="1014,1508,0,2" bothways="true" /> ! <teleporter source="904,1363,-21,2" destination="1014,1509,0,2" bothways="true" /> ! <teleporter source="650,1297,-58,2" destination="626,1526,-28,2" /> ! <teleporter source="626,1527,-28,2" destination="650,1298,-58,2" /> ! <teleporter source="651,1297,-58,2" destination="627,1526,-28,2" /> ! <teleporter source="627,1527,-28,2" destination="651,1298,-59,2" /> ! <teleporter source="652,1297,-58,2" destination="628,1526,-28,2" /> ! <teleporter source="628,1527,-28,2" destination="652,1298,-58,2" /> ! <teleporter source="653,1297,-58,2" destination="629,1526,-28,2" /> ! <teleporter source="629,1527,-28,2" destination="653,1298,-58,2" /> ! <teleporter source="747,1539,-28,2" destination="785,1514,-28,2" /> ! <teleporter source="785,1524,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="747,1555,-28,2" destination="785,1570,-28,2" /> ! <teleporter source="784,1580,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1548,-28,2" destination="781,1547,-28,2" /> ! <teleporter source="782,1550,-28,2" destination="783,1538,-28,2" /> ! <teleporter source="783,1539,-28,2" destination="787,1542,-28,2" /> ! <teleporter source="787,1543,-28,2" destination="781,1554,-28,2" /> ! <teleporter source="781,1555,-28,2" destination="789,1556,-28,2" /> ! <teleporter source="789,1557,-28,2" destination="785,1550,-28,2" /> ! <teleporter source="784,1550,-28,2" destination="777,1554,-28,2" /> ! <teleporter source="778,1554,-28,2" destination="787,1538,-28,2" /> ! <teleporter source="787,1537,-28,2" destination="781,1546,-28,2" /> ! <teleporter source="781,1545,-28,2" destination="789,1552,-28,2" /> ! <teleporter source="789,1553,-28,2" destination="789,1546,-28,2" /> ! <teleporter source="789,1545,-28,2" destination="779,1541,-28,2" /> ! <teleporter source="780,1541,-28,2" destination="785,1554,-28,2" /> ! <teleporter source="785,1555,-28,2" destination="783,1542,-28,2" /> ! <teleporter source="782,1542,-28,2" destination="785,1546,-28,2" /> ! <teleporter source="784,1546,-28,2" destination="776,1548,-28,2" /> ! <teleporter source="777,1555,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="777,1553,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="776,1549,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="777,1548,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="777,1547,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="776,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="778,1541,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="779,1540,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="779,1542,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="780,1554,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="781,1553,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="782,1554,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="780,1550,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="781,1549,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="781,1551,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="780,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="781,1547,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="782,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="783,1543,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="784,1542,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="783,1541,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="782,1538,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="783,1537,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="784,1538,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="786,1538,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="787,1539,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="788,1538,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="788,1542,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="787,1541,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="786,1542,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="785,1545,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="786,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="785,1547,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="785,1549,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="785,1551,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="786,1550,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="784,1554,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="785,1553,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="786,1554,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="788,1556,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="789,1555,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="790,1556,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="788,1552,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="789,1551,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="790,1552,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="790,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="788,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="789,1547,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1545,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1546,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1547,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1549,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="791,1550,-28,2" destination="798,1547,-28,2" /> ! <teleporter source="546,455,-40,2" destination="426,113,-28,2" bothways="true" /> ! <teleporter source="547,455,-40,2" destination="427,113,-28,2" bothways="true" /> ! <teleporter source="548,455,-40,2" destination="428,113,-28,2" bothways="true" /> ! <teleporter source="429,113,-28,2" destination="548,455,-40,2" /> ! <teleporter source="242,27,-16,2" destination="372,31,-31,2" /> ! <teleporter source="242,26,-16,2" destination="372,30,-31,2" /> ! <teleporter source="242,25,-16,2" destination="372,29,-31,2" /> ! <teleporter source="371,31,-36,2" destination="241,27,-18,2" /> ! <teleporter source="371,30,-36,2" destination="241,26,-18,2" /> ! <teleporter source="371,29,-36,2" destination="241,25,-18,2" /> ! <teleporter source="272,141,-16,2" destination="555,427,-1,2" /> ! <teleporter source="273,141,-16,2" destination="556,427,-1,2" /> ! <teleporter source="274,141,-16,2" destination="557,427,-1,2" /> ! <teleporter source="555,426,-6,2" destination="272,140,-21,2" /> ! <teleporter source="556,426,-6,2" destination="273,140,-21,2" /> ! <teleporter source="557,426,-6,2" destination="274,140,-21,2" /> ! <teleporter source="265,130,-31,2" destination="284,72,-21,2" /> ! <teleporter source="266,130,-31,2" destination="285,72,-21,2" /> ! <teleporter source="267,130,-31,2" destination="286,72,-21,2" /> ! <teleporter source="268,130,-31,2" destination="287,72,-21,2" /> ! <teleporter source="284,73,-16,2" destination="265,131,-28,2" /> ! <teleporter source="285,73,-16,2" destination="266,131,-28,2" /> ! <teleporter source="286,73,-16,2" destination="267,131,-28,2" /> ! <teleporter source="287,73,-16,2" destination="268,131,-28,2" /> ! <teleporter source="284,67,-30,2" destination="131,128,-21,2" /> ! <teleporter source="285,67,-30,2" destination="132,128,-21,2" /> ! <teleporter source="286,67,-30,2" destination="133,128,-21,2" /> ! <teleporter source="287,67,-30,2" destination="134,128,-21,2" /> ! <teleporter source="131,129,-16,2" destination="284,68,-28,2" /> ! <teleporter source="132,129,-16,2" destination="285,68,-28,2" /> ! <teleporter source="133,129,-16,2" destination="286,68,-28,2" /> ! <teleporter source="134,129,-16,2" destination="287,68,-28,2" /> ! <teleporter source="358,40,-36,2" destination="156,88,-18,2" /> ! <teleporter source="358,41,-36,2" destination="156,89,-18,2" /> ! <teleporter source="358,42,-36,2" destination="156,90,-18,2" /> ! <teleporter source="155,88,-16,2" destination="357,40,-31,2" /> ! <teleporter source="155,89,-16,2" destination="357,41,-31,2" /> ! <teleporter source="155,90,-16,2" destination="357,42,-31,2" /> ! <teleporter source="259,90,-28,2" destination="236,113,-28,2" bothways="true" /> ! <teleporter source="938,494,-40,2" destination="83,749,-23,2" bothways="true" /> ! <teleporter source="939,494,-40,2" destination="84,749,-23,2" bothways="true" /> ! <teleporter source="940,494,-40,2" destination="85,749,-23,2" bothways="true" /> ! <teleporter source="941,494,-40,2" destination="86,749,-23,2" bothways="true" /> ! <teleporter source="313,1329,-40,2" destination="327,1593,-13,2" bothways="true" /> ! <teleporter source="314,1329,-38,2" destination="328,1593,-13,2" bothways="true" /> ! <teleporter source="315,1329,-36,2" destination="329,1593,-13,2" bothways="true" /> ! <teleporter source="330,1593,-13,2" destination="315,1329,-35,2" /> ! <teleporter source="265,1587,-28,2" destination="225,1334,-20,2" bothways="true" /> ! <teleporter source="266,1587,-28,2" destination="226,1334,-20,2" bothways="true" /> ! <teleporter source="267,1587,-28,2" destination="227,1334,-20,2" bothways="true" /> ! <teleporter source="1139,592,-80,2" destination="1238,583,-19,2" /> ! <teleporter source="1140,592,-80,2" destination="1238,584,-19,2" /> ! <teleporter source="1141,592,-80,2" destination="1238,585,-19,2" /> ! <teleporter source="1142,592,-80,2" destination="1238,585,-19,2" /> ! <teleporter source="1237,583,-19,2" destination="1139,593,-80,2" /> ! <teleporter source="1237,584,-19,2" destination="1140,593,-80,2" /> ! <teleporter source="1237,585,-19,2" destination="1141,593,-80,2" /> ! <teleporter source="709,667,-39,2" destination="912,451,-80,2" /> ! <teleporter source="710,667,-39,2" destination="912,452,-80,2" /> ! <teleporter source="711,667,-39,2" destination="912,453,-80,2" /> ! <teleporter source="911,451,-80,2" destination="709,668,-39,2" /> ! <teleporter source="911,452,-80,2" destination="710,668,-39,2" /> ! <teleporter source="911,453,-80,2" destination="711,668,-38,2" /> ! <teleporter source="827,777,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="827,778,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="827,779,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="828,777,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="828,778,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="828,779,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="829,777,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="829,778,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="829,779,-80,2" destination="1975,114,-28,2" /> ! <teleporter source="1978,114,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1978,115,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1978,116,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1978,117,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1979,114,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1979,115,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1979,116,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1979,117,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1980,114,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1980,115,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1980,116,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1980,117,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1981,114,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1981,115,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1981,116,-28,2" destination="835,778,-80,2" /> ! <teleporter source="1981,117,-28,2" destination="835,778,-80,2" /> </definitions> Index: trammel.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/trammel.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** trammel.xml 10 Jul 2004 11:46:18 -0000 1.3 --- trammel.xml 1 Oct 2004 19:43:31 -0000 1.4 *************** *** 8,27 **** --> <!-- ! <teleport source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! ! <region name="trammel_teleports"> ! <!-- The World --> ! <rectangle x1="1" y1="1" x2="6144" y2="4096" map="1" /> ! <!-- Teleports --> ! <!-- Shame --> <!-- Thanks to Ubil_Manther in IRC --> ! <teleport source="512,1559,0,1" destination="5394,127,0,1" /> ! <teleport source="513,1559,0,1" destination="5395,127,0,1" /> ! <teleport source="514,1559,0,1" destination="5396,127,0,1" /> ! <teleport destination="512,1559,0,1" source="5394,127,0,1" /> ! <teleport destination="513,1559,0,1" source="5395,127,0,1" /> ! <teleport destination="514,1559,0,1" source="5396,127,0,1" /> ! </region> ! </definitions> --- 8,256 ---- --> <!-- ! <teleporter source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! <teleporter source="512,1559,0,1" destination="5394,127,0,1" bothways="true" /> ! <teleporter source="513,1559,0,1" destination="5395,127,0,1" bothways="true" /> ! <teleporter source="514,1559,0,1" destination="5396,127,0,1" bothways="true" /> ! <teleporter source="5490,19,-25,1" destination="5514,10,5,1" bothways="true" /> ! <teleporter source="5875,19,-5,1" destination="5507,162,5,1" bothways="true" /> ! <teleporter source="5604,102,5,1" destination="5514,147,25,1" bothways="true" /> ! <teleporter source="5513,176,5,1" destination="5540,187,0,1" /> ! <teleporter source="5538,170,5,1" destination="5517,176,0,1" /> ! <teleporter source="4721,3813,0,1" destination="5904,16,64,1" bothways="true" /> ! <teleporter source="4722,3813,0,1" destination="5905,16,64,1" bothways="true" /> ! <teleporter source="4723,3813,0,1" destination="5906,16,64,1" bothways="true" /> ! <teleporter source="6040,192,12,1" destination="6059,88,24,1" bothways="true" /> ! <teleporter source="6040,193,12,1" destination="6059,89,24,1" bothways="true" /> ! <teleporter source="6040,194,12,1" destination="6059,90,24,1" bothways="true" /> ! <teleporter source="5920,168,16,1" destination="6083,144,-20,1" /> ! <teleporter source="5920,169,16,1" destination="6083,145,-20,1" /> ! <teleporter source="5920,170,16,1" destination="6083,146,-20,1" /> ! <teleporter source="6083,144,-20,1" destination="5920,168,22,1" /> ! <teleporter source="6083,145,-20,1" destination="5920,169,22,1" /> ! <teleporter source="6083,146,-20,1" destination="5920,170,22,1" /> ! <teleporter source="5972,168,0,1" destination="5905,100,0,1" /> ! <teleporter source="5906,96,0,1" destination="5977,169,0,1" /> ! <teleporter source="2498,916,0,1" destination="5455,1864,0,1" bothways="true" /> ! <teleporter source="2499,916,0,1" destination="5456,1864,0,1" bothways="true" /> ! <teleporter source="2500,916,0,1" destination="5457,1864,0,1" bothways="true" /> ! <teleporter source="2384,836,0,1" destination="5615,1996,0,1" bothways="true" /> ! <teleporter source="2384,837,0,1" destination="5615,1997,0,1" bothways="true" /> ! <teleporter source="2384,838,0,1" destination="5615,1998,0,1" bothways="true" /> ! <teleporter source="2420,883,0,1" destination="5392,1959,0,1" bothways="true" /> ! <teleporter source="2421,883,0,1" destination="5393,1959,0,1" bothways="true" /> ! <teleporter source="2422,883,0,1" destination="5394,1959,0,1" bothways="true" /> ! <teleporter source="2455,858,0,1" destination="5388,2027,0,1" bothways="true" /> ! <teleporter source="2456,858,0,1" destination="5389,2027,0,1" bothways="true" /> ! <teleporter source="2457,858,0,1" destination="5390,2027,0,1" bothways="true" /> ! <teleporter source="2544,850,0,1" destination="5578,1927,0,1" bothways="true" /> ! <teleporter source="2545,850,0,1" destination="5579,1927,0,1" bothways="true" /> ! <teleporter source="2546,850,0,1" destination="5580,1927,0,1" bothways="true" /> ! <teleporter source="5551,1805,12,1" destination="5556,1825,-3,1" /> ! <teleporter source="5552,1805,12,1" destination="5557,1825,-3,1" /> ! <teleporter source="5553,1805,12,1" destination="5557,1825,-3,1" /> ! <teleporter source="5556,1826,-10,1" destination="5551,1806,7,1" /> ! <teleporter source="5557,1826,-10,1" destination="5552,1806,7,1" /> ! <teleporter source="5466,1804,12,1" destination="5593,1840,-3,1" /> ! <teleporter source="5466,1805,12,1" destination="5593,1841,-3,1" /> ! <teleporter source="5466,1806,12,1" destination="5593,1842,-3,1" /> ! <teleporter source="5594,1840,-9,1" destination="5467,1804,7,1" /> ! <teleporter source="5594,1841,-9,1" destination="5467,1805,7,1" /> ! <teleporter source="5824,631,0,1" destination="2041,215,14,1" bothways="true" /> ! <teleporter source="5825,631,0,1" destination="2042,215,14,1" bothways="true" /> ! <teleporter source="5826,631,0,1" destination="2043,215,14,1" bothways="true" /> ! <teleporter source="5698,662,0,1" destination="5793,527,10,1" /> ! <teleporter source="4110,430,5,1" destination="5187,639,0,1" /> ! <teleporter source="4111,430,5,1" destination="5188,639,0,1" /> ! <teleporter source="4112,430,5,1" destination="5189,639,0,1" /> ! <teleporter source="5187,639,0,1" destination="4110,430,5,1" /> ! <teleporter source="5188,639,0,1" destination="4111,430,5,1" /> ! <teleporter source="5189,639,0,1" destination="4112,430,5,1" /> ! <teleporter source="5216,586,-13,1" destination="5304,533,2,1" /> ! <teleporter source="5217,586,-13,1" destination="5305,533,2,1" /> ! <teleporter source="5218,586,-13,1" destination="5306,533,2,1" /> ! <teleporter source="5304,532,7,1" destination="5216,585,-8,1" /> ! <teleporter source="5305,532,7,1" destination="5217,585,-8,1" /> ! <teleporter source="5306,532,7,1" destination="5218,585,-8,1" /> ! <teleporter source="5218,761,-28,1" destination="5305,651,7,1" /> ! <teleporter source="5219,761,-28,1" destination="5306,651,7,1" /> ! <teleporter source="5305,650,12,1" destination="5218,760,-23,1" /> ! <teleporter source="5306,650,12,1" destination="5219,760,-23,1" /> ! <teleporter source="5346,578,5,1" destination="5137,649,5,1" bothways="true" /> ! <teleporter source="5186,639,0,1" destination="4110,430,5,1" /> ! <teleporter source="5504,569,46,1" destination="5574,628,37,1" /> ! <teleporter source="5504,570,46,1" destination="5574,629,37,1" /> ! <teleporter source="5504,571,46,1" destination="5574,630,37,1" /> ! <teleporter source="5572,632,17,1" destination="5521,672,27,1" /> ! <teleporter source="5572,633,17,1" destination="5521,673,27,1" /> ! <teleporter source="5572,634,17,1" destination="5521,674,27,1" /> ! <teleporter source="5573,628,42,1" destination="5503,569,51,1" /> ! <teleporter source="5573,629,42,1" destination="5503,570,51,1" /> ! <teleporter source="5573,630,42,1" destination="5503,571,51,1" /> ! <teleporter source="5588,632,30,1" destination="1296,1082,0,1" bothways="true" /> ! <teleporter source="5588,630,30,1" destination="1296,1080,0,1" bothways="true" /> ! <teleporter source="5588,631,30,1" destination="1296,1081,0,1" bothways="true" /> ! <teleporter source="5522,672,32,1" destination="5573,632,22,1" /> ! <teleporter source="5522,673,32,1" destination="5573,633,22,1" /> ! <teleporter source="5522,674,32,1" destination="5573,634,22,1" /> ! <teleporter source="5386,756,-8,1" destination="5408,859,47,1" /> ! <teleporter source="5386,757,-8,1" destination="5408,860,47,1" /> ! <teleporter source="5386,755,-8,1" destination="5408,858,47,1" /> ! <teleporter source="5409,860,52,1" destination="5387,757,-3,1" /> ! <teleporter source="5409,858,52,1" destination="5387,755,-3,1" /> ! <teleporter source="5409,859,52,1" destination="5387,756,-3,1" /> ! <teleporter source="5242,1007,0,1" destination="1175,2635,0,1" bothways="true" /> ! <teleporter source="5243,1007,0,1" destination="1176,2635,0,1" bothways="true" /> ! <teleporter source="5244,1007,0,1" destination="1177,2635,0,1" bothways="true" /> ! <teleporter source="5142,797,22,1" destination="5129,908,-23,1" /> ! <teleporter source="5143,797,22,1" destination="5130,908,-23,1" /> ! <teleporter source="5144,797,22,1" destination="5131,908,-23,1" /> ! <teleporter source="5145,797,22,1" destination="5132,908,-23,1" /> ! <teleporter source="5153,808,-25,1" destination="5134,984,17,1" /> ! <teleporter source="5153,809,-25,1" destination="5134,985,17,1" /> ! <teleporter source="5153,810,-25,1" destination="5134,986,17,1" /> ! <teleporter source="5153,811,-25,1" destination="5134,987,17,1" /> ! <teleporter source="5129,909,-28,1" destination="5142,798,17,1" /> ! <teleporter source="5130,909,-28,1" destination="5143,798,17,1" /> ! <teleporter source="5131,909,-28,1" destination="5144,798,17,1" /> ! <teleporter source="5132,909,-28,1" destination="5145,798,17,1" /> ! <teleporter source="5133,984,22,1" destination="5152,808,-19,1" /> ! <teleporter source="5133,985,22,1" destination="5152,809,-19,1" /> ! <teleporter source="5133,986,22,1" destination="5152,810,-19,1" /> ! <teleporter source="5133,987,22,1" destination="5152,811,-19,1" /> ! <teleporter source="2603,2121,-20,1" destination="2605,2130,8,1" /> ! <teleporter source="2603,2120,-20,1" destination="2605,2130,8,1" /> ! <teleporter source="2669,2071,-20,1" destination="2666,2099,3,1" /> ! <teleporter source="2669,2072,-20,1" destination="2666,2099,3,1" /> ! <teleporter source="2669,2073,-20,1" destination="2666,2099,3,1" /> ! <teleporter source="2676,2241,-18,1" destination="2691,2234,2,1" /> ! <teleporter source="2676,2242,-18,1" destination="2691,2234,2,1" /> ! <teleporter source="2758,2092,-20,1" destination="2756,2097,38,1" /> ! <teleporter source="2759,2092,-20,1" destination="2756,2097,38,1" /> ! <teleporter source="2685,2063,39,1" destination="2685,2063,-20,1" /> ! <teleporter source="5217,18,15,1" destination="5204,74,17,1" /> ! <teleporter source="5200,71,17,1" destination="5211,22,15,1" /> ! <teleporter source="1997,81,7,1" destination="5881,242,0,1" /> ! <teleporter source="5704,146,-45,1" destination="5705,305,7,1" /> ! <teleporter source="5704,147,-45,1" destination="5705,306,7,1" /> ! <teleporter source="5874,146,27,1" destination="5208,2323,31,1" /> ! <teleporter source="5875,146,27,1" destination="5208,2322,32,1" /> ! <teleporter source="5876,146,27,1" destination="5208,2322,32,1" /> ! <teleporter source="5877,146,27,1" destination="5208,2322,32,1" /> ! <teleporter source="5923,169,1,1" destination="5925,171,22,1" /> ! <teleporter source="2399,198,0,1" destination="5753,436,79,1" /> ! <teleporter source="2400,198,0,1" destination="5754,436,80,1" /> ! <teleporter source="5191,152,0,1" destination="1367,891,0,1" /> ! <teleporter source="5849,239,-25,1" destination="5831,324,27,1" /> ! <teleporter source="5850,239,-25,1" destination="5832,324,26,1" /> ! <teleporter source="5851,239,-25,1" destination="5833,324,28,1" /> ! <teleporter source="5852,239,-25,1" destination="5834,324,27,1" /> ! <teleporter source="5853,239,-23,1" destination="5835,324,27,1" /> ! <teleporter source="5882,241,0,1" destination="1998,81,5,1" /> ! <teleporter source="5882,242,0,1" destination="1998,81,5,1" /> ! <teleporter source="5882,243,0,1" destination="1998,81,5,1" /> ! <teleporter source="5706,305,12,1" destination="5705,146,-45,1" /> ! <teleporter source="5706,306,12,1" destination="5705,147,-45,1" /> ! <teleporter source="5748,362,2,1" destination="313,786,-24,1" /> ! <teleporter source="5749,362,0,1" destination="313,786,-24,1" /> ! <teleporter source="5750,362,3,1" destination="314,786,-24,1" /> ! <teleporter source="5753,324,21,1" destination="5670,2391,40,1" /> ! <teleporter source="5831,323,34,1" destination="5849,238,-25,1" /> ! <teleporter source="5832,323,34,1" destination="5850,238,-25,1" /> ! <teleporter source="5833,323,33,1" destination="5851,238,-25,1" /> ! <teleporter source="5834,323,33,1" destination="5852,238,-25,1" /> ! <teleporter source="5835,323,33,1" destination="5853,238,-23,1" /> ! <teleporter source="5658,423,8,1" destination="5697,3659,2,1" /> ! <teleporter source="5686,385,2,1" destination="2777,894,-23,1" /> ! <teleporter source="5686,386,2,1" destination="2777,894,-23,1" /> ! <teleporter source="5686,387,2,1" destination="2777,895,-23,1" /> ! <teleporter source="5731,445,-18,1" destination="6087,3676,18,1" /> ! <teleporter source="5753,437,78,1" destination="2400,199,0,1" /> ! <teleporter source="5850,432,0,1" destination="5127,3143,97,1" /> ! <teleporter source="5850,433,-2,1" destination="5127,3143,97,1" /> ! <teleporter source="5850,434,-1,1" destination="5127,3143,97,1" /> ! <teleporter source="5850,431,2,1" destination="5127,3143,97,1" /> ! <teleporter source="5826,465,-1,1" destination="1987,2063,-40,1" /> ! <teleporter source="5827,465,-1,1" destination="1988,2063,-40,1" /> ! <teleporter source="5828,465,0,1" destination="1989,2063,-40,1" /> ! <teleporter source="313,786,-24,1" destination="5748,361,2,1" /> ! <teleporter source="314,786,-24,1" destination="5749,361,2,1" /> ! <teleporter source="2776,895,-23,1" destination="5685,387,2,1" /> ! <teleporter source="4540,898,32,1" destination="4442,1122,5,1" /> ! <teleporter source="4300,968,5,1" destination="4442,1122,5,1" /> ! <teleporter source="4436,1107,5,1" destination="4300,992,5,1" /> ! <teleporter source="4443,1137,5,1" destination="4487,1475,5,1" /> ! <teleporter source="4449,1107,5,1" destination="4539,890,28,1" /> ! <teleporter source="4449,1115,5,1" destination="4671,1135,10,1" /> ! <teleporter source="4663,1134,13,1" destination="4442,1122,5,1" /> ! <teleporter source="5701,1320,16,1" destination="5786,1336,-8,1" /> ! <teleporter source="5702,1320,16,1" destination="5787,1336,-8,1" /> ! <teleporter source="5703,1320,16,1" destination="5788,1336,-8,1" /> ! <teleporter source="5786,1335,-13,1" destination="5701,1319,13,1" /> ! <teleporter source="5787,1335,-13,1" destination="5702,1319,13,1" /> ! <teleporter source="5788,1335,-13,1" destination="5703,1319,13,1" /> ! <teleporter source="6005,1380,1,1" destination="5151,4063,37,1" /> ! <teleporter source="6005,1378,0,1" destination="5151,4062,37,1" /> ! <teleporter source="6005,1379,2,1" destination="5151,4062,37,1" /> ! <teleporter source="6025,1344,-26,1" destination="5137,3664,27,1" /> ! <teleporter source="6025,1345,-26,1" destination="5137,3664,27,1" /> ! <teleporter source="6025,1346,-26,1" destination="5137,3665,31,1" /> ! <teleporter source="5687,1424,38,1" destination="2923,3406,8,1" /> ! <teleporter source="5792,1416,41,1" destination="5758,2908,15,1" /> ! <teleporter source="5792,1417,41,1" destination="5758,2909,15,1" /> ! <teleporter source="5792,1415,41,1" destination="5758,2907,15,1" /> ! <teleporter source="5899,1411,43,1" destination="1630,3320,0,1" /> ! <teleporter source="5900,1411,42,1" destination="1630,3320,0,1" /> ! <teleporter source="5918,1412,-29,1" destination="5961,1409,59,1" /> ! <teleporter source="5918,1410,-29,1" destination="5961,1408,59,1" /> ! <teleporter source="5918,1411,-29,1" destination="5961,1408,59,1" /> ! <teleporter source="5961,1408,59,1" destination="5918,1411,-29,1" /> ! <teleporter source="5961,1409,59,1" destination="5918,1412,-29,1" /> ! <teleporter source="6125,1411,15,1" destination="6075,3332,4,1" /> ! <teleporter source="6126,1411,15,1" destination="6075,3332,4,1" /> ! <teleporter source="6127,1411,15,1" destination="6075,3332,4,1" /> ! <teleporter source="6137,1409,2,1" destination="6140,1432,4,1" /> ! <teleporter source="6138,1409,2,1" destination="6140,1432,4,1" /> ! <teleporter source="6140,1431,4,1" destination="6137,1408,2,1" /> ! <teleporter source="4496,1475,15,1" destination="4442,1122,5,1" /> ! <teleporter source="6031,1501,42,1" destination="1491,1642,24,1" /> ! <teleporter source="6031,1499,42,1" destination="1491,1640,24,1" /> ! <teleporter source="1491,1640,24,1" destination="6032,1499,31,1" /> ! <teleporter source="1491,1642,24,1" destination="6032,1501,31,1" /> ! <teleporter source="5340,1599,40,1" destination="5426,3122,-74,1" /> ! <teleporter source="5341,1599,40,1" destination="5426,3122,-74,1" /> ! <teleporter source="1987,2062,-40,1" destination="5826,464,0,1" /> ! <teleporter source="1988,2062,-40,1" destination="5827,464,-1,1" /> ! <teleporter source="1989,2062,-40,1" destination="5828,464,-1,1" /> ! <teleporter source="5203,2327,27,1" destination="5876,147,25,1" /> ! <teleporter source="5207,2322,27,1" destination="5877,147,25,1" /> ! <teleporter source="5207,2323,26,1" destination="5876,147,25,1" /> ! <teleporter source="5670,2391,40,1" destination="5753,325,10,1" /> ! <teleporter source="5974,2697,35,1" destination="2985,2890,35,1" /> ! <teleporter source="5267,2757,35,1" destination="424,3283,35,1" /> ! <teleporter source="5757,2908,14,1" destination="5791,1416,38,1" /> ! <teleporter source="5757,2909,15,1" destination="5791,1417,40,1" /> ! <teleporter source="5757,2907,15,1" destination="5791,1415,38,1" /> ! <teleporter source="1653,2963,0,1" destination="1677,2987,0,1" /> ! <teleporter source="1677,2987,0,1" destination="1675,2987,20,1" /> ! <teleporter source="5426,3123,-80,1" destination="5341,1602,0,1" /> ! <teleporter source="5126,3143,99,1" destination="5849,432,1,1" /> ! <teleporter source="424,3283,35,1" destination="5267,2757,35,1" /> ! <teleporter source="1629,3320,0,1" destination="5899,1411,43,1" /> ! <teleporter source="6075,3332,4,1" destination="6126,1410,15,1" /> ! <teleporter source="2923,3405,6,1" destination="5687,1423,39,1" /> ! <teleporter source="1142,3621,5,1" destination="1414,3828,5,1" /> ! <teleporter source="5137,3664,27,1" destination="6025,1344,-26,1" /> ! <teleporter source="5137,3665,31,1" destination="6025,1345,-26,1" /> ! <teleporter source="5697,3660,-5,1" destination="5658,424,0,1" /> ! <teleporter source="6086,3676,16,1" destination="5731,446,-16,1" /> ! <teleporter source="1409,3824,5,1" destination="1124,3623,5,1" /> ! <teleporter source="1419,3832,5,1" destination="1466,4015,5,1" /> ! <teleporter source="1406,3996,5,1" destination="1414,3828,5,1" /> ! <teleporter source="5150,4062,38,1" destination="6005,1378,0,1" /> ! <teleporter source="5150,4063,38,1" destination="6005,1380,1,1" /> ! <teleporter source="5906,4069,26,1" destination="2494,3576,5,1" bothways="true" /> ! <teleporter source="2985,2890,35,1" destination="5974,2697,35,1" /> ! <teleporter source="3632,2566,0,1" destination="3632,2566,20,1" bothways="true" /> </definitions> Index: felucca.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/teleports/felucca.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** felucca.xml 10 Jul 2004 11:46:18 -0000 1.3 --- felucca.xml 1 Oct 2004 19:43:31 -0000 1.4 *************** *** 8,27 **** --> <!-- ! <teleport source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! ! <region name="felucca_teleports"> ! <!-- The World --> ! <rectangle x1="1" y1="1" x2="6144" y2="4096" map="0" /> ! <!-- Teleports --> ! <!-- Shame --> <!-- Thanks to Ubil_Manther in IRC --> ! <teleport source="512,1559,0,0" destination="5394,127,0,0" /> ! <teleport source="513,1559,0,0" destination="5395,127,0,0" /> ! <teleport source="514,1559,0,0" destination="5396,127,0,0" /> ! <teleport destination="512,1559,0,0" source="5394,127,0,0" /> ! <teleport destination="513,1559,0,0" source="5395,127,0,0" /> ! <teleport destination="514,1559,0,0" source="5396,127,0,0" /> ! </region> ! </definitions> --- 8,256 ---- --> <!-- ! <teleporter source="x,y,z,map" destination="x,y,z,map" /> --> <definitions> ! <teleporter source="512,1559,0,0" destination="5394,127,0,0" bothways="true" /> ! <teleporter source="513,1559,0,0" destination="5395,127,0,0" bothways="true" /> ! <teleporter source="514,1559,0,0" destination="5396,127,0,0" bothways="true" /> ! <teleporter source="5490,19,-25,0" destination="5514,10,5,0" bothways="true" /> ! <teleporter source="5875,19,-5,0" destination="5507,162,5,0" bothways="true" /> ! <teleporter source="5604,102,5,0" destination="5514,147,25,0" bothways="true" /> ! <teleporter source="5513,176,5,0" destination="5540,187,0,0" /> ! <teleporter source="5538,170,5,0" destination="5517,176,0,0" /> ! <teleporter source="4721,3813,0,0" destination="5904,16,64,0" bothways="true" /> ! <teleporter source="4722,3813,0,0" destination="5905,16,64,0" bothways="true" /> ! <teleporter source="4723,3813,0,0" destination="5906,16,64,0" bothways="true" /> ! <teleporter source="6040,192,12,0" destination="6059,88,24,0" bothways="true" /> ! <teleporter source="6040,193,12,0" destination="6059,89,24,0" bothways="true" /> ! <teleporter source="6040,194,12,0" destination="6059,90,24,0" bothways="true" /> ! <teleporter source="5920,168,16,0" destination="6083,144,-20,0" /> ! <teleporter source="5920,169,16,0" destination="6083,145,-20,0" /> ! <teleporter source="5920,170,16,0" destination="6083,146,-20,0" /> ! <teleporter source="6083,144,-20,0" destination="5920,168,22,0" /> ! <teleporter source="6083,145,-20,0" destination="5920,169,22,0" /> ! <teleporter source="6083,146,-20,0" destination="5920,170,22,0" /> ! <teleporter source="5972,168,0,0" destination="5905,100,0,0" /> ! <teleporter source="5906,96,0,0" destination="5977,169,0,0" /> ! <teleporter source="2498,916,0,0" destination="5455,1864,0,0" bothways="true" /> ! <teleporter source="2499,916,0,0" destination="5456,1864,0,0" bothways="true" /> ! <teleporter source="2500,916,0,0" destination="5457,1864,0,0" bothways="true" /> ! <teleporter source="2384,836,0,0" destination="5615,1996,0,0" bothways="true" /> ! <teleporter source="2384,837,0,0" destination="5615,1997,0,0" bothways="true" /> ! <teleporter source="2384,838,0,0" destination="5615,1998,0,0" bothways="true" /> ! <teleporter source="2420,883,0,0" destination="5392,1959,0,0" bothways="true" /> ! <teleporter source="2421,883,0,0" destination="5393,1959,0,0" bothways="true" /> ! <teleporter source="2422,883,0,0" destination="5394,1959,0,0" bothways="true" /> ! <teleporter source="2455,858,0,0" destination="5388,2027,0,0" bothways="true" /> ! <teleporter source="2456,858,0,0" destination="5389,2027,0,0" bothways="true" /> ! <teleporter source="2457,858,0,0" destination="5390,2027,0,0" bothways="true" /> ! <teleporter source="2544,850,0,0" destination="5578,1927,0,0" bothways="true" /> ! <teleporter source="2545,850,0,0" destination="5579,1927,0,0" bothways="true" /> ! <teleporter source="2546,850,0,0" destination="5580,1927,0,0" bothways="true" /> ! <teleporter source="5551,1805,12,0" destination="5556,1825,-3,0" /> ! <teleporter source="5552,1805,12,0" destination="5557,1825,-3,0" /> ! <teleporter source="5553,1805,12,0" destination="5557,1825,-3,0" /> ! <teleporter source="5556,1826,-10,0" destination="5551,1806,7,0" /> ! <teleporter source="5557,1826,-10,0" destination="5552,1806,7,0" /> ! <teleporter source="5466,1804,12,0" destination="5593,1840,-3,0" /> ! <teleporter source="5466,1805,12,0" destination="5593,1841,-3,0" /> ! <teleporter source="5466,1806,12,0" destination="5593,1842,-3,0" /> ! <teleporter source="5594,1840,-9,0" destination="5467,1804,7,0" /> ! <teleporter source="5594,1841,-9,0" destination="5467,1805,7,0" /> ! <teleporter source="5824,631,0,0" destination="2041,215,14,0" bothways="true" /> ! <teleporter source="5825,631,0,0" destination="2042,215,14,0" bothways="true" /> ! <teleporter source="5826,631,0,0" destination="2043,215,14,0" bothways="true" /> ! <teleporter source="5698,662,0,0" destination="5793,527,10,0" /> ! <teleporter source="4110,430,5,0" destination="5187,639,0,0" /> ! <teleporter source="4111,430,5,0" destination="5188,639,0,0" /> ! <teleporter source="4112,430,5,0" destination="5189,639,0,0" /> ! <teleporter source="5187,639,0,0" destination="4110,430,5,0" /> ! <teleporter source="5188,639,0,0" destination="4111,430,5,0" /> ! <teleporter source="5189,639,0,0" destination="4112,430,5,0" /> ! <teleporter source="5216,586,-13,0" destination="5304,533,2,0" /> ! <teleporter source="5217,586,-13,0" destination="5305,533,2,0" /> ! <teleporter source="5218,586,-13,0" destination="5306,533,2,0" /> ! <teleporter source="5304,532,7,0" destination="5216,585,-8,0" /> ! <teleporter source="5305,532,7,0" destination="5217,585,-8,0" /> ! <teleporter source="5306,532,7,0" destination="5218,585,-8,0" /> ! <teleporter source="5218,761,-28,0" destination="5305,651,7,0" /> ! <teleporter source="5219,761,-28,0" destination="5306,651,7,0" /> ! <teleporter source="5305,650,12,0" destination="5218,760,-23,0" /> ! <teleporter source="5306,650,12,0" destination="5219,760,-23,0" /> ! <teleporter source="5346,578,5,0" destination="5137,649,5,0" bothways="true" /> ! <teleporter source="5186,639,0,0" destination="4110,430,5,0" /> ! <teleporter source="5504,569,46,0" destination="5574,628,37,0" /> ! <teleporter source="5504,570,46,0" destination="5574,629,37,0" /> ! <teleporter source="5504,571,46,0" destination="5574,630,37,0" /> ! <teleporter source="5572,632,17,0" destination="5521,672,27,0" /> ! <teleporter source="5572,633,17,0" destination="5521,673,27,0" /> ! <teleporter source="5572,634,17,0" destination="5521,674,27,0" /> ! <teleporter source="5573,628,42,0" destination="5503,569,51,0" /> ! <teleporter source="5573,629,42,0" destination="5503,570,51,0" /> ! <teleporter source="5573,630,42,0" destination="5503,571,51,0" /> ! <teleporter source="5588,632,30,0" destination="1296,1082,0,0" bothways="true" /> ! <teleporter source="5588,630,30,0" destination="1296,1080,0,0" bothways="true" /> ! <teleporter source="5588,631,30,0" destination="1296,1081,0,0" bothways="true" /> ! <teleporter source="5522,672,32,0" destination="5573,632,22,0" /> ! <teleporter source="5522,673,32,0" destination="5573,633,22,0" /> ! <teleporter source="5522,674,32,0" destination="5573,634,22,0" /> ! <teleporter source="5386,756,-8,0" destination="5408,859,47,0" /> ! <teleporter source="5386,757,-8,0" destination="5408,860,47,0" /> ! <teleporter source="5386,755,-8,0" destination="5408,858,47,0" /> ! <teleporter source="5409,860,52,0" destination="5387,757,-3,0" /> ! <teleporter source="5409,858,52,0" destination="5387,755,-3,0" /> ! <teleporter source="5409,859,52,0" destination="5387,756,-3,0" /> ! <teleporter source="5242,1007,0,0" destination="1175,2635,0,0" bothways="true" /> ! <teleporter source="5243,1007,0,0" destination="1176,2635,0,0" bothways="true" /> ! <teleporter source="5244,1007,0,0" destination="1177,2635,0,0" bothways="true" /> ! <teleporter source="5142,797,22,0" destination="5129,908,-23,0" /> ! <teleporter source="5143,797,22,0" destination="5130,908,-23,0" /> ! <teleporter source="5144,797,22,0" destination="5131,908,-23,0" /> ! <teleporter source="5145,797,22,0" destination="5132,908,-23,0" /> ! <teleporter source="5153,808,-25,0" destination="5134,984,17,0" /> ! <teleporter source="5153,809,-25,0" destination="5134,985,17,0" /> ! <teleporter source="5153,810,-25,0" destination="5134,986,17,0" /> ! <teleporter source="5153,811,-25,0" destination="5134,987,17,0" /> ! <teleporter source="5129,909,-28,0" destination="5142,798,17,0" /> ! <teleporter source="5130,909,-28,0" destination="5143,798,17,0" /> ! <teleporter source="5131,909,-28,0" destination="5144,798,17,0" /> ! <teleporter source="5132,909,-28,0" destination="5145,798,17,0" /> ! <teleporter source="5133,984,22,0" destination="5152,808,-19,0" /> ! <teleporter source="5133,985,22,0" destination="5152,809,-19,0" /> ! <teleporter source="5133,986,22,0" destination="5152,810,-19,0" /> ! <teleporter source="5133,987,22,0" destination="5152,811,-19,0" /> ! <teleporter source="2603,2121,-20,0" destination="2605,2130,8,0" /> ! <teleporter source="2603,2120,-20,0" destination="2605,2130,8,0" /> ! <teleporter source="2669,2071,-20,0" destination="2666,2099,3,0" /> ! <teleporter source="2669,2072,-20,0" destination="2666,2099,3,0" /> ! <teleporter source="2669,2073,-20,0" destination="2666,2099,3,0" /> ! <teleporter source="2676,2241,-18,0" destination="2691,2234,2,0" /> ! <teleporter source="2676,2242,-18,0" destination="2691,2234,2,0" /> ! <teleporter source="2758,2092,-20,0" destination="2756,2097,38,0" /> ! <teleporter source="2759,2092,-20,0" destination="2756,2097,38,0" /> ! <teleporter source="2685,2063,39,0" destination="2685,2063,-20,0" /> ! <teleporter source="5217,18,15,0" destination="5204,74,17,0" /> ! <teleporter source="5200,71,17,0" destination="5211,22,15,0" /> ! <teleporter source="1997,81,7,0" destination="5881,242,0,0" /> ! <teleporter source="5704,146,-45,0" destination="5705,305,7,0" /> ! <teleporter source="5704,147,-45,0" destination="5705,306,7,0" /> ! <teleporter source="5874,146,27,0" destination="5208,2323,31,0" /> ! <teleporter source="5875,146,27,0" destination="5208,2322,32,0" /> ! <teleporter source="5876,146,27,0" destination="5208,2322,32,0" /> ! <teleporter source="5877,146,27,0" destination="5208,2322,32,0" /> ! <teleporter source="5923,169,1,0" destination="5925,171,22,0" /> ! <teleporter source="2399,198,0,0" destination="5753,436,79,0" /> ! <teleporter source="2400,198,0,0" destination="5754,436,80,0" /> ! <teleporter source="5191,152,0,0" destination="1367,891,0,0" /> ! <teleporter source="5849,239,-25,0" destination="5831,324,27,0" /> ! <teleporter source="5850,239,-25,0" destination="5832,324,26,0" /> ! <teleporter source="5851,239,-25,0" destination="5833,324,28,0" /> ! <teleporter source="5852,239,-25,0" destination="5834,324,27,0" /> ! <teleporter source="5853,239,-23,0" destination="5835,324,27,0" /> ! <teleporter source="5882,241,0,0" destination="1998,81,5,0" /> ! <teleporter source="5882,242,0,0" destination="1998,81,5,0" /> ! <teleporter source="5882,243,0,0" destination="1998,81,5,0" /> ! <teleporter source="5706,305,12,0" destination="5705,146,-45,0" /> ! <teleporter source="5706,306,12,0" destination="5705,147,-45,0" /> ! <teleporter source="5748,362,2,0" destination="313,786,-24,0" /> ! <teleporter source="5749,362,0,0" destination="313,786,-24,0" /> ! <teleporter source="5750,362,3,0" destination="314,786,-24,0" /> ! <teleporter source="5753,324,21,0" destination="5670,2391,40,0" /> ! <teleporter source="5831,323,34,0" destination="5849,238,-25,0" /> ! <teleporter source="5832,323,34,0" destination="5850,238,-25,0" /> ! <teleporter source="5833,323,33,0" destination="5851,238,-25,0" /> ! <teleporter source="5834,323,33,0" destination="5852,238,-25,0" /> ! <teleporter source="5835,323,33,0" destination="5853,238,-23,0" /> ! <teleporter source="5658,423,8,0" destination="5697,3659,2,0" /> ! <teleporter source="5686,385,2,0" destination="2777,894,-23,0" /> ! <teleporter source="5686,386,2,0" destination="2777,894,-23,0" /> ! <teleporter source="5686,387,2,0" destination="2777,895,-23,0" /> ! <teleporter source="5731,445,-18,0" destination="6087,3676,18,0" /> ! <teleporter source="5753,437,78,0" destination="2400,199,0,0" /> ! <teleporter source="5850,432,0,0" destination="5127,3143,97,0" /> ! <teleporter source="5850,433,-2,0" destination="5127,3143,97,0" /> ! <teleporter source="5850,434,-1,0" destination="5127,3143,97,0" /> ! <teleporter source="5850,431,2,0" destination="5127,3143,97,0" /> ! <teleporter source="5826,465,-1,0" destination="1987,2063,-40,0" /> ! <teleporter source="5827,465,-1,0" destination="1988,2063,-40,0" /> ! <teleporter source="5828,465,0,0" destination="1989,2063,-40,0" /> ! <teleporter source="313,786,-24,0" destination="5748,361,2,0" /> ! <teleporter source="314,786,-24,0" destination="5749,361,2,0" /> ! <teleporter source="2776,895,-23,0" destination="5685,387,2,0" /> ! <teleporter source="4540,898,32,0" destination="4442,1122,5,0" /> ! <teleporter source="4300,968,5,0" destination="4442,1122,5,0" /> ! <teleporter source="4436,1107,5,0" destination="4300,992,5,0" /> ! <teleporter source="4443,1137,5,0" destination="4487,1475,5,0" /> ! <teleporter source="4449,1107,5,0" destination="4539,890,28,0" /> ! <teleporter source="4449,1115,5,0" destination="4671,1135,10,0" /> ! <teleporter source="4663,1134,13,0" destination="4442,1122,5,0" /> ! <teleporter source="5701,1320,16,0" destination="5786,1336,-8,0" /> ! <teleporter source="5702,1320,16,0" destination="5787,1336,-8,0" /> ! <teleporter source="5703,1320,16,0" destination="5788,1336,-8,0" /> ! <teleporter source="5786,1335,-13,0" destination="5701,1319,13,0" /> ! <teleporter source="5787,1335,-13,0" destination="5702,1319,13,0" /> ! <teleporter source="5788,1335,-13,0" destination="5703,1319,13,0" /> ! <teleporter source="6005,1380,1,0" destination="5151,4063,37,0" /> ! <teleporter source="6005,1378,0,0" destination="5151,4062,37,0" /> ! <teleporter source="6005,1379,2,0" destination="5151,4062,37,0" /> ! <teleporter source="6025,1344,-26,0" destination="5137,3664,27,0" /> ! <teleporter source="6025,1345,-26,0" destination="5137,3664,27,0" /> ! <teleporter source="6025,1346,-26,0" destination="5137,3665,31,0" /> ! <teleporter source="5687,1424,38,0" destination="2923,3406,8,0" /> ! <teleporter source="5792,1416,41,0" destination="5758,2908,15,0" /> ! <teleporter source="5792,1417,41,0" destination="5758,2909,15,0" /> ! <teleporter source="5792,1415,41,0" destination="5758,2907,15,0" /> ! <teleporter source="5899,1411,43,0" destination="1630,3320,0,0" /> ! <teleporter source="5900,1411,42,0" destination="1630,3320,0,0" /> ! <teleporter source="5918,1412,-29,0" destination="5961,1409,59,0" /> ! <teleporter source="5918,1410,-29,0" destination="5961,1408,59,0" /> ! <teleporter source="5918,1411,-29,0" destination="5961,1408,59,0" /> ! <teleporter source="5961,1408,59,0" destination="5918,1411,-29,0" /> ! <teleporter source="5961,1409,59,0" destination="5918,1412,-29,0" /> ! <teleporter source="6125,1411,15,0" destination="6075,3332,4,0" /> ! <teleporter source="6126,1411,15,0" destination="6075,3332,4,0" /> ! <teleporter source="6127,1411,15,0" destination="6075,3332,4,0" /> ! <teleporter source="6137,1409,2,0" destination="6140,1432,4,0" /> ! <teleporter source="6138,1409,2,0" destination="6140,1432,4,0" /> ! <teleporter source="6140,1431,4,0" destination="6137,1408,2,0" /> ! <teleporter source="4496,1475,15,0" destination="4442,1122,5,0" /> ! <teleporter source="6031,1501,42,0" destination="1491,1642,24,0" /> ! <teleporter source="6031,1499,42,0" destination="1491,1640,24,0" /> ! <teleporter source="1491,1640,24,0" destination="6032,1499,31,0" /> ! <teleporter source="1491,1642,24,0" destination="6032,1501,31,0" /> ! <teleporter source="5340,1599,40,0" destination="5426,3122,-74,0" /> ! <teleporter source="5341,1599,40,0" destination="5426,3122,-74,0" /> ! <teleporter source="1987,2062,-40,0" destination="5826,464,0,0" /> ! <teleporter source="1988,2062,-40,0" destination="5827,464,-1,0" /> ! <teleporter source="1989,2062,-40,0" destination="5828,464,-1,0" /> ! <teleporter source... [truncated message content] |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:34:22
|
Update of /cvsroot/wpdev/xmlscripts/scripts/commands In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11706/commands Modified Files: add.py bank.py dupe.py dye.py edit.py info.py Log Message: bugfixes Index: edit.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/edit.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** edit.py 26 May 2004 13:07:21 -0000 1.2 --- edit.py 1 Oct 2004 16:34:10 -0000 1.3 *************** *** 19,43 **** # def response(player, arguments, response): ! if response.button == 0: ! return ! command = (response.button >> 28) & 0xC ! item = wolfpack.finditem((response.button & 0x3FFFFFFF) | 0x40000000) ! # Delete Item ! if command == 0x04: ! item.delete() ! # Bounce Item ! elif command == 0x08: ! if not tobackpack(item, player): ! item.update() ! # Show Info For Item ! elif command == 0x0C: ! iteminfo(player.socket, item) ! else: ! player.socket.sysmessage('Unknown command.') # --- 19,47 ---- # def response(player, arguments, response): ! if response.button == 0: ! return ! command = (response.button >> 28) & 0xC ! item = wolfpack.finditem((response.button & 0x3FFFFFFF) | 0x40000000) ! # Delete Item ! if command == 0x04: ! player.log(LOG_MESSAGE, 'Deleting item 0x%x from character 0x%x.\n' % (item.serial, item.container.serial)) ! item.delete() ! # Bounce Item ! elif command == 0x08: ! player.log(LOG_MESSAGE, 'Bouncing item 0x%x from character 0x%x.\n' % (item.serial, item.container.serial)) ! ! if not tobackpack(item, player): ! item.update() ! # Show Info For Item ! elif command == 0x0C: ! player.log(LOG_MESSAGE, 'Showing info gump for item 0x%x from character 0x%x.\n' % (item.serial, item.container.serial)) ! iteminfo(player.socket, item) ! else: ! player.socket.sysmessage('Unknown command.') # *************** *** 45,133 **** # def callback(player, arguments, target): ! if not target.char: ! return ! dialog = wolfpack.gumps.cGump() ! dialog.setCallback("commands.edit.response") ! items = [] ! for layer in range(LAYER_RIGHTHAND, LAYER_TRADING+1): ! item = target.char.itemonlayer(layer) ! if item: ! items.append(item) ! pages = ceil(len(items) / 4.0) ! dialog.startPage(0) ! dialog.addResizeGump(35, 12, 9260, 460, 504) ! dialog.addGump(1, 12, 10421, 0) ! dialog.addGump(30, -1, 10420, 0) ! dialog.addResizeGump(66, 40, 9200, 405, 65) ! dialog.addText(108, 52, "Wolfpack Edit Command", 2100) ! dialog.addText(108, 72, "Please choose the item you wan't to view closely.", 2100) ! dialog.addTiledGump(90, 11, 164, 17, 10250, 0) ! dialog.addGump(474, 12, 10431, 0) ! dialog.addGump(439, -1, 10430, 0) ! dialog.addGump(14, 200, 10422, 0) ! dialog.addGump(468, 200, 10432, 0) ! dialog.addGump(249, 11, 10254, 0) ! dialog.addGump(74, 45, 10464, 0) ! dialog.addGump(435, 45, 10464, 0) ! dialog.addGump(461, 408, 10412, 0) ! dialog.addGump(-15, 408, 10402, 0) ! dialog.addTiledGump(281, 11, 158, 17, 10250, 0) ! dialog.addGump(265, 11, 10252, 0) ! for page in range(1, pages + 1): ! dialog.startPage(page) ! if page > 1: ! dialog.addPageButton(60, 467, 9909, 9911, page - 1) ! dialog.addText(88, 467, "Previous Page", 2100) ! if page < pages: ! dialog.addPageButton(448, 467, 9903, 9905, page + 1) ! dialog.addText(376, 468, "Next Page", 2100) ! yoffset = 0 ! for i in range(0, 4): ! if (page - 1) * 4 + i >= len(items): ! break ! item = items[(page - 1) * 4 + i] ! dialog.addResizeGump(64, 108 + yoffset, 9200, 405, 82) ! dialog.addTilePic(92, 127 + yoffset, item.id) ! if LAYERNAMES.has_key(item.layer): ! layername = LAYERNAMES[item.layer] ! else: ! layername = 'Unknown' ! dialog.addText(164, 118 + yoffset, "Layer: %u (%s)" % (item.layer, layername), 2100) ! dialog.addText(164, 138 + yoffset, "Item Id: 0x%x" % item.id, 2100) ! if item.color == 0: ! textcolor = 2100 ! else: ! textcolor = item.color - 1 ! dialog.addText(164, 158 + yoffset, "Item Color: 0x%x" % item.color, textcolor) ! itemid = item.serial & 0x3FFFFFFF ! dialog.addText(348, 115 + yoffset, "Delete Item", 2100) ! dialog.addButton(428, 114 + yoffset, 9903, 9905, itemid | 0x40000000) ! dialog.addText(376, 139 + yoffset, "Bounce", 2100) ! dialog.addButton(428, 138 + yoffset, 9903, 9905, itemid | 0x80000000) ! dialog.addText(396, 163 + yoffset, "Info", 2100) ! dialog.addButton(428, 162 + yoffset, 9903, 9905, itemid | 0xC0000000) ! yoffset += 86 ! dialog.send(player) # --- 49,137 ---- # def callback(player, arguments, target): ! if not target.char: ! return ! dialog = wolfpack.gumps.cGump() ! dialog.setCallback("commands.edit.response") ! items = [] ! for layer in range(LAYER_RIGHTHAND, LAYER_TRADING+1): ! item = target.char.itemonlayer(layer) ! if item: ! items.append(item) ! pages = ceil(len(items) / 4.0) ! dialog.startPage(0) ! dialog.addResizeGump(35, 12, 9260, 460, 504) ! dialog.addGump(1, 12, 10421, 0) ! dialog.addGump(30, -1, 10420, 0) ! dialog.addResizeGump(66, 40, 9200, 405, 65) ! dialog.addText(108, 52, "Wolfpack Edit Command", 2100) ! dialog.addText(108, 72, "Please choose the item you wan't to view closely.", 2100) ! dialog.addTiledGump(90, 11, 164, 17, 10250, 0) ! dialog.addGump(474, 12, 10431, 0) ! dialog.addGump(439, -1, 10430, 0) ! dialog.addGump(14, 200, 10422, 0) ! dialog.addGump(468, 200, 10432, 0) ! dialog.addGump(249, 11, 10254, 0) ! dialog.addGump(74, 45, 10464, 0) ! dialog.addGump(435, 45, 10464, 0) ! dialog.addGump(461, 408, 10412, 0) ! dialog.addGump(-15, 408, 10402, 0) ! dialog.addTiledGump(281, 11, 158, 17, 10250, 0) ! dialog.addGump(265, 11, 10252, 0) ! for page in range(1, pages + 1): ! dialog.startPage(page) ! if page > 1: ! dialog.addPageButton(60, 467, 9909, 9911, page - 1) ! dialog.addText(88, 467, "Previous Page", 2100) ! if page < pages: ! dialog.addPageButton(448, 467, 9903, 9905, page + 1) ! dialog.addText(376, 468, "Next Page", 2100) ! yoffset = 0 ! for i in range(0, 4): ! if (page - 1) * 4 + i >= len(items): ! break ! item = items[(page - 1) * 4 + i] ! dialog.addResizeGump(64, 108 + yoffset, 9200, 405, 82) ! dialog.addTilePic(92, 127 + yoffset, item.id) ! if LAYERNAMES.has_key(item.layer): ! layername = LAYERNAMES[item.layer] ! else: ! layername = 'Unknown' ! dialog.addText(164, 118 + yoffset, "Layer: %u (%s)" % (item.layer, layername), 2100) ! dialog.addText(164, 138 + yoffset, "Item Id: 0x%x" % item.id, 2100) ! if item.color == 0: ! textcolor = 2100 ! else: ! textcolor = item.color - 1 ! dialog.addText(164, 158 + yoffset, "Item Color: 0x%x" % item.color, textcolor) ! itemid = item.serial & 0x3FFFFFFF ! dialog.addText(348, 115 + yoffset, "Delete Item", 2100) ! dialog.addButton(428, 114 + yoffset, 9903, 9905, itemid | 0x40000000) ! dialog.addText(376, 139 + yoffset, "Bounce", 2100) ! dialog.addButton(428, 138 + yoffset, 9903, 9905, itemid | 0x80000000) ! dialog.addText(396, 163 + yoffset, "Info", 2100) ! dialog.addButton(428, 162 + yoffset, 9903, 9905, itemid | 0xC0000000) ! yoffset += 86 ! dialog.send(player) # *************** *** 135,140 **** # def edit(socket, command, arguments): ! socket.sysmessage('Please select an item or character you want to edit.') ! socket.attachtarget('commands.edit.callback', []) # --- 139,144 ---- # def edit(socket, command, arguments): ! socket.sysmessage('Please select an item or character you want to edit.') ! socket.attachtarget('commands.edit.callback', []) # *************** *** 142,144 **** # def onLoad(): ! wolfpack.registercommand('edit', edit) --- 146,148 ---- # def onLoad(): ! wolfpack.registercommand('edit', edit) Index: info.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/info.py,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** info.py 25 Sep 2004 20:53:18 -0000 1.24 --- info.py 1 Oct 2004 16:34:10 -0000 1.25 *************** *** 135,139 **** gump = wolfpack.gumps.cGump() gump.setCallback( "commands.info.charinfo_response" ) ! gump.setArgs( [char] ) gump.startPage(0) --- 135,139 ---- gump = wolfpack.gumps.cGump() gump.setCallback( "commands.info.charinfo_response" ) ! gump.setArgs( [char.serial] ) gump.startPage(0) *************** *** 392,401 **** # gump.addInputField( 284, 200, 200, 16, 0x834, 43, '' ) # 44 ! gump.addText( 113, 240, "Poisoned:", 0x834 ) gump.addResizeGump( 280, 240, 0xBB8, 215, 20 ) ! if char.hastag('poisoned'): ! gump.addInputField( 284, 200, 200, 16, 0x834, 44, unicode( char.gettag('poisoned') ) ) ! else: ! gump.addInputField( 284, 200, 200, 16, 0x834, 44, '' ) # 45 #gump.addText( 113, 260, ":", 0x834 ) --- 392,398 ---- # gump.addInputField( 284, 200, 200, 16, 0x834, 43, '' ) # 44 ! gump.addText( 113, 240, "Poison:", 0x834 ) gump.addResizeGump( 280, 240, 0xBB8, 215, 20 ) ! gump.addInputField( 284, 240, 200, 16, 0x834, 44, unicode( char.poison ) ) # 45 #gump.addText( 113, 260, ":", 0x834 ) *************** *** 537,541 **** def charinfo_response( player, args, choice ): socket = player.socket ! char = args[0] if choice.button == 0 or not char or not socket: return True --- 534,538 ---- def charinfo_response( player, args, choice ): socket = player.socket ! char = wolfpack.findchar(args[0]) if choice.button == 0 or not char or not socket: return True *************** *** 545,601 **** # socket.sysmessage( "You've burnt your fingers!" ) # return True ! textentries = choice.text keys = textentries.keys() ! for key in keys: if key == 1: ! char.name = textentries[ key ] elif key == 2: ! char.title = textentries[ key ] elif key == 3: ! char.id = int( hex2dec( textentries[ key ] ) ) elif key == 4: ! char.orgid = int( hex2dec( textentries[ key ] ) ) elif key == 5: ! char.skin = int( hex2dec( textentries[ key ] ) ) elif key == 6: ! char.orgskin = int( hex2dec( textentries[ key ] ) ) elif key == 7: ! char.fame = int( textentries[ key ] ) elif key == 8: ! char.karma = int( textentries[ key ] ) elif key == 9: ! char.kills = int( textentries[ key ] ) elif key == 10: ! char.deaths = int( textentries[ key ] ) elif key == 11: ! char.pos = ( textentries[ key ] ) elif key == 12: ! char.direction = int( textentries[ key ] ) elif key == 13: ! char.invulnerable = str2bool( textentries[ key ] ) elif key == 14: ! char.strength = int( textentries[ key ] ) elif key == 15: ! char.dexterity = int( textentries[ key ] ) elif key == 16: ! char.intelligence = int( textentries[ key ] ) elif key == 17: ! char.maxhitpoints = int( textentries[ key ] ) elif key == 18: ! char.hitpoints = int( textentries[ key ] ) elif key == 19: ! char.maxstamina = int( textentries[ key ] ) elif key == 20: ! char.stamina = int( textentries[ key ] ) elif key == 21: ! char.maxmana = int( textentries[ key ] ) elif key == 22: ! char.mana = int( textentries[ key ] ) elif key == 23: ! char.hidden = str2bool( textentries[ key ] ) elif key == 24: ! char.dead = str2bool( textentries[ key ] ) elif key == 25: char.polymorph = str2bool( textentries[ key ] ) --- 542,663 ---- # socket.sysmessage( "You've burnt your fingers!" ) # return True ! textentries = choice.text keys = textentries.keys() ! for key in keys: if key == 1: ! if char.name != textentries[1]: ! player.log(LOG_MESSAGE, "Changing name of character 0x%x from '%s' to '%s'.\n" % ( char.serial, char.name, textentries[key] ) ) ! char.name = textentries[ key ] elif key == 2: ! value = textentries[2] ! if char.title != value: ! player.log(LOG_MESSAGE, "Changing title of character 0x%x from '%s' to '%s'.\n" % ( char.serial, char.title, textentries[key] ) ) ! char.title = textentries[ key ] elif key == 3: ! value = int(hex2dec(textentries[key])) ! if char.id != value: ! player.log(LOG_MESSAGE, "Changing id of character 0x%x from 0x%x to 0x%x.\n" % ( char.serial, char.id, value ) ) ! char.id = int( hex2dec( textentries[ key ] ) ) elif key == 4: ! value = int(hex2dec(textentries[key])) ! if char.orgid != value: ! player.log(LOG_MESSAGE, "Changing orgid of character 0x%x from 0x%x to 0x%x.\n" % ( char.serial, char.orgid, value ) ) ! char.orgid = int( hex2dec( textentries[ key ] ) ) elif key == 5: ! value = int(hex2dec(textentries[key])) ! if char.skin != value: ! player.log(LOG_MESSAGE, "Changing skin of character 0x%x from 0x%x to 0x%x.\n" % ( char.serial, char.skin, value ) ) ! char.skin = int( hex2dec( textentries[ key ] ) ) elif key == 6: ! value = int(hex2dec(textentries[key])) ! if char.orgskin != value: ! player.log(LOG_MESSAGE, "Changing orgskin of character 0x%x from 0x%x to 0x%x.\n" % ( char.serial, char.orgskin, value ) ) ! char.orgskin = int( hex2dec( textentries[ key ] ) ) elif key == 7: ! value = int(hex2dec(textentries[key])) ! if char.fame != value: ! player.log(LOG_MESSAGE, "Changing fame of character 0x%x from %u to %u.\n" % ( char.serial, char.fame, value ) ) ! char.fame = int( textentries[ key ] ) elif key == 8: ! value = int(hex2dec(textentries[key])) ! if char.karma != value: ! player.log(LOG_MESSAGE, "Changing karma of character 0x%x from %u to %u.\n" % ( char.serial, char.karma, value ) ) ! char.karma = int( textentries[ key ] ) elif key == 9: ! value = int(hex2dec(textentries[key])) ! if char.kills != value: ! player.log(LOG_MESSAGE, "Changing kills of character 0x%x from %u to %u.\n" % ( char.serial, char.kills, value ) ) ! char.kills = int( textentries[ key ] ) elif key == 10: ! value = int(hex2dec(textentries[key])) ! if char.deaths != value: ! player.log(LOG_MESSAGE, "Changing deaths of character 0x%x from %u to %u.\n" % ( char.serial, char.deaths, value ) ) ! char.deaths = int( textentries[ key ] ) elif key == 11: ! value = textentries[key] ! if str(char.pos) != value: ! player.log(LOG_MESSAGE, "Changing position of character 0x%x from %s to %s.\n" % ( char.serial, str(char.pos), value ) ) ! char.pos = value elif key == 12: ! value = int(hex2dec(textentries[key])) ! if char.direction != value: ! player.log(LOG_MESSAGE, "Changing direction of character 0x%x from %u to %u.\n" % ( char.serial, char.direction, value ) ) ! char.direction = int( textentries[ key ] ) elif key == 13: ! value = str2bool(textentries[key]) ! if char.invulnerable != value: ! player.log(LOG_MESSAGE, "Changing invulnerability of character 0x%x from %s to %s.\n" % ( char.serial, str(char.invulnerable), str(value) ) ) ! char.invulnerable = value elif key == 14: ! value = int(hex2dec(textentries[key])) ! if char.strength != value: ! player.log(LOG_MESSAGE, "Changing strength of character 0x%x from %u to %u.\n" % ( char.serial, char.strength, value ) ) ! char.strength = int( textentries[ key ] ) elif key == 15: ! value = int(hex2dec(textentries[key])) ! if char.dexterity != value: ! player.log(LOG_MESSAGE, "Changing dexterity of character 0x%x from %u to %u.\n" % ( char.serial, char.dexterity, value ) ) ! char.dexterity = value elif key == 16: ! value = int(hex2dec(textentries[key])) ! if char.intelligence != value: ! player.log(LOG_MESSAGE, "Changing intelligence of character 0x%x from %u to %u.\n" % ( char.serial, char.intelligence, value ) ) ! char.intelligence = value elif key == 17: ! value = int(hex2dec(textentries[key])) ! if char.maxhitpoints != value: ! player.log(LOG_MESSAGE, "Changing maxhitpoints of character 0x%x from %u to %u.\n" % ( char.serial, char.maxhitpoints, value ) ) ! char.maxhitpoints = value elif key == 18: ! value = int(hex2dec(textentries[key])) ! if char.hitpoints != value: ! player.log(LOG_MESSAGE, "Changing hitpoints of character 0x%x from %u to %u.\n" % ( char.serial, char.hitpoints, value ) ) ! char.hitpoints = value elif key == 19: ! value = int(hex2dec(textentries[key])) ! if char.maxstamina != value: ! player.log(LOG_MESSAGE, "Changing maxstamina of character 0x%x from %u to %u.\n" % ( char.serial, char.maxstamina, value ) ) ! char.maxstamina = value elif key == 20: ! value = int(hex2dec(textentries[key])) ! if char.stamina != value: ! player.log(LOG_MESSAGE, "Changing stamina of character 0x%x from %u to %u.\n" % ( char.serial, char.stamina, value ) ) ! char.stamina = value elif key == 21: ! value = int(hex2dec(textentries[key])) ! if char.maxmana != value: ! player.log(LOG_MESSAGE, "Changing maxmana of character 0x%x from %u to %u.\n" % ( char.serial, char.maxmana, value ) ) ! char.maxmana = value elif key == 22: ! value = int(hex2dec(textentries[key])) ! if char.mana != value: ! player.log(LOG_MESSAGE, "Changing mana of character 0x%x from %u to %u.\n" % ( char.serial, char.mana, value ) ) ! char.mana = value elif key == 23: ! char.hidden = str2bool( textentries[ key ] ) elif key == 24: ! char.dead = str2bool( textentries[ key ] ) elif key == 25: char.polymorph = str2bool( textentries[ key ] ) *************** *** 636,640 **** elif key == 38: if not char.npc: ! char.account.name = textentries[ key ] else: if ( textentries[ key ] ) == 'Null' or ( textentries[ key ] ) == 'None': --- 698,703 ---- elif key == 38: if not char.npc: ! #char.account.name = textentries[ key ] ! pass else: if ( textentries[ key ] ) == 'Null' or ( textentries[ key ] ) == 'None': *************** *** 674,686 **** # char.mindamage = int( textentries[ key ] ) elif key == 44: ! if not char.npc: ! if (textentries[ key ]) == '': ! if char.hastag( 'poisoned' ): ! char.deltag( 'poisoned' ) ! else: ! char.settag( 'poisoned', int( textentries[ key ] ) ) ! #elif char.npc: ! # if not textentries[ key ] == '': ! # char.maxdamage = int( textentries[ key ] ) elif key == 46: if char.npc: --- 737,743 ---- # char.mindamage = int( textentries[ key ] ) elif key == 44: ! #char.poison = int( textentries[ key ] ) ! pass ! elif key == 46: if char.npc: Index: add.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/add.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** add.py 23 Sep 2004 00:52:46 -0000 1.12 --- add.py 1 Oct 2004 16:34:10 -0000 1.13 *************** *** 1,5 **** import wolfpack ! from wolfpack.consts import WPDT_NPC, WPDT_ITEM, WPDT_MULTI from wolfpack import console from system.makemenus import MakeItemAction, MakeMenu, MakeAction, findmenu --- 1,5 ---- import wolfpack ! from wolfpack.consts import * from wolfpack import console from system.makemenus import MakeItemAction, MakeMenu, MakeAction, findmenu *************** *** 17,20 **** --- 17,22 ---- npc = wolfpack.addnpc(str(arguments[0]), target.pos) npc.update() + + player.log(LOG_MESSAGE, "Adds npc %s (0x%x) at %s.\n" % (str(arguments[0]), npc.serial, str(target.pos))) # *************** *** 36,39 **** --- 38,43 ---- multi.moveto(target.pos) multi.update() + + player.log(LOG_MESSAGE, "Adds multi %s (0x%x) at %s.\n" % (str(arguments[0]), multi.serial, target.pos)) # *************** *** 48,63 **** item.decay = False item.movable = 3 ! if target.item: if target.item.type == 1: target.item.additem(item, 1, 1, 0) elif target.item.container: target.item.container.additem(item, 1, 1, 0) else: item.moveto(target.item.pos) elif target.char: item.moveto(target.char.pos) else: item.moveto(target.pos) item.update() --- 52,92 ---- item.decay = False item.movable = 3 ! if target.item: if target.item.type == 1: target.item.additem(item, 1, 1, 0) + + if arguments[1]: + player.log(LOG_MESSAGE, "Adds static item %s (0x%x) into 0x%x.\n" % (str(arguments[0]), item.serial, target.item.serial)) + else: + player.log(LOG_MESSAGE, "Adds item %s (0x%x) into 0x%x.\n" % (str(arguments[0]), item.serial, target.item.serial)) elif target.item.container: target.item.container.additem(item, 1, 1, 0) + + if arguments[1]: + player.log(LOG_MESSAGE, "Adds static item %s (0x%x) into 0x%x.\n" % (str(arguments[0]), item.serial, target.item.container.serial)) + else: + player.log(LOG_MESSAGE, "Adds item %s (0x%x) into 0x%x.\n" % (str(arguments[0]), item.serial, target.item.container.serial)) else: item.moveto(target.item.pos) + + if arguments[1]: + player.log(LOG_MESSAGE, "Adds static item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.item.pos))) + else: + player.log(LOG_MESSAGE, "Adds item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.item.pos))) elif target.char: item.moveto(target.char.pos) + + if arguments[1]: + player.log(LOG_MESSAGE, "Adds static item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.char.pos))) + else: + player.log(LOG_MESSAGE, "Adds item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.char.pos))) else: item.moveto(target.pos) + + if arguments[1]: + player.log(LOG_MESSAGE, "Adds static item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.pos))) + else: + player.log(LOG_MESSAGE, "Adds item %s (0x%x) at %s.\n" % (str(arguments[0]), item.serial, str(target.pos))) item.update() Index: dupe.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/dupe.py,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** dupe.py 23 Aug 2004 03:10:39 -0000 1.3 --- dupe.py 1 Oct 2004 16:34:10 -0000 1.4 *************** *** 21,24 **** --- 21,26 ---- import wolfpack from wolfpack.utilities import hex2dec + from wolfpack import console + from wolfpack.consts import * def dupe(socket, command, arguments): *************** *** 41,46 **** return False for i in range(0, args[0]): ! target.item.dupe().update() def onLoad(): --- 43,53 ---- return False + #char.log(LOG_MESSAGE, "Duping item 0x%x.\n" % target.item.serial) + for i in range(0, args[0]): ! created = target.item.dupe() ! created.update() ! ! char.log(LOG_MESSAGE, "Duping item 0x%x. New serial is 0x%x.\n" % (target.item.serial, created.serial)) def onLoad(): Index: bank.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/bank.py,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** bank.py 26 May 2004 13:07:21 -0000 1.2 --- bank.py 1 Oct 2004 16:34:10 -0000 1.3 *************** *** 10,13 **** --- 10,14 ---- import wolfpack from wolfpack.utilities import hex2dec + from wolfpack.consts import * def bank( socket, command, arguments ): *************** *** 36,39 **** --- 37,44 ---- return + if args[0] == LAYER_BANKBOX: + char.log(LOG_MESSAGE, "Opening bankbox (0x%x) of character 0x%x.\n" % (container.serial, target.char.serial)) + else: + char.log(LOG_MESSAGE, "Opening container (0x%x) on layer %u of character 0x%x.\n" % (container.serial, args[0], target.char.serial)) char.socket.sendcontainer( container ) Index: dye.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/commands/dye.py,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** dye.py 23 Aug 2004 03:10:39 -0000 1.5 --- dye.py 1 Oct 2004 16:34:10 -0000 1.6 *************** *** 17,20 **** --- 17,21 ---- import wolfpack from wolfpack.utilities import hex2dec + from wolfpack.consts import * def dye( socket, command, arguments ): *************** *** 28,40 **** if target.item: color = args[0] target.item.color = hex(color) target.item.update() elif target.char: skin = args[0] if skin == 0: skin = target.char.orgskin ! target.char.removefromview() target.char.skin = hex(skin) target.char.update() else: char.socket.sysmessage( 'That was not a valid object.', GRAY ) --- 29,46 ---- if target.item: color = args[0] + oldcolor = target.item.color target.item.color = hex(color) target.item.update() + + char.log(LOG_MESSAGE, "Redyes item 0x%x from color 0x%x to 0x%x.\n" % (target.item.serial, oldcolor, target.item.color)) elif target.char: skin = args[0] if skin == 0: skin = target.char.orgskin ! oldskin = target.char.skin target.char.skin = hex(skin) target.char.update() + + char.log(LOG_MESSAGE, "Redyes char 0x%x from skin 0x%x to 0x%x.\n" % (target.char.serial, oldskin, target.char.skin)) else: char.socket.sysmessage( 'That was not a valid object.', GRAY ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:34:21
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11706/system Modified Files: makemenus.py Log Message: bugfixes Index: makemenus.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/makemenus.py,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** makemenus.py 20 Sep 2004 04:28:23 -0000 1.28 --- makemenus.py 1 Oct 2004 16:34:11 -0000 1.29 *************** *** 126,131 **** if self.amount > 0: item.amount = self.amount if not tobackpack(item, player): ! item.update() player.socket.sysmessage('You put the new item into your backpack.') MakeAction.make(self, player, arguments, nodelay) --- 126,134 ---- if self.amount > 0: item.amount = self.amount + player.log(LOG_MESSAGE, "Created %u items %s (0x%x).\n" % (self.amount, self.definition, item.serial)) + else: + player.log(LOG_MESSAGE, "Created item %s (0x%x).\n" % (self.definition, item.serial)) if not tobackpack(item, player): ! item.update() player.socket.sysmessage('You put the new item into your backpack.') MakeAction.make(self, player, arguments, nodelay) *************** *** 492,495 **** --- 495,499 ---- if exceptional: + player.log(LOG_MESSAGE, "Crafted exceptional item %s (0x%x). Amount: %u.\n" % (self.definition, item.serial, item.amount)) if self.parent.allowmark and self.markable and player.hastag('markitem'): item.settag('exceptional', int(player.serial)) *************** *** 499,503 **** self.success(player, arguments, item, 1, 0) else: ! self.success(player, arguments, item, 0, 0) if not tobackpack(item, player): --- 503,508 ---- self.success(player, arguments, item, 1, 0) else: ! player.log(LOG_MESSAGE, "Crafted item %s (0x%x). Amount: %u.\n" % (self.definition, item.serial, item.amount)) ! self.success(player, arguments, item, 0, 0) if not tobackpack(item, player): |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:34:21
|
Update of /cvsroot/wpdev/xmlscripts/scripts/skills In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11706/skills Modified Files: hiding.py Log Message: bugfixes Index: hiding.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/skills/hiding.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** hiding.py 31 Aug 2004 01:55:37 -0000 1.12 --- hiding.py 1 Oct 2004 16:34:10 -0000 1.13 *************** *** 25,28 **** --- 25,40 ---- char.socket.deltag( 'skill_delay' ) + # If any opponent is within 10 tiles. Deny hiding. + opponents = char.getopponents() + + for enemy in opponents: + # Forget about old fights + if enemy.attacktarget != char and char.attacktarget != enemy: + continue + + if enemy.distanceto(char) < 10: + char.socket.clilocmessage(501238) + return False + success = char.checkskill( HIDING, 0, 1000 ) |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:34:20
|
Update of /cvsroot/wpdev/xmlscripts/scripts/combat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11706/combat Modified Files: __init__.py Log Message: bugfixes Index: __init__.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/__init__.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** __init__.py 27 Sep 2004 14:37:25 -0000 1.15 --- __init__.py 1 Oct 2004 16:34:10 -0000 1.16 *************** *** 31,34 **** --- 31,42 ---- return + # Our defender went invisible or hidden? + if defender.invisible or defender.hidden: + attacker.attacktarget = None + return + + # Reveal us + attacker.reveal() + # Let the defender strike back if he doesnt fight anyone right now if not defender.attacktarget: |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:34:19
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11706 Modified Files: bandages.py Log Message: bugfixes Index: bandages.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/bandages.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** bandages.py 27 Sep 2004 16:28:31 -0000 1.13 --- bandages.py 1 Oct 2004 16:34:09 -0000 1.14 *************** *** 60,65 **** --- 60,67 ---- if bandages.id == 0xe20: bandages.id = 0xe21 + bandages.baseid = 'e21' elif bandages.id == 0xe22: bandages.id = 0xee9 + bandages.baseid = 'ee9' bandages.update() |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:33:05
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11300/webroot Modified Files: ChangeLog.wolfpack Log Message: bugfixes Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.131 retrieving revision 1.132 diff -C2 -d -r1.131 -r1.132 *** ChangeLog.wolfpack 1 Oct 2004 14:29:24 -0000 1.131 --- ChangeLog.wolfpack 1 Oct 2004 16:32:55 -0000 1.132 *************** *** 31,34 **** --- 31,35 ---- - Carving now takes bloodcolor into account. - Import now imports multis from WSC files and makes all items non movable. + - Fixed bug #0000311. (Hiding and invisibility in combat) * Misc. Changes: * Known Issues, Bugs, and Missing Features: |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:33:03
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11272 Modified Files: ChangeLog basechar.cpp player.cpp targetrequests.cpp walking.cpp world.cpp Log Message: bugfixes Index: basechar.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v retrieving revision 1.156 retrieving revision 1.157 diff -C2 -d -r1.156 -r1.157 *** basechar.cpp 30 Sep 2004 12:34:10 -0000 1.156 --- basechar.cpp 1 Oct 2004 16:32:52 -0000 1.157 *************** *** 2516,2521 **** switch ( body_ ) { - case 0x004E: - case 0x0050: case 0x003A: case 0x0039: --- 2516,2519 ---- *************** *** 2577,2580 **** --- 2575,2582 ---- if ( objectType() == enNPC && dynamic_cast<P_NPC>( this )->owner() == pChar ) source->sendContainer( getBackpack() ); + break; + + default: + break; }; } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.88 retrieving revision 1.89 diff -C2 -d -r1.88 -r1.89 *** ChangeLog 1 Oct 2004 15:15:56 -0000 1.88 --- ChangeLog 1 Oct 2004 16:32:52 -0000 1.89 *************** *** 12,15 **** --- 12,19 ---- - Fixed base definitions for multis. - Fixed items in multis being lost after two saves. + - Fixed issues with walking (especially stairs). + - Fixed bug #0000323. (World time not being loaded with binary saves) + - Fixed bug #0000335. (Riding liches + toads) + - Fixed bug #0000340. (Showing unicode properties crashes the server) Wolfpack 12.9.11 Beta (26. September 2004) Index: player.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v retrieving revision 1.133 retrieving revision 1.134 diff -C2 -d -r1.133 -r1.134 *** player.cpp 22 Sep 2004 17:14:11 -0000 1.133 --- player.cpp 1 Oct 2004 16:32:53 -0000 1.134 *************** *** 476,480 **** pMountItem->setColor( pMount->skin() ); ! switch ( static_cast<unsigned short>( pMount->body() & 0x00FF ) ) { case 0xC8: --- 476,480 ---- pMountItem->setColor( pMount->skin() ); ! switch ( pMount->body() ) { case 0xC8: Index: targetrequests.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v retrieving revision 1.104 retrieving revision 1.105 diff -C2 -d -r1.104 -r1.105 *** targetrequests.cpp 24 Sep 2004 04:47:38 -0000 1.104 --- targetrequests.cpp 1 Oct 2004 16:32:53 -0000 1.105 *************** *** 137,141 **** else { ! socket->sysMessage( tr( "'%1' is '%2'" ).arg( key ).arg( PyString_AsString( PyObject_Str( result ) ) ) ); Py_DECREF( result ); } --- 137,149 ---- else { ! if (PyUnicode_Check(result) || PyString_Check(result)) { ! socket->sysMessage( tr( "'%1' is '%2'" ).arg( key ).arg( Python2QString(result) ) ); ! } else { ! PyObject *repr = PyObject_Str(result); ! QString value = Python2QString(repr); ! socket->sysMessage( tr( "'%1' is '%2'" ).arg( key ).arg( value ) ); ! Py_XDECREF(repr); ! } ! Py_DECREF( result ); } Index: walking.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v retrieving revision 1.151 retrieving revision 1.152 diff -C2 -d -r1.151 -r1.152 *** walking.cpp 20 Sep 2004 00:16:20 -0000 1.151 --- walking.cpp 1 Oct 2004 16:32:53 -0000 1.152 *************** *** 135,138 **** --- 135,152 ---- bool operator()( stBlockItem a, stBlockItem b ) { + // If the items have the same top, the one with the surface flag has precedence + unsigned int itemTopA = a.height + a.z; + unsigned int itemTopB = b.height + b.z; + + if (itemTopA == itemTopB) { + if (a.height == 0 && a.walkable) { + return true; + } + + if (b.height == 0 && b.walkable) { + return true; + } + } + return ( ( a.height + a.z ) > ( b.height + b.z ) ); } *************** *** 193,197 **** // If we are a stair only the half height counts (round up) if ( tTile.flag2 & 0x04 ) ! staticBlock.height = ( Q_UINT8 ) ( ( tTile.height + 1 ) / 2 ); else staticBlock.height = tTile.height; --- 207,211 ---- // If we are a stair only the half height counts (round up) if ( tTile.flag2 & 0x04 ) ! staticBlock.height = ( Q_UINT8 ) ( ( tTile.height ) / 2 ); else staticBlock.height = tTile.height; *************** *** 233,237 **** stBlockItem blockItem; ! blockItem.height = tTile.height; blockItem.z = pItem->pos().z; --- 247,251 ---- stBlockItem blockItem; ! blockItem.height = (tTile.flag2 & 0x04) ? (tTile.height / 2) : tTile.height; blockItem.z = pItem->pos().z; *************** *** 265,269 **** stBlockItem blockItem; ! blockItem.height = tTile.height; blockItem.z = pItem->pos().z + multi[j].z; --- 279,283 ---- stBlockItem blockItem; ! blockItem.height = (tTile.flag2 & 0x04) ? (tTile.height / 2) : tTile.height; blockItem.z = pItem->pos().z + multi[j].z; *************** *** 312,315 **** --- 326,335 ---- Q_INT8 itemTop = ( item.z + item.height ); + // If we found something to step on and the next tile + // below would block us, use the good one instead + if (found && (itemTop > pos.z - P_M_MAX_Z_BLOCKS || !item.walkable)) { + break; + } + // If we encounter any object with itemTop <= pos.z which is NOT walkable // Then we can as well just return false as while falling we would be *************** *** 325,337 **** // of any item if ( itemTop < pos.z + P_M_MAX_Z_CLIMB && itemTop >= pos.z - P_M_MAX_Z_FALL ) { pos.z = itemTop; found = true; ! break; // Climbing maptiles is 5 tiles easier } else if ( item.maptile && itemTop < pos.z + P_M_MAX_Z_CLIMB + 5 && itemTop >= pos.z - P_M_MAX_Z_FALL ) { pos.z = itemTop; found = true; break; } else if ( itemTop < pos.z ) { pos.z = itemTop; found = true; --- 345,381 ---- // of any item if ( itemTop < pos.z + P_M_MAX_Z_CLIMB && itemTop >= pos.z - P_M_MAX_Z_FALL ) { + // We already found something to step on above. + // See if it's easier to step down. + if (found && abs(oldz - pos.z) < abs(oldz - itemTop)) { + break; + } + pos.z = itemTop; found = true; ! ! if (item.height > 1) { ! break; ! } ! ! // break; - We can't break here anymore since we have to check if the ground would be easier ! // to step on // Climbing maptiles is 5 tiles easier } else if ( item.maptile && itemTop < pos.z + P_M_MAX_Z_CLIMB + 5 && itemTop >= pos.z - P_M_MAX_Z_FALL ) { + // We already found something to step on above. + // See if it's easier to step down. + if (found && abs(oldz - pos.z) < abs(oldz - itemTop)) { + break; + } + pos.z = itemTop; found = true; break; } else if ( itemTop < pos.z ) { + // We already found something to step on above. + // See if it's easier to step down. + if (found && abs(oldz - pos.z) < abs(oldz - itemTop)) { + break; + } + pos.z = itemTop; found = true; *************** *** 375,383 **** // npcs stop wandering through the walls of multis. I am curious if this code // has other (negative) affects besides that. ! if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS ) ) return false; // Or does it spread the whole range ? ! if ( ( item.z <= oldz ) && ( itemTop >= oldz + P_M_MAX_Z_BLOCKS ) ) return false; } --- 419,427 ---- // npcs stop wandering through the walls of multis. I am curious if this code // has other (negative) affects besides that. ! if ( ( item.z > oldz ) && ( item.z < oldz + P_M_MAX_Z_BLOCKS / 2 ) ) return false; // Or does it spread the whole range ? ! if ( ( item.z <= oldz ) && ( itemTop >= oldz + P_M_MAX_Z_BLOCKS / 2 ) ) return false; } Index: world.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** world.cpp 25 Sep 2004 21:15:46 -0000 1.130 --- world.cpp 1 Oct 2004 16:32:53 -0000 1.131 *************** *** 533,536 **** --- 533,542 ---- } } + + // load server time from db + QString db_time; + QString default_time = Config::instance()->getString( "General", "UO Time", "", true ); + getOption( "worldtime", db_time, default_time ); + UoTime::instance()->setMinutes( db_time.toInt() ); } |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 16:33:03
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11272/python Modified Files: char.cpp Log Message: bugfixes Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.201 retrieving revision 1.202 diff -C2 -d -r1.201 -r1.202 *** char.cpp 30 Sep 2004 19:58:52 -0000 1.201 --- char.cpp 1 Oct 2004 16:32:54 -0000 1.202 *************** *** 2463,2468 **** --- 2463,2492 ---- } + /* + \method char.getopponents + \description This method returns a list of characters this character is fighting with. + \return A list of char objects. + */ + static PyObject* wpChar_getopponents( wpChar* self, PyObject* args ) + { + QPtrList<cFightInfo> &fights = self->pChar->fights(); + PyObject *list = PyList_New(fights.count()); + unsigned int i = 0; + + for ( cFightInfo *fight = fights.first(); fight; fight = fights.next() ) + { + if (fight->attacker() == self->pChar) { + PyList_SetItem(list, i++, fight->victim()->getPyObject()); + } else { + PyList_SetItem(list, i++, fight->attacker()->getPyObject()); + } + } + + return list; + } + static PyMethodDef wpCharMethods[] = { + { "getopponents", ( getattrofunc ) wpChar_getopponents, METH_VARARGS, "Get a list of characters this character is fighting at the moment." }, { "moveto", ( getattrofunc ) wpChar_moveto, METH_VARARGS, "Moves the character to the specified location." }, { "resurrect", ( getattrofunc ) wpChar_resurrect, METH_VARARGS, "Resurrects the character." }, |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 15:16:15
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26899 Modified Files: ChangeLog basedef.cpp basedef.h uobject.cpp Log Message: Fix annoying multi bugs. Index: uobject.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v retrieving revision 1.187 retrieving revision 1.188 diff -C2 -d -r1.187 -r1.188 *** uobject.cpp 26 Sep 2004 14:41:22 -0000 1.187 --- uobject.cpp 1 Oct 2004 15:15:56 -0000 1.188 *************** *** 236,239 **** --- 236,242 ---- serial_ = reader.readInt(); setMulti( dynamic_cast<cMulti*>( World::instance()->findItem( reader.readInt() ) ) ); + if (multi_) { + multi_->addObject(this); + } pos_.x = reader.readShort(); pos_.y = reader.readShort(); Index: basedef.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** basedef.cpp 21 Sep 2004 05:28:04 -0000 1.22 --- basedef.cpp 1 Oct 2004 15:15:56 -0000 1.23 *************** *** 362,365 **** --- 362,366 ---- { id_ = id; + definitionType = WPDT_ITEM; reset(); } *************** *** 419,423 **** inheritID = node->value(); ! const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, inheritID ); if ( element ) applyDefinition( element ); --- 420,424 ---- inheritID = node->value(); ! const cElement* element = Definitions::instance()->getDefinition( definitionType, inheritID ); if ( element ) applyDefinition( element ); *************** *** 435,439 **** { loaded = true; ! const cElement* element = Definitions::instance()->getDefinition( WPDT_ITEM, id_ ); if ( !element ) --- 436,440 ---- { loaded = true; ! const cElement* element = Definitions::instance()->getDefinition( definitionType, id_ ); if ( !element ) *************** *** 455,460 **** if ( it == definitions.end() ) { ! cItemBaseDef* def = new cItemBaseDef( id ); ! it = definitions.insert( id, def ); } --- 456,467 ---- if ( it == definitions.end() ) { ! // Is this a multi base definition? ! if (Definitions::instance()->getDefinition(WPDT_MULTI, id)) { ! cMultiBaseDef* def = new cMultiBaseDef( id ); ! it = definitions.insert( id, def ); ! } else { ! cItemBaseDef* def = new cItemBaseDef( id ); ! it = definitions.insert( id, def ); ! } } *************** *** 682,683 **** --- 689,694 ---- return cBaseDef::getProperty(name); } + + cMultiBaseDef::cMultiBaseDef(const QCString &id) : cItemBaseDef(id) { + definitionType = WPDT_MULTI; + } Index: ChangeLog =================================================================== RCS file: /cvsroot/wpdev/wolfpack/ChangeLog,v retrieving revision 1.87 retrieving revision 1.88 diff -C2 -d -r1.87 -r1.88 *** ChangeLog 30 Sep 2004 12:31:12 -0000 1.87 --- ChangeLog 1 Oct 2004 15:15:56 -0000 1.88 *************** *** 9,12 **** --- 9,15 ---- - Fix bug # 0000341 ( set char.orgname on char creation ) - The bloodcolor for NPCs can now be defined. + - Containers and corpses ignore the object delay. + - Fixed base definitions for multis. + - Fixed items in multis being lost after two saves. Wolfpack 12.9.11 Beta (26. September 2004) Index: basedef.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** basedef.h 21 Sep 2004 05:28:04 -0000 1.18 --- basedef.h 1 Oct 2004 15:15:56 -0000 1.19 *************** *** 29,32 **** --- 29,33 ---- #define __BASEDEF_H__ + #include "definitions.h" #include "definable.h" #include "singleton.h" *************** *** 56,59 **** --- 57,62 ---- virtual void load() = 0; void refreshScripts(); + + eDefCategory definitionType; public: void processNode( const cElement* node ); *************** *** 359,362 **** --- 362,371 ---- }; + class cMultiBaseDef : public cItemBaseDef + { + public: + cMultiBaseDef( const QCString& id ); + }; + typedef SingletonHolder<cItemBaseDefs> ItemBaseDefs; |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 14:29:33
|
Update of /cvsroot/wpdev/xmlscripts/documentation/webroot In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16832/webroot Modified Files: ChangeLog.wolfpack Log Message: made leather containers dyable fixed categories for curtains Index: ChangeLog.wolfpack =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/documentation/webroot/ChangeLog.wolfpack,v retrieving revision 1.130 retrieving revision 1.131 diff -C2 -d -r1.130 -r1.131 *** ChangeLog.wolfpack 30 Sep 2004 12:46:59 -0000 1.130 --- ChangeLog.wolfpack 1 Oct 2004 14:29:24 -0000 1.131 *************** *** 8,11 **** --- 8,13 ---- - Added data for item flipping for carpentry items. - Added bloodcolor for undeads. + - Made leather containers dyable. + - Fixed categories for curtains. * Python Script Changes: - Fixed BONUS* properties. |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 14:29:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/buildings In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16761/items/buildings Modified Files: curtains.xml Log Message: made leather containers dyable fixed categories for curtains Index: curtains.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/buildings/curtains.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** curtains.xml 1 Jul 2004 23:51:25 -0000 1.8 --- curtains.xml 1 Oct 2004 14:29:04 -0000 1.9 *************** *** 15,19 **** <id>0x980</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 1</categories> </item> --- 15,19 ---- <id>0x980</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 1</category> </item> *************** *** 21,25 **** <id>0x981</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 2</categories> </item> --- 21,25 ---- <id>0x981</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 2</category> </item> *************** *** 27,31 **** <id>0x982</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 3</categories> </item> --- 27,31 ---- <id>0x982</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 3</category> </item> *************** *** 33,37 **** <id>0x983</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 4</categories> </item> --- 33,37 ---- <id>0x983</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 4</category> </item> *************** *** 39,43 **** <id>0x984</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 5</categories> </item> --- 39,43 ---- <id>0x984</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 5</category> </item> *************** *** 45,49 **** <id>0x985</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 6</categories> </item> --- 45,49 ---- <id>0x985</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 6</category> </item> *************** *** 51,55 **** <id>0x986</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 7</categories> </item> --- 51,55 ---- <id>0x986</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 7</category> </item> *************** *** 57,61 **** <id>0x987</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 8</categories> </item> --- 57,61 ---- <id>0x987</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 8</category> </item> *************** *** 63,67 **** <id>0x988</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 9</categories> </item> --- 63,67 ---- <id>0x988</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 9</category> </item> *************** *** 69,73 **** <id>0x989</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 10</categories> </item> --- 69,73 ---- <id>0x989</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 10</category> </item> *************** *** 75,79 **** <id>0x98a</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 11</categories> </item> --- 75,79 ---- <id>0x98a</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 11</category> </item> *************** *** 81,85 **** <id>0x98b</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 12</categories> </item> --- 81,85 ---- <id>0x98b</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 12</category> </item> *************** *** 87,91 **** <id>0x160d</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 13</categories> </item> --- 87,91 ---- <id>0x160d</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 13</category> </item> *************** *** 93,97 **** <id>0x160e</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 14</categories> </item> --- 93,97 ---- <id>0x160e</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 14</category> </item> *************** *** 99,103 **** <id>0x3ed8</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 15</categories> </item> --- 99,103 ---- <id>0x3ed8</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 15</category> </item> *************** *** 105,109 **** <id>0x3ed9</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 16</categories> </item> --- 105,109 ---- <id>0x3ed9</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 16</category> </item> *************** *** 111,115 **** <id>0x3eda</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 17</categories> </item> --- 111,115 ---- <id>0x3eda</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 17</category> </item> *************** *** 117,121 **** <id>0x3edb</id> <nodecay /> ! <categories>Decoration\Curtains\Red Curtain\Red Curtain 18</categories> </item> --- 117,121 ---- <id>0x3edb</id> <nodecay /> ! <category>Decoration\Curtains\Red Curtain\Red Curtain 18</category> </item> *************** *** 123,127 **** <id>0x12da</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 1</categories> </item> --- 123,127 ---- <id>0x12da</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 1</category> </item> *************** *** 129,133 **** <id>0x12db</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 2</categories> </item> --- 129,133 ---- <id>0x12db</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 2</category> </item> *************** *** 135,139 **** <id>0x12dc</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 3</categories> </item> --- 135,139 ---- <id>0x12dc</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 3</category> </item> *************** *** 141,145 **** <id>0x12dd</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 4</categories> </item> --- 141,145 ---- <id>0x12dd</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 4</category> </item> *************** *** 147,151 **** <id>0x12de</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 5</categories> </item> --- 147,151 ---- <id>0x12de</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 5</category> </item> *************** *** 153,157 **** <id>0x12df</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 6</categories> </item> --- 153,157 ---- <id>0x12df</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 6</category> </item> *************** *** 159,163 **** <id>0x12e0</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 7</categories> </item> --- 159,163 ---- <id>0x12e0</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 7</category> </item> *************** *** 165,169 **** <id>0x12e1</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (W/E) 8</categories> </item> --- 165,169 ---- <id>0x12e1</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (W/E) 8</category> </item> *************** *** 171,175 **** <id>0x12e2</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 1</categories> </item> --- 171,175 ---- <id>0x12e2</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 1</category> </item> *************** *** 177,181 **** <id>0x12e3</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 2</categories> </item> --- 177,181 ---- <id>0x12e3</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 2</category> </item> *************** *** 183,187 **** <id>0x12e4</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 3</categories> </item> --- 183,187 ---- <id>0x12e4</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain Sash (W/E) 3</category> </item> *************** *** 189,193 **** <id>0x12e5</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 1</categories> </item> --- 189,193 ---- <id>0x12e5</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 1</category> </item> *************** *** 195,199 **** <id>0x12e6</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 2</categories> </item> --- 195,199 ---- <id>0x12e6</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 2</category> </item> *************** *** 201,205 **** <id>0x12e7</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 3</categories> </item> --- 201,205 ---- <id>0x12e7</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 3</category> </item> *************** *** 207,211 **** <id>0x12e8</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 4</categories> </item> --- 207,211 ---- <id>0x12e8</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 4</category> </item> *************** *** 213,217 **** <id>0x12e9</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 5</categories> </item> --- 213,217 ---- <id>0x12e9</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 5</category> </item> *************** *** 219,223 **** <id>0x12ea</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 6</categories> </item> --- 219,223 ---- <id>0x12ea</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 6</category> </item> *************** *** 225,229 **** <id>0x12eb</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 7</categories> </item> --- 225,229 ---- <id>0x12eb</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 7</category> </item> *************** *** 231,235 **** <id>0x12ec</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain (N/S) 8</categories> </item> --- 231,235 ---- <id>0x12ec</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain (N/S) 8</category> </item> *************** *** 237,241 **** <id>0x12ed</id> <nodecay /> ! <categories>Decoration\Curtains\White Curtain\White Curtain Sash (N/S)</categories> </item> --- 237,241 ---- <id>0x12ed</id> <nodecay /> ! <category>Decoration\Curtains\White Curtain\White Curtain Sash (N/S)</category> </item> *************** *** 243,247 **** <id>0x154e</id> <nodecay /> ! <categories>Decoration\Curtains\Standing Red Curtain\Red Curtain (1/3)</categories> </item> --- 243,247 ---- <id>0x154e</id> <nodecay /> ! <category>Decoration\Curtains\Standing Red Curtain\Red Curtain (1/3)</category> </item> *************** *** 249,253 **** <id>0x154f</id> <nodecay /> ! <categories>Decoration\Curtains\Standing Red Curtain\Red Curtain (3/3)</categories> </item> --- 249,253 ---- <id>0x154f</id> <nodecay /> ! <category>Decoration\Curtains\Standing Red Curtain\Red Curtain (3/3)</category> </item> *************** *** 255,259 **** <id>0x1557</id> <nodecay /> ! <categories>Decoration\Curtains\Standing Red Curtain\Red Curtain (2/3)</categories> </item> --- 255,259 ---- <id>0x1557</id> <nodecay /> ! <category>Decoration\Curtains\Standing Red Curtain\Red Curtain (2/3)</category> </item> *************** *** 261,265 **** <id>0x159e</id> <nodecay /> ! <categories>Decoration\Curtains\Small White Curtains\White Curtain 1 (W/E)</categories> </item> --- 261,265 ---- <id>0x159e</id> <nodecay /> ! <category>Decoration\Curtains\Small White Curtains\White Curtain 1 (W/E)</category> </item> *************** *** 267,271 **** <id>0x159f</id> <nodecay /> ! <categories>Decoration\Curtains\Small White Curtains\White Curtain 1 (N/S)</categories> </item> --- 267,271 ---- <id>0x159f</id> <nodecay /> ! <category>Decoration\Curtains\Small White Curtains\White Curtain 1 (N/S)</category> </item> *************** *** 273,277 **** <id>0x15f6</id> <nodecay /> ! <categories>Decoration\Curtains\Small White Curtains\White Curtain 2 (W/E)</categories> </item> --- 273,277 ---- <id>0x15f6</id> <nodecay /> ! <category>Decoration\Curtains\Small White Curtains\White Curtain 2 (W/E)</category> </item> *************** *** 279,283 **** <id>0x15f7</id> <nodecay /> ! <categories>Decoration\Curtains\Small White Curtains\White Curtain 2 (N/S)</categories> </item> --- 279,283 ---- <id>0x15f7</id> <nodecay /> ! <category>Decoration\Curtains\Small White Curtains\White Curtain 2 (N/S)</category> </item> *************** *** 285,289 **** <id>0x1638</id> <nodecay /> ! <categories>Decoration\Curtains\Small Red Curtain\Red Curtain 1</categories> </item> --- 285,289 ---- <id>0x1638</id> <nodecay /> ! <category>Decoration\Curtains\Small Red Curtain\Red Curtain 1</category> </item> *************** *** 291,295 **** <id>0x1639</id> <nodecay /> ! <categories>Decoration\Curtains\Small Red Curtain\Red Curtain 2</categories> </item> --- 291,295 ---- <id>0x1639</id> <nodecay /> ! <category>Decoration\Curtains\Small Red Curtain\Red Curtain 2</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 14:29:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/items/equipment In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16761/items/equipment Modified Files: containers.xml Log Message: made leather containers dyable fixed categories for curtains Index: containers.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/items/equipment/containers.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** containers.xml 29 Sep 2004 01:43:54 -0000 1.14 --- containers.xml 1 Oct 2004 14:29:05 -0000 1.15 *************** *** 49,52 **** --- 49,53 ---- <category>Equipment\Containers\Belt Pouch (N/S)</category> <weight>1.0</weight> + <dye /> </item> *************** *** 87,90 **** --- 88,92 ---- <weight>2.0</weight> <buyprice>6</buyprice> + <dye /> </item> *************** *** 96,99 **** --- 98,102 ---- <weight>1.0</weight> <buyprice>6</buyprice> + <dye /> </item> *************** *** 105,113 **** <weight>3.0</weight> <buyprice>15</buyprice> </item> <item id="9b2" inherit="e75"> <id>0x9b2</id> ! <category>Equipment\Containers\Backpack (N/S)</category> </item> --- 108,117 ---- <weight>3.0</weight> <buyprice>15</buyprice> + <dye /> </item> <item id="9b2" inherit="e75"> <id>0x9b2</id> ! <category>Equipment\Containers\Backpack (N/S)</category> </item> |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 10:44:51
|
Update of /cvsroot/wpdev/xmlscripts/scripts/combat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4238/combat Modified Files: aos.py Log Message: Combat gain fixes Index: aos.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/combat/aos.py,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** aos.py 27 Sep 2004 14:37:25 -0000 1.20 --- aos.py 1 Oct 2004 10:44:31 -0000 1.21 *************** *** 16,20 **** # Normalize chance = min(1.0, max(0.02, chance)) ! minskill = (1.0 - chance) * 1200 maxskill = 1200 char.checkskill(skill, minskill, maxskill) --- 16,20 ---- # Normalize chance = min(1.0, max(0.02, chance)) ! minskill = min(char.skill[skill], (1.0 - chance) * 1200) maxskill = 1200 char.checkskill(skill, minskill, maxskill) |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 10:33:04
|
Update of /cvsroot/wpdev/xmlscripts/scripts/system In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1772 Modified Files: skillgain.py Log Message: Fix for skillgain Index: skillgain.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/system/skillgain.py,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** skillgain.py 28 Sep 2004 11:55:42 -0000 1.10 --- skillgain.py 1 Oct 2004 10:32:53 -0000 1.11 *************** *** 211,215 **** # No gain for effortless or futile attempts ! if value < lower or value >= higher: return --- 211,215 ---- # No gain for effortless or futile attempts ! if value >= higher: return |
|
From: Sebastian H. <dar...@us...> - 2004-10-01 10:15:05
|
Update of /cvsroot/wpdev/wolfpack/network In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30480/network Modified Files: uosocket.cpp Log Message: containers and corpses now ignore the object delay Index: uosocket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v retrieving revision 1.421 retrieving revision 1.422 diff -C2 -d -r1.421 -r1.422 *** uosocket.cpp 29 Sep 2004 19:08:17 -0000 1.421 --- uosocket.cpp 1 Oct 2004 10:14:52 -0000 1.422 *************** *** 3065,3075 **** bool cUOSocket::useItem( P_ITEM item ) { ! if ( !_player->isGM() && _player->objectDelay() >= Server::instance()->time() ) ! { ! sysMessage( tr( "You must wait to perform another action." ) ); ! return false; } - else - _player->setObjectDelay( Config::instance()->objectDelay() * MY_CLOCKS_PER_SEC + Server::instance()->time() ); // Cant use stuff that isn't in your pack. --- 3065,3077 ---- bool cUOSocket::useItem( P_ITEM item ) { ! if (item->type() != 1 && !item->corpse()) { ! if ( !_player->isGM() && _player->objectDelay() >= Server::instance()->time() ) ! { ! sysMessage( tr( "You must wait to perform another action." ) ); ! return false; ! } ! else ! _player->setObjectDelay( Config::instance()->objectDelay() * MY_CLOCKS_PER_SEC + Server::instance()->time() ); } // Cant use stuff that isn't in your pack. |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 19:59:01
|
Update of /cvsroot/wpdev/wolfpack/python In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345/python Modified Files: char.cpp item.cpp socket.cpp utilities.h Log Message: UCS4 fixes Index: item.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/item.cpp,v retrieving revision 1.134 retrieving revision 1.135 diff -C2 -d -r1.134 -r1.135 *** item.cpp 27 Sep 2004 22:26:24 -0000 1.134 --- item.cpp 30 Sep 2004 19:58:52 -0000 1.135 *************** *** 396,400 **** if ( value.type() == cVariant::String ) ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.toString().ucs2(), value.toString().length() ); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); --- 396,400 ---- if ( value.type() == cVariant::String ) ! return QString2Python(value.toString()); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); Index: socket.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/socket.cpp,v retrieving revision 1.86 retrieving revision 1.87 diff -C2 -d -r1.86 -r1.87 *** socket.cpp 19 Sep 2004 22:13:36 -0000 1.86 --- socket.cpp 30 Sep 2004 19:58:52 -0000 1.87 *************** *** 686,690 **** if ( value.type() == cVariant::String ) ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.toString().ucs2(), value.toString().length() ); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); --- 686,690 ---- if ( value.type() == cVariant::String ) ! return QString2Python(value.toString()); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); Index: utilities.h =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/utilities.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** utilities.h 10 Sep 2004 04:10:37 -0000 1.45 --- utilities.h 30 Sep 2004 19:58:52 -0000 1.46 *************** *** 141,145 **** --- 141,151 ---- else { + #if defined(Py_UNICODE_WIDE) + QCString utf = string.utf8(); + PyObject *obj = PyUnicode_DecodeUTF8( utf.data(), utf.length(), "" ); + return obj; + #else return PyUnicode_FromUnicode( ( Py_UNICODE * ) string.ucs2(), string.length() ); + #endif } } Index: char.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/python/char.cpp,v retrieving revision 1.200 retrieving revision 1.201 diff -C2 -d -r1.200 -r1.201 *** char.cpp 27 Sep 2004 22:48:38 -0000 1.200 --- char.cpp 30 Sep 2004 19:58:52 -0000 1.201 *************** *** 969,973 **** if ( value.type() == cVariant::String ) ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.toString().ucs2(), value.toString().length() ); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); --- 969,973 ---- if ( value.type() == cVariant::String ) ! return QString2Python(value.toString()); else if ( value.type() == cVariant::Int ) return PyInt_FromLong( value.asInt() ); |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 19:59:00
|
Update of /cvsroot/wpdev/wolfpack In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9345 Modified Files: dbdriver.cpp guilds.cpp Log Message: UCS4 fixes Index: dbdriver.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/dbdriver.cpp,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** dbdriver.cpp 22 Aug 2004 02:29:50 -0000 1.45 --- dbdriver.cpp 30 Sep 2004 19:58:51 -0000 1.46 *************** *** 264,268 **** QString value = self->result->getString( pos ); ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); } --- 264,268 ---- QString value = self->result->getString( pos ); ! return QString2Python(value); } Index: guilds.cpp =================================================================== RCS file: /cvsroot/wpdev/wolfpack/guilds.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** guilds.cpp 22 Aug 2004 02:29:50 -0000 1.23 --- guilds.cpp 30 Sep 2004 19:58:51 -0000 1.24 *************** *** 571,583 **** PyDict_SetItemString( result, "showsign", PyInt_FromLong( info->showSign() ? 1 : 0 ) ); PyDict_SetItemString( result, "joined", PyInt_FromLong( info->joined() ) ); ! ! if ( info->guildTitle().isNull() ) ! { ! PyDict_SetItemString( result, "guildtitle", PyUnicode_FromWideChar( L"", 0 ) ); ! } ! else ! { ! PyDict_SetItemString( result, "guildtitle", PyUnicode_FromUnicode( ( Py_UNICODE * ) info->guildTitle().ucs2(), info->guildTitle().length() ) ); ! } return result; --- 571,575 ---- PyDict_SetItemString( result, "showsign", PyInt_FromLong( info->showSign() ? 1 : 0 ) ); PyDict_SetItemString( result, "joined", PyInt_FromLong( info->joined() ) ); ! PyDict_SetItemString( result, "guildtitle", QString2Python(info->guildTitle()) ); return result; *************** *** 663,674 **** { const QString& value = self->guild->name(); ! if ( value == QString::null ) ! { ! return PyUnicode_FromWideChar( L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } /* --- 655,659 ---- { const QString& value = self->guild->name(); ! return QString2Python(value); } /* *************** *** 678,689 **** { const QString& value = self->guild->abbreviation(); ! if ( value == QString::null ) ! { ! return PyUnicode_FromWideChar( L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } /* --- 663,667 ---- { const QString& value = self->guild->abbreviation(); ! return QString2Python(value); } /* *************** *** 693,704 **** { const QString& value = self->guild->charta(); ! if ( value == QString::null ) ! { ! return PyUnicode_FromWideChar( L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } /* --- 671,675 ---- { const QString& value = self->guild->charta(); ! return QString2Python(value); } /* *************** *** 708,719 **** { const QString& value = self->guild->website(); ! if ( value == QString::null ) ! { ! return PyUnicode_FromWideChar( L"", 0 ); ! } ! else ! { ! return PyUnicode_FromUnicode( ( Py_UNICODE * ) value.ucs2(), value.length() ); ! } } /* --- 679,683 ---- { const QString& value = self->guild->website(); ! return QString2Python(value); } /* |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 16:36:14
|
Update of /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv799/npcs/humans/vendors Modified Files: healer.xml Log Message: more bandages Index: healer.xml =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/definitions/npcs/humans/vendors/healer.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** healer.xml 26 Sep 2004 12:52:23 -0000 1.5 --- healer.xml 30 Sep 2004 16:35:53 -0000 1.6 *************** *** 17,21 **** <restockable> <item id="e21"> ! <amount>10</amount> </item> <item id="f07"> --- 17,21 ---- <restockable> <item id="e21"> ! <amount>200</amount> </item> <item id="f07"> |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 16:01:53
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26709/magic Modified Files: circle1.py Log Message: nightsight changes Index: circle1.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle1.py,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** circle1.py 30 Sep 2004 15:57:31 -0000 1.13 --- circle1.py 30 Sep 2004 16:01:12 -0000 1.14 *************** *** 134,138 **** # With 100% magery you gain a 18 light level bonus ! bonus = max(6, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) target.addscript( 'magic.nightsight' ) --- 134,138 ---- # With 100% magery you gain a 18 light level bonus ! bonus = max(8, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) target.addscript( 'magic.nightsight' ) |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 16:01:38
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26709 Modified Files: potions.py Log Message: nightsight changes Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.56 retrieving revision 1.57 diff -C2 -d -r1.56 -r1.57 *** potions.py 30 Sep 2004 15:57:31 -0000 1.56 --- potions.py 30 Sep 2004 16:01:14 -0000 1.57 *************** *** 369,373 **** # With 100% magery you gain a 18 light level bonus (min. 5) ! bonus = max(6, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) char.addscript('magic.nightsight') --- 369,373 ---- # With 100% magery you gain a 18 light level bonus (min. 5) ! bonus = max(8, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) char.addscript('magic.nightsight') |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 15:57:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25945 Modified Files: potions.py Log Message: nightsight changes Index: potions.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/potions.py,v retrieving revision 1.55 retrieving revision 1.56 diff -C2 -d -r1.55 -r1.56 *** potions.py 29 Sep 2004 10:42:47 -0000 1.55 --- potions.py 30 Sep 2004 15:57:31 -0000 1.56 *************** *** 362,365 **** --- 362,366 ---- def nightsightPotion( char, potion ): socket = char.socket + # Remove an old bonus if char.hastag('nightsight'): *************** *** 367,376 **** char.lightbonus = max(0, char.lightbonus - bonus) ! # With 100% magery you gain a 18 light level bonus ! bonus = min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0))) ! char.addscript( 'magic.nightsight' ) ! char.settag( 'nightsight', bonus) ! char.settag( 'nightsight_start', wolfpack.time.minutes()) char.lightbonus += bonus --- 368,377 ---- char.lightbonus = max(0, char.lightbonus - bonus) ! # With 100% magery you gain a 18 light level bonus (min. 5) ! bonus = max(6, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) ! char.addscript('magic.nightsight') ! char.settag('nightsight', bonus) ! char.settag('nightsight_start', wolfpack.time.minutes()) char.lightbonus += bonus *************** *** 378,381 **** --- 379,383 ---- socket.updatelightlevel() + char.action(ANIM_FIDGET3) char.soundeffect(0x1e3) char.effect(0x376a, 9, 32) |
|
From: Sebastian H. <dar...@us...> - 2004-09-30 15:57:41
|
Update of /cvsroot/wpdev/xmlscripts/scripts/magic In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25945/magic Modified Files: circle1.py Log Message: nightsight changes Index: circle1.py =================================================================== RCS file: /cvsroot/wpdev/xmlscripts/scripts/magic/circle1.py,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** circle1.py 25 Aug 2004 17:03:05 -0000 1.12 --- circle1.py 30 Sep 2004 15:57:31 -0000 1.13 *************** *** 134,138 **** # With 100% magery you gain a 18 light level bonus ! bonus = min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0))) target.addscript( 'magic.nightsight' ) --- 134,138 ---- # With 100% magery you gain a 18 light level bonus ! bonus = max(6, min(18, math.floor(18 * (char.skill[MAGERY] / 1000.0)))) target.addscript( 'magic.nightsight' ) |
