* Merged Renewal Kafra scripts (follow-up r16699).

* Updated quest_db with Kagerou/Oboro and more Port Malaya entries (Hercules 1053fa0).
* Sorted quest_db by ID.
* Some clarification and cleaning of script_commands.txt.

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

db/quest_db.txt

@@ -20,6 +20,19 @@
 1014,0,0,0,0,0,0,0,"Job Change to Swordman"
 1015,0,0,0,0,0,0,0,"Your first quest"
 1016,0,0,0,0,0,0,0,"Gaining base levels"
+
+// Ropewa & Yuridi Quest
+1109,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth"
+1110,0,0,0,0,0,0,0,"Ropewa & Yuridi - Victims of the Labyrinth"
+1111,0,0,0,0,0,0,0,"Ropewa & Yuridi - Maze in the Labyrinth"
+1112,0,0,0,0,0,0,0,"Ropewa & Yuridi - Lost in the Labyrinth"
+1113,0,0,0,0,0,0,0,"Ropewa & Yuridi - Torn Apart"
+1114,0,0,0,0,0,0,0,"Ropewa & Yuridi - The Cost of Restoration"
+1115,0,0,0,0,0,0,0,"Ropewa & Yuridi - Song of the Abyss"
+1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song"
+1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
+1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues"
+
 1145,0,0,0,0,0,0,0,"Help the poor cat"
 1146,0,0,0,0,0,0,0,"Help the poor cat"
 1147,0,0,0,0,0,0,0,"Help the poor cat"
@@ -31,6 +44,26 @@
 1153,0,0,0,0,0,0,0,"Help the poor cat"
 1154,0,2197,20,0,0,0,0,"Help the poor cat"
 1155,0,0,0,0,0,0,0,"Help the poor cat"
+1174,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1175,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1176,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1177,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1178,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1179,0,0,0,0,0,0,0,"Rumor, Time and Legend"
+1180,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1181,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1182,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1183,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1184,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1185,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1186,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1187,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1188,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1189,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1190,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1191,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1192,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+1193,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
 2000,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2001,0,0,0,0,0,0,0,"Job Change to Blacksmith"
 2002,0,0,0,0,0,0,0,"Job Change to Blacksmith"
@@ -226,6 +259,12 @@
 2222,0,0,0,0,0,0,0,"Wanderer Job Change Quest"
 2223,0,1428,100,0,0,0,0,"Generic Job Change Quest"
 
+// New Novice Ground
+2299,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
+2300,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer"
+2301,0,0,0,0,0,0,0,"Training Center: Leave the boat"
+2302,0,0,0,0,0,0,0,"Training Center: Formation"
+
 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"
@@ -467,8 +506,26 @@
 
 4197,10800,0,0,0,0,0,0,"Octopus"
 
+4229,0,0,0,0,0,0,0,"Devil in the Cave"
+
 5000,0,0,0,0,0,0,0,"The Crow of the Fate - 7"
 
+// Researcher's Quest
+5016,0,0,0,0,0,0,0,"Bring me a Research Tool Bag"
+5017,0,0,0,0,0,0,0,"Revenge of the Reseacher"
+5018,0,0,0,0,0,0,0,"Revenge of the Reseacher"
+5019,0,0,0,0,0,0,0,"Bathroom Sample Studying"
+5020,86400,0,0,0,0,0,0,"Sample Researching"
+5021,0,0,0,0,0,0,0,"Sample Collecting"
+5022,0,0,0,0,0,0,0,"Sample Collecting"
+5023,21600,0,0,0,0,0,0,"Inspection of the Sample"
+5024,0,0,0,0,0,0,0,"Eastern Pool Research"
+5025,0,0,0,0,0,0,0,"Western Pool Research"
+5026,0,0,0,0,0,0,0,"Southern Pool Research"
+5027,0,0,0,0,0,0,0,"Northern Pool Research"
+5028,43200,0,0,0,0,0,0,"Inspection of the Sample"
+5029,3600,0,0,0,0,0,0,"Unidentified Creature"
+
 5035,0,0,0,0,0,0,0,"Help the old man!"
 5036,0,0,0,0,0,0,0,"Help the old man!"
 5037,0,0,0,0,0,0,0,"Help the old man!"
