* Added bonus3 bAddClassDropItem, care of Epoque.

- Added several missing items to the item database, updated others.
- Raised level 10 Dec. AGI to be level 48, when used by mobs.
- Added missing mercenaries to the mercenary DB, and skills.
- Added missing monster_chat_db entries for Nydhoggr's Shadow.
- Added Brasilis pets to the pet DB, these pets are unhatchable on purpose.
- Added additional quests to the quest_db, mostly for RE.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14901 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/07/11
+	* Rev. 14901 Added bonus3 bAddClassDropItem, care of Epoque. [L0ne_W0lf]
 2011/07/10
 	* Temporary fix for bugreport:4961 (unintended conversion from signed to unsigned). [FlavioJS]
 	* CMake: lowered required version to 2.8.3 and moved custom cmake modules to 3rdparty/cmake.

db/Changelog.txt

@@ -8,7 +8,14 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
-
+2011/07/11
+	* Rev. 14901 Lots of updates. :] [L0ne_W0lf]
+	- Added several missing items to the item database, updated others.
+	- Raised level 10 Dec. AGI to be level 48, when used by mobs.
+	- Added missing mercenaries to the mercenary DB, and skills.
+	- Added missing monster_chat_db entries for Nydhoggr's Shadow.
+	- Added Brasilis pets to the pet DB, these pets are unhatchable on purpose.
+	- Added additional quests to the quest_db, mostly for RE.
 2011/04/16
 	* Rev. 14797 Added Archangel Wings (2573) and their respective Box (16998) item based on client-side kRO description. [Ai4rei]
 2011/03/19

db/const.txt

@@ -440,6 +440,7 @@ bAddSkillBlow	2041
 bSPVanishRate	2042
 bMagicSPGainValue	2043
 bMagicHPGainValue	2044
+bAddClassDropItem	2045
 
 EQI_HEAD_TOP	1
 EQI_ARMOR	2

db/mercenary_db.txt

@@ -8,8 +8,12 @@
 1967,M_YGNIZEM,Egnigem Cenia,58,11200,320,2,823,1212,35,8,60,35,52,18,79,20,10,12,1,7,43,145,576,432,288
 2000,M_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300
 2001,F_GAMEMASTER,[GM] Game Master,50,7000,250,2,100,50,6,17,1,109,1,60,215,111,10,0,0,7,20,150,450,432,300
+2034,M_DESERT_WOLF_B,Baby Desert Wolf,9,164,15,1,500,600,0,0,1,9,9,5,40,40,10,12,0,2,23,100,1600,900,240
 2037,VALKYRIE_A,Valkyrie Randgris,90,5000,15,1,10,160,10,20,1,20,40,0,20,20,10,12,1,8,66,100,576,576,480
 2038,VALKYRIE_B,Valkyrie Randgris,90,10000,15,1,300,450,10,40,1,20,80,0,80,20,10,12,1,8,66,100,576,576,480
+2058,M_MIMIC,Mimic,51,6120,182,1,800,950,10,40,44,121,1,60,75,110,10,12,1,0,60,100,972,500,288
+2059,M_DISGUISE,Disguise,55,7543,180,2,526,693,18,29,0,72,45,35,48,65,10,12,1,6,82,147,516,768,384
+2060,M_ALICE,Alice,62,10000,221,1,700,850,5,5,64,64,42,85,100,130,10,12,1,7,60,200,502,1999,480
 // Normal Mercenaries
 6017,MER_ARCHER01,Mina,20,256,200,10,170,85,7,5,1,16,5,1,28,8,10,0,0,7,20,150,700,432,300
 6018,MER_ARCHER02,Dororu,30,457,70,10,228,114,11,7,1,18,8,1,40,11,10,0,0,7,20,150,700,432,300

db/mercenary_skill_db.txt

@@ -149,3 +149,16 @@
 2001,8238,5	//MER_KYRIE
 2001,8239,5	//MER_BLESSING
 2001,8240,5	//MER_INCAGI
+// M_MIMIC
+2058,8233,1	//MER_AUTOBERSERK
+2058,8220,5	//ML_AUTOGUARD
+2058,8201,5	//MS_BASH
+// M_DISGUISE
+2059,8223,2	//MER_QUICKEN
+2059,8225,5	//MER_CRASH
+2059,8236,3	//MER_LEXDIVINA
+// M_ALICE
+2060,8232,5	//MER_PROVOKE
+2060,8202,5	//MS_MAGNUM
+2060,8217,5	//ML_BRANDISH
+2060,8226,1	//MER_REGAIN

db/mob_chat_db.txt

@@ -31,3 +31,9 @@
 27,0xFF0000,What do you want from me?
 28,0xFF0000,No! I didn't do this! He's the one who planned out all this!
 29,0xFF0000,I just wanted to find peace..!  That's why I have been fleeing away!
+30,0xFF0000,Ahhhh!!! Now, I just have to kill you all!
+31,0xFF0000,Annoying flies!! Get off of me!
+32,0xFF0000,Suffer in Hell!
+33,0xFF0000,Mwahahaha! Taste the anger of the earth!!!
+34,0xFF0000,No... I won't accept this as defeat!
+

db/mob_db.txt

@@ -1110,7 +1110,7 @@
 //2054,E_BATHORY,Bathory,Bathory,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2055,E_INCUBUS,Incubus,Incubus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2056,E_ZHERLTHSH,Zherlthsh,Zealotus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//2057,E_CRAMP,Cramp,Cramp,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2057,E_CRAMP,Cramp,Cramp,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2058,M_MIMIC,Mimic,Mimic,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2059,M_DISGUISE,Disguise,Disguise,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2060,M_ALICE,Alice,Alice,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1134,7 +1134,7 @@
 //2078,S_SUCCUBUS,Succubus,Succubus,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2079,CRYSTAL_H,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2080,CRYSTAL_L,Crystal,Crystal,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
-//2081,E_HYDRA,Hydra,Hydra,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+2081,E_HYDRA,Hydra,Hydra,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 2082,G_PIRANHA,Piranha,Piranha,75,4522,0,0,0,1,182,223,2,10,69,45,30,30,66,35,10,12,1,5,61,0x3295,200,768,768,384,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2083,HORN_SCARABA,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
 //2084,HORN_SCARABA2,Scaraba,Scaraba,1,50,0,0,0,1,7,10,0,5,1,1,1,1,6,30,10,12,1,3,21,0x120,400,1872,672,480,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0

