* Updated quest_read_db. Might need reviewing. ;-;

- Reports entries when read by server at start up like other DBs.
- Will now skip blank lines instead of reporting false errors.
- Will report when entries are > MAX_QUEST_DB.
* Updated quest and item DB with Eden Group information.

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

11 files changed, 209 insertions, 39 deletions

diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 488fb69e5..59c2aea23 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -1,5 +1,10 @@
 Date	Added
 
+2010/11/14
+	* Rev. 14463 Updated quest_read_db. [L0ne_W0lf]
+	- Reports entries when read by server at start up like other DBs.
+	- Will now skip blank lines instead of reporting false errors.
+	- Will report when entries are > MAX_QUEST_DB.
 2010/11/10
 	* Made bAtkRate add the rate rather than setting it. (bugreport:4499) [Paradox924X]
 	* Added an item_delay database usable for item-specific use delays. [Paradox924X]
diff --git a/conf/battle/exp.conf b/conf/battle/exp.conf
index 7e9675ed2..f3d438ea2 100644
--- a/conf/battle/exp.conf
+++ b/conf/battle/exp.conf
@@ -92,7 +92,7 @@ death_penalty_job: 100
 zeny_penalty: 0
 
 // Will display experience gained from killing a monster. (Note 1)
-disp_experience: yes
+disp_experience: no
 
 // Will display zeny earned (from mobs, trades, etc) (Note 1)
 disp_zeny: no
diff --git a/conf/mapflag/nomemo.txt b/conf/mapflag/nomemo.txt
index 9e2d412a2..6e57620c9 100644
--- a/conf/mapflag/nomemo.txt
+++ b/conf/mapflag/nomemo.txt
@@ -106,6 +106,7 @@ ra_temsky	mapflag	nomemo
 ve_in	mapflag	nomemo
 ve_in02	mapflag	nomemo
 thor_camp	mapflag	nomemo
+moc_para01	mapflag	nomemo
 
 // Fields  ===================
 alb2trea	mapflag	nomemo
diff --git a/conf/mapflag/nopenalty.txt b/conf/mapflag/nopenalty.txt
index b34c99191..0d22861aa 100644
--- a/conf/mapflag/nopenalty.txt
+++ b/conf/mapflag/nopenalty.txt
@@ -124,6 +124,7 @@ veins	mapflag	nopenalty
 ve_in	mapflag	nopenalty
 ve_in02	mapflag	nopenalty
 thor_camp	mapflag	nopenalty
+moc_para01	mapflag	nopenalty
 
 // Job Quests ========================
 job_sword1	mapflag	nopenalty
diff --git a/conf/mapflag/noteleport.txt b/conf/mapflag/noteleport.txt
index a00dc26a7..10672aea9 100644
--- a/conf/mapflag/noteleport.txt
+++ b/conf/mapflag/noteleport.txt
@@ -117,6 +117,7 @@ kh_dun01	mapflag	noteleport
 ve_in	mapflag	noteleport
 ve_in02	mapflag	noteleport
 thor_camp	mapflag	noteleport
+moc_para01	mapflag	noteleport
 
 // Job Quests ====================
 job_sword1	mapflag	noteleport
diff --git a/db/Changelog.txt b/db/Changelog.txt
index c40cdbcd9..1b30aa076 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -8,6 +8,8 @@
 	1475 Equestrian's Spear:	NEED INFO.
 	13005 Angelic Wing Dagger:	NEED INFO.
 =======================
+2010/11/14
+	* Rev. 14463 Updated quest and item DBs with Eden Group information. [L0ne_W0lf]
 2010/11/10
 	* Rev. 14458 Added some items with enforced delays to the item_delay_db! [L0ne_W0lf]
 2010/11/02