@@ -541,6 +598,25 @@
 5123,0,0,0,0,0,0,0,"[Rest] Sniper"
 5124,0,0,0,0,0,0,0,"[Rest] Clown"
 5125,0,0,0,0,0,0,0,"[Rest] Gypsy"
+
+// Kagerou/Oboro Job Quest
+5131,0,0,0,0,0,0,0,"Strange Conversation"
+5132,0,0,0,0,0,0,0,"Family Business-(1)"
+5133,0,0,0,0,0,0,0,"Family Business-(2)"
+5134,0,0,0,0,0,0,0,"New path"
+5135,0,0,0,0,0,0,0,"4 tests"
+5136,0,0,0,0,0,0,0,"Knowledge test"
+5137,0,0,0,0,0,0,0,"Survival test"
+5138,0,0,0,0,0,0,0,"Weapons test"
+5139,0,0,0,0,0,0,0,"The guy looks familiar!!"
+5140,0,0,0,0,0,0,0,"Uncertain chilliness"
+5141,120,0,0,0,0,0,0,"Got a curse!!"
+5142,0,0,0,0,0,0,0,"Prototype-(1)"
+5143,0,0,0,0,0,0,0,"Prototype-(2)"
+5144,0,0,0,0,0,0,0,"Prototype-(2)"
+5145,0,0,0,0,0,0,0,"Prototype-(3)"
+5146,0,0,0,0,0,0,0,"Battle test"
+
 6000,0,0,0,0,0,0,0,"Job Change to Taekwon"
 6001,0,0,0,0,0,0,0,"Job Change to Taekwon"
 6002,0,0,0,0,0,0,0,"Job Change to Taekwon"
@@ -765,6 +841,14 @@
 7201,0,0,0,0,0,0,0,"Removing traces"
 7202,0,0,0,0,0,0,0,"Secret order from Doha - Collect proof"
 7203,0,0,0,0,0,0,0,"Secret order from Doha - Final Report"
+7206,0,0,0,0,0,0,0,"New Day for Cheshire"
+7207,0,0,0,0,0,0,0,"Cheshire's Box"
+7208,82800,0,0,0,0,0,0,"Wait for Cheshire?"
+
+// Misty Forest Labyrinth
+7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
+7212,0,0,0,0,0,0,0,"Loki's Search"
+7213,0,0,0,0,0,0,0,"Wandering Protector"
 
 // Paradise Gear Advanced Quests [Chilly]
 7214,0,0,0,0,0,0,0,"Paradise Advanced: Romeo Training"
@@ -1268,6 +1352,10 @@
 9164,0,0,0,0,0,0,0,"Delivery of Good News(4)"
 9165,0,0,0,0,0,0,0,"Reward from Paiko for success of Jaty Crown"
 
+9222,0,0,0,0,0,0,0,"Get Rid of Bangungot from Hospital 2F"
+9223,0,0,0,0,0,0,0,"Will there be Peace at the Hospital?"
+9224,0,0,0,0,0,0,0,"Explore Hospital 2F"
+
 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"
@@ -1565,6 +1653,34 @@
 11175,7200,0,0,0,0,0,0,"Supply Shortage"
 11176,0,0,0,0,0,0,0,"For my friends"
 
