Merged database changes from trunk r14927.

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

Changelog-Renewal.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2011/08/07
+	* Rev. 14927 Added bonus3 bAddClassDropItem, care of Epoque. [L0ne_W0lf]
 2011/07/10
 	* Merged changes from trunk [14827:14894/trunk]. [Ai4rei]
 2011/06/13

db/Changelog.txt

@@ -9,6 +9,8 @@
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
 
+2011/08/07
+	* Rev. 14927 Merged database changes from trunk r14927. [L0ne_W0lf]
 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

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

db/item_trade.txt

@@ -1089,57 +1089,57 @@
 14594,91,100	// Quagmire_Scroll
 
 // Battleground Rewards (Tierra Gorge/Flavius)
-13036,123,100	// BF_Dagger1
-13037,123,100	// BF_Dagger2
-13410,123,100	// BF_Sword1
-13411,123,100	// BF_Sword2
-1425,123,100	// BF_Spear1
-1632,123,100	// BF_Staff1
-1633,123,100	// BF_Staff2
-1634,123,100	// BF_Staff3
-1635,123,100	// BF_Staff4
-1542,123,100	// BF_Morning_Star1
-1543,123,100	// BF_Morning_Star2
-1923,123,100	// BF_Instrument1
-1924,123,100	// BF_Instrument2
-1977,123,100	// BF_Whip1
-1978,123,100	// BF_Whip2
-1574,123,100	// BF_Book1
-1575,123,100	// BF_Book2
-1823,123,100	// BF_Knuckle1
-1824,123,100	// BF_Knuckle2
-1183,123,100	// BF_Two_Handed_Sword1
-1184,123,100	// BF_Two_Handed_Sword2
-1482,123,100	// BF_Lance1
-1379,123,100	// BF_Two_Handed_Axe1
-1380,123,100	// BF_Two_Handed_Axe2
-13305,123,100	// BF_Huuma_Shuriken1
-13306,123,100	// BF_Huuma_Shuriken2
-1279,123,100	// BF_Katar1
-1280,123,100	// BF_Katar2
-1738,123,100	// BF_Bow1
-1739,123,100	// BF_Bow2
-13108,123,100	// BF_Pistol1
-13171,123,100	// BF_Rifle1
-13172,123,100	// BF_Gatling_Gun1
-13173,123,100	// BF_Shotgun1
-13174,123,100	// BF_Launcher1
-2538,123,100	// Commander_Manteau
-2539,123,100	// Commander_Manteau_
-2540,123,100	// Sheriff_Manteau
-2435,123,100	// Battle_Greave
-2436,123,100	// Combat_Boots
-2437,123,100	// Battle_Boots
-2376,123,100	// Assaulter_Plate
-2377,123,100	// Elite_Engineer_Armor
-2378,123,100	// Assassin_Robe
-2379,123,100	// Warlock_Battle_Robe
-2380,123,100	// Medic_Robe
-2381,123,100	// Elite_Archer_Suit
-2382,123,100	// Elite_Shooter_Suit
-2733,123,100	// Medal_Gunner
-7828,123,100	// BF_Badge1
-7829,123,100	// BF_Badge2
+13036,83,100	// BF_Dagger1
+13037,83,100	// BF_Dagger2
+13410,83,100	// BF_Sword1
+13411,83,100	// BF_Sword2
+1425,83,100	// BF_Spear1
+1632,83,100	// BF_Staff1
+1633,83,100	// BF_Staff2
+1634,83,100	// BF_Staff3
+1635,83,100	// BF_Staff4
+1542,83,100	// BF_Morning_Star1
+1543,83,100	// BF_Morning_Star2
+1923,83,100	// BF_Instrument1
+1924,83,100	// BF_Instrument2
+1977,83,100	// BF_Whip1
+1978,83,100	// BF_Whip2
+1574,83,100	// BF_Book1
+1575,83,100	// BF_Book2
+1823,83,100	// BF_Knuckle1
+1824,83,100	// BF_Knuckle2
+1183,83,100	// BF_Two_Handed_Sword1
+1184,83,100	// BF_Two_Handed_Sword2
+1482,83,100	// BF_Lance1
+1379,83,100	// BF_Two_Handed_Axe1
+1380,83,100	// BF_Two_Handed_Axe2
+13305,83,100	// BF_Huuma_Shuriken1
+13306,83,100	// BF_Huuma_Shuriken2
+1279,83,100	// BF_Katar1
+1280,83,100	// BF_Katar2
+1738,83,100	// BF_Bow1
+1739,83,100	// BF_Bow2
+13108,83,100	// BF_Pistol1
+13171,83,100	// BF_Rifle1
+13172,83,100	// BF_Gatling_Gun1
+13173,83,100	// BF_Shotgun1
+13174,83,100	// BF_Launcher1
+2538,83,100	// Commander_Manteau
+2539,83,100	// Commander_Manteau_
+2540,83,100	// Sheriff_Manteau
+2435,83,100	// Battle_Greave
+2436,83,100	// Combat_Boots
+2437,83,100	// Battle_Boots
+2376,83,100	// Assaulter_Plate
+2377,83,100	// Elite_Engineer_Armor
+2378,83,100	// Assassin_Robe
+2379,83,100	// Warlock_Battle_Robe
+2380,83,100	// Medic_Robe
+2381,83,100	// Elite_Archer_Suit
+2382,83,100	// Elite_Shooter_Suit
+2733,83,100	// Medal_Gunner
+7828,83,100	// BF_Badge1
+7829,83,100	// BF_Badge2
 
 7801,123,100	// Girl_Fan_Letter
 7802,123,100	// Autograph_Book
@@ -1295,44 +1295,44 @@
 6051,115,100	// Gray_Hollow
 
 // Battleground Rewards (Krieger Von Midgard)
-13416,115,100	// Krieger_Onehand_Sword1
-13417,115,100	// Krieger_Onehand_Sword2
-13418,115,100	// Krieger_Onehand_Sword3
-13042,115,100	// Krieger_Dagger1
-1310,115,100	// Krieger_Onehand_Axe1
-1426,115,100	// Krieger_Onehand_Spear1
-1546,115,100	// Krieger_Onehand_Mace1
-1576,115,100	// Krieger_Book1
-1577,115,100	// Krieger_Book2
-1640,115,100	// Krieger_Onehand_Staff1
-1641,115,100	// Krieger_Onehand_Staff2
-1826,115,100	// Krieger_Knuckle1
-1827,115,100	// Krieger_Knuckle2
-1927,115,100	// Krieger_Instrument1
-1981,115,100	// Krieger_Whip1
-1187,115,100	// Krieger_Twohand_Sword1
-1281,115,100	// Krieger_Katar1
-1282,115,100	// Krieger_Katar2
-1382,115,100	// Krieger_Twohand_Axe1
-1486,115,100	// Krieger_Twohand_Spear1
-2002,115,100	// Krieger_Twohand_Staff1
-13307,115,100	// Krieger_Huuma_Shuriken1
-1743,115,100	// Krieger_Bow1
-13110,115,100	// Krieger_Pistol1
-13176,115,100	// Krieger_Rifle1
-13177,115,100	// Krieger_Gatling1
-13178,115,100	// Krieger_Shotgun1
-13179,115,100	// Krieger_Launcher1
-2394,115,100	// Krieger_Suit1
-2444,115,100	// Krieger_Shoes1
-2549,115,100	// Krieger_Muffler1
-2772,115,100	// Krieger_Ring1
-2445,115,100	// Krieger_Shoes2
-2446,115,100	// Krieger_Shoes3
-2395,115,100	// Krieger_Suit2
-2396,115,100	// Krieger_Suit3
-2773,115,100	// Krieger_Ring2
-2774,115,100	// Krieger_Ring3
+13416,83,100	// Krieger_Onehand_Sword1
+13417,83,100	// Krieger_Onehand_Sword2
+13418,83,100	// Krieger_Onehand_Sword3
+13042,83,100	// Krieger_Dagger1
+1310,83,100	// Krieger_Onehand_Axe1
+1426,83,100	// Krieger_Onehand_Spear1
+1546,83,100	// Krieger_Onehand_Mace1
+1576,83,100	// Krieger_Book1
+1577,83,100	// Krieger_Book2
+1640,83,100	// Krieger_Onehand_Staff1
+1641,83,100	// Krieger_Onehand_Staff2
+1826,83,100	// Krieger_Knuckle1
+1827,83,100	// Krieger_Knuckle2
+1927,83,100	// Krieger_Instrument1
+1981,83,100	// Krieger_Whip1
+1187,83,100	// Krieger_Twohand_Sword1
+1281,83,100	// Krieger_Katar1
+1282,83,100	// Krieger_Katar2
+1382,83,100	// Krieger_Twohand_Axe1
+1486,83,100	// Krieger_Twohand_Spear1
+2002,83,100	// Krieger_Twohand_Staff1
+13307,83,100	// Krieger_Huuma_Shuriken1
+1743,83,100	// Krieger_Bow1
+13110,83,100	// Krieger_Pistol1
+13176,83,100	// Krieger_Rifle1
+13177,83,100	// Krieger_Gatling1
+13178,83,100	// Krieger_Shotgun1
+13179,83,100	// Krieger_Launcher1
+2394,83,100	// Krieger_Suit1
+2444,83,100	// Krieger_Shoes1
+2549,83,100	// Krieger_Muffler1
+2772,83,100	// Krieger_Ring1
+2445,83,100	// Krieger_Shoes2
+2446,83,100	// Krieger_Shoes3
+2395,83,100	// Krieger_Suit2
+2396,83,100	// Krieger_Suit3
+2773,83,100	// Krieger_Ring2
+2774,83,100	// Krieger_Ring3
 
 // Misc. Items
 7923,115,100	// KRATHONG_
