Happy boxing day, eAthena! Here have a massive update.

* Implemented the first round of episode 12.1 change which include:
- Many Morroc NPCs have been moved to Morroc Ruins.
- The addition of new of NPCs to the ruins of Morroc.
- Several warp points leading around Morroc altered.
- The implementation of the continental Guard Quest.
- The removal of the 'Dandelion's Request" quest.
- This update contains several changes, as Morroc and several fields no longer exist in one sense of the word. AS such, many NPCs have been moved, there may be quests that no longer function because of NPCs on inaccessable maps.
* Commented out maps no longer accessable with 12.1 in maps_athena.conf
* Updated mob_skill_db episode 12.1 skills to official.

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

1 files changed, 5 insertions, 4 deletions

diff --git a/npc/quests/quests_veins.txt b/npc/quests/quests_veins.txt
index 910e3a659..b779d05b7 100644
--- a/npc/quests/quests_veins.txt
+++ b/npc/quests/quests_veins.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= L0ne_W0lf
 //===== Current Version: ===================================== 
-//= 1.6
+//= 1.7
 //===== Compatible With: ===================================== 
 //= eAthena SVN
 //===== Description: ========================================= 
@@ -38,6 +38,7 @@
 //= 1.5 Added Nameless Island quest addition. [L0ne_W0lf]
 //= 1.5a Corrected a couple typos in Nameless Addition. [L0ne_W0lf]
 //= 1.6 Replaced effect numerics with constants. [L0ne_W0lf]
+//= 1.7 Moved a couple NPCs related to the Spy quest. [L0ne_W0lf]
 //============================================================ 
 
 // Stone Quest
@@ -994,7 +995,7 @@ prt_church,89,108,6	script	Bard#sch	741,{
 	}
 }
 
-moc_castle,137,88,2	script	Prison Ward#sch	707,{
+morocc,53,87,7	script	Prison Ward#sch	707,{
 	if (que_sch < 4) {
 		mes "[Jesse]";
 		mes "Only authorized";
@@ -1114,7 +1115,7 @@ moc_castle,137,88,2	script	Prison Ward#sch	707,{
 	close;
 }
 
-moc_castle,173,122,0	script	Public Security Officer	748,{
+morocc_in,79,163,0	script	Public Security Officer	748,{
 	if (que_sch < 7) {
 		mes "[Krieg]";
 		mes "I'm in charge of public";
@@ -1196,7 +1197,7 @@ moc_castle,173,122,0	script	Public Security Officer	748,{
 	close;
 }
 
-ra_in01,48,352,0	warp	que_sch_jail	1,1,moc_castle,136,86
+ra_in01,48,352,0	warp	que_sch_jail	1,1,morocc,56,89
 
 ra_in01,50,387,4	script	Upset Looking Bard#sch	51,{
 	if (que_sch < 10) {