diff --git a/db/item_db.txt b/db/item_db.txt
index 28a738fef..0a89e7298 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -542,8 +542,8 @@
 1189,Krasnaya,Krasnaya,4,20,,3800,200,,1,3,0x00004082,2,2,34,2,50,1,3,{ if(readparam(bStr)>=95) { bonus bAtk,20; } },{},{}
 1190,Claymore_C,Claymore,4,20,,0,220,,1,0,0x00004080,7,2,34,3,1,0,3,{ bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{}
 //1191,Alca_Bringer,
-//1192,P_Slayer1,Eden Slayer I,
-//1193,P_Slayer1,Eden Slayer II,
+//1192,P_Slayer1,Eden Slayer I,4,0,,0,162,,1,0,0x00004082,7,2,34,2,26,0,3,{},{},{}
+//1193,P_Slayer2,Eden Slayer II,4,0,,0,185,,1,0,0x00004082,7,2,34,2,40,0,3,{},{},{}
 //1194,Executioner,
 // Daggers
 1201,Knife,Knife,4,50,,400,17,,1,3,0xFE9F7EEF,7,2,2,1,1,1,1,{},{},{}
@@ -894,8 +894,8 @@
 1647,Croce_Staff,Croce Staff,4,20,,400,10,,1,1,0x00008110,2,2,2,3,50,1,10,{ bonus bAtkEle,Ele_Holy; bonus bMatkRate,15; bonus bInt,4; bonus4 bAutoSpellOnSkill,"AL_HEAL","AL_BLESSING",getskilllv("AL_BLESSING")>1?getskilllv("AL_BLESSING"):1,20; },{},{}
 1648,Staff_Of_Bordeaux,Staff Of Bordeaux,4,0,,500,30,,1,0,0x00010204,2,2,2,4,50,1,10,{ bonus bMatkRate,15; bonus bInt,2; bonus bDex,1; if(getskilllv("SA_DRAGONOLOGY") == 5) { bonus bUseSPrate,-15; bonus bInt,3; } },{},{}
 //1649,Rafini_Staff,
-//1650,P_Staff1,Eden Staff I,
-//1651,P_Staff2,Eden Staff II,
+//1650,P_Staff1,Eden Staff I,4,0,,0,69,,1,0,0x00818314,7,2,2,2,26,0,10,{ bonus bInt,1; bonus bMatkRate,15; },{},{}
+//1651,P_Staff2,Eden Staff II,4,0,,0,60,,1,0,0x00818314,7,2,2,2,40,0,10,{ bonus bInt,2; bonus bMatkRate,15; },{},{}
 // Bows
 1701,Bow,Bow,4,1000,,500,15,,5,3,0x000A0848,7,2,34,1,4,1,11,{},{},{}
 1702,Bow_,Bow,4,1000,,500,15,,5,4,0x000A0848,7,2,34,1,4,1,11,{},{},{}
@@ -942,8 +942,8 @@
 1744,Bow_Of_Evil,Bow Of Evil,4,0,,0,170,,5,0,0x000A0848,7,2,34,4,1,0,11,{ bonus2 bSkillAtk,"AC_DOUBLE",25; bonus bDex,2; },{},{}
 1745,Falken_Blitz,Falken Blitz,4,0,,1000,100,,5,2,0x00080808,2,2,34,3,50,1,11,{ bonus2 bSkillAtk,"SN_SHARPSHOOTING",10; bonus2 bSkillAtk,"AC_DOUBLE",10; bonus2 bSkillAtk,"AC_CHARGEARROW",10; },{},{}
 //1746,Elven_Bow,
-//1747,P_Bow1,Eden Bow I,
-//1748,P_Bow2,Eden Bow II,
+//1747,P_Bow1,Eden Bow I,4,0,,0,82,,5,3,0x000A0848,7,2,34,2,26,0,11,{},{},{}
+//1748,P_Bow2,Eden Bow II,4,0,,0,120,,5,3,0x000A0848,7,2,34,2,40,0,11,{},{},{}
 // Arrows
 1750,Arrow,Arrow,10,1,,1,25,,,,0x000A1848,7,2,32768,,1,,1,{},{},{}
 1751,Silver_Arrow,Silver Arrow,10,3,,2,30,,,,0x000A1848,7,2,32768,,1,,1,{ bonus bAtkEle,Ele_Holy; },{},{}
@@ -1380,9 +1380,9 @@
 //2453,Freya_Spirit_Sandals3,Freya Spirit Sandals,
 //2454,Freya_Spirit_Sandals4,Freya Spirit Sandals,
 //2455,Guardian_Boots,Guardian Boots,
-//2456,Para_Team_Boots1,Eden Team Boots I,
-//2457,Para_Team_Boots2,Eden Team Boots II,
-//2458,Para_Team_Boots3,Eden Team Boots III,
+//2456,Para_Team_Boots1,Eden Team Boots I,5,0,,0,,12,,0,0xFFFFFFFF,7,2,64,,12,0,0,{ bonus bHPrecovRate,10; bonus bSPrecovRate,2; },{},{}
+//2457,Para_Team_Boots2,Eden Team Boots II,5,0,,0,,16,,0,0xFFFFFFFF,7,2,64,,26,0,0,{ bonus bHPrecovRate,12; bonus bSPrecovRate,4; },{},{}
+//2458,Para_Team_Boots3,Eden Team Boots III,5,0,,0,,18,,0,0xFFFFFFFF,7,2,64,,40,0,0,{ bonus bHPrecovRate,14; bonus bSPrecovRate,6; },{},{}
 // Garments
 //===================================================================
 2501,Hood,Hood,5,1000,,200,,1,,0,0xFFFFFFFF,7,2,4,,0,1,0,{},{},{}
@@ -1444,7 +1444,7 @@
 //2557,Freya_Soul_Scarf3,Freya Soul Scarf,
 //2558,Freya_Soul_Scarf4,Freya Soul Scarf,
 //2559,Guardian_Manteau,Guardian Manteau,
-//2560,Para_Team_Manteau,Eden Team Manteau,
+//2560,Para_Team_Manteau,Eden Team Manteau,5,0,,0,,14,,0,0xFFFFFFFF,7,2,4,,12,0,0,{ bonus2 bSubEle,Ele_Neutral,10; },{},{}
 // Accessories
 //===================================================================
 2601,Ring,Ring,5,30000,,100,,0,,0,0xFFFFFFFE,7,2,136,,20,0,0,{ bonus bStr,2; },{},{}
@@ -2788,7 +2788,7 @@
 5580,Red_Beret,Red Beret,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,559,{},{},{}
 5581,Cancer_Crown,Cancer Crown,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,560,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bDef,1; bonus bHealPower,3; bonus bFlee,10; } },{},{}
 5582,Cancer_Diadem,Cancer Diadem,5,20,,300,,3,,0,0xFFFFFFFF,7,2,256,,70,1,561,{ bonus2 bSubEle,Ele_water,5; if(getrefine()>6) { bonus bMDef,1; bonus bHealPower,3; bonus bMatkRate,2; } },{},{}