@@ -1356,16 +1356,6 @@
 5460,115,100	// Adv_Dragon_Skull
 5461,115,100	// Adv_Whisper_Mask
 5464,123,100	// Zaha_Doll_Hat
-12333,123,100	// Ansila
-12725,91,100	// Runstone_Nosiege
-12726,91,100	// Runstone_Rhydo
-12727,91,100	// Runstone_Verkana
-12728,91,100	// Runstone_Isia
-12729,91,100	// Runstone_Asir
-12730,91,100	// Runstone_Urj
-12731,91,100	// Runstone_Turisus
-12732,91,100	// Runstone_Pertz
-12733,91,100	// Runstone_Hagalas
 5254,73,100	// Deviling_Hat
 14296,91,100	// Angel_Scroll
 14297,91,100	// Devil_Scroll
@@ -1454,10 +1444,6 @@
 //14361,91,100	// ???
 //14362,91,100	// ???
 //14363,91,100	// ???
-12323,115,100	// N_Fly_Wing
-12324,115,100	// N_Butterfly_Wing
-12325,115,100	// N_Magnifier
-2393,115,100	// N_Adventurer's_Suit
 //12400,83,100	// ???
 //2815,91,100	// ???
 5346,73,100	// Gf_Recruiter_Hat
@@ -1518,7 +1504,21 @@
 12348,91,100	// Manuk's_Faith
 12349,91,100	// Cornus'_Tears
 
+// New Novice Training Grounds
+1381,115,100	// N_Battle_Axe
+1545,115,100	// N_Mace
+1639,115,100	// N_Rod
+1742,115,100	// N_Composite_Bow
+2393,115,100	// N_Adventurer's_Suit
+12323,123,100	// N_Fly_Wing
+12324,123,100	// N_Butterfly_Wing
+12325,123,100	// N_Magnifier
+13040,115,100	// N_Cutter
+13041,115,100	// N_Main_Gauche
+13415,115,100	// N_Falchion
+
 // Epidode 13.3
+// * Eden Group
 1192,123,100	// P_Slayer1
 1193,123,100	// P_Slayer2
 1650,123,100	// P_Staff1
@@ -1543,10 +1543,66 @@
 16004,123,100	// P_Mace1
 16005,123,100	// P_Mace2
 
-// Novice Training Grounds
-2819,123,100
-2820,123,100
-2821,123,100
-2822,123,100
-2823,123,100
-2824,123,100
+// * Third Job-related
+1703,123,100	// Bow__
+2794,123,100	// Magic_Stone_Ring
+2795,115,100	// Green_Apple_Ring
+2796,123,100	// Magical_Stone
+2797,123,100	// Magical_Stone_
+5746,91,100	// Rune_Circlet
+5747,91,100	// Mitra
+5748,91,100	// Sniper_Goggle
+5749,91,100	// Driver_Band
+5750,91,100	// Shadow_Handicraft
+5751,91,100	// Minstrel_Song_Hat
+5752,91,100	// Midas_Whisper
+5753,91,100	// Magic_Stone_Hat
+5754,91,100	// Blazing_Soul
+5755,91,100	// Silent_Executer
+5756,91,100	// Wind_Whisper
+5757,91,100	// Schmidt_Helm
+5758,91,100	// Dying_Swan
+5760,91,100	// Driver_Band_
+6151,115,100	// Peice_Of_Great_Bradium
+6152,115,100	// Glittering_Crystal
+6153,123,100	// Special_Exchange_Coupon
+6154,115,100	// Broken_Horn_Pipe
+6156,115,100	// Approval_Report
+6266,123,100	// Cheat_Key
+6267,123,100	// Virtual_Key
+6268,123,100	// Mirth_Key
+6269,123,100	// Master_Brush
+6270,115,100	// Mins_Picture
+6271,115,100	// Mins_Receipt
+6274,123,100	// Saint_Cloth_Piece
+6275,123,100	// King_Shield
+6276,123,100	// Clear_Reagent
+6277,123,100	// Red_Reagent
+6278,123,100	// Black_Reagent
+12384,115,100	// Rainbow_Ruby_Water
+12385,115,100	// Rainbow_Ruby_Fire
+12386,115,100	// Rainbow_Ruby_Wind
+12387,115,100	// Rainbow_Ruby_Earth
+12388,123,100	// Runstone_Crush
+12389,123,100	// Runstone_Storm
+12390,123,100	// Runstone_Millennium
+2798,115,100	// Will_Of_Exhausted_Angel
+12258,115,100	// Bombring_Box
+12333,123,100	// Ansila
+12725,91,100	// Runstone_Nosiege
+12726,91,100	// Runstone_Rhydo
+12727,91,100	// Runstone_Verkana
+12728,91,100	// Runstone_Isia
+12729,91,100	// Runstone_Asir
+12730,91,100	// Runstone_Urj
+12731,91,100	// Runstone_Turisus
+12732,91,100	// Runstone_Pertz
+12733,91,100	// Runstone_Hagalas
+
+// * New Novice Training Grounds
+2819,115,100	// Swordman_Manual
+2820,115,100	// Thief_Manual
+2821,115,100	// Acolyte_Manual
+2822,115,100	// Archer_Manual
+2823,115,100	// Merchant_Manual
+2824,115,100	// Mage_Manual

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/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"
@@ -200,7 +251,7 @@
 3042,0,0,0,0,0,0,0,"The Cursed Baphomet Doll"
 3043,0,0,0,0,0,0,0,"The Gigantic Magestic Goat"
 3044,0,0,0,0,0,0,0,"The Gigantic Magestic Goat"
-3045,9600,0,0,0,0,0,0,"Sealed Shrine"
+3045,7200,0,0,0,0,0,0,"Sealed Shrine"
 3046,0,0,0,0,0,0,0,"Sealed Shrine After-effect"
 
 3050,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 1"
@@ -280,8 +331,30 @@
 3132,0,0,0,0,0,0,0,"Z Gang Wanted - Find the Z Gang's Agit"
 3133,0,0,0,0,0,0,0,"Z Gang Wanted - Agit Found!"
 3134,0,0,0,0,0,0,0,"Z Gang Wanted - Clean Sweep of Z Gang"
-3135,0,0,0,0,0,0,0,"Nidhoggur's Nest"
-3136,0,0,0,0,0,0,0,"Nidhoggur's Nest Time Limit"
+3135,259200,0,0,0,0,0,0,"Nidhoggur's Nest"
+3136,14400,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"
@@ -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,86400,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"
@@ -449,6 +553,7 @@
 7122,0,1002,1,0,0,0,0,"First battle - Poring Hunt"
 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,1622,33,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"

src/map/map.h

@@ -393,7 +393,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

@@ -2259,8 +2259,10 @@ int mob_dead(struct mob_data *md, struct block_list *src, int type)
 			int itemid = 0;
 			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))
+				if ( ( sd->add_drop[i].race <= (1<<status->race) &&
+				       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<<RC_MAX) && 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)
 		{