Merge pull request #123 from wushin/starting-area-fix

Starting Area Redux

3 files changed, 17 insertions, 14 deletions

diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
index 6b971d1f..4894dad8 100644
--- a/world/map/npc/024-2/barrier.txt
+++ b/world/map/npc/024-2/barrier.txt
@@ -2,10 +2,15 @@
 
 024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|0,1,1,
 {
-    if (BaseLevel < 40) goto L_PushBack;
-    close;
+    callfunc "MorganState";
+    if (@morgan >= 4)
+        goto L_End;
+    goto L_PushBack;
 
 L_PushBack:
     warp "024-2.gat", 34, 24;
-    close;
+    goto L_End;
+
+L_End:
+    end;
 }
diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt
index 334c62ad..2b4f8674 100644
--- a/world/map/npc/024-2/tyer.txt
+++ b/world/map/npc/024-2/tyer.txt
@@ -3,6 +3,6 @@
 024-2.gat,36,21,0|script|Tyer|157,
 {
     mes "[Tyer]";
-    mes "\"Hello.\"";
+    mes "\"Hello. Welcome to the Magic Insitute of Tulimshar.\"";
     close;
 }
diff --git a/world/map/npc/024-2/tyer_trigger.txt b/world/map/npc/024-2/tyer_trigger.txt
index 353dea16..45218430 100644
--- a/world/map/npc/024-2/tyer_trigger.txt
+++ b/world/map/npc/024-2/tyer_trigger.txt
@@ -1,24 +1,22 @@
 // A man in the magic school
 
-024-2.gat,33,24,0|script|#Tyer_Trigger|0,1,1,
+024-2.gat,33,24,0|script|#Tyer_Trigger|0,0,1,
 {
-    if (BaseLevel >= 40) end;
+    callfunc "MorganState";
+    if (@morgan >= 4)
+        goto L_Close;
 
     mes "[Tyer]";
-    mes "\"You're still too young to go in there.\"";
-    next;
-
+    mes "\"You're not allowed to go in there.\"";
     menu
-        "What do you mean I'm too young to go in there?", L_Explain,
+        "What do you mean I'm not allowed to go in there?", L_Explain,
         "Ah, right.", L_Close;
 
 L_Explain:
     mes "[Tyer]";
-    mes "\"The canyon is a dangerous place, so only more experienced people are allowed there.\"";
+    mes "\"Access to those areas are for students of magic only.\"";
     next;
-
-    mes "[Tyer]";
-    mes "\"That barrier was made to keep those that are too young out.\"";
+    mes "\"That barrier was made to keep those that are not students out.\"";
     goto L_Close;
 
 L_Close: