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

3 files changed, 26 insertions, 22 deletions

diff --git a/npc/merchants/inn.txt b/npc/merchants/inn.txt
index 28b29154c..3dfb0ad09 100644
--- a/npc/merchants/inn.txt
+++ b/npc/merchants/inn.txt
@@ -4,7 +4,7 @@
 //= Darkchild (1.1)
 //= Playtester (1.2)
 //===== Current Version: ===================================== 
-//= 2.6
+//= 2.7
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -41,6 +41,7 @@
 //= 2.4 Fixed Inn Employee#Ahlma warping to same destination as save point, bugreport: 191.
 //= 2.5 Added Moskovia Gostinitsa (Inn) from jA
 //= 2.6 Updated Alberta inn to official. [L0ne_W0lf]
+//= 2.7 Removed Morroc Inns as per episode 12.1. [L0ne_W0lf]
 //============================================================ 
 
 
@@ -81,6 +82,7 @@ payon_in01,132,62,5	script	Inn Employee#Ahee	53,{
 
 //======================== Morocc ====================================
 // North East --------------------------
+/*
 morocc_in,147,141,3	script	Inn Employee#Hasna	53,{
 
 	callfunc "F_InnMaid","[Employee Hasna]","Morroc Inn","morocc_in",142,140;
@@ -92,7 +94,7 @@ morocc_in,80,100,5	script	Inn Employee#Manar	53,{
 	callfunc "F_InnMaid","[Employee Manar]","Morroc Inn","morocc_in",78,95;
 	warp "morocc_in",79,123; end;
 }
-
+*/
 
 //====================== Aldebaran ===================================
 aldeba_in,92,58,5	script	Inn Maid#Rilim	53,{
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;
 }
diff --git a/npc/merchants/shops.txt b/npc/merchants/shops.txt
index 29f8e530a..5216d7489 100644
--- a/npc/merchants/shops.txt
+++ b/npc/merchants/shops.txt
@@ -3,7 +3,7 @@
 //===== By: ================================================== 
 //= eAthena Dev Team
 //===== Current Version: ===================================== 
-//= 2.4
+//= 2.5
 //===== Compatible With: ===================================== 
 //= eAthena 1.0+
 //===== Description: ========================================= 
@@ -37,6 +37,7 @@
 //= 2.2 Added Veins shops. [L0ne_W0lf]
 //= 2.3 Corrected NPC names to fall within proper restrictions. [L0ne_W0lf]
 //= 2.4 Fixed Jawaii Ice cream salesman. [L0ne_W0lf]
+//= 2.5 Updated Morroc shops to episode 12.1. [L0ne_W0lf]
 //============================================================ 
 
 //=======================================================
@@ -199,25 +200,25 @@ xmas_in,169,34,2	shop	Gift Seller#xmas	702,2612:-1,744:-1,748:-1,736:-1,746:-1,7
 xmas_in,174,98,2	shop	Weapon Dealer#xmas	49,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1
 
 //=======================================================
-// Morroc
+// Morroc - Post Ep. 12.1
 //=======================================================
-morocc_in,141,67,0	shop	Weapon Dealer#moc	58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1
+in_moc_16,22,20,7	shop	Sepulchral Merchant#moc	880,1771:-1
+moc_ruins,91,128,4	shop	Tool Dealer#moc1	93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
+moc_ruins,114,63,6	shop	Tool Dealer#moc2	99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
+moc_ruins,93,53,2	shop	Item Collector#moc1	85,911:-1,528:-1,919:-1
+moc_ruins,81,113,0	shop	Item Collector#moc2	85,911:-1,528:-1,919:-1
+moc_ruins,110,105,2	shop	Jeweler#moc1	102,721:-1,723:-1,726:-1,728:-1,729:-1
+moc_ruins,52,85,6	shop	Jeweler#moc2	99,730:-1,2613:-1
+moc_ruins,113,126,4	shop	Trader#moc1	99,747:-1
+moc_ruins,131,138,0	shop	Trader#moc2	93,748:-1
+moc_ruins,71,139,5	shop	Trader#moc3	93,2612:-1
+moc_ruins,125,135,6	shop	Trader#moc4	89,2609:-1,1516:-1,1522:-1
+moc_ruins,87,109,0	shop	Butcher#moc	58,517:-1
+moc_ruins,90,149,6	shop	Trader#moc5	99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
+moc_ruins,118,170,4	shop	Pet Groomer#moc	125,537:-1,643:-1,10013:-1,10014:-1
+morocc_in,141,67,0	shop	Weapon Dealer#moc1	58,1750:-1,1751:-1,1701:-1,1601:-1,1201:-1,1204:-1,1207:-1,1210:-1,1213:-1,1216:-1,1219:-1,1222:-1,1250:-1,1252:-1,1254:-1
 morocc_in,141,60,0	shop	Armor Dealer#moc	58,2101:-1,2103:-1,2401:-1,2403:-1,2405:-1,2501:-1,2503:-1,2218:-1,2301:-1,2303:-1,2305:-1,2321:-1,2328:-1,2332:-1,2307:-1,2309:-1,2335:-1,2628:-1
-morocc,35,69,6	shop	Trader#moc	89,2609:-1,1516:-1,1522:-1
-morocc,139,92,6	shop	Trader#moc2	99,513:-1,513:-1,513:-1,513:-1,513:-1,513:-1
-morocc,145,44,6	shop	Jeweler#moc	99,730:-1,2613:-1
-morocc,147,102,4	shop	Tool Dealer#moc	93,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1
-morocc,151,243,6	shop	Tool Dealer#moc2	99,1750:-1,611:-1,501:-1,502:-1,503:-1,504:-1,506:-1,645:-1,656:-1,601:-1,602:-1,1065:-1,2242:-1
-morocc,157,72,6	shop	Butcher#moc	85,517:-1
-morocc,166,51,2	shop	Jeweler#moc2	102,721:-1,723:-1,726:-1,728:-1,729:-1
-morocc,170,101,2	shop	Item Collector#moc	85,911:-1,528:-1,919:-1,925:-1
-morocc,206,250,0	shop	Item Collector#moc2	85,911:-1,528:-1,919:-1,925:-1
-morocc,244,134,5	shop	Trader#moc3	93,2612:-1
-morocc,259,193,4	shop	Trader#moc4	99,747:-1
-morocc,268,193,0	shop	Trader#moc5	93,748:-1
-morocc,269,167,4	shop	Pet Groomer#moc	125,537:-1,643:-1,10013:-1,10014:-1
 morocc_in,132,57,0	shop	Weapon Dealer#moc2	99,1146:-1,1245:-1
-in_moc_16,22,20,7	shop	Sepulchral Merchant#moc	880,1771:-1
 
 //=======================================================
 // Niflheim
@@ -303,7 +304,7 @@ moscovia,199,110,3	shop	Milk#mosc	959,519:-1
 //===========================================================
 prontera,156,212,1	shop	Chef Assistant#prt	700,7454:-1,7456:-1,7482:-1,580:-1
 payon,206,119,5	shop	Chef Assistant#pay	89,7455:-1
-morocc,120,97,5	shop	Chef Assistant#moc	86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
+moc_ruins,115,123,5	shop	Chef Assistant#moc	86,7455:-1,7453:-1,7454:-1,7456:-1,7452:-1
 geffen,196,111,3	shop	Chef Assistant#gef	85,7482:-1
 alberta,167,135,5	shop	Chef Assistant#alb	712,579:-1
 aldebaran,165,107,2	shop	Chef Assistant#alde	97,7456:-1,7452:-1,580:-1