-5583,Paradise_Hat,Paradise Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,1,{},{},{}
+//5583,Para_Team_Hat,Eden Team Hat,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,465,{},{},{}
 5584,Majestic_Evil_Horn,Majestic Evil Horns,5,20,,100,,1,,0,0xFFFFFFFF,7,2,256,,0,1,562,{ bonus2 bSubRace,RC_Demon,3; bonus2 bHPDrainRate,3,15; bonus2 bSPDrainRate,1,7; },{},{}
 5585,Rune_Cloth_Circlet,Rune Cloth Circlet,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,564,{},{},{}
 5586,Mogikiller,Mosquito Coil,5,20,,100,,1,,1,0xFFFFFFFF,7,2,256,,0,1,563,{},{},{}
@@ -5027,8 +5027,8 @@
 13046,Krieg,Krierg,4,20,,500,110,,1,3,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_BACKSTAP",Eff_Bleeding,100; bonus2 bSkillAtk,"RG_BACKSTAP",15; },{},{}
 13047,Weihna,Weihna,4,20,,500,135,,1,2,0x00000040,2,2,2,2,50,1,1,{ bonus3 bAddEffOnSkill,"RG_RAID",Eff_Poison,100; autobonus "{ bonus bAtkRate,10; }",5,5000,BF_WEAPON|BF_SHORT,"{ specialeffect2 EF_POTION_BERSERK; }"; },{},{}
 //13048,Damascus_C
-//13050,P_Dagger,Eden Dagger I,
-//13051,P_Dagger,Eden Dagger II,
+//13050,P_Dagger1,Eden Dagger I,4,0,,0,124,,1,0,0xFE9F7EEF,7,2,2,2,26,0,1,{},{},{}
+//13051,P_Dagger2,Eden Dagger II,4,0,,0,158,,1,0,0xFE9F7EEF,7,2,2,2,40,0,1,{},{},{}
 //13053,Moonlight_Sword,
 //13054,Combat_Knife,
 //13055,Asura,
@@ -5046,6 +5046,8 @@
 //13109,Wasteland_Outlaw_C
 13110,Krieger_Pistol1,Glorious Pistol,4,0,,0,80,,7,0,0x01000000,7,2,34,4,80,1,17,{ bonus2 bAddRace,RC_DemiHuman,55; bonus2 bIgnoreDefRate,RC_DemiHuman,20; bonus bUnbreakableWeapon,0; if(getrefine() > 5) bonus2 bIgnoreDefRate,RC_DemiHuman,5; if(getrefine() > 8) { bonus4 bAutoSpellOnSkill,"GS_RAPIDSHOWER","GS_GLITTERING",1,1000; bonus2 bSkillAtk,"GS_RAPIDSHOWER",getrefine()*2; } },{},{}
 //13111,Sharpshooter_Revolver
+//13112,P_Revolver1,Eden Revlover I,4,0,,0,4,,7,0,0x01000000,7,2,34,1,26,0,17,{ bonus bHit,-5; },{},{}
+//13113,P_Revolver2,Eden Revlover II,4,0,,0,60,,7,0,0x01000000,7,2,34,1,40,0,17,{ bonus bHit,-5; },{},{}
 13150,Branch,Branch,4,3000,,500,50,,9,3,0x01000000,7,2,34,1,1,1,18,{},{},{}
 13151,The_Cyclone,Cyclone,4,17500,,700,120,,9,1,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
 13152,The_Cyclone_,Cyclone,4,17500,,700,120,,9,2,0x01000000,7,2,34,2,24,1,18,{ bonus bHit,10; bonus bCritical,10; },{},{}
