Merged database changes from trunk r14927.

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

1 files changed, 218 insertions, 4 deletions

diff --git a/db/quest_db.txt b/db/quest_db.txt
index 5069d59d4..4e0cff4dc 100644
--- a/db/quest_db.txt
+++ b/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"