From 1518f177b5786e420b8799ee4acfb513e5c2e12e Mon Sep 17 00:00:00 2001 From: euphyy Date: Fri, 10 Aug 2012 15:58:07 +0000 Subject: * Follow-up r16618, fixed SQL entry as well (sql-files/mob_db_re.sql) * Follow-up r16616, forgot the pre-re/re split files... (npc/(pre-)re/kafras/) * Merged changes in eAthena 15164 and 15165 (doc/packet_struct_notation.txt) * Removed unreadable characters in various files git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16619 54d463be-8e91-2dee-dedb-b68131a5f0ec --- doc/packet_struct_notation.txt | 42 ++++++++++++++++++++++++++++++++++++--- npc/cities/gonryun.txt | 2 +- npc/cities/payon.txt | 2 +- npc/cities/umbala.txt | 2 +- npc/pre-re/kafras/kafras_izl.txt | 14 ++++++------- npc/re/kafras/kafras_brasilis.txt | 14 ++++++------- npc/re/kafras/kafras_izl.txt | 14 ++++++------- sql-files/mob_db_re.sql | 4 ++-- 8 files changed, 65 insertions(+), 29 deletions(-) diff --git a/doc/packet_struct_notation.txt b/doc/packet_struct_notation.txt index 7c3974da2..0ce87289c 100644 --- a/doc/packet_struct_notation.txt +++ b/doc/packet_struct_notation.txt @@ -3,9 +3,10 @@ //===== By ================================================ //= Ai4rei //===== Version =========================================== -//= 1.0 +//= 1.1 //========================================================= //= 1.0 - Initial version. +//= 1.1 - Added examples. //===== Description ======================================= //= Explanation how packets are and should be documented. //========================================================= @@ -27,7 +28,7 @@ regardless of architecture. /// 0 = owner (menu) /// 1 = normal -The first line contain a brief description of what the packet does, +The first line contains a brief description of what the packet does, or what it is good for, followed by it's AEGIS name in parentheses; first two letters of the AEGIS name specify origin (first letter) and destination (second letter) of the packet. If the packet's name @@ -60,7 +61,7 @@ values. B = 1 byte (byte) W = 2 bytes (word) - L = 4 bytes (dword) + L = 4 bytes (long, dword) Q = 8 bytes (quad) nB = n bytes @@ -83,3 +84,38 @@ values. I = Inter S = Server (any type of server) Z = Zone (Map) + += Examples = + +Packet with nested repetition blocks: + + /// Presents a textual list of producable items (ZC_MAKABLEITEMLIST). + /// 018d .W { .W { .W }*3 }* + /// material id: + /// unused by the client + +Packet with multiple versions identified with different AEGIS names: + + /// Request for server's tick. + /// 007e .L (CZ_REQUEST_TIME) + /// 0360 .L (CZ_REQUEST_TIME2) + +Packet with multiple versions identified with same AEGIS name: + + /// Cashshop Buy Ack (ZC_PC_CASH_POINT_UPDATE). + /// 0289 .L .W + /// 0289 .L .L .W (PACKETVER >= 20070711) + +Packet with combination of both different AEGIS names and different +versions with same name: + + /// Sends hotkey bar. + /// 02b9 { .B .L .W }*27 (ZC_SHORTCUT_KEY_LIST) + /// 07d9 { .B .L .W }*36 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090603) + /// 07d9 { .B .L .W }*38 (ZC_SHORTCUT_KEY_LIST_V2, PACKETVER >= 20090617) + +Packet for a client command: + + /// /item /monster (CZ_ITEM_CREATE). + /// Request to make items or spawn monsters. + /// 013f .24B diff --git a/npc/cities/gonryun.txt b/npc/cities/gonryun.txt index 314513b75..937fe0413 100644 --- a/npc/cities/gonryun.txt +++ b/npc/cities/gonryun.txt @@ -412,7 +412,7 @@ gonryun,169,71,3 script Guidev#gon 770,{ // Old changelog //============================================================ // May be missing npc's and dialogue. -//= 1.1 Fixed Typo�s [Nexon] +//= 1.1 Fixed Typos [Nexon] //= 1.2 Removed Duplicates [Silent] //= 1.3 Max NPC Name is 23 [Toms] //= 1.3a Removed temp NPC plugs due Broken Sword quest [Lupus] diff --git a/npc/cities/payon.txt b/npc/cities/payon.txt index 4af9f6d78..4d85c3a9c 100644 --- a/npc/cities/payon.txt +++ b/npc/cities/payon.txt @@ -16,7 +16,7 @@ //= 1.5b - Used Dino9021's script for the Gemstone exchanger [DracoRPG] //= 1.5b1 fixed Gemstone Exchanger NPC [Lupus] //= 1.5b2 added adv.classes/baby classes support [Lupus] -//= 1.6 Fixed typo�s [Nexon] +//= 1.6 Fixed typos [Nexon] //= 1.7 Fixed bugs and exploits V__V [Lupus] //= 1.8 Removed Duplicates [Silent] //= 1.9 Fixed missing next;'s [Evera] diff --git a/npc/cities/umbala.txt b/npc/cities/umbala.txt index 5bf25f350..57ffafd2d 100644 --- a/npc/cities/umbala.txt +++ b/npc/cities/umbala.txt @@ -15,7 +15,7 @@ //= 1.2 - Fixed Something by Muad Dib //= 1.3 - Fixed up For eA by Darkchild //= 1.4 - Fixed some wrong item names [Lupus] -//= 1.5 � Spell Checked [massdriller] +//= 1.5 - Spell Checked [massdriller] //= 1.6 - Fixed item names, added a chance to get to Niflheim via Jumping Bungy Area [Lupus] //= 1.7 - Fixed bugs and exploits [Lupus] //= 1.8 - Warps you to Niff with 1HP [Lance] diff --git a/npc/pre-re/kafras/kafras_izl.txt b/npc/pre-re/kafras/kafras_izl.txt index 7b0abcd52..ba2081fd6 100644 --- a/npc/pre-re/kafras/kafras_izl.txt +++ b/npc/pre-re/kafras/kafras_izl.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Izlude Kafras -//===== By: ========================= +//===== By: ================================================== //= Daegaladh -//===== Current Version: =================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================== +//===== Compatible With: ===================================== //= rAthena SVN -//===== Description: ============================================ +//===== Description: ========================================= //= Izlude Kafras. -//===== Additional Comments: ========================================== +//===== Additional Comments: ================================= //= 1.0 First version. -//===================================================================== +//============================================================ izlude,134,87,3 duplicate(kaf_izlude) Kafra Employee 117 diff --git a/npc/re/kafras/kafras_brasilis.txt b/npc/re/kafras/kafras_brasilis.txt index 2c0da8bcb..b495c1ec8 100644 --- a/npc/re/kafras/kafras_brasilis.txt +++ b/npc/re/kafras/kafras_brasilis.txt @@ -1,12 +1,12 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= Brasilis Kafra -//===== By: ========================= +//===== By: ================================================== //= L0ne_W0lf -//===== Current Version: =================== +//===== Current Version: ===================================== //= 1.2 -//===== Compatible With: ===================== +//===== Compatible With: ===================================== //= rAthena 1.0 -//===== Description: ============================================ +//===== Description: ========================================= //= Description of argument settings for callfunc "F_Kafra". //= arg(0): When set at 0 the default Kafra message is displayed. //= When set to 1 the Niflhiem Kafra message is displayed. @@ -15,11 +15,11 @@ //= arg(2): Set to 1 to disable info menu. Otherwise set to 0. //= arg(3): Cost of Storage service //= arg(4): Cost of Rent a Pushcart service -//===== Additional Comments: ========================================== +//===== Additional Comments: ================================= //= 1.0 First version. //= 1.1 Updated save point coordinates. //= 1.2 Removed custom text. [Daegaladh] -//===================================================================== +//============================================================ brasilis,197,221,4 script Kafra Employee::kaf_bra 117,{ cutin "kafra_01",2; diff --git a/npc/re/kafras/kafras_izl.txt b/npc/re/kafras/kafras_izl.txt index eac206dc9..96bf3e2ef 100644 --- a/npc/re/kafras/kafras_izl.txt +++ b/npc/re/kafras/kafras_izl.txt @@ -1,15 +1,15 @@ -//===== rAthena Script ======================================= +//===== rAthena Script ======================================= //= New Izlude Kafras -//===== By: ========================= +//===== By: ================================================== //= Daegaladh -//===== Current Version: =================== +//===== Current Version: ===================================== //= 1.0 -//===== Compatible With: ===================== +//===== Compatible With: ===================================== //= rAthena SVN -//===== Description: ============================================ +//===== Description: ========================================= //= Izlude Kafras with renewal coordinates. -//===== Additional Comments: ========================================== +//===== Additional Comments: ================================= //= 1.0 First version. -//===================================================================== +//============================================================ izlude,128,148,6 duplicate(kaf_izlude) Kafra Employee 117 diff --git a/sql-files/mob_db_re.sql b/sql-files/mob_db_re.sql index 97af92d78..86c96986a 100644 --- a/sql-files/mob_db_re.sql +++ b/sql-files/mob_db_re.sql @@ -1274,7 +1274,7 @@ REPLACE INTO `mob_db` VALUES (2092,'DOLOMEDES','Dolomedes','Dolomedes',132,54591 REPLACE INTO `mob_db` VALUES (2093,'BOTARING','Botaring','Botaring',15,15,1,7,7,2,20,40,20,20,10,10,10,10,77,77,10,12,0,0,26,0x81,170,1872,672,480,0,0,0,0,0,0,0,12492,7000,12492,3500,12492,1000,5204,700,664,2000,665,2000,666,2000,0,0,0,0,603,500); # Additional MVPs -REPLACE INTO `mob_db` VALUES (2094,'E_ORK_HERO2','Orc Hero','1',50,362000,1,2010,2010,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,1005,725,2000,607,5000,607,5000,968,9700,10018,500,1366,150,12539,50,1124,1000,985,4559,1387,100,0,0,0,0,4143,1); +REPLACE INTO `mob_db` VALUES (2094,'E_ORK_HERO2','Orc Hero','Orc Hero',50,362000,1,2010,2010,1,662,1103,197,70,97,82,107,71,144,43,10,12,2,7,42,0x37B5,150,1678,780,648,1005,725,2000,607,5000,607,5000,968,9700,10018,500,1366,150,12539,50,1124,1000,985,4559,1387,100,0,0,0,0,4143,1); REPLACE INTO `mob_db` VALUES (2095,'E_EDDGA','Eddga','Eddga',65,247500,1,2010,2010,1,866,1342,166,70,92,80,103,66,90,85,10,12,2,2,23,0x37B5,300,872,1344,432,1005,1030,5000,1030,3000,1030,3000,1133,150,2268,250,518,10000,12539,50,1030,250,985,2300,13046,100,0,0,0,0,4074,1); REPLACE INTO `mob_db` VALUES (2096,'E_OSIRIS2','Osiris','Osiris',68,475840,1,2010,2010,1,1580,2483,172,164,97,99,86,131,145,67,10,12,1,1,89,0x37B5,100,1072,672,384,1005,603,2000,608,500,608,500,617,2000,1232,150,2235,200,12539,50,1009,1000,5053,150,1285,100,0,0,0,0,4144,1); REPLACE INTO `mob_db` VALUES (2097,'E_DRACULA','Dracula','Dracula',75,350000,1,2010,2010,3,1322,3134,152,146,86,99,88,92,145,82,10,12,2,6,87,0x37B5,145,1290,1140,576,1005,607,5500,732,5000,732,5000,607,4700,1473,5,1722,5,2507,15,2621,4,1557,4,12539,50,0,0,0,0,4134,1); @@ -1283,7 +1283,7 @@ REPLACE INTO `mob_db` VALUES (2099,'E_MISTRESS','Mistress','Mistress',78,378000, REPLACE INTO `mob_db` VALUES (2100,'E_BAPHOMET2','Baphomet','Baphomet',81,668000,1,2010,2010,2,2864,4148,279,45,120,125,30,85,155,85,10,12,2,6,67,0x37B5,100,768,768,576,1005,607,2000,750,5000,750,5000,12539,100,2256,300,1476,50,714,500,5160,10,985,5432,984,4171,0,0,0,0,4147,1); REPLACE INTO `mob_db` VALUES (2101,'E_LORD_OF_DEATH2','Lord of Death','Lord of the Dead',94,603883,1,2010,2010,3,4116,5078,336,73,140,99,30,109,100,90,10,12,2,6,67,0x37B5,180,1446,1296,360,1005,607,5500,732,5000,732,5000,7108,5335,1417,5,12539,100,2621,2,7109,10,1306,1,1529,2,0,0,0,0,4210,1); REPLACE INTO `mob_db` VALUES (2102,'E_DARKLORD','Dark Lord','Dark Lord',1,1,0,0,0,1,1,2,2,0,1,1,1,1,1,1,10,12,2,6,20,0x37B5,100,868,768,480,0,0,0,0,0,0,0,12396,5000,12397,5000,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0); -REPLACE INTO `mob_db` VALUES (2103,'E_KTULLANUX','Ktullanux','1',98,2626000,1,2010,2010,3,2888,5568,129,78,85,126,30,125,177,112,10,12,2,2,81,0x37B5,400,432,840,216,1005,607,5500,617,5000,617,5000,7562,9000,616,3000,2509,3000,2111,5000,617,5000,607,5000,12539,100,0,0,0,0,4419,1); +REPLACE INTO `mob_db` VALUES (2103,'E_KTULLANUX','Ktullanux','Ktullanux',98,2626000,1,2010,2010,3,2888,5568,129,78,85,126,30,125,177,112,10,12,2,2,81,0x37B5,400,432,840,216,1005,607,5500,617,5000,617,5000,7562,9000,616,3000,2509,3000,2111,5000,617,5000,607,5000,12539,100,0,0,0,0,4419,1); REPLACE INTO `mob_db` VALUES (2104,'E_DARK_SNAKE_LORD','Dark Snake Lord','Evil Snake Lord',105,1101000,1,2010,2010,3,2217,4203,314,185,122,172,107,135,196,88,10,12,2,2,68,0x37B5,200,588,816,420,1005,607,5500,617,5500,617,5500,7169,5820,10020,5100,1471,80,12539,50,1474,500,7226,900,661,2000,0,0,0,0,4330,1); REPLACE INTO `mob_db` VALUES (2105,'E_TURTLE_GENERAL','Turtle General','Turtle General',110,1442000,1,2010,2010,2,2438,4504,394,123,116,123,154,99,181,98,10,12,2,2,42,0x37B5,200,900,1000,500,1005,967,5500,607,2000,607,2000,1529,8,1306,5,7480,200,1417,9,7070,5335,1141,80,12539,50,0,0,0,0,4246,1); REPLACE INTO `mob_db` VALUES (2106,'E_APOCALIPS_H','Vesper','Vesper',128,3802000,1,2010,2010,3,2620,7276,402,109,177,195,165,130,182,102,10,12,2,2,46,0x37B5,180,504,912,432,1005,617,5500,603,2000,603,2000,7095,5000,7094,3000,12539,50,2659,100,2660,100,2661,100,2662,100,0,0,0,0,4374,1); -- cgit v1.2.3-60-g2f50