Fixed the NPC locations and barriers for 041-1 and 042-1

-Fixed all the NPC locations to match the new coordinates
-Fixed the barriers to warp you to the correct locations
-Fixed the warps on 041-1 aswell

7 files changed, 19 insertions, 19 deletions

diff --git a/world/map/npc/022-1/tutorial.txt b/world/map/npc/022-1/tutorial.txt
index 5b89336c..4a6be094 100644
--- a/world/map/npc/022-1/tutorial.txt
+++ b/world/map/npc/022-1/tutorial.txt
@@ -9,6 +9,6 @@
     set sorfina, 0;
     set tanisha, 0;
     set maggot, 0;
-    warp "042-1.gat", 114, 76;
+    warp "042-1.gat", 95, 69;
     end;
 }
diff --git a/world/map/npc/041-1/tutorial.txt b/world/map/npc/041-1/tutorial.txt
index 8dae4fde..95a5e6e0 100644
--- a/world/map/npc/041-1/tutorial.txt
+++ b/world/map/npc/041-1/tutorial.txt
@@ -2,8 +2,8 @@
 // Author: Jenalya
 // if you enter the tutorial area, it is set to be already done
 
-041-1.gat,33,5,0|script|#tutorial|45,1,0{
+041-1.gat,58,5,0|script|#tutorial|45,1,0{
     set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
-    warp "042-1.gat", 17, 80;
+    warp "042-1.gat", 44, 143;
     end;
 }
diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index ae599f5a..ac9a73a6 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -1,7 +1,7 @@
 // This file is part of the Tutorial
 // Authors: Jenalya, alastrim
 
-042-1.gat,111,68,0|script|Hasan|189,{
+042-1.gat,90,61,0|script|Hasan|189,{
 
     set @toll, 10000;
     set @x, getx();
@@ -11,7 +11,7 @@
         goto L_Tut_Done;
     // Please consider rewriting this in terms of isin()
     // it's not that trivial to put this in a rectangle...
-    if ( (@y < 64)&&(@x < 110) || (@x < 107) )
+    if ( (@y < 58)&&(@x < 89) || (@x < 87) )
         goto L_Cliff_Up;
     // implicitly, $@ScorpionFighter is nonzero
     if (getcharid(3) == $@ScorpionFighter)
@@ -101,7 +101,7 @@ L_Trick:
     set $@ScorpionTimer, 0;
     set $@ScorpionFighter, getcharid(3);
     set $@ScorpDeath, PC_DIE_COUNTER;
-    monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
     initnpctimer;
     end;
 
@@ -168,7 +168,7 @@ L_SummonAgain:
     message strcharinfo(0), "Kaan is mad at you for your interference! He walks over to the edge of the cliff and throws a rock on top of your head, then lets another scorpion run just near Hasan!";
     percentheal -100, 0;
     message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
-    monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+    monster "042-1.gat",89,63,"Scorpion",1003,1, "Hasan::onScorpionDeath";
     end;
 
 L_Clean:
@@ -181,7 +181,7 @@ L_Clean:
 
 L_TimeOut:
     message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strength! Seems like you took too long and the plan didn't work this time.";
-    warp "042-1.gat", 112, 64;
+    warp "042-1.gat", 91, 58;
     message strcharinfo(0), "Hasan: \"Hey you! I told you you cannot pass!\"";
     goto L_Clean;
 
@@ -221,7 +221,7 @@ onScorpionDeath:
 
 }
 
-042-1.gat,111,68,0|script|#Toll|32767,2,2,{
+042-1.gat,90,62,0|script|#Toll|32767,2,2,{
     end;
 
 OnTouch:
@@ -230,19 +230,19 @@ OnTouch:
         end;
     if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
         end;
-    warp "042-1.gat", 112, 64;
+    warp "042-1.gat", 91, 58;
     message strcharinfo(0), "Hasan: \"Stop!\"";
     end;
 
 }
 
-042-1.gat,117,76,0|script|#barrier|45,0,2{
+042-1.gat,96,69,0|script|#barrier|45,0,2{
     end;
 
 OnTouch:
     if (FLAGS & FLAG_TUTORIAL_DONE)
         goto L_Tut;
-    warp "042-1.gat", 115, 76;
+    warp "042-1.gat", 94, 69;
     // implicitly, $@ScorpionFighter is nonzero
     if ($@ScorpionFighter == getcharid(3))
         message strcharinfo(0), "Hasan: \"" + strcharinfo(0) + "! Please help me!\"";
diff --git a/world/map/npc/042-1/kaan.txt b/world/map/npc/042-1/kaan.txt
index 89c75132..ac2e6edc 100644
--- a/world/map/npc/042-1/kaan.txt
+++ b/world/map/npc/042-1/kaan.txt
@@ -1,7 +1,7 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,106,70,0|script|Kaan|160,{
+042-1.gat,84,65,0|script|Kaan|160,{
 
     if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
     if (hasan == 4) goto L_Hasan_Saved;
@@ -53,7 +53,7 @@ L_Tanisha3:
     mes "\"But I took care of that problem.\"";
     mes "He looks very proud.";
     next;
-    mes "\"I built this fence to keep them out.\"";
+    mes "\"I built the fence down south of here to keep them out.\"";
     next;
     menu
         "Impressive! Just a bit... skewed.",-,
diff --git a/world/map/npc/042-1/npcs.txt b/world/map/npc/042-1/npcs.txt
index 44512766..9d2d6ebb 100644
--- a/world/map/npc/042-1/npcs.txt
+++ b/world/map/npc/042-1/npcs.txt
@@ -1,6 +1,6 @@
 // Talk NPCs to help make trek interesting between Tutorial and Bazaar.
 
-042-1.gat,62,73,0|script|Liana|205,{
+042-1.gat,82,96,0|script|Liana|205,{
     set @npcname$, "Liana";
 
     mes "[" + @npcname$ + "]";
diff --git a/world/map/npc/042-1/valon.txt b/world/map/npc/042-1/valon.txt
index 47aa18a6..07d2ae66 100644
--- a/world/map/npc/042-1/valon.txt
+++ b/world/map/npc/042-1/valon.txt
@@ -1,7 +1,7 @@
 // This file is part of the Tutorial
 // Author: Jenalya
 
-042-1.gat,17,82,0|script|Valon|156,1,0{
+042-1.gat,44,144,0|script|Valon|156,1,0{
 
     if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
 
@@ -27,13 +27,13 @@ L_Tut_Done:
 OnTouch:
     if (FLAGS & FLAG_TUTORIAL_DONE)
         goto L_Tut;
-    warp "042-1.gat", 17, 81;
+    warp "042-1.gat", 44, 143;
     mes "[Valon]";
     mes "\"The desert is merciless.";
     mes "I can't let you leave like this.\"";
     close;
 
 L_Tut:
-    warp "041-1.gat", 33, 8;
+    warp "041-1.gat", 58, 6;
     end;
 }
diff --git a/world/map/npc/042-2/sorfina.txt b/world/map/npc/042-2/sorfina.txt
index 660c89fe..20080b87 100644
--- a/world/map/npc/042-2/sorfina.txt
+++ b/world/map/npc/042-2/sorfina.txt
@@ -306,7 +306,7 @@ OnTouch:
     if ((sorfina < 4)
         && !(FLAGS & FLAG_TUTORIAL_DONE))
             goto L_Block;
-    warp "042-1.gat", 37, 57;
+    warp "042-1.gat", 63, 77;
     end;
 
 L_Block: