From 61c88ec162713b980f30e6e5111c1cfbd9f23d3a Mon Sep 17 00:00:00 2001
From: wushin <pasekei@gmail.com>
Date: Wed, 7 Jan 2015 21:04:38 -0600
Subject: Adjust rest of world to Match new tutorial

---
 world/map/npc/024-2/_import.txt      |  9 ---------
 world/map/npc/024-2/_mobs.txt        |  9 ---------
 world/map/npc/024-2/_warps.txt       |  5 -----
 world/map/npc/024-2/barrier.txt      | 16 ----------------
 world/map/npc/024-2/mapflags.txt     |  2 --
 world/map/npc/024-2/tyer.txt         |  8 --------
 world/map/npc/024-2/tyer_trigger.txt | 24 ------------------------
 7 files changed, 73 deletions(-)
 delete mode 100644 world/map/npc/024-2/_import.txt
 delete mode 100644 world/map/npc/024-2/_mobs.txt
 delete mode 100644 world/map/npc/024-2/_warps.txt
 delete mode 100644 world/map/npc/024-2/barrier.txt
 delete mode 100644 world/map/npc/024-2/mapflags.txt
 delete mode 100644 world/map/npc/024-2/tyer.txt
 delete mode 100644 world/map/npc/024-2/tyer_trigger.txt

(limited to 'world/map/npc/024-2')

diff --git a/world/map/npc/024-2/_import.txt b/world/map/npc/024-2/_import.txt
deleted file mode 100644
index 685cb331..00000000
--- a/world/map/npc/024-2/_import.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// Map 024-2: Tulimshar Magic School
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-2.gat
-npc: npc/024-2/_mobs.txt
-npc: npc/024-2/_warps.txt
-npc: npc/024-2/barrier.txt
-npc: npc/024-2/mapflags.txt
-npc: npc/024-2/tyer.txt
-npc: npc/024-2/tyer_trigger.txt
diff --git a/world/map/npc/024-2/_mobs.txt b/world/map/npc/024-2/_mobs.txt
deleted file mode 100644
index 14ac77bc..00000000
--- a/world/map/npc/024-2/_mobs.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Magic School mobs
-
-
-
-024-2.gat,0,0,0|script|Mob024-2|-1
-{
-    end;
-}
diff --git a/world/map/npc/024-2/_warps.txt b/world/map/npc/024-2/_warps.txt
deleted file mode 100644
index b6e41de6..00000000
--- a/world/map/npc/024-2/_warps.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// Tulimshar Magic School warps
-
-024-2.gat,26,27|warp|To Tulimshar Canyon|0,-1,024-1.gat,80,49
-024-2.gat,42,28|warp|To Outside|-1,-1,024-1.gat,86,49
diff --git a/world/map/npc/024-2/barrier.txt b/world/map/npc/024-2/barrier.txt
deleted file mode 100644
index 84405447..00000000
--- a/world/map/npc/024-2/barrier.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-// A barrier in the magic school to keep less experienced players out of the canyon
-
-024-2.gat,31,24,0|script|#MagicSchoolBarrier1#M|127,1,1
-{
-    callfunc "MorganState";
-    if (@morgan >= 4)
-        goto L_End;
-    goto L_PushBack;
-
-L_PushBack:
-    warp "024-2.gat", 34, 24;
-    goto L_End;
-
-L_End:
-    end;
-}
diff --git a/world/map/npc/024-2/mapflags.txt b/world/map/npc/024-2/mapflags.txt
deleted file mode 100644
index 03190692..00000000
--- a/world/map/npc/024-2/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-024-2.gat|mapflag|town
-024-2.gat|mapflag|resave|001-1,57,71
diff --git a/world/map/npc/024-2/tyer.txt b/world/map/npc/024-2/tyer.txt
deleted file mode 100644
index 21868e96..00000000
--- a/world/map/npc/024-2/tyer.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// A man in the magic school
-
-024-2.gat,36,21,0|script|Tyer|157
-{
-    mes "[Tyer]";
-    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
deleted file mode 100644
index 6c532b62..00000000
--- a/world/map/npc/024-2/tyer_trigger.txt
+++ /dev/null
@@ -1,24 +0,0 @@
-// A man in the magic school
-
-024-2.gat,33,24,0|script|#Tyer_Trigger|127,0,1
-{
-    callfunc "MorganState";
-    if (@morgan >= 4)
-        goto L_Close;
-
-    mes "[Tyer]";
-    mes "\"You're not allowed to go in there.\"";
-    menu
-        "What do you mean I'm not allowed to go in there?", L_Explain,
-        "Ah, right.", L_Close;
-
-L_Explain:
-    mes "[Tyer]";
-    mes "\"Access to those areas are for students of magic only.\"";
-    next;
-    mes "\"That barrier was made to keep those that are not students out.\"";
-    goto L_Close;
-
-L_Close:
-    close;
-}
-- 
cgit v1.2.3-70-g09d2