@@ -5158,8 +5160,8 @@
 //13420,Honglyun's_Sword
 13421,Ruber,Ruber,4,20,,1500,170,,1,1,0x000444A2,2,2,2,3,50,1,2,{ autobonus "{ bonus2 bSkillAtk,\"KN_BOWLINGBASH\",20; bonus2 bSkillAtk,\"SM_BASH\",20; }",5,15000,BF_WEAPON,"{ specialeffect2 EF_ENHANCE; }"; },{},{}
 //13422,Flamberge_C
-//13423,P_Sabre1,Eden Sabre I,
-//13424,P_Sabre2,Eden Sabre II,
+//13423,P_Sabre1,Eden Sabre I,4,0,,0,147,,1,0,0x000654E2,7,2,2,2,26,0,2,{},{},{}
+//13424,P_Sabre2,Eden Sabre II,4,0,,0,170,,1,0,0x000654E2,7,2,2,2,40,0,2,{},{},{}
 //13426,Cutlas_C
 //13427,Solar_Sword_C
 // More Cash Shop Items
@@ -6094,9 +6096,9 @@
 15000,Bone_Plate,Bone Plate,5,20,,1000,,7,,1,0x00021040,2,2,16,,85,1,0,{ bonus bStr,1; bonus bMDef,3; bonus2 bIgnoreDefRate,RC_DemiHuman,10; bonus2 bIgnoreDefRate,RC_Brute,10; bonus3 bAutoSpellWhenHit,"NPC_WIDEBLEEDING",1,10; },{},{}
 15001,Odin's_Blessing_I,Odin's Blessing,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 15002,Rune_Plate,Rune Plate,2,0,,0,,,,1,0xFFFFFFFF,7,2,,,,,,{},{},{}
-//15009,Para_Team_Uniform1,Eden Team Uniform I,
-//15010,Para_Team_Uniform2,Eden Team Uniform II,
-//15011,Para_Team_Uniform3,Eden Team Uniform III,
+//15009,Para_Team_Uniform1,Eden Team Uniform I,5,0,,0,,35,,0,0xFFFFFFFF,7,2,16,,12,0,0,{ bonus bMaxHP,100; bonus bMaxSP,10; },{},{}
+//15010,Para_Team_Uniform2,Eden Team Uniform II,5,0,,0,,46,,0,0xFFFFFFFF,7,2,16,,26,0,0,{ bonus bMaxHP,200; bonus bMaxSP,20; },{},{}
+//15011,Para_Team_Uniform3,Eden Team Uniform III,5,0,,0,,58,,0,0xFFFFFFFF,7,2,16,,40,0,0,{ bonus bMaxHP,300; bonus bMaxSP,30; bonus bMDef,5; },{},{}
 //15012,Puente_Robe,
 //15013,Claire_Suits,
 //15014,Ebone_Armor,
@@ -6104,8 +6106,8 @@
 16001,Red_Square_Bag,Red Square Bag,4,20,,500,130,,,2,0x0004C5B2,2,2,2,4,50,1,8,{ bonus bMaxHP,200; bonus2 bSkillAtk,"AM_ACIDTERROR",20; bonus2 bSkillAtk,"AM_DEMONSTRATION",20; bonus2 bAddMonsterDropItem,501,50; bonus2 bAddMonsterDropItem,502,20; bonus2 bAddMonsterDropItem,503,20; bonus2 bAddMonsterDropItem,504,20; bonus2 bAddMonsterDropItem,505,10; if(readparam(bStr)>=95) bonus2 bAddEff,Eff_Stun,500; },{},{}
 16002,Stunner_C,Stunner,2,20,,2000,140,,1,0,0x00008110,7,2,2,3,27,1,8,{ bonus2 bAddEff,Eff_Stun,1000; bonus2 bAddSize,0,40; bonus2 bAddSize,1,40; bonus2 bAddSize,2,40; },{},{}
 //16003,Carga_Mace,
-//16004,P_Mace1,Eden Mace I,
-//16005,P_Mace2,Eden Mace II,
+//16004,P_Mace1,Eden Mace I,4,0,,0,142,,1,0,0x0004C5B2,7,2,2,2,26,0,8,{},{},{}
+//16005,P_Mace2,Eden Mace II,4,0,,0,163,,1,0,0x0004C5B2,7,2,2,2,40,0,8,{},{},{}
 //16008,Spanner,
 16134,King_Frog_Hat_Box,Frog King Hat Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
 16135,Evil's_Bone_Hat_Box,Satanic Bone Helm Box,2,0,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