+// Mora
+11182,180,0,0,0,0,0,0,"Teohre's Report"
+11183,0,0,0,0,0,0,0,"Teohre's Favor"
+11184,0,0,0,0,0,0,0,"Runaway Laphine"
+11185,0,0,0,0,0,0,0,"Pouch"
+11186,0,0,0,0,0,0,0,"Pouch"
+11187,0,0,0,0,0,0,0,"Pouch"
+11188,0,0,0,0,0,0,0,"Pouch"
+11189,0,0,0,0,0,0,0,"Roast Beef"
+11190,0,0,0,0,0,0,0,"Roast Beef"
+11191,0,0,0,0,0,0,0,"Shortage of Roast Beef"
+11192,0,0,0,0,0,0,0,"Mora Village..."
+11193,0,0,0,0,0,0,0,"Sonya's Friend"
+11194,0,0,0,0,0,0,0,"Runaway Laphine"
+11195,0,0,0,0,0,0,0,"Pouch"
+11196,0,0,0,0,0,0,0,"Pouch"
+11197,0,0,0,0,0,0,0,"Pouch"
+11198,0,0,0,0,0,0,0,"Mora Village..."
+11199,0,0,0,0,0,0,0,"Theo's Friend"
+11200,0,0,0,0,0,0,0,"Pouch"
+11201,0,0,0,0,0,0,0,"Roast Beef"
+11202,0,0,0,0,0,0,0,"Roast Beef"
+11203,0,0,0,0,0,0,0,"Shortage of Roast Beef"
+11206,0,0,0,0,0,0,0,"Quick Delivery Yoneseu"
+11207,0,0,0,0,0,0,0,"A Very Heavy Burden"
+11208,0,0,0,0,0,0,0,"Daphne"
+
+// Malangdo
 11209,0,0,0,0,0,0,0,"Hardships of Thomas"
 11210,0,0,0,0,0,0,0,"Malangdo Reunion"
 11211,0,0,0,0,0,0,0,"Malangdo Reunion"
@@ -1601,6 +1717,33 @@
 11242,0,0,0,0,0,0,0,"Repair of cracks"
 11243,86400,0,0,0,0,0,0,"Repair of cracks"
 
+11284,0,0,0,0,0,0,0,"Nurse at Port Malaya-1"
+11285,0,0,0,0,0,0,0,"Nurse at Port Malaya-2"
+11286,0,0,0,0,0,0,0,"Nurse at Port Malaya-3"
+11287,0,0,0,0,0,0,0,"Nurse at Port Malaya-4"
+11288,0,0,0,0,0,0,0,"Nurse at Port Malaya-5"
+11289,0,0,0,0,0,0,0,"Nurse at Port Malaya-6"
+11290,0,0,0,0,0,0,0,"Nurse at Port Malaya-7"
+11291,0,0,0,0,0,0,0,"Nurse at Port Malaya-8"
+11292,0,0,0,0,0,0,0,"Nurse at Port Malaya-9"
+11293,0,0,0,0,0,0,0,"Nurse at Port Malaya-10"
+11294,0,0,0,0,0,0,0,"Nurse at Port Malaya-11"
+11295,0,0,0,0,0,0,0,"Nurse at Port Malaya-12"
+11296,0,0,0,0,0,0,0,"Nurse at Port Malaya-13"
+11297,0,0,0,0,0,0,0,"Nurse at Port Malaya-14"
+11298,0,0,0,0,0,0,0,"Nurse at Port Malaya-15"
+11299,0,0,0,0,0,0,0,"Nurse at Port Malaya-16"
+11300,0,0,0,0,0,0,0,"Nurse at Port Malaya-17"
+11301,0,0,0,0,0,0,0,"Nurse at Port Malaya-18"
+11302,0,0,0,0,0,0,0,"Nurse at Port Malaya-19"
+11303,0,0,0,0,0,0,0,"Nurse at Port Malaya-20"
+11304,0,0,0,0,0,0,0,"Nurse at Port Malaya-21"
+11305,0,0,0,0,0,0,0,"Nurse at Port Malaya-22"
+11306,0,0,0,0,0,0,0,"Nurse at Port Malaya-23"
+11307,0,0,0,0,0,0,0,"Nurse at Port Malaya-24"
+11308,0,0,0,0,0,0,0,"Nurse at Port Malaya-25"
+11309,0,0,0,0,0,0,0,"Nurse at Port Malaya-26"
+
 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"
@@ -1812,6 +1955,42 @@
 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"
 
