Remove 009-2

9 files changed, 11 insertions, 70 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index b62174f70..7f9c91dbd 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -37,7 +37,6 @@ map_list: (
     "005-7",
     "007-1",
     "009-1",
-    "009-2",
     "009-5",
     "010-1-1",
     "010-1",
diff --git a/db/map_index.txt b/db/map_index.txt
index b9aaf0e57..1ac063510 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -34,15 +34,14 @@
 005-7 34
 007-1 35
 009-1 36
-009-2 37
-009-5 38
-010-1-1 39
-010-1 40
-010-2 41
-boss 42
-botcheck 43
-sec_pri 44
-soren-2 45
-soren 46
-test 47
-testbg 48
+009-5 37
+010-1-1 38
+010-1 39
+010-2 40
+boss 41
+botcheck 42
+sec_pri 43
+soren-2 44
+soren 45
+test 46
+testbg 47
diff --git a/maps/re/009-2.mcache b/maps/re/009-2.mcache
deleted file mode 100644
index f9e30a0af..000000000
--- a/maps/re/009-2.mcache
+++ /dev/null
diff --git a/npc/003-1-3/_import.txt b/npc/003-1-3/_import.txt
index 1f128d46a..90753ead4 100644
--- a/npc/003-1-3/_import.txt
+++ b/npc/003-1-3/_import.txt
@@ -2,4 +2,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/003-1-3/_mobs.txt",
 "npc/003-1-3/_warps.txt",
-"npc/003-1-3/thief.txt",
diff --git a/npc/003-1-3/thief.txt b/npc/003-1-3/thief.txt
deleted file mode 100644
index bdcfc2253..000000000
--- a/npc/003-1-3/thief.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-// TMW2 Scripts.
-// Author:
-//  Jesusalva
-// Description:
-//  Temporary NPC to block path to Halinarzo, later a controlled warp. May be removed soon.
-
-003-1-3,45,35,0	script	Thief#temp003	NPC_PLAYER,0,0,{
-
-    mesn;
-    mesq l("I am from the Thief's Guild of Hurnscald.");
-    next;
-    mesq l("At the moment no one is being allowed past this point.");
-    next;
-    mesq l("Call the High Council, if you may. I won't free this path any time soon!");
-    close;
-
-OnTouch:
-    if (is_admin()) goto L_Warp; // if (BaseLevel >= 15) and this NPC must be invisible
-    warp "003-1-3", 45, 36;
-    percentheal -10,0;
-    mesn;
-    mesq l("Stop there! No one is allowed past this point! Stand back!!");
-    mes "";
-    mes col("The thief pushes you with so much strength, that you get hurt.",9);
-    close;
-
-L_Warp:
-    warp "009-2", 70, 179;
-    close;
-
-OnInit:
-    .@npcId = getnpcid(0, .name$);
-    setunitdata(.@npcId, UDT_HEADTOP, ForestArmor); // Dress
-    setunitdata(.@npcId, UDT_HEADMIDDLE, JeansChaps); // 2214 FIXME
-    setunitdata(.@npcId, UDT_HEADBOTTOM, LousyMoccasins); // Shoes
-    setunitdata(.@npcId, UDT_WEAPON, 3501); // We should use a hood instead
-    setunitdata(.@npcId, UDT_HAIRSTYLE, 8);
-    setunitdata(.@npcId, UDT_HAIRCOLOR, 5);
-
-    .sex = G_MALE;
-    .distance = 4;
-    end;
-
-}
diff --git a/npc/009-2/_import.txt b/npc/009-2/_import.txt
deleted file mode 100644
index c78e52bc3..000000000
--- a/npc/009-2/_import.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// Map 009-2: Halinarzo Route
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/009-2/_mobs.txt",
-"npc/009-2/_warps.txt",
diff --git a/npc/009-2/_mobs.txt b/npc/009-2/_mobs.txt
deleted file mode 100644
index c4f3e2792..000000000
--- a/npc/009-2/_mobs.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 009-2: Halinarzo Route mobs
-009-2,98,98,78,79	monster	Blub	1008,1,60000,120000
diff --git a/npc/009-2/_warps.txt b/npc/009-2/_warps.txt
deleted file mode 100644
index d9e035887..000000000
--- a/npc/009-2/_warps.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 009-2: Halinarzo Route warps
-009-2,86,20,0	warp	#009-2_86_20	2,0,009-1,56,108
-009-2,70,180,0	warp	#009-2_70_180	0,0,003-1-3,45,36
diff --git a/npc/_import.txt b/npc/_import.txt
index 644ac5f35..878ab5f04 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -36,7 +36,6 @@
 @include "npc/005-7/_import.txt"
 @include "npc/007-1/_import.txt"
 @include "npc/009-1/_import.txt"
-@include "npc/009-2/_import.txt"
 @include "npc/009-5/_import.txt"
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"