diff --git a/db/item_trade.txt b/db/item_trade.txt
index ca8035ed5..c12e88785 100644
--- a/db/item_trade.txt
+++ b/db/item_trade.txt
@@ -1517,3 +1517,28 @@
 12345,91,100	// Luciola's_Honey_Jam
 12348,91,100	// Manuk's_Faith
 12349,91,100	// Cornus'_Tears
+
+// Epidode 13.3
+//1192,123,100	// P_Slayer1
+//1193,123,100	// P_Slayer2
+//1650,123,100	// P_Staff1
+//1651,123,100	// P_Staff2
+//1747,123,100	// P_Bow1
+//1748,123,100	// P_Bow2
+//2456,123,100	// Para_Team_Boots1
+//2457,123,100	// Para_Team_Boots2
+//2458,123,100	// Para_Team_Boots3
+//2560,123,100	// Para_Team_Manteau
+//5583,123,100	// Para_Team_Hat
+//6219,123,100	// Para_Team_Mark
+//13050,123,100	// P_Dagger1
+//13051,123,100	// P_Dagger2
+//13112,123,100	// P_Revolver1
+//13113,123,100	// P_Revolver2
+//13423,123,100	// P_Sabre1
+//13424,123,100	// P_Sabre2
+//15009,123,100	// Para_Team_Uniform1
+//15010,123,100	// Para_Team_Uniform2
+//15011,123,100	// Para_Team_Uniform3
+//16004,123,100	// P_Mace1
+//16005,123,100	// P_Mace2
diff --git a/db/quest_db.txt b/db/quest_db.txt
index f196f8a02..55e8f2c22 100644
--- a/db/quest_db.txt
+++ b/db/quest_db.txt
@@ -2,7 +2,6 @@
 //
 // Structure of Database :
 // Quest ID,Time Limit,Target1,Val1,Target2,Val2,Target3,Val3,Quest Title
-//
 1000,0,0,0,0,0,0,0,"Transcend"
 1001,0,0,0,0,0,0,0,"Job Change to Acolyte"
 1002,0,0,0,0,0,0,0,"Job Change to Acolyte"
@@ -139,10 +138,10 @@
 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"
-//
+
 2143,50,0,0,0,0,0,0,"Guild Dungeon Event"
 2144,0,0,0,0,0,0,0,"Guild Dungeon Event"
-//
+
 2147,0,0,0,0,0,0,0,"Attitude to the New"
 2148,0,0,0,0,0,0,0,"Attitude to the New"
 2149,0,0,0,0,0,0,0,"Attitude to the New"
@@ -203,7 +202,7 @@
 3044,0,0,0,0,0,0,0,"The Gigantic Magestic Goat"
 3045,9600,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"
 3051,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 2"
 3052,0,0,0,0,0,0,0,"Resurrection of Satan Morocc - 3"
@@ -245,7 +244,7 @@
 3092,0,0,0,0,0,0,0,"Report to the continent - Success to restore!"
 3093,0,0,0,0,0,0,0,"Report to the continent - Report to the continent"
 3094,0,0,0,0,0,0,0,"Report to the continent - Return to the expedition"
-//
+
 3100,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Lost Bond of Debt"
 3101,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Strange Heap of Earth"
 3102,0,0,0,0,0,0,0,"Consolidating Heavy Debt - Bond of Debt Found, but..."
@@ -283,6 +282,23 @@
 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"
+
+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!"
+3253,0,0,0,0,0,0,0,"Request - Missing occult mania"
+3254,0,0,0,0,0,0,0,"Request - A country wants you"
+3255,0,1166,30,0,0,0,0,"Request - A wild boar subjugate operation"
+3256,0,0,0,0,0,0,0,"Request - Ready for waiting summer"
+3257,0,1170,30,0,0,0,0,"Request - A grudge of women"
+3258,0,0,0,0,0,0,0,"Request - A material of delicacy"
+3259,0,1143,30,0,0,0,0,"Request - A agony of a doll maste"
+3260,0,1035,30,0,0,0,0,"Request - Tiresome flies"
+3261,0,1026,30,0,0,0,0,"Request - Unclean girl"
+3262,0,0,0,0,0,0,0,"Request - Queer hobby"
+3263,0,0,0,0,0,0,0,"Request - A mallet of goblin"
+3265,0,0,0,0,0,0,0,"Request - Missing occult mania"
+
 4000,0,0,0,0,0,0,0,"Sherin's Job Interview"
 4001,0,0,0,0,0,0,0,"Job Change to Hunter"
 4002,0,0,0,0,0,0,0,"Job Change to Hunter"