+// Mora Coin Daily Quests
+12225,0,2132,3,0,0,0,0,"Pom Spider Hunting"
+12226,0,2133,4,0,0,0,0,"Angra Mantis Hunting"
+12227,0,2134,5,0,0,0,0,"Parus Hunting"
+12228,0,2136,6,0,0,0,0,"Little Fatam Hunting"
+12229,0,2137,7,0,0,0,0,"Miming Hunting"
+12230,82800,0,0,0,0,0,0,"Mora Monster Hunt"
+12231,0,0,0,0,0,0,0,"Insect Feeler Collecting"
+12232,0,0,0,0,0,0,0,"Immortal Heart Collecting"
+12233,0,0,0,0,0,0,0,"Rotten Bandage Collecting"
+12234,0,0,0,0,0,0,0,"Orcish Voucher Collecting"
+12235,0,0,0,0,0,0,0,"Skeleton Bone Collecting"
+12236,0,0,0,0,0,0,0,"Memento Collecting"
+12237,0,0,0,0,0,0,0,"Shell Collecting"
+12238,0,0,0,0,0,0,0,"Scale Shell Collecting"
+12239,0,0,0,0,0,0,0,"Venom Canine Collecting"
+12240,0,0,0,0,0,0,0,"Sticky Mucus Collecting"
+12241,82800,0,0,0,0,0,0,"Mora Item Request 1"
+12242,82800,0,0,0,0,0,0,"Mora Item Request 2"
+
+// Missing Person Quests
+12243,0,0,0,0,0,0,0,"Missing Information on Tajareu"
+12244,0,0,0,0,0,0,0,"Missing Information on Tokenizer"
+12245,0,0,0,0,0,0,0,"Missing Information on Mesile"
+12246,0,0,0,0,0,0,0,"Missing Information on Noir"
+12247,0,0,0,0,0,0,0,"Missing Information on Pajama God"
+12248,0,0,0,0,0,0,0,"Missing Information on Mendel"
+12249,0,0,0,0,0,0,0,"Missing Information on Miles"
+12250,0,0,0,0,0,0,0,"Missing Information on Kunmune"
+12251,0,0,0,0,0,0,0,"Missing Information on Chayihokin"
+12252,0,0,0,0,0,0,0,"Missing Information on Tuale"
+12253,82800,0,0,0,0,0,0,"Missing Person Search Time Limit"
+
+12278,0,0,0,0,0,0,0,"Towards Bakonawa Lake..."
+12279,0,0,0,0,0,0,0,"Get Rid of Bakonawa"
+
 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"
@@ -2292,115 +2471,3 @@
 60353,0,0,0,0,0,0,0,"Bathroom Ghost"
 60354,0,0,0,0,0,0,0,"Bathroom Ghost"
 60355,0,0,0,0,0,0,0,"Bathroom Ghost"