db/mob_skill_db.txt

@@ -250,8 +250,8 @@
 1046,Doppelganger@NPC_CRITICALSLASH,attack,170,1,2000,0,5000,yes,target,always,0,,,,,,,
 1046,Doppelganger@CR_AUTOGUARD,attack,249,10,2000,500,300000,no,self,always,0,,,,,,29,
 1046,Doppelganger@CR_AUTOGUARD,chase,249,10,2000,500,300000,no,self,longrangeattacked,,,,,,,29,
-1046,Doppelganger@AL_DECAGI,attack,30,10,500,0,20000,no,target,always,0,,,,,,5,
-1046,Doppelganger@AL_DECAGI,chase,30,10,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,attack,30,48,500,0,20000,no,target,always,0,,,,,,5,
+1046,Doppelganger@AL_DECAGI,chase,30,48,500,0,20000,no,target,always,0,,,,,,5,
 1046,Doppelganger@NPC_SUMMONSLAVE,attack,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
 1046,Doppelganger@NPC_SUMMONSLAVE,idle,196,1,10000,700,10000,no,self,slavele,3,1427,,,,,,
 1046,Doppelganger@BS_HAMMERFALL,chase,110,11,10000,0,5000,yes,target,skillused,18,,,,,,,
@@ -399,7 +399,7 @@
 1086,Golden Thief Bug@NPC_SUMMONSLAVE,idle,196,10,10000,0,0,no,self,onspawn,0,1054,,,,,,
 1086,Golden Thief Bug@TF_HIDING,attack,51,1,1000,0,5000,no,self,myhpltmaxrate,20,,,,,,19,
 1086,Golden Thief Bug@AL_HEAL,idle,28,11,10000,0,5000,yes,self,mystatuson,hiding,,,,,,,
-1087,Orc Hero@AL_DECAGI,chase,30,10,2000,0,300000,no,target,always,0,,,,,,6,
+1087,Orc Hero@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
 1087,Orc Hero@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1087,Orc Hero@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1087,Orc Hero@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -551,7 +551,7 @@
 1111,Drainliar@NPC_BLINDATTACK,attack,177,3,500,0,5000,yes,target,always,0,,,,,,,
 1111,Drainliar@NPC_BLOODDRAIN,attack,199,1,500,0,5000,yes,target,always,0,,,,,,,
 1111,Drainliar@NPC_DARKNESSATTACK,attack,190,1,2000,0,5000,yes,target,always,0,,,,,,,
-1112,Drake@AL_DECAGI,chase,30,10,2000,0,60000,no,target,always,0,,,,,,29,
+1112,Drake@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,29,
 1112,Drake@NPC_ARMORBRAKE,attack,344,10,2000,0,60000,no,target,always,0,,,,,,,
 1112,Drake@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1112,Drake@BS_MAXIMIZE,attack,114,1,500,0,5000,no,self,always,0,,,,,,,
@@ -1151,7 +1151,7 @@
 1251,Stormy Knight@WZ_STORMGUST,chase,89,10,2000,500,5000,no,target,always,0,,,,,,21,
 1251,Stormy Knight@WZ_STORMGUST,chase,89,10,10000,500,5000,no,target,skillused,18,,,,,,21,
 1251,Stormy Knight@AL_HEAL,idle,28,11,10000,0,10000,yes,self,myhpltmaxrate,50,,,,,,,
-1252,Garm@AL_DECAGI,chase,30,10,2000,0,300000,no,target,always,0,,,,,,6,
+1252,Garm@AL_DECAGI,chase,30,48,2000,0,300000,no,target,always,0,,,,,,6,
 1252,Garm@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1252,Garm@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1252,Garm@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -1618,7 +1618,7 @@
 1372,Goat@NPC_EMOTION,chase,197,1,200,0,5000,yes,self,always,0,19,0x1089,,,,,
 1372,Goat@NPC_SPLASHATTACK,attack,174,1,2000,0,5000,yes,target,attackpcge,2,,,,,,,
 1372,Goat@NPC_STUNATTACK,attack,179,3,500,1500,5000,no,target,always,0,,,,,,6,
-1373,Lord of Death@AL_DECAGI,chase,30,10,2000,0,60000,no,target,always,0,,,,,,,
+1373,Lord of Death@AL_DECAGI,chase,30,48,2000,0,60000,no,target,always,0,,,,,,,
 1373,Lord of Death@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1373,Lord of Death@NPC_POWERUP,attack,349,5,10000,0,30000,yes,self,myhpltmaxrate,30,,,,,,6,
 1373,Lord of Death@NPC_HELLJUDGEMENT,chase,662,10,10000,1000,10000,no,self,always,0,,,,,,36,
@@ -1774,7 +1774,7 @@
 1388,Arc Angeling@NPC_SUMMONSLAVE,attack,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
 1388,Arc Angeling@NPC_SUMMONSLAVE,idle,196,7,10000,700,60000,no,self,slavele,3,1443,1246,1742,1743,1744,18,
 1388,Arc Angeling@RG_INTIMIDATE,attack,219,5,2000,0,5000,yes,target,always,0,,,,,,,
-1389,Dracula@AL_DECAGI,chase,30,10,2000,0,5000,no,target,always,0,,,,,,,
+1389,Dracula@AL_DECAGI,chase,30,48,2000,0,5000,no,target,always,0,,,,,,,
 1389,Dracula@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 1389,Dracula@AL_TELEPORT,idle,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
 1389,Dracula@AL_TELEPORT,walk,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
@@ -2675,10 +2675,10 @@
 1584,Tamruan@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
 1584,Tamruan@NPC_SILENCEATTACK,attack,178,5,2000,700,5000,no,target,always,0,,,,,,9,
 1584,Tamruan@NPC_EMOTION,chase,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