@@ -316,7 +332,7 @@
 4032,0,0,0,0,0,0,0,"Conspiracy of the two families"
 4033,0,0,0,0,0,0,0,"Death of Ahrum"
 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"
 6001,0,0,0,0,0,0,0,"Job Change to Taekwon"
 6002,0,0,0,0,0,0,0,"Job Change to Taekwon"
@@ -420,7 +436,40 @@
 7080,86400,0,0,0,0,0,0,"Finding Refined Bradium"
 7081,0,0,0,0,0,0,0,"Helping the Laphine Craftsman"
 7082,86400,0,0,0,0,0,0,"Helping the Laphine Craftsman"
-//
+
+7128,0,0,0,0,0,0,0,"Training course 'conquest a desert!' -start"
+7129,0,1009,10,0,0,0,0,"The training course 'conquer the desert!' - A real battle 1"
+7130,0,1107,10,0,0,0,0,"The training course 'conquer the desert!' - A real battle 2"
+7131,0,1001,5,0,0,0,0,"The training course 'conquer the desert!' - A real battle 3"
+7132,0,0,0,0,0,0,0,"The training course 'conquer the desert!' - Complete a quest"
+7133,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Start"
+7134,0,1051,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle1"
+7135,0,1175,10,0,0,0,0,"The training course 'conquer the culvert!' - A real battle2"
+7136,0,1005,5,0,0,0,0,"The training course 'conquer the culvert!' - A real battle3"
+7137,0,0,0,0,0,0,0,"The training course 'conquer the culvert!' - Complete a quest"
+7138,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Start"
+7139,0,1076,15,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle1"
+7140,0,1031,10,0,0,0,0,"The training course 'conquer the haunted cave!' - A real battle2"
+7141,0,0,0,0,0,0,0,"The training course 'conquer the haunted cave!' - Complete a quest"
+7142,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Start"
+7143,0,1160,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle1"
+7144,0,1095,15,0,0,0,0,"The training course 'conquer ant hell!' - A real battle2"
+7145,0,1176,10,0,0,0,0,"The training course 'conquer ant hell!' - A real battle3"
+7146,0,0,0,0,0,0,0,"The training course 'conquer ant hell!' - Complete a quest"
+7147,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - start"
+7148,0,1686,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle1"
+7149,0,1023,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle2"
+7150,0,1273,10,0,0,0,0,"The training course 'conquer the orc village!' - A real battle3"
+7151,0,0,0,0,0,0,0,"The training course 'conquer the orc village!' - Complete a quest"
+7152,0,0,0,0,0,0,0,"bThe training course 'conquer the orc dungeon!' - start"
+7153,0,1153,20,0,0,0,0,"The training course 'conquer the orc dungeon!' - A real battle1"
+7154,0,1152,20,0,0,0,0,"The training course 'conquer the orc dungeon!'- A real battle2"
+7155,0,0,0,0,0,0,0,"The training course 'conquer the orc dungeon!' - complete a quest"
+7156,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - start"
+7157,0,1264,15,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle1"
+7158,0,1065,10,0,0,0,0,0,"The training course 'conquer an undersea city!' - A real battle2"
+7159,0,0,0,0,0,0,0,"The training course 'conquer an undersea city!' - Complete a quest"
+
 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"
@@ -593,7 +642,7 @@
 8169,0,0,0,0,0,0,0,"Living and Dead Water"
 8170,0,0,0,0,0,0,0,"Living and Dead Water"
 8171,0,0,0,0,0,0,0,"Living and Dead Water"
-//
+
 8181,0,0,0,0,0,0,0,"Sight Blaster"
 8182,0,0,0,0,0,0,0,"Push Back Theory"
 8183,0,0,0,0,0,0,0,"Sight Blaster"
@@ -667,7 +716,22 @@
 8251,0,0,0,0,0,0,0,"Injection of Magic"
 8252,0,0,0,0,0,0,0,"Handworked jewels"
 8253,3600,0,0,0,0,0,0,"Language translation device"
-//
+
+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!"
+8269,0,1104,10,0,0,0,0,"Hunt coco!"
+8270,0,1034,10,0,0,0,0,"Hunt tharafrog!"
+8271,0,0,0,0,0,0,0,"Toxic sprays delivery!"
+8272,0,0,0,0,0,0,0,"Deliver a honey!"
+8273,0,0,0,0,0,0,0,"Deliver a  blanket!"
+8274,0,0,0,0,0,0,0,"Collect bones!"
+8275,0,0,0,0,0,0,0,"Collect feet!"
+8276,0,0,0,0,0,0,0,"Collect scell!"
+8277,0,0,0,0,0,0,0,"Collect tails!"
+8278,0,0,0,0,0,0,0,"Collect cookies!"
+8279,0,0,0,0,0,0,0,"Collect mustache!"
+
 9000,0,0,0,0,0,0,0,"Job Change to Knight"
 9001,0,0,0,0,0,0,0,"Loyalty of a Knight"
 9002,0,0,0,0,0,0,0,"Loyalty of a Knight"
