Merge branch 'revert-5f62243a' into 'master'

Revert "Merge branch 'master' into 'master'"

See merge request TMW2/serverdata!16

1 files changed, 113 insertions, 9 deletions

diff --git a/db/quest_db.conf b/db/quest_db.conf
index 6cecd3b7b..9edb2d544 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -191,23 +191,127 @@ quest_db: (
     Name: "TulimsharQuest_Neko"
 },
 
-
-// ID 71 to 95: Halinarzo Quests
+// ID 71 to 90: Halinarzo Quests
 {
     Id: 71
     Name: "HalinarzoQuest_Foxhound"
 },
-// ID 96 to 120: Mine Quests
+{
+    Id: 72
+    Name: "HalinarzoQuest_TraderKing"
+},
+{
+    Id: 73
+    Name: "HalinarzoQuest_SickWife"
+},
+{
+    Id: 74
+    Name: "HalinarzoQuest_LifeDelight"
+},
+{
+    Id: 75
+    Name: "HalinarzoQuest_Sawis"
+},
+
+// ID 91 to 110: Hurnscald Quests
+{
+    Id: 91
+    Name: "HurnscaldQuest_ForestBow"
+},
+{
+    Id: 92
+    Name: "HurnscaldQuest_HarkEye"
+},
+{
+    Id: 93
+    Name: "HurnscaldQuest_Celestia"
+},
+{
+    Id: 94
+    Name: "HurnscaldQuest_TeaParty"
+},
+{
+    Id: 95
+    Name: "HurnscaldQuest_Farmers"
+},
 {
     Id: 96
+    Name: "HurnscaldQuest_Arkim"
+},
+{
+    Id: 97
+    Name: "HurnscaldQuest_Bandits"
+},
+
+// ID 111 to 130: Nivalis Quests
+// ID 131 to 150: Frostia Quests
+{
+    Id: 131
+    Name: "FrostiaQuest_WolfNecklace"
+},
+// ID 151 to 170: Artis Quests
+// ID 171 to 190: Esperia Quests
+// ID 191 to 269: Dungeon Quests
+{
+    Id: 191
     Name: "MineQuest_Tycoon"
 },
-// ID 121 to 145: Hurnscald Quests
-// ID 146 to 170: Nivalis Quests
-// ID 171 to 195: Artis Quests
-// ID 196 to 220: Esperia Quests
-// ID 221 to 245: Artis Quests
-// ID 246 to 270: Frostia Quests
+{
+    Id: 192
+    Name: "MineQuest_Dracoula"
+},
+{
+    Id: 193
+    Name: "MineQuest_Caelum"
+},
+
+// ID 270 to 299: Land Of Fire Quests
+{
+    Id: 270
+    Name: "LoFQuest_EPISODE"
+},
+{
+    Id: 271
+    Name: "LoFQuest_George"
+},
+{
+    Id: 272
+    Name: "LoFQuest_Fairy"
+},
+{
+    Id: 273
+    Name: "LoFQuest_Doug"
+},
+
+// ID 300 to 320: Seasonal/Annual/Monthly quests
+{
+    Id: 300
+    Name: "SQuest_Summer"
+},
+{
+    Id: 301
+    Name: "SQuest_Autumn"
+},
+{
+    Id: 302
+    Name: "SQuest_Winter"
+},
+{
+    Id: 303
+    Name: "SQuest_Spring"
+},
+{
+    Id: 304
+    Name: "SQuest_Sponsor"
+},
+{
+    Id: 305
+    Name: "SQuest_Ched"
+},
+{
+    Id: 306
+    Name: "SQuest_Paxel"
+},
 
 // ID 1000+: Test quests
 {