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, 3 insertions, 2 deletions

diff --git a/npc/merchants/refine.txt b/npc/merchants/refine.txt
index 728930ba6..d5b80168a 100644
--- a/npc/merchants/refine.txt
+++ b/npc/merchants/refine.txt
@@ -3,7 +3,7 @@
 //===== By: ==================================================
 //= Syrus22 (1.1) dafide18 (1.4) Skotlex (1.5)
 //===== Current Version: =====================================
-//= 2.8
+//= 2.9
 //===== Compatible With: =====================================
 //= Any Athena Version
 //===== Description: =========================================
@@ -54,6 +54,7 @@
 //= 2.8 Added proper Blacksmith Supplier to Einroch. [L0ne_W0lf]
 //=     Updated dated features comment to reflect new usage.
 //= 2.8a Small bugfix. (bugreport:2418) [Paradox924X]
+//= 2.9 MOved Morroc repairman to Morroc Ruins. [L0ne_W0lf]
 //============================================================
 
 
@@ -1127,7 +1128,7 @@ alberta_in,31,65,4	script	Repairman#alb	86,{
 	end;
 }
 
-morocc_in,71,41,4	script	Repairman#moc	99,{
+moc_ruins,107,94,5	script	Repairman#moc	99,{
 	callfunc "repairmain","Repairman";
 	end;
 }