Nivalis Removal and Related Changes

All warps to Nivalis removed, furquest moved, magic house notes changed,
Nivalis Soul-Menhir changed to Hurnscald flags

7 files changed, 12 insertions, 12 deletions

diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt
index c91746ae..590407e6 100644
--- a/npc/013-2_Magic_house/notes.txt
+++ b/npc/013-2_Magic_house/notes.txt
@@ -52,13 +52,13 @@
 	close;
 }
 
-// Warp to snow land
+// Warp to snake pit
 013-2.gat,25,27,0	script	Spell	127,{
-	mes "You read: \"Snow-white flakes and eminent frost - I'll go there, whatever the cost!\"";
+	mes "You read: \"Slithering and scales make a poisonous bite - Where you go feels me with fright!\"";
 	next;
 	mes "You feel yourself getting lighter...";
 	next;
-	warp "020-1.gat",84,68;
+	warp "005-3.gat",86,33;
 	close;
 }
 
@@ -78,7 +78,7 @@
 	next;
 	mes "For a moment everything turns black...";
 	next;
-	warp "002-4.gat",91,41;
+	warp "013-3.gat",127,70;
 	close;
 }
 
diff --git a/npc/014-1_Woodland/_import.txt b/npc/014-1_Woodland/_import.txt
index 3c67f38f..b84a9892 100644
--- a/npc/014-1_Woodland/_import.txt
+++ b/npc/014-1_Woodland/_import.txt
@@ -1,5 +1,4 @@
 map: 014-1.gat
 npc: npc/014-1_Woodland/_mobs.txt
 npc: npc/014-1_Woodland/_warps.txt
-npc: npc/014-1_Woodland/taro.txt
 npc: npc/014-1_Woodland/wedding-officiator.txt
diff --git a/npc/020-1_Nivalis/soul-menhir.txt b/npc/020-1_Nivalis/soul-menhir.txt
index ee973170..1569d0d6 100644
--- a/npc/020-1_Nivalis/soul-menhir.txt
+++ b/npc/020-1_Nivalis/soul-menhir.txt
@@ -2,9 +2,9 @@
 
 020-1.gat,64,89,0	script	Soul Menhir	144, {
 	callfunc "ClearVariables";
-	set @map$, "020-1.gat";
-	setarray @Xs, 63, 64, 65, 63, 65, 63, 65;
-	setarray @Ys, 88, 88, 88, 89, 89, 90, 90;
+	set @map$, "009-1.gat";
+	setarray @Xs, 52, 53, 54, 52, 54, 52, 54;
+	setarray @Ys, 39, 39, 39, 40, 40, 41, 41;
 	set @x, 0;
 	set @y, 0;
 	callfunc "SoulMenhir";
diff --git a/npc/020-2_Nivalis/_import.txt b/npc/020-2_Nivalis/_import.txt
index ea665c20..807bc1a0 100644
--- a/npc/020-2_Nivalis/_import.txt
+++ b/npc/020-2_Nivalis/_import.txt
@@ -1,6 +1,6 @@
 map: 020-2.gat
 npc: npc/020-2_Nivalis/_mobs.txt
 npc: npc/020-2_Nivalis/_warps.txt
-npc: npc/020-2_Nivalis/furquest.txt
 npc: npc/020-2_Nivalis/mapflags.txt
 npc: npc/020-2_Nivalis/shops.txt
+npc: npc/020-2_Nivalis/taro.txt
diff --git a/npc/014-1_Woodland/taro.txt b/npc/020-2_Nivalis/taro.txt
index 3ec76163..a9418f80 100644
--- a/npc/014-1_Woodland/taro.txt
+++ b/npc/020-2_Nivalis/taro.txt
@@ -1,7 +1,7 @@
 
 // Woodland Taro
 
-014-1.gat,54,43,0	script	Taro	114,{
+020-2.gat,104,28,0	script	Taro	114,{
 	if (getequipid(equip_head) == 511 || getequipid(equip_head) == 1206) goto L_Santa;
 	if (getequipid(equip_head) == 633) goto L_Elf;
 	if (getequipid(equip_head) == 628) goto L_NearElf;
diff --git a/npc/021-2_Tulimshar/_import.txt b/npc/021-2_Tulimshar/_import.txt
index 028c104f..d33c0268 100644
--- a/npc/021-2_Tulimshar/_import.txt
+++ b/npc/021-2_Tulimshar/_import.txt
@@ -2,6 +2,7 @@ map: 021-2.gat
 npc: npc/021-2_Tulimshar/_mobs.txt
 npc: npc/021-2_Tulimshar/_warps.txt
 npc: npc/021-2_Tulimshar/bakery.txt
+npc: npc/021-2_Tulimshar/furquest.txt
 npc: npc/021-2_Tulimshar/government_building.txt
 npc: npc/021-2_Tulimshar/mapflags.txt
 npc: npc/021-2_Tulimshar/workshop.txt
diff --git a/npc/020-2_Nivalis/furquest.txt b/npc/021-2_Tulimshar/furquest.txt
index f5382376..44126aa5 100644
--- a/npc/020-2_Nivalis/furquest.txt
+++ b/npc/021-2_Tulimshar/furquest.txt
@@ -2,8 +2,8 @@
 // Script by Shaili and QOAL
 //#################################################################################
  
-// Santa's Inn - Agostine, The Legendary Tailor
-020-2.gat,102,28,0	script	Agostine	137,{
+// Tulimshar Crafting Workshop - Agostine, The Legendary Tailor
+021-2.gat,32,63,0	script	Agostine	137,{
 	if (QUEST_WG_state == 1) goto L_State_0_3;
 	if (QUEST_WG_state == 2) goto L_State_1;
 	if (QUEST_WG_state == 3) goto L_State_2;