1 files changed, 672 insertions, 2 deletions
diff --git a/db/quest_db.conf b/db/quest_db.conf
index a834d4294..221e9f248 100644
--- a/db/quest_db.conf
+++ b/db/quest_db.conf
@@ -1436,10 +1436,10 @@ quest_db: (
 	)
 },
 //  New Novice Ground
-{
+/*{
 	Id: 2299
 	Name: "Training Center: Talk to Lisa"
-},
+},*/
 {
 	Id: 2300
 	Name: "Training Center: Talk to General Reindeer"
@@ -12001,6 +12001,676 @@ quest_db: (
 	Id: 14141
 	Name: "Ingredients for research"
 },
+// Academy 14.2
+{
+	Id: 1229
+	Name: "Swordsman training"
+},
+{
+	Id: 1230
+	Name: "Swordsman training"
+},
+{
+	Id: 1233
+	Name: "Swordsman training"
+},
+{
+	Id: 1234
+	Name: "Swordsman training"
+},
+{
+	Id: 1235
+	Name: "Swordsman training"
+},
+{
+	Id: 1236
+	Name: "Swordsman training"
+},
+{
+	Id: 1237
+	Name: "Shop guide"
+},
+{
+	Id: 1238
+	Name: "Shop guide"
+},
+{
+	Id: 1239
+	Name: "Shop guide"
+},
+{
+	Id: 1240
+	Name: "Shop guide"
+},
+{
+	Id: 2293
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2294
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2295
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2296
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2297
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2298
+	Name: "Adventurer's Companion"
+},
+{
+	Id: 2299
+	Name: "Rapid Completion Experience"
+},
+{
+	Id: 4268
+	Name: "Ninja trainer"
+},
+{
+	Id: 4269
+	Name: "Registration at the Academy"
+},
+{
+	Id: 4270
+	Name: "Ninja training - stat explanation"
+},
+{
+	Id: 4271
+	Name: "Ninja training-explanation about the skills"
+},
+{
+	Id: 4272
+	Name: "Ninja training- conversation about the skills"
+},
+{
+	Id: 4273
+	Name: "Ninja training- explanation about the weapons"
+},
+{
+	Id: 4274
+	Name: "Ninjas training- explanation about job change"
+},
+{
+	Id: 4275
+	Name: "Ninja training-Exercise1"
+	Targets: (
+	{
+		MobId: 1113
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4276
+	Name: "Ninja training-Exercise2"
+	Targets: (
+	{
+		MobId: 1002
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4277
+	Name: "Ninja training-Actual battle2"
+	Targets: (
+	{
+		MobId: 1052
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4278
+	Name: "Ninja training-Actual battle1"
+	Targets: (
+	{
+		MobId: 1024
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4279
+	Name: "Ninja training-test"
+},
+{
+	Id: 4280
+	Name: "Ninja training-test"
+},
+{
+	Id: 4281
+	Name: "Beginner's training-Ninja"
+},
+{
+	Id: 4282
+	Name: "Ninja training-exercise1"
+	Targets: (
+	{
+		MobId: 1113
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4283
+	Name: "Ninja training-exercise2"
+	Targets: (
+	{
+		MobId: 1002
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4284
+	Name: "Ninja training-actual battle2"
+	Targets: (
+	{
+		MobId: 1052
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4285
+	Name: "Ninja training-actual battle1"
+	Targets: (
+	{
+		MobId: 1024
+		Count: 10
+	},
+	)
+},
+{
+	Id: 4286
+	Name: "Ninja training-test"
+},
+{
+	Id: 4287
+	Name: "Ninja training-test"
+},
+{
+	Id: 5147
+	Name: "Gunslinger basic training(1)"
+},
+{
+	Id: 5148
+	Name: "Gunslinger basic training(2)"
+},
+{
+	Id: 5149
+	Name: "<Battle training request form A>"
+	Targets: (
+	{
+		MobId: 1004
+		Count: 10
+	},
+	)
+},
+{
+	Id: 5150
+	Name: "<Battle training request form B>"
+	Targets: (
+	{
+		MobId: 1012
+		Count: 10
+	},
+	)
+},
+{
+	Id: 5151
+	Name: "<Battle training request form C>"
+	Targets: (
+	{
+		MobId: 1167
+		Count: 10
+	},
+	)
+},
+{
+	Id: 5152
+	Name: "<Battle training request form D>"
+	Targets: (
+	{
+		MobId: 1052
+		Count: 10
+	},
+	)
+},
+{
+	Id: 5153
+	Name: "Refining tutorial (1)"
+},
+{
+	Id: 5154
+	Name: "Refining tutorial (2)"
+},
+{
+	Id: 5155
+	Name: "Refining tutorial (3)"
+},
+{
+	Id: 5156
+	Name: "Refining tutorial (4)"
+},
+{
+	Id: 5157
+	Name: "Enchant tutorial (1)"
+},
+{
+	Id: 5158
+	Name: "Entchant tutorial (2)"
+},
+{
+	Id: 5159
+	Name: "Enchant tutorial (3)"
+},
+{
+	Id: 7471
+	Name: "First time talking after being born"
+},
+{
+	Id: 7472
+	Name: "First step towards a new world"
+},
+{
+	Id: 7473
+	Name: "Cool drink"
+},
+{
+	Id: 7474
+	Name: "Searching for treasure"
+},
+{
+	Id: 7475
+	Name: "Discovered the Airship"
+},
+{
+	Id: 7476
+	Name: "Discovered the Arena"
+},
+{
+	Id: 7477
+	Name: "Bridge to Prontera"
+},
+{
+	Id: 7478
+	Name: "Basic Medical Botany"
+},
+{
+	Id: 7479
+	Name: "Friend or Foe?"
+},
+{
+	Id: 7480
+	Name: "Regarding Thief job"
+},
+{
+	Id: 7481
+	Name: "Vicente's class"
+},
+{
+	Id: 7482
+	Name: "Vercassel's class"
+},
+{
+	Id: 7483
+	Name: "Use the Thief Manual"
+},
+{
+	Id: 7484
+	Name: "Shop owner! Order to steal!"
+},
+{
+	Id: 7485
+	Name: "Assassin! Use Envenom"
+	Targets: (
+	{
+		MobId: 1725
+		Count: 1
+	},
+	)
+},
+{
+	Id: 7486
+	Name: "With Lumin"
+},
+{
+	Id: 7487
+	Name: "30 second duel"
+	TimeLimit: 30
+	Targets: (
+	{
+		MobId: 1725
+		Count: 4
+	},
+	)
+
+},
+{
+	Id: 7488
+	Name: "Trio set of Fire Elements"
+},
+{
+	Id: 7489
+	Name: "Silent liquidation plan"
+},
+{
+	Id: 7490
+	Name: "Mushroom soup calling memories"
+},
+{
+	Id: 7491
+	Name: "Get away to Paradise!"
+},
+{
+	Id: 7492
+	Name: "Invincible pumpkin knight"
+},
+{
+	Id: 7493
+	Name: "Battle of 17 vs. 1"
+},
+{
+	Id: 7494
+	Name: "Cleanup of the mushroom farm"
+},
+{
+	Id: 9264
+	Name: "Job change to Mage"
+},
+{
+	Id: 9265
+	Name: "Job change to Mage"
+},
+{
+	Id: 9266
+	Name: "Job change to Mage"
+},
+{
+	Id: 9267
+	Name: "The way to be a strong Mage - 1"
+},
+{
+	Id: 9268
+	Name: "The way to be a strong Mage - 2"
+},
+{
+	Id: 9269
+	Name: "The way to be a strong Mage - 3"
+},
+{
+	Id: 9270
+	Name: "The way to be a strong Mage - 4"
+},
+{
+	Id: 11255
+	Name: "Otter Ssamsun"
+},
+{
+	Id: 11338
+	Name: "Conversation with Subino"
+},
+{
+	Id: 11339
+	Name: "The most delicious on earth"
+	Targets: (
+	{
+		MobId: 1002
+		Count: 10
+	},
+	)
+},
+{
+	Id: 11340
+	Name: "Carrots are delicious!"
+	Targets: (
+	{
+		MobId: 1063
+		Count: 10
+	},
+	)
+},
+{
+	Id: 11341
+	Name: "Rolling Fabre's clothing"
+	Targets: (
+	{
+		MobId: 1007
+		Count: 10
+	},
+	)
+},
+{
+	Id: 11342
+	Name: "Antidote Material~"
+	Targets: (
+	{
+		MobId: 1004
+		Count: 10
+	},
+	)
+},
+{
+	Id: 11343
+	Name: "Conversation with Alice"
+},
+{
+	Id: 11344
+	Name: "Barrier!!"
+	Targets: (
+	{
+		MobId: 1008
+		Count: 5
+	},
+	)
+},
+{
+	Id: 11345
+	Name: "Conversation with Alice"
+},
+{
+	Id: 11346
+	Name: "Acolyte_damped creatures(LV.13)"
+},
+{
+	Id: 11347
+	Name: "Acolyte_soft bone(LV.18)"
+},
+{
+	Id: 11348
+	Name: "Acolyte_Solid bone(LV.23)"
+},
+{
+	Id: 12302
+	Name: "Salim Hamid"
+},
+{
+	Id: 12303
+	Name: "Applicant for trader"
+},
+{
+	Id: 12304
+	Name: "Introduction to merchantology"
+},
+{
+	Id: 12305
+	Name: "About the capability figure"
+},
+{
+	Id: 12306
+	Name: "Experience of disounts"
+},
+{
+	Id: 12307
+	Name: "Way to the Merchant"
+},
+{
+	Id: 12308
+	Name: "Removal of Worm Tails"
+},
+{
+	Id: 12309
+	Name: "Removal of Boa"
+},
+{
+	Id: 12310
+	Name: "Removal of Spore"
+},
+{
+	Id: 12311
+	Name: "Removal of Pirate Skeletons"
+},
+{
+	Id: 12312
+	Name: "Supplementary to the theory lesson"
+},
+{
+	Id: 12313
+	Name: "About stats"
+},
+{
+	Id: 12314
+	Name: "About skills"
+},
+{
+	Id: 13101
+	Name: "The way of Taekwon"
+},
+{
+	Id: 13102
+	Name: "Spinning kick"
+},
+{
+	Id: 13103
+	Name: "Breaking Willows"
+},
+{
+	Id: 13104
+	Name: "Breaking Spores"
+},
+{
+	Id: 13105
+	Name: "Breaking Zombies"
+},
+{
+	Id: 13106
+	Name: "Breaking Skeletons"
+},
+{
+	Id: 14142
+	Name: "To the Archer's town!"
+},
+{
+	Id: 14143
+	Name: "Application for the Archer's job change"
+},
+{
+	Id: 14144
+	Name: "Retest - Stats"
+},
+{
+	Id: 14145
+	Name: "Archer Skills"
+},
+{
+	Id: 14146
+	Name: "Hunting training"
+},
+{
+	Id: 14147
+	Name: "Retest - Skills"
+},
+{
+	Id: 14148
+	Name: "To the next step"
+},
+{
+	Id: 14149
+	Name: "Listening to the 2nd job change"
+},
+{
+	Id: 14150
+	Name: "To the next step"
+},
+{
+	Id: 14151
+	Name: "Hunting training - Spoa"
+},
+{
+	Id: 14152
+	Name: "Hunting training - Creamy"
+},
+{
+	Id: 14153
+	Name: "Hunting training - Skeleton"
+},
+{
+	Id: 14154
+	Name: "Fragrant herb mix"
+},
+{
+	Id: 14155
+	Name: "Crunchy salad"
+},
+{
+	Id: 14156
+	Name: "Anything shabushabu"
+},
+{
+	Id: 14157
+	Name: "Baked golden apple"
+},
+{
+	Id: 14158
+	Name: "Presentation of the Archer manual"
+},
+{
+	Id: 14159
+	Name: "Met with the PR staff"
+},
+{
+	Id: 14160
+	Name: "Met with the PR staff"
+},
+{
+	Id: 14161
+	Name: "Test of stats"
+},
+{
+	Id: 14162
+	Name: "Test of skills"
+},
+{
+	Id: 14163
+	Name: "Caught Spores"
+},
+{
+	Id: 14164
+	Name: "Caught Creamy"
+},
+{
+	Id: 14165
+	Name: "Caught Skeletons"
+},
+{
+	Id: 15000
+	Name: "Experiencing abnormal statuses"
+},
+{
+	Id: 15001
+	Name: "Hold your breath"
+	TimeLimit: 20
+},
 //  2014 Halloween Event
 {
 	Id: 14450