@@ -786,7 +850,30 @@
 10087,0,0,0,0,0,0,0,"Escape from the reality, into the broad world"
 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"
-//
+
+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"
+10105,0,0,0,0,0,0,0,"To client - the chapter of a clock tower"
+10106,0,0,0,0,0,0,0,"To client - the chapter of localizing "
+10107,0,1164,10,0,0,0,0,"Sphinx dungeon - Requiem"
+10108,0,1140,10,0,0,0,0,"Sphinx dungeon - Marduk"
+10109,0,1154,10,0,0,0,0,"Sphinx dungeon - Pasana"
+10110,0,1260,10,0,0,0,0,"Glast heim - Dark Frame"
+10111,0,1117,10,0,0,0,0,"Glast heim - Evil druid"
+10112,0,1192,10,0,0,0,0,"Glast heim - Wraith"
+10113,0,1276,10,0,0,0,0,"Glast Heim - Raydric Archer"
+10114,0,1369,20,0,0,0,0,"Juno - Grand Peco"
+10115,0,1386,20,0,0,0,0,"Juno - sleeper"
+10116,0,1372,20,0,0,0,0,"Juno - Goat"
+10117,0,1376,20,0,0,0,0,"Juno - Harpy"
+10118,0,1269,10,0,0,0,0,"clock tower - Clock"
+10119,0,1199,15,0,0,0,0,"clock tower - Punk"
+10120,0,1195,15,0,0,0,0,"clock tower - Rideword"
+10121,0,1883,15,0,0,0,0,"Localizing - Uzhas"
+10122,0,1404,15,0,0,0,0,"Localizing - Miyabi Doll"
+10123,0,1516,15,0,0,0,0,"Localizing - Mi Gao"
+
 11000,0,0,0,0,0,0,0,"Inspection of Odin Shrine"
 11001,0,0,0,0,0,0,0,"Inspection of Odin Shrine"
 11002,0,0,0,0,0,0,0,"Inspection of Odin Shrine"
@@ -882,7 +969,28 @@
 11103,0,0,0,0,0,0,0,"Secret note of Bazet"
 11104,0,0,0,0,0,0,0,"Resting time"
 11105,0,0,0,0,0,0,0,"Tendrilrion skin"
-//
+
+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"
+11117,0,1024,20,0,0,0,0,"Request : Hunt Worm tail"
+11118,0,1014,30,0,0,0,0,"Request : Hunt Spore"
+11119,0,1048,20,0,0,0,0,"Request : Pest control"
+11120,0,1055,20,0,0,0,0,"Request : Hunt Muka"
+11121,0,1005,20,0,0,0,0,"Request : Hunt Farmiliar"
+11122,0,1019,30,0,0,0,0,"Request : Collect feather"
+11123,0,1077,30,0,0,0,0,"Request : Collect Poison spore"
+11124,86400,0,0,0,0,0,0,"Request : Hunt honet - Complete"
+11125,86400,0,0,0,0,0,0,"Request : Hunt condor - Complete"
+11126,86400,0,0,0,0,0,0,"Request : Hunt grasshopper's leg - Complete"
+11127,86400,0,0,0,0,0,0,"Request : Hunt Worm tail - Complete"
+11128,86400,0,0,0,0,0,0,"Request : Hunt spore - Complete"
+11129,86400,0,0,0,0,0,0,"Request : Pest control - Complete"
+11130,86400,0,0,0,0,0,0,"Request : Hunt muka - Complete"
+11131,86400,0,0,0,0,0,0,"Request : Hunt Farmiliar - Complete"
+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"
+
 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"
@@ -947,7 +1055,25 @@
 12061,0,0,0,0,0,0,0,"Concentration"
 12062,86400,0,0,0,0,0,0,"Today's Mining Closed"
 12070,0,0,0,0,0,0,0,"Limited time for enter"
-//
+
+12072,0,1034,20,0,0,0,0,"Hunt tharafrog"
+12073,0,1248,15,0,0,0,0,"Remove Cruiser"
+12074,0,1070,30,0,0,0,0,"Remove Kukre"
+12075,0,1686,15,0,0,0,0,"Remove orcbaby"
+12076,0,1023,20,0,0,0,0,"Remove orcwarroir"
+12077,0,1066,15,0,0,0,0,"Hunt vadon"
+12078,0,1064,30,0,0,0,0,"Hunt Megalodon"
+12079,0,1144,15,0,0,0,0,"Hunt Marse"
+12080,0,1067,20,0,0,0,0,"Hunt Cornutus"
+12081,0,1151,15,0,0,0,0,"Remove Myst"
+12082,0,1074,30,0,0,0,0,"Hunt shellfish"
+12083,0,1142,15,0,0,0,0,"Hunt Marine sphere"
+12084,0,1158,20,0,0,0,0,"Hunt Phen"
+12085,0,1152,15,0,0,0,0,"Remove orcskeleton"
+12086,0,1177,30,0,0,0,0,"Remove Zenorc"
+12087,0,1041,15,0,0,0,0,"Remove mummy"
+12088,0,0,0,0,0,0,0,"Accomplishing a request"
+
 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"