-
-// Mora
-// Mora Quests
-// Misty Forest Labyrinth
-7211,9000,0,0,0,0,0,0,"Misty Forest Labyrinth Exploration"
-7212,0,0,0,0,0,0,0,"Loki's Search"
-7213,0,0,0,0,0,0,0,"Wandering Protector"
-
-// New Sapha's Honor Quest
-7206,0,0,0,0,0,0,0,"New Day for Cheshire"
-7207,0,0,0,0,0,0,0,"Cheshire's Box"
-7208,82800,0,0,0,0,0,0,"Wait for Cheshire?"
-
-// Roast Beef Quest
-11182,180,0,0,0,0,0,0,"Teohre's Report"
-11183,0,0,0,0,0,0,0,"Teohre's Favor"
-// Theo
-11184,0,0,0,0,0,0,0,"Runaway Laphine"
-11185,0,0,0,0,0,0,0,"Pouch"
-11186,0,0,0,0,0,0,0,"Pouch"
-11187,0,0,0,0,0,0,0,"Pouch"
-11188,0,0,0,0,0,0,0,"Pouch"
-11189,0,0,0,0,0,0,0,"Roast Beef"
-11190,0,0,0,0,0,0,0,"Roast Beef"
-11191,0,0,0,0,0,0,0,"Shortage of Roast Beef"
-
-11198,0,0,0,0,0,0,0,"Mora Village..."
-11199,0,0,0,0,0,0,0,"Theo's Friend"
-// Sonya
-11192,0,0,0,0,0,0,0,"Mora Village..."
-11193,0,0,0,0,0,0,0,"Sonya's Friend"
-
-11194,0,0,0,0,0,0,0,"Runaway Laphine"
-11195,0,0,0,0,0,0,0,"Pouch"
-11196,0,0,0,0,0,0,0,"Pouch"
-11197,0,0,0,0,0,0,0,"Pouch"
-//
-11200,0,0,0,0,0,0,0,"Pouch"
-11201,0,0,0,0,0,0,0,"Roast Beef"
-11202,0,0,0,0,0,0,0,"Roast Beef"
-11203,0,0,0,0,0,0,0,"Shortage of Roast Beef"
-
-11206,0,0,0,0,0,0,0,"Quick Delivery Yoneseu"
-11207,0,0,0,0,0,0,0,"A Very Heavy Burden"
-11208,0,0,0,0,0,0,0,"Daphne"
-
-// Ropewa & Yuridi Quest
-1109,0,0,0,0,0,0,0,"Ropewa & Yuridi - Survivors of the Labyrinth"
-1110,0,0,0,0,0,0,0,"Ropewa & Yuridi - Victims of the Labyrinth"
-1111,0,0,0,0,0,0,0,"Ropewa & Yuridi - Maze in the Labyrinth"
-1112,0,0,0,0,0,0,0,"Ropewa & Yuridi - Lost in the Labyrinth"
-1113,0,0,0,0,0,0,0,"Ropewa & Yuridi - Torn Apart"
-1114,0,0,0,0,0,0,0,"Ropewa & Yuridi - The Cost of Restoration"
-1115,0,0,0,0,0,0,0,"Ropewa & Yuridi - Song of the Abyss"
-1116,0,0,0,0,0,0,0,"Ropewa & Yuridi - Dead Man's Song"
-1117,0,0,0,0,0,0,0,"Ropewa & Yuridi - Eternal Promise, Broken Ring"
-1118,0,0,0,0,0,0,0,"Neighborhood Knight - I Need Clues"
-
-// Researcher's Quest
-5016,0,0,0,0,0,0,0,"Bring me a Research Tool Bag"
-5017,0,0,0,0,0,0,0,"Revenge of the Reseacher"
-5018,0,0,0,0,0,0,0,"Revenge of the Reseacher"
-5019,0,0,0,0,0,0,0,"Bathroom Sample Studying"
-5020,86400,0,0,0,0,0,0,"Sample Researching"
-5021,0,0,0,0,0,0,0,"Sample Collecting"
-5022,0,0,0,0,0,0,0,"Sample Collecting"
-5023,21600,0,0,0,0,0,0,"Inspection of the Sample"
-5024,0,0,0,0,0,0,0,"Eastern Pool Research"
-5025,0,0,0,0,0,0,0,"Western Pool Research"
-5026,0,0,0,0,0,0,0,"Southern Pool Research"
-5027,0,0,0,0,0,0,0,"Northern Pool Research"
-5028,43200,0,0,0,0,0,0,"Inspection of the Sample"
-5029,3600,0,0,0,0,0,0,"Unidentified Creature"
-
-// Mora Coin Daily Quests
-12225,0,2132,3,0,0,0,0,"Pom Spider Hunting"
-12226,0,2133,4,0,0,0,0,"Angra Mantis Hunting"
-12227,0,2134,5,0,0,0,0,"Parus Hunting"
-12228,0,2136,6,0,0,0,0,"Little Fatam Hunting"
-12229,0,2137,7,0,0,0,0,"Miming Hunting"
-12230,82800,0,0,0,0,0,0,"Mora Monster Hunt"
-12231,0,0,0,0,0,0,0,"Insect Feeler Collecting"
-12232,0,0,0,0,0,0,0,"Immortal Heart Collecting"
-12233,0,0,0,0,0,0,0,"Rotten Bandage Collecting"
-12234,0,0,0,0,0,0,0,"Orcish Voucher Collecting"
-12235,0,0,0,0,0,0,0,"Skeleton Bone Collecting"
-12236,0,0,0,0,0,0,0,"Memento Collecting"
-12237,0,0,0,0,0,0,0,"Shell Collecting"
-12238,0,0,0,0,0,0,0,"Scale Shell Collecting"
-12239,0,0,0,0,0,0,0,"Venom Canine Collecting"
-12240,0,0,0,0,0,0,0,"Sticky Mucus Collecting"
-12241,82800,0,0,0,0,0,0,"Mora Item Request 1"
-12242,82800,0,0,0,0,0,0,"Mora Item Request 2"
-
-// Missing Person Quests
-12243,0,0,0,0,0,0,0,"Missing Information on Tajareu"
-12244,0,0,0,0,0,0,0,"Missing Information on Tokenizer"
-12245,0,0,0,0,0,0,0,"Missing Information on Mesile"
-12246,0,0,0,0,0,0,0,"Missing Information on Noir"
-12247,0,0,0,0,0,0,0,"Missing Information on Pajama God"
-12248,0,0,0,0,0,0,0,"Missing Information on Mendel"
-12249,0,0,0,0,0,0,0,"Missing Information on Miles"
-12250,0,0,0,0,0,0,0,"Missing Information on Kunmune"
-12251,0,0,0,0,0,0,0,"Missing Information on Chayihokin"
-12252,0,0,0,0,0,0,0,"Missing Information on Tuale"
-12253,82800,0,0,0,0,0,0,"Missing Person Search Time Limit"
-
-// New Novice Ground
-2299,0,0,0,0,0,0,0,"Training Center: Talk to Lisa"
-2300,0,0,0,0,0,0,0,"Training Center: Talk to General Reindeer"
-2301,0,0,0,0,0,0,0,"Training Center: Leave the boat"
-2302,0,0,0,0,0,0,0,"Training Center: Formation"