-1585,Mime Monkey@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,18,
-1585,Mime Monkey@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,18,
-1585,Mime Monkey@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,18,
-1585,Mime Monkey@SM_PROVOKE,attack,6,10,500,600,5000,no,target,always,0,,,,,,18,
+//1585,Mime Monkey@NPC_HALLUCINATION,chase,207,1,500,500,5000,yes,target,always,0,,,,,,18,
+//1585,Mime Monkey@SM_PROVOKE,chase,6,10,500,600,5000,no,target,always,0,,,,,,18,
+//1585,Mime Monkey@NPC_HALLUCINATION,attack,207,1,500,500,5000,yes,target,always,0,,,,,,18,
+//1585,Mime Monkey@SM_PROVOKE,attack,6,10,500,600,5000,no,target,always,0,,,,,,18,
 1586,Leaf Cat@AL_HEAL,attack,28,1,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,18,
 1586,Leaf Cat@AL_HEAL,attack,28,1,10000,500,5000,no,self,myhpltmaxrate,30,,,,,,18,
 1586,Leaf Cat@AL_HEAL,chase,28,1,10000,500,5000,no,friend,friendhpltmaxrate,60,,,,,,18,
@@ -2882,7 +2882,7 @@
 1637,Margaretha Sorin@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1637,Margaretha Sorin@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1637,Margaretha Sorin@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1637,Margaretha Sorin@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1637,Margaretha Sorin@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1637,Margaretha Sorin@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1637,Margaretha Sorin@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1637,Margaretha Sorin@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3031,7 +3031,7 @@
 1643,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1643,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1643,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1643,High Priest Margaretha@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1643,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1643,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1643,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1643,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3196,7 +3196,7 @@
 1649,High Priest Margaretha@AL_PNEUMA,idle,25,1,10000,0,0,yes,self,longrangeattacked,,,,,,,,
 1649,High Priest Margaretha@AL_INCAGI,attack,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
 1649,High Priest Margaretha@AL_INCAGI,chase,29,10,2000,0,240000,yes,self,always,0,,,,,,2,
-1649,High Priest Margaretha@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1649,High Priest Margaretha@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1649,High Priest Margaretha@MG_SAFETYWALL,attack,12,10,1000,0,5000,yes,self,always,0,,,,,,,
 1649,High Priest Margaretha@AL_PNEUMA,attack,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
 1649,High Priest Margaretha@AL_PNEUMA,chase,25,1,5000,0,10000,yes,self,longrangeattacked,,,,,,,19,
@@ -3382,8 +3382,8 @@
 1661,Errende Ebecee@AL_HEAL,chase,28,11,10000,500,5000,yes,self,myhpltmaxrate,30,,,,,,3,
 1661,Errende Ebecee@NPC_HOLYATTACK,attack,189,3,1000,0,5000,yes,target,always,0,,,,,,,
 1661,Errende Ebecee@NPC_SILENCEATTACK,attack,178,4,1000,700,5000,no,target,always,0,,,,,,,
-1661,Errende Ebecee@AL_DECAGI,attack,30,10,500,1000,5000,no,target,always,0,,,,,,29,
-1661,Errende Ebecee@AL_DECAGI,chase,30,10,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,attack,30,48,500,1000,5000,no,target,always,0,,,,,,29,
+1661,Errende Ebecee@AL_DECAGI,chase,30,48,500,1000,5000,no,target,always,0,,,,,,29,
 1662,Kavach Icarus@AC_DOUBLE,attack,46,10,500,1000,5000,no,target,always,0,,,,,,,
 1662,Kavach Icarus@AC_DOUBLE,attack,46,10,10000,1000,1000,no,target,skillused,46,,,,,,,
 1662,Kavach Icarus@AC_DOUBLE,chase,46,10,2000,1000,5000,no,target,always,0,,,,,,,
@@ -3674,8 +3674,8 @@
 1707,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,0,5000,yes,target,always,0,,,,,,30,
 1707,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
 1707,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
-1707,Thanatos Dolor@AL_DECAGI,attack,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1707,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
 1707,Thanatos Dolor@AL_HEAL,attack,28,8,1000,0,5000,yes,self,myhpltmaxrate,40,,,,,,3,
 1707,Thanatos Dolor@AL_HEAL,idle,28,8,1000,0,5000,yes,friend,friendhpltmaxrate,40,,,,,,3,
@@ -3740,8 +3740,8 @@
 1712,Thanatos Dolor@NPC_MENTALBREAKER,chase,159,2,500,1000,10000,no,target,always,0,,,,,,,
 1712,Thanatos Dolor@NPC_DARKTHUNDER,attack,341,9,500,1000,5000,no,target,always,0,,,,,,,
 1712,Thanatos Dolor@NPC_DARKTHUNDER,chase,341,9,500,1000,5000,no,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
-1712,Thanatos Dolor@AL_DECAGI,attack,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
+1712,Thanatos Dolor@AL_DECAGI,attack,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
 1712,Thanatos Dolor@AL_HEAL,attack,28,11,1000,0,5000,yes,self,myhpltmaxrate,70,,,,,,3,
 1712,Thanatos Dolor@AL_HEAL,idle,28,9,1000,0,5000,yes,friend,friendhpltmaxrate,70,,,,,,3,
@@ -3982,8 +3982,8 @@
 1754,Skeggiold@AL_HEAL,idle,28,9,5000,500,5000,no,self,myhpltmaxrate,30,,,,,,18,
 1754,Skeggiold@MG_THUNDERSTORM,attack,21,7,1000,1500,10000,no,target,always,0,,,,,,,
 1754,Skeggiold@MG_THUNDERSTORM,chase,21,7,1000,1500,10000,no,target,always,0,,,,,,,
-1754,Skeggiold@AL_DECAGI,attack,30,10,500,0,30000,no,target,always,0,,,,,,29,
-1754,Skeggiold@AL_DECAGI,chase,30,10,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,attack,30,48,500,0,30000,no,target,always,0,,,,,,29,
+1754,Skeggiold@AL_DECAGI,chase,30,48,500,0,30000,no,target,always,0,,,,,,29,
 1754,Skeggiold@NPC_PETRIFYATTACK,attack,180,2,500,500,5000,no,target,always,0,,,,,,3,
 1754,Skeggiold@NPC_PETRIFYATTACK,chase,180,2,500,500,5000,no,target,always,0,,,,,,3,
 1754,Skeggiold@RG_STRIPARMOR,attack,217,3,500,0,5000,yes,target,always,0,,,,,,6,
@@ -4116,7 +4116,7 @@
 1769,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
 1769,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
 1769,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1769,Agav@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1769,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1769,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1769,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1769,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
@@ -4275,7 +4275,7 @@
 1786,Agav@MG_SAFETYWALL,attack,12,10,2000,0,5000,yes,self,always,0,,,,,,,
 1786,Agav@NPC_CURSEATTACK,attack,181,5,500,800,5000,no,target,always,0,,,,,,30,
 1786,Agav@NPC_CURSEATTACK,chase,181,5,500,800,5000,no,target,always,0,,,,,,30,
-1786,Agav@AL_DECAGI,chase,30,10,2000,0,10000,yes,target,always,0,,,,,,,
+1786,Agav@AL_DECAGI,chase,30,48,2000,0,10000,yes,target,always,0,,,,,,,
 1786,Agav@PR_LEXDIVINA,attack,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1786,Agav@PR_LEXDIVINA,chase,76,1,1000,0,5000,yes,target,always,0,,,,,,36,
 1786,Agav@PR_LEXDIVINA,attack,76,1,5000,0,5000,yes,target,casttargeted,0,,,,,,36,
@@ -5509,11 +5509,11 @@
 2008,Woomawang@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2008,Woomawang@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2008,Woomawang@NPC_CALLSLAVE,idle,352,1,10000,0,15000,yes,self,always,0,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,chase,193,1,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
-2008,Woomawang@NPC_METAMORPHOSIS,attack,193,1,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_SUMMONSLAVE,idle,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2008,Woomawang@NPC_METAMORPHOSIS,chase,193,6,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
+2008,Woomawang@NPC_METAMORPHOSIS,attack,193,6,10000,5000,5000,no,self,myhpltmaxrate,50,,,,,,,
 2008,Woomawang@NPC_SHIELDBRAKE,attack,346,10,2000,0,5000,yes,target,always,0,,,,,,,
 2008,Woomawang@LK_SPIRALPIERCE,attack,397,5,2000,500,5000,yes,target,always,0,,,,,,,
 2008,Woomawang@NPC_CRITICALWOUND,attack,673,3,2000,0,30000,yes,target,always,0,,,,,,,
@@ -5528,15 +5528,15 @@
 2008,Woomawang@NPC_AGIUP,chase,350,5,10000,0,30000,yes,self,myhpltmaxrate,60,,,,,,,
 2009,Woomawang@AL_TELEPORT,idle,26,1,10000,0,0,yes,self,rudeattacked,,,,,,,,
 2009,Woomawang@AL_TELEPORT,chase,26,1,5000,0,5000,yes,self,rudeattacked,,,,,,,,
-2009,Woomawang@NPC_RUN,attack,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
-2009,Woomawang@NPC_RUN,chase,354,1,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
+2009,Woomawang@NPC_RUN,attack,354,10,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
+2009,Woomawang@NPC_RUN,chase,354,10,10000,0,0,yes,self,myhpltmaxrate,1,,,,,,26,
 2009,Woomawang@AL_HEAL,idle,28,9,10000,0,2000,yes,self,myhpltmaxrate,99,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,attack,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,chase,352,1,10000,0,15000,yes,self,always,0,,,,,,,
 2009,Woomawang@NPC_CALLSLAVE,idle,352,1,10000,0,15000,yes,self,always,0,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,attack,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,chase,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
-2009,Woomawang@NPC_SUMMONSLAVE,idle,196,1,10000,0,10000,yes,self,slavele,5,,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,attack,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,chase,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
+2009,Woomawang@NPC_SUMMONSLAVE,idle,196,6,10000,0,10000,yes,self,slavele,5,2010,,,,,,
 2009,Woomawang@NPC_STONESKIN,chase,675,4,10000,1000,30000,no,self,myhpltmaxrate,3,,,,,,,
 2009,Woomawang@NPC_STONESKIN,attack,675,4,10000,1000,30000,no,self,myhpltmaxrate,3,,,,,,,
 2009,Woomawang@NPC_EVILLAND,attack,670,10,10000,0,15000,yes,target,myhpltmaxrate,50,,,,,,,
@@ -5655,8 +5655,8 @@
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,idle,671,3,10000,0,120000,yes,self,always,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,chase,671,3,10000,0,120000,yes,self,always,0,,,,,,,
 2022,Nidhoggr's Shadow@NPC_MAGICMIRROR,attack,671,3,10000,0,120000,yes,self,always,0,,,,,,,
-2022,Nidhoggr's Shadow@NPC_STONESKIN,chase,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,
-2022,Nidhoggr's Shadow@NPC_STONESKIN,attack,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,
+2022,Nidhoggr's Shadow@NPC_STONESKIN,chase,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,34
+2022,Nidhoggr's Shadow@NPC_STONESKIN,attack,675,3,10000,2500,300000,no,self,myhpltmaxrate,3,,,,,,,34
 2022,Nidhoggr's Shadow@NPC_POWERUP,attack,349,5,6000,0,60000,yes,self,myhpltmaxrate,15,,,,,,6,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,attack,670,4,500,0,25000,yes,target,myhpltmaxrate,15,,,,,,,
 2022,Nidhoggr's Shadow@WZ_QUAGMIRE,chase,92,5,10000,700,5000,no,target,myhpltmaxrate,28,,,,,,12,
@@ -5669,8 +5669,8 @@
 2022,Nidhoggr's Shadow@NPC_WIDESTONE,attack,666,5,10000,0,60000,yes,self,myhpltmaxrate,40,,,,,,,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,idle,670,10,500,0,120000,yes,target,myhpltmaxrate,50,,,,,,,
 2022,Nidhoggr's Shadow@NPC_EVILLAND,chase,670,10,500,0,120000,yes,target,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,chase,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,
-2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,attack,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,
+2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,chase,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,32
+2022,Nidhoggr's Shadow@NPC_HELLJUDGEMENT,attack,662,2,10000,7000,25000,no,self,myhpltmaxrate,50,,,,,,,32
 2022,Nidhoggr's Shadow@NPC_DARKNESSBREATH,attack,658,10,10000,800,35000,no,target,myhpltmaxrate,50,,,,,,32,
 2022,Nidhoggr's Shadow@NPC_SLOWCAST,attack,672,5,10000,0,60000,yes,self,myhpltmaxrate,70,,,,,,,
 2022,Nidhoggr's Shadow@NPC_CRITICALWOUND,attack,673,3,2000,0,30000,yes,target,myhpltmaxrate,70,,,,,,,