@@ -1106,7 +1232,7 @@
 17015,0,0,0,0,0,0,0,"The Research Note"
 17016,0,0,0,0,0,0,0,"Regicide"
 17017,0,0,0,0,0,0,0,"Reporting the King's Death"
-//
+
 18001,0,0,0,0,0,0,0,"Delivery for Rooney"
 18002,0,0,0,0,0,0,0,"Delivery for Rooney"
 18003,0,0,0,0,0,0,0,"Delivery for Rooney"
@@ -1224,7 +1350,7 @@
 19127,0,0,0,0,0,0,0,"The Eye of Hellion"
 19128,0,0,0,0,0,0,0,"The Eye of Hellion"
 19129,0,0,0,0,0,0,0,"The Eye of Hellion"
-//
+
 50000,0,0,0,0,0,0,0,"Pirate Dagger materials"
 50001,0,0,0,0,0,0,0,"Weather Beaten Old Man"
 50002,0,0,0,0,0,0,0,"Lost Treasure?"
@@ -1254,7 +1380,7 @@
 50027,0,0,0,0,0,0,0,"Buried treasure"
 50028,0,0,0,0,0,0,0,"Stolen treasure!"
 50029,0,0,0,0,0,0,0,"A Pirate's Spirit!"
-//
+
 //60000,0,0,0,0,0,0,0,"60000"
 60001,0,0,0,0,0,0,0,"Monster Extermination"
 60002,0,0,0,0,0,0,0,"Monster Extermination"
@@ -1408,7 +1534,7 @@
 60188,0,1365,50,0,0,0,0,"Hunting Apocalypse"
 60189,0,1365,100,0,0,0,0,"Hunting Apocalypse"
 60190,0,1365,150,0,0,0,0,"Hunting Apocalypse"
-//
+
 60200,604800,0,0,0,0,0,0,"Endless Tower Effect"
 60201,14400,0,0,0,0,0,0,"Endless Tower Time Limit"
 60301,0,1155,100,0,0,0,0,"Dragon Hunting"
@@ -1421,3 +1547,4 @@
 60308,0,1713,200,0,0,0,0,"Dragon Hunting"
 60309,0,1716,100,0,0,0,0,"Dragon Hunting"
 60310,0,1716,200,0,0,0,0,"Dragon Hunting"
+
diff --git a/src/common/mmo.h b/src/common/mmo.h
index 0d48418c3..b1a257e9c 100644
--- a/src/common/mmo.h
+++ b/src/common/mmo.h
@@ -105,7 +105,7 @@
 #define MAX_GUILDCASTLE 34	// Updated to include new entries for WoE:SE. [L0ne_W0lf]
 #define MAX_GUILDLEVEL 50
 #define MAX_GUARDIANS 8	//Local max per castle. [Skotlex]
-#define MAX_QUEST_DB 1500 //Max quests that the server will load
+#define MAX_QUEST_DB 2000 //Max quests that the server will load
 #define MAX_QUEST_OBJECTIVES 3 //Max quest objectives for a quest
 
 #define MIN_HAIR_STYLE battle_config.min_hair_style
diff --git a/src/map/quest.c b/src/map/quest.c
index d751b27ff..3e43fcda6 100644
--- a/src/map/quest.c
+++ b/src/map/quest.c
@@ -314,6 +314,10 @@ int quest_read_db(void)
 	
 	while(fgets(line, sizeof(line), fp))
 	{
+		if (k == MAX_QUEST_DB) {
+			ShowError("quest_read_db: Too many entries specified in %s/quest_db.txt!\n", db_path);
+			break;
+		}
 		if(line[0]=='/' && line[1]=='/')
 			continue;
 		memset(str,0,sizeof(str));
@@ -326,6 +330,8 @@ int quest_read_db(void)
 				*np = 0;
 				p = np + 1;
 			}
+			else if (str[0] == NULL)
+				continue;
 			else
 			{
 				ShowError("quest_read_db: insufficient columes in line %s\n", line);
@@ -352,7 +358,7 @@ int quest_read_db(void)
 		k++;
 	}
 	fclose(fp);
-	ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","quest_db.txt");
+	ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", k, "quest_db.txt");
 	return 0;
 }