doc/script_commands.txt

@@ -3889,7 +3889,7 @@ changing jobs, which can be checked for later in scripts.
 
 *jobname (<job number>)
 
-This command retrieves the name of the given job using the msg_athena entries 550->650.
+This command retrieves the name of the given job using the map_msg entries 550->655.
 
 	mes "[Kid]";
 	mes "I never thought I'd met a "+jobname(Class)+" here of all places.";
@@ -3899,15 +3899,15 @@ This command retrieves the name of the given job using the msg_athena entries 55
 
 *eaclass ({<job number>})
 
-This commands returns the "eA job-number" corresponding to the given class (if none is given, it returns uses
-the invoking player's class as argument). The eA job-number is also a class number system, but it's one that
-comes with constants which make it easy to convert among classes. The command will return -1 if you pass it a
-job number which doesn't has a eA Job value equivalent.
+This commands returns the "eA job-number" corresponding to the given class, and
+uses the invoking player's class if none is given. The eA job-number is also a
+class number system, but it's one that comes with constants which make it easy
+to convert among classes. The command will return -1 if you pass it a job number
+which doesn't have an eA job-number equivalent.
 
 	set @eac, eaclass();
 	if ((@eac&EAJ_BASEMASK) == EAJ_SWORDMAN)
-		mes "You must be a swordman, knight, crusader, paladin, high swordman, lord knight, baby swordman,";
-		mes "baby knight or baby crusader.";
+		mes "Your base job is Swordman.";
 	if (@eac&EAJL_UPPER)
 		mes "You are a rebirth job.";
 	if ((@eac&EAJ_UPPERMASK) == EAJ_SWORDMAN)
@@ -3919,11 +3919,12 @@ For more information on the eA Job System, see the docs/ea_job_system.txt file.
 
 *roclass <job number> {,<gender>}
 
-Does the opposite of eaclass. That is, given a eA Job class, it returns which is the corresponding RO class number. 
-A gender is required because both Bard and Dancers share the same eA Job value (EAJ_BARDDANCER), if it isn't given, the
-gender of the executing player is taken (if there's no player running the script, male will be used by default).
-The command returns -1 when there isn't a valid class to represent the required job (for example, if you try to get the
-baby version of a Taekwon class).
+Does the opposite of eaclass. That is, given an eA job-number, it returns the
+corresponding RO class number. A gender is required because both Bard and Dancers
+share the same eA job-number (EAJ_BARDDANCER), and uses the invoking player's
+gender if none is given (if no player is attached, male will be used by default).
+The command will return -1 if there is no valid class to represent the specified
+job (for example, if you try to get the baby version of a Taekwon class).
 
 	set @eac, eaclass();
 	//Check if class is already rebirth
@@ -3942,14 +3943,11 @@ baby version of a Taekwon class).
 
 *changebase <job ID number>;
 
-This will change the appearance of the invoking character to that of a specified 
-job class. Nothing but appearance will change. This command is used in item 
-scripts for "Wedding Dress" and "Tuxedo" so the character like job 22, which is 
-the job number of the wedding sprites.
+This command will change the appearance of the invoking character to that of a
+specified job class. Nothing but appearance will change.
 