@@ -5685,7 +5685,7 @@
 2022,Nidhoggr's Shadow@NPC_DRAGONFEAR,attack,659,5,2000,1000,20000,no,self,always,0,,,,,,32,
 2022,Nidhoggr's Shadow@WZ_METEOR,attack,83,10,2000,1000,10000,no,target,always,0,,,,,,29,
 2022,Nidhoggr's Shadow@SA_DISPELL,attack,289,5,10000,0,30000,yes,target,always,0,,,,,,,
-2022,Nidhoggr's Shadow@NPC_PULSESTRIKE,attack,661,5,2000,10000,40000,no,self,always,0,,,,,,,
+2022,Nidhoggr's Shadow@NPC_PULSESTRIKE,attack,661,5,2000,10000,40000,no,self,always,0,,,,,,,31
 2022,Nidhoggr's Shadow@NPC_ALLHEAL,idle,687,1,10000,120000,30000,yes,self,myhpltmaxrate,60,,,,,,20,
 2023,Dark Shadow@NPC_DARKSTRIKE,chase,340,2,2000,0,5000,yes,target,always,0,,,,,,,
 2023,Dark Shadow@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
@@ -5696,6 +5696,7 @@
 2026,Dandelion@NPC_POISON,attack,176,3,1000,500,60000,no,target,myhpltmaxrate,30,,,,,,,
 2026,Dandelion@NPC_COMBOATTACK,attack,171,1,3000,0,5000,yes,target,always,0,,,,,,,27
 2026,Dandelion@TF_SPRINKLESAND,attack,149,1,500,0,5000,yes,target,always,0,,,,,,,28
+
 2027,Dark Shadow@NPC_DARKSTRIKE,chase,340,2,2000,0,5000,yes,target,always,0,,,,,,,
 2027,Dark Shadow@NPC_EMOTION,idle,197,1,2000,0,5000,yes,self,always,0,9,,,,,,
 2027,Dark Shadow@NPC_FIREATTACK,attack,186,3,500,500,5000,no,target,always,0,,,,,,,

db/pet_db.txt

@@ -119,3 +119,7 @@
 1586,LEAF_CAT,Leaf Cat,12359,9041,10023,6096,80,60,20,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubRace,RC_Brute,3; }
 1630,BACSOJIN_,White Lady,12357,9039,10021,6094,80,60,10,100,250,20,2000,150,0,0,300,300,800,{},{}
 1837,IMP,Fire Imp,12374,9056,10038,6114,80,60,10,100,250,20,200,150,0,0,300,300,800,{},{ bonus2 bSubEle,Ele_Fire,2; bonus2 bAddEle,Ele_Fire,2; }
+
+// Brasilis Quest - Suspicious Beach [UNHATCHABLE]
+2057,E_CRAMP,Strange Cramp,12408,6221,0,0,0,0,0,0,0,50,0,0,0,0,350,400,800,{},{} // kRO version
+2081,E_HYDRA,Strange Hydra,12408,6221,0,0,0,0,0,0,0,50,0,0,0,0,350,400,800,{},{} // iRO/cRO version

db/quest_db.txt

@@ -138,7 +138,17 @@
 2129,0,0,0,0,0,0,0,"Thor Volcano base camp"
 2130,0,0,0,0,0,0,0,"Thor Volcano base camp"
 2131,0,0,0,0,0,0,0,"Thor Volcano base camp"
-
+2132,0,0,0,0,0,0,0,"For Arunafeltz"
+2133,0,0,0,0,0,0,0,"For Arunafeltz"
+2134,0,0,0,0,0,0,0,"For Arunafeltz"
+2135,0,0,0,0,0,0,0,"For Arunafeltz"
+2136,0,0,0,0,0,0,0,"For Arunafeltz"
+2137,0,0,0,0,0,0,0,"For Arunafeltz"
+2138,0,0,0,0,0,0,0,"For Arunafeltz"
+2139,0,0,0,0,0,0,0,"For Arunafeltz"
+2140,0,0,0,0,0,0,0,"For Arunafeltz"
+2141,0,0,0,0,0,0,0,"For Arunafeltz"
+2142,0,0,0,0,0,0,0,"For Arunafeltz"
 2143,50,0,0,0,0,0,0,"Guild Dungeon Event"
 2144,0,0,0,0,0,0,0,"Guild Dungeon Event"
 
@@ -163,6 +173,47 @@
 2184,0,0,0,0,0,0,0,"Flower of Alfheim"
 2185,0,0,0,0,0,0,0,"Spirit of Alfheim"
 2186,64800,0,0,0,0,0,0,"Helping Grenouille"
+
+2187,0,0,0,0,0,0,0,"Arch Bishop job changing quest"
+2188,0,0,0,0,0,0,0,"Arch Bishop job changing quest"
+2189,0,0,0,0,0,0,0,"Arch Bishop job changing quest"
+2190,0,0,0,0,0,0,0,"Arch Bishop job changing quest"
+2191,0,0,0,0,0,0,0,"Arch Bishop job changing quest"
+
+2192,0,0,0,0,0,0,0,"Guarana quest"
+2193,0,0,0,0,0,0,0,"Guarana quest"
+2194,0,0,0,0,0,0,0,"Guarana quest"
+2195,0,0,0,0,0,0,0,"Guarana quest"
+2196,0,0,0,0,0,0,0,"Guarana quest"
+2197,0,0,0,0,0,0,0,"Guarana quest"
+2198,0,0,0,0,0,0,0,"Guarana quest"
+2199,0,0,0,0,0,0,0,"Guarana quest"
+2200,0,0,0,0,0,0,0,"Guarana quest"
+2201,0,0,0,0,0,0,0,"Fortunate training"
+2202,0,0,0,0,0,0,0,"Fortunate training"
+2203,0,0,0,0,0,0,0,"Fortunate training"
+2204,0,0,0,0,0,0,0,"Fortunate training"
+2205,0,0,0,0,0,0,0,"Fortunate training"
+2206,0,0,0,0,0,0,0,"Fortunate training"
+2207,0,0,0,0,0,0,0,"Fortunate training"
+2208,0,0,0,0,0,0,0,"Ghost of bathroom"
+
+2209,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2210,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2211,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2212,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2213,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2214,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2215,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2216,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2217,0,0,0,0,0,0,0,"Generic Job Change Quest"
+2218,0,0,0,0,0,0,0,"Wanderer Job Change Quest"
+2219,0,0,0,0,0,0,0,"Wanderer Job Change Quest"
+2220,0,0,0,0,0,0,0,"Wanderer Job Change Quest"
+2221,600,1718,50,0,0,0,0,"Wanderer Job Change Quest"
+2222,0,0,0,0,0,0,0,"Wanderer Job Change Quest
+2223,0,1428,100,0,0,0,0,"Generic Job Change Quest"
+
 3000,0,0,0,0,0,0,0,"Job Change to Bard"
 3001,0,0,0,0,0,0,0,"Job Change to Bard"
 3002,0,0,0,0,0,0,0,"Job Change to Bard"