-It would be entered in the equip bonus section of an item
-
-2338,Wedding_Dress,Wedding Dress,5,43000,,500,,0,,0,119529470,7,0,16,,0,1,0,{ bonus bMdef,15; changebase 22; }
+	changebase Job_Novice; // Changes player to Novice sprite.
+	changebase Class; // Changes player back to default sprite.
 
 ---------------------------------------
 

npc/re/kafras/kafras.txt

@@ -0,0 +1,35 @@
+//===== rAthena Script ======================================= 
+//= Kafras (Cities/Dungeons/Fields)
+//===== By: ================================================== 
+//= Joseph
+//===== Current Version: ===================================== 
+//= 1.0
+//===== Compatible With: ===================================== 
+//= rAthena SVN
+//===== Description: =========================================
+//= Argument settings for callfunc "F_Kafra":
+//=  arg(0): 0 - Default Kafra message
+//=          1 - Niflhiem Kafra message
+//=          2 - Guild Kafra message
+//=  arg(1): 1 - Disable teleport menu 
+//=  arg(2): 1 - Disable info menu
+//=  arg(3): Cost of Storage service
+//=  arg(4): Cost of Rent a Pushcart service
+//===== Additional Comments: ================================= 
+//= 0.x Previous Authors: 
+//=     - L0ne_W0lf, Daegaladh
+//= 1.0 Merged and cleaned up Kafras. [Euphy]
+//============================================================ 
+
+// Brasilis
+//============================================================
+brasilis,197,221,4	script	Kafra Employee::kaf_bra	117,{
+	cutin "kafra_01",2;
+	callfunc "F_Kafra",0,3,0,80,700;
+	savepoint "brasilis",195,259;
+	callfunc "F_KafEnd",0,1,"in the city of Brasilis";
+}
+
+// Izlude
+//============================================================
+izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117

npc/re/kafras/kafras_brasilis.txt

@@ -1,31 +0,0 @@
-//===== rAthena Script ======================================= 
-//= Brasilis Kafra
-//===== By: ================================================== 
-//= L0ne_W0lf
-//===== Current Version: ===================================== 
-//= 1.2
-//===== Compatible With: ===================================== 
-//= rAthena 1.0
-//===== 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.
-//=    When set to 2 the Guild Kafra message is displayed. 
-//=  arg(1): Set to 1 to disable teleport menu option. Otherwise set to 0.
-//=  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: ================================= 
-//= 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;
-	callfunc "F_Kafra",0,3,0,80,700;
-
-	M_Save:
-		savepoint "brasilis",195,259;
-		callfunc "F_KafEnd",0,1,"in the city of Brasilis";
-}

npc/re/kafras/kafras_izl.txt

@@ -1,15 +0,0 @@
-//===== rAthena Script ======================================= 
-//= New Izlude Kafras
-//===== By: ================================================== 
-//= Daegaladh
-//===== Current Version: ===================================== 
-//= 1.0
-//===== Compatible With: ===================================== 
-//= rAthena SVN
-//===== Description: =========================================
-//= Izlude Kafras with renewal coordinates.
-//===== Additional Comments: ================================= 
-//= 1.0 First version.
-//============================================================ 
-
-izlude,128,148,6	duplicate(kaf_izlude)	Kafra Employee	117

npc/re/scripts_athena.conf

@@ -45,8 +45,7 @@ npc: npc/re/guides/guides_veins.txt
 npc: npc/re/instances/OctopusCave.txt
 
 // ---------------- Kafras & Cool Event Corp. -------------------
-npc: npc/re/kafras/kafras_izl.txt
-npc: npc/re/kafras/kafras_brasilis.txt
+npc: npc/re/kafras/kafras.txt
 
 // -------------------------- Merchant --------------------------
 npc: npc/re/merchants/3rd_trader.txt

src/common/mmo.h

@@ -98,7 +98,7 @@
 #define MAX_GUILDSKILL	15 // increased max guild skills because of new skills [Sara-chan]
 #define MAX_GUILDLEVEL 50
 #define MAX_GUARDIANS 8	//Local max per castle. [Skotlex]
-#define MAX_QUEST_DB 2300 //Max quests that the server will load
+#define MAX_QUEST_DB 2400 //Max quests that the server will load
 #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
 
 // for produce