@@ -283,6 +334,28 @@
 3135,0,0,0,0,0,0,0,"Nidhoggur's Nest"
 3136,0,0,0,0,0,0,0,"Nidhoggur's Nest Time Limit"
 
+3200,0,0,0,0,0,0,0,"Job changes to Rune knight - Recommendation for Rune knight"
+3201,0,0,0,0,0,0,0,"Job changes to Rune knight - Secret rendezvous of Rune knigh"
+3202,0,0,0,0,0,0,0,"Job changes to Rune knight - The first test"
+3203,0,0,0,0,0,0,0,"Job changes to Rune knight - The first test"
+3204,0,0,0,0,0,0,0,"Job changes to Rune knight - Pass the first test"
+3205,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3206,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3207,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3208,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3209,0,1504,10,0,0,0,0,"Job changes to Rune knight - Accumulation of magic energy1"
+3210,0,1506,10,0,0,0,0,"Job changes to Rune knight - Accumulation of magic energy2"
+3211,0,1508,10,0,0,0,0,"Job changes to Rune knight - Accumulation of magic energy3"
+3212,0,1510,10,0,0,0,0,"Job changes to Rune knight - Accumulation of magic energy4"
+3213,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3214,0,0,0,0,0,0,0,"Job changes to Rune knight - The second test"
+3215,0,0,0,0,0,0,0,"Job changes to Rune knight - Pass the second test"
+3216,0,0,0,0,0,0,0,"Job changes to Rune knight - The final test"
+3217,0,0,0,0,0,0,0,"Job changes to Rune knight - The final test"
+3218,0,0,0,0,0,0,0,"Job changes to Rune knight - Pass the final test"
+3219,0,0,0,0,0,0,0,"Job changes to Rune knight - The end of all tes"
+3220,0,0,0,0,0,0,0,"Job changes to Rune knight - Waiting time of test"
+
 3250,0,1041,30,0,0,0,0,"Request - What is this bandage for?"
 3251,0,1271,30,0,0,0,0,"Request - An alligator of Counterattack"
 3252,0,1264,30,0,0,0,0,"Request - My mermaid don't do like this way!"
@@ -334,6 +407,10 @@
 //4032,0,0,0,0,0,0,0,"Conspiracy of the two families"
 //4033,0,0,0,0,0,0,0,"Death of Ahrum"
 
+4133,0,0,0,0,0,0,0,"Iara"
+4134,0,0,0,0,0,0,0,"Iara"
+4135,0,0,0,0,0,0,0,"Iara"
+
 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7"
 
 6000,0,0,0,0,0,0,0,"Job Change to Taekwon"
@@ -440,6 +517,33 @@
 7081,0,0,0,0,0,0,0,"Helping the Laphine Craftsman"
 7082,86400,0,0,0,0,0,0,"Helping the Laphine Craftsman"
 
+7091,0,0,0,0,0,0,0,"An advice of Diora 01"
+7092,0,0,0,0,0,0,0,"An advice of Diora 02"
+7093,0,0,0,0,0,0,0,"An advice of Diora 03"
+7094,0,0,0,0,0,0,0,"An advice of Diora 04"
+7095,0,0,0,0,0,0,0,"An advice of Diora 05"
+7096,0,0,0,0,0,0,0,"A proof of new requirement"
+7097,0,0,0,0,0,0,0,"A proof of new requirement"
+7098,0,0,0,0,0,0,0,"A proof of new requirement"
+7099,0,0,0,0,0,0,0,"A proof of new requirement"
+7100,0,0,0,0,0,0,0,"A message of Bercascell"
+7101,0,0,0,0,0,0,0,"Special task of an assassin guild  1"
+7102,0,0,0,0,0,0,0,"Special task of an assassin guild  2"
+7103,0,0,0,0,0,0,0,"Special task of an assassin guild  3"
+7104,0,0,0,0,0,0,0,"Special task of an assassin guild  4"
+7105,0,0,0,0,0,0,0,"Special task of an assassin guild  4"
+7106,0,0,0,0,0,0,0,"Special task of an assassin guild  5"
+7107,0,0,0,0,0,0,0,"Special task of an assassin guild  6"
+7108,0,0,0,0,0,0,0,"Special task of an assassin guild  7"
+7109,0,0,0,0,0,0,0,"Special task of an assassin guild  8"
+7110,0,0,0,0,0,0,0,"Special task of an assassin guild  9"
+7111,0,0,0,0,0,0,0,"Special task of an assassin guild  10"
+7112,0,0,0,0,0,0,0,"Information of Madelle"
+7113,0,0,0,0,0,0,0,"Information of Crave"
+7114,0,0,0,0,0,0,0,"Information of Trovan"
+7115,0,0,0,0,0,0,0,"Information of a peddler"
+7116,0,0,0,0,0,0,0,"Information of a old man"
+
 // Novice Training Grounds
 7117,0,0,0,0,0,0,0,"Your first quest!"
 7118,0,0,0,0,0,0,0,"Novice Training"
@@ -447,8 +551,9 @@
 7120,0,0,0,0,0,0,0,"Novice Training"
 7121,0,0,0,0,0,0,0,"Novice Training"
 7122,0,1002,1,0,0,0,0,"First battle - Poring Hunt"
-7123,0,1049,2,0,0,0,0,"Battle Basics -Swordman"
+7123,0,1050,2,0,0,0,0,"Battle Basics -Swordman"
 7124,0,1063,5,0,0,0,0,"Battle Basics -Mage"
+//7125,0,0,0,0,0,0,0,"not used"
 7126,0,0,0,0,0,0,0,"Selling items"
 7127,0,1010,5,0,0,0,0,"Battle Basics -Thief"
 
@@ -485,6 +590,30 @@
 7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle 2"
 7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest"
 
+7160,0,0,0,0,0,0,0,"Mysterious Cryptogram"
+7161,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
+7162,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
+7163,0,0,0,0,0,0,0,"Mysterious Cryptogram - 2nd"
+7164,0,0,0,0,0,0,0,"Hunt for shadow of deception"
+7165,0,0,0,0,0,0,0,"Key of deception"
+7166,0,0,0,0,0,0,0,"Rachel Branch of Shadow Workshop"
+7167,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
+7168,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
+7169,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
+7170,0,0,0,0,0,0,0,"Mysterious Cryptogram - 3rd"
+7171,0,0,0,0,0,0,0,"Hunt for shadow of delusion"
+7172,0,0,0,0,0,0,0,"Key of delusion"
+7173,0,0,0,0,0,0,0,"Message to Halled from Paul"
+7174,0,0,0,0,0,0,0,"Mysterious Cryptogram - 4th"
+7175,0,0,0,0,0,0,0,"Hunft for shadow of gaiety"
+7176,0,0,0,0,0,0,0,"Key of Gaiety"
+7177,0,0,0,0,0,0,0,"A young guy in Lighthalzen"
+7178,0,0,0,0,0,0,0,"Destination of Deception, Delusion and Gaiety"
+7179,0,0,0,0,0,0,0,"Vicente, you dare!"
+7180,0,0,0,0,0,0,0,"Message from Doomk"
+
+7181,0,0,0,0,0,0,0,"Karakas's ring"
+
 8000,0,0,0,0,0,0,0,"Quitting Job Change"
 8001,0,0,0,0,0,0,0,"Job Change to Assassin"
 8002,0,0,0,0,0,0,0,"Job Change to Assassin"
@@ -732,6 +861,18 @@
 8252,0,0,0,0,0,0,0,"Handworked jewels"
 8253,3600,0,0,0,0,0,0,"Language translation device"
 
+8254,0,0,0,0,0,0,0,"with a light heart and body"
+8255,0,0,0,0,0,0,0,"The test of power for existence"
+8256,0,0,0,0,0,0,0,"The test of power for existence"
+8257,0,0,0,0,0,0,0,"Providing food of Teardrop"
+8258,0,0,0,0,0,0,0,"Providing food of Teardrop"
+8259,0,0,0,0,0,0,0,"to a place for taking a practical technique test"
+8260,0,0,0,0,0,0,0,"Mission! Documents delivery"
+8261,0,0,0,0,0,0,0,"When you play the flute,then the wolf show up!"
+8262,0,0,0,0,0,0,0,"Ranger master never again"
+
+8265,0,0,0,0,0,0,0,"One time a one hour!"
+
 8266,0,1077,10,0,0,0,0,"Hunting poison spore!"
 8267,0,1056,10,0,0,0,0,"Hunting smokie!"
 8268,0,1033,10,0,0,0,0,"Hunt elder wilow!"
@@ -775,6 +916,17 @@
 9121,0,0,0,0,0,0,0,"Lina's Curse - Nightmare Terror Hunt"
 9122,0,0,0,0,0,0,0,"Lina's Curse"
 9123,0,0,0,0,0,0,0,"Lina's Curse"
+9024,0,0,0,0,0,0,0,"An errand boy from Einbroch"
+// kRO
+//9028,0,0,0,0,0,0,0,"strange Mouse"
+//9029,86400,0,0,0,0,0,0,"Strange Mouse : present conditions"
+// iRO/cRO
+9028,0,0,0,0,0,0,0,"strange Hydra"
+9029,86400,0,0,0,0,0,0,"Strange Hydra : present conditions"
+9030,0,0,0,0,0,0,0,"Find a puppy"
+9031,0,0,0,0,0,0,0,"Find a puppy"
+9032,86400,0,0,0,0,0,0,"Find a puppy"
+
 10000,0,0,0,0,0,0,0,"To the Prontera Royal Court"
 10001,0,0,0,0,0,0,0,"Qualification Test"
 10002,0,0,0,0,0,0,0,"Qualification Review"
@@ -866,6 +1018,19 @@
 10088,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 10089,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 
+10090,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10091,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10092,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10093,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10094,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10095,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10096,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10097,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10098,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10099,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10100,0,0,0,0,0,0,0,"Job changes to Mechanic"
+10101,0,0,0,0,0,0,0,"Job changes to Mechanic"
+
 10102,0,0,0,0,0,0,0,"To client - the chapter of the sphinx dungeon"
 10103,0,0,0,0,0,0,0,"To client - the chapter of Glast heim"
 10104,0,0,0,0,0,0,0,"To client - the chapter of Yuno"
@@ -985,6 +1150,15 @@
 11104,0,0,0,0,0,0,0,"Resting time"
 11105,0,0,0,0,0,0,0,"Tendrilrion skin"
 
+11106,0,0,0,0,0,0,0,"Job changing to Warlock"
+11107,0,0,0,0,0,0,0,"Job changing to Warlock"
+11108,0,0,0,0,0,0,0,"Job changing to Warlock"
+11109,0,0,0,0,0,0,0,"Job changing to Warlock"
+11110,0,0,0,0,0,0,0,"Job changing to Warlock"
+11111,0,0,0,0,0,0,0,"Job changing to Warlock"
+11112,0,0,0,0,0,0,0,"Job changing to Warlock"
+11113,0,0,0,0,0,0,0,"Until radering is functioning"
+
 11114,0,1004,10,0,0,0,0,"Request : Hunt Honet"
 11115,0,1009,20,0,0,0,0,"Request : Hunt Condor"
 11116,0,1052,10,0,0,0,0,"Request : Hunt grasshopper's leg"
@@ -1006,6 +1180,31 @@
 11132,86400,0,0,0,0,0,0,"Request : Collect feather - Complete"
 11133,86400,0,0,0,0,0,0,"Request : Collect Poison spore - Complete"
 
+11135,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11136,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11137,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11138,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11139,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11140,0,0,0,0,0,0,0,"The sky, plane and travel sickness."
+11141,0,0,0,0,0,0,0,"Human & gossip is towarding to the bar"
+11142,0,0,0,0,0,0,0,"Fearful metalic sound"
+11143,0,0,0,0,0,0,0,"Thanatos tower"
+11144,0,0,0,0,0,0,0,"Juno manager : click"
+11145,0,0,0,0,0,0,0,"I want to get the "
+11146,0,0,0,0,0,0,0,"to ice tunnel..."
+11147,0,0,0,0,0,0,0,"Lared's dew"
+11148,0,0,0,0,0,0,0,"Toward Comodo with the bow"
+11149,0,0,0,0,0,0,0,"Just pour the water. Pour! Pour!..."
+11150,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11151,0,0,0,0,0,0,0,"Looking for Maestro Song"
+11152,0,0,0,0,0,0,0,"to the quiet place!..."
+11153,0,0,0,0,0,0,0,"Missing watch top"
+11154,0,0,0,0,0,0,0,"I will remember the memories with you...."
+11155,0,0,0,0,0,0,0,"undefinable battler"
+11156,0,1106,100,0,0,0,0,"annoying homework"
+11157,0,0,0,0,0,0,0,"Helmes valley "
+11158,0,0,0,0,0,0,0,"On the way for meditation"
+
 12000,0,0,0,0,0,0,0,"An old friend"
 12001,0,0,0,0,0,0,0,"Digotz, Maku's old friend"
 12002,0,0,0,0,0,0,0,"Messenger of Friendship"
@@ -1089,6 +1288,21 @@
 12087,0,1041,15,0,0,0,0,"Remove mummy"
 12088,0,0,0,0,0,0,0,"Accomplishing a request"
 
+12090,0,0,0,0,0,0,0,"Mysterious guy"
+12091,0,0,0,0,0,0,0,"Just save the burning heart"
+12092,0,0,0,0,0,0,0,"Long lasting story"
+12093,0,0,0,0,0,0,0,"the record the intelligence Lyoda left"
+12094,0,0,0,0,0,0,0,"The damaged shield letter"
+12096,0,0,0,0,0,0,0,"Towards Karakas"
+12097,0,0,0,0,0,0,0,"Basic preparation"
+12098,0,0,0,0,0,0,0,"Tour of dungeon"
+12217,0,0,0,0,0,0,0,"Request - Traces of wild boar hunt"
+12218,0,0,0,0,0,0,0,"How to make lava elixir"
+12219,0,0,0,0,0,0,0,"How to creat flame elixir"
+12220,0,0,0,0,0,0,0,"How to create glaicer elixir"
+12221,0,0,0,0,0,0,0,"How to create fossil elixir"
+12222,0,0,0,0,0,0,0,"How to create storm elixir"
+
 16000,0,0,0,0,0,0,0,"Metz Brayde's Notice"
 16001,0,0,0,0,0,0,0,"First examination"
 16002,0,0,0,0,0,0,0,"Fetching Items for Arian -1"

doc/item_bonus.txt

@@ -437,3 +437,5 @@ bonus bUnstripable,n;	Armor cannot be taken off via strip skills (n is meaningle
 bonus2 bHPDrainValueRace,r,n;	Heals +n HP when attacking a monster of race r with normal attack.
 bonus bMagicSPGainValue,n;	Heals +n SP when killing an enemy with magic attack.
 bonus bMagicHPGainValue,n;	Heals +n HP when killing an enemy with magic attack.
+
+bonus3 bAddClassDropItem,s,x,n;		Adds an n/100% chance of dropping item s when killing monster class x.

src/common/mmo.h

@@ -160,7 +160,7 @@
 //Mercenary System
 #define MC_SKILLBASE 8201
 #define MAX_MERCSKILL 40
-#define MAX_MERCENARY_CLASS 40
+#define MAX_MERCENARY_CLASS 44
 
 enum item_types {
 	IT_HEALING = 0,

src/map/map.h

@@ -349,7 +349,7 @@ enum _sp {
 	SP_SP_GAIN_RACE, SP_SUBRACE2, SP_UNBREAKABLE_SHOES,	// 2031-2033
 	SP_UNSTRIPABLE_WEAPON,SP_UNSTRIPABLE_ARMOR,SP_UNSTRIPABLE_HELM,SP_UNSTRIPABLE_SHIELD,  // 2034-2037
 	SP_INTRAVISION, SP_ADD_MONSTER_DROP_ITEMGROUP, SP_SP_LOSS_RATE, // 2038-2040
-	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE, SP_MAGIC_SP_GAIN_VALUE, SP_MAGIC_HP_GAIN_VALUE //2041-2044
+	SP_ADD_SKILL_BLOW, SP_SP_VANISH_RATE, SP_MAGIC_SP_GAIN_VALUE, SP_MAGIC_HP_GAIN_VALUE, SP_ADD_CLASS_DROP_ITEM //2041-2045
 };
 
 enum _look {

src/map/mob.c

@@ -2260,7 +2260,8 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			for (i = 0; i < ARRAYLENGTH(sd->add_drop) && (sd->add_drop[i].id || sd->add_drop[i].group); i++)
 			{
 				if (sd->add_drop[i].race & (1<<status->race) ||
-					sd->add_drop[i].race & 1<<(status->mode&MD_BOSS?RC_BOSS:RC_NONBOSS))
+					sd->add_drop[i].race & 1<<(status->mode&MD_BOSS?RC_BOSS:RC_NONBOSS) ||
+					sd->add_drop[i].race == md->class_)
 				{
 					//check if the bonus item drop rate should be multiplied with mob level/10 [Lupus]
 					if(sd->add_drop[i].rate < 0) {

src/map/pc.c

@@ -1607,8 +1607,8 @@ static int pc_bonus_item_drop(struct s_add_drop *drop, const short max, short id
 	}
 	for(i = 0; i < max && (drop[i].id || drop[i].group); i++) {
 		if(
-			(id && drop[i].id == id) ||
-			(group && drop[i].group == group)
+			((id && drop[i].id == id) ||
+			(group && drop[i].group == group)) && race < (1<<RC_MAX)
 		) {
 			drop[i].race |= race;
 			if(drop[i].rate > 0 && rate > 0)
@@ -2853,6 +2853,10 @@ int pc_bonus3(struct map_session_data *sd,int type,int type2,int type3,int val)
 		if(sd->state.lr_flag != 2)
 			pc_bonus_item_drop(sd->add_drop, ARRAYLENGTH(sd->add_drop), type2, 0, 1<<type3, val);
 		break;
+	case SP_ADD_CLASS_DROP_ITEM:
+		if(sd->state.lr_flag != 2)
+			pc_bonus_item_drop(sd->add_drop, ARRAYLENGTH(sd->add_drop), type2, 0, type3, val);
+		break;
 	case SP_AUTOSPELL:
 		if(sd->state.lr_flag != 2)
 		{