Blame gumi, moving 011 to 011-1 due bad parser

14 files changed, 111 insertions, 18 deletions

diff --git a/conf/map/maps.conf b/conf/map/maps.conf
index 6d9502457..76cc2f14b 100644
--- a/conf/map/maps.conf
+++ b/conf/map/maps.conf
@@ -40,7 +40,7 @@ map_list: (
     "010-1-1",
     "010-1",
     "010-2",
-    "011",
+    "011-1",
     "boss",
     "botcheck",
     "sec_pri",
diff --git a/db/map_index.txt b/db/map_index.txt
index 26fd220e4..ea1931869 100644
--- a/db/map_index.txt
+++ b/db/map_index.txt
@@ -37,7 +37,7 @@
 010-1-1 37
 010-1 38
 010-2 39
-011 40
+011-1 40
 boss 41
 botcheck 42
 sec_pri 43
diff --git a/maps/re/009-1.mcache b/maps/re/009-1.mcache
index e70ceccce..11b3be6e4 100644
--- a/maps/re/009-1.mcache
+++ b/maps/re/009-1.mcache
diff --git a/maps/re/011.mcache b/maps/re/011.mcache
deleted file mode 100644
index c47677811..000000000
--- a/maps/re/011.mcache
+++ /dev/null
diff --git a/npc/009-1/_import.txt b/npc/009-1/_import.txt
index ef571ea53..0ea0f7252 100644
--- a/npc/009-1/_import.txt
+++ b/npc/009-1/_import.txt
@@ -2,4 +2,5 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 "npc/009-1/_mobs.txt",
 "npc/009-1/_warps.txt",
+"npc/009-1/lynnthetraveler.txt",
 "npc/009-1/soul-menhir.txt",
diff --git a/npc/009-1/_warps.txt b/npc/009-1/_warps.txt
index 975964cd1..c8b9057ef 100644
--- a/npc/009-1/_warps.txt
+++ b/npc/009-1/_warps.txt
@@ -1,4 +1,4 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
 // Map 009-1: Halinarzo warps
 009-1,56,107,0	warp	#009-1_56_107	2,0,010-2,171,20
-009-1,119,40,0	warp	#009-1_119_40	0,0,11,177,177
+009-1,119,40,0	warp	#009-1_119_40	0,0,011-1,177,177
diff --git a/npc/009-1/lynnthetraveler.txt b/npc/009-1/lynnthetraveler.txt
new file mode 100644
index 000000000..91cd3758f
--- /dev/null
+++ b/npc/009-1/lynnthetraveler.txt
@@ -0,0 +1,92 @@
+// TMW2 Script
+// Author:
+//    Jesusalva
+// Description:
+//    The Travelers travel around the world telling stories.
+
+009-1,30,26,0	script	Lynn The Traveler	NPC_F_COINKEEPER,{
+
+    mesn;
+    if (strcharinfo(0) == $MOST_HEROIC$) mesq l("Wow! Are you @@? Everyone, in every city, talks about you!", $MOST_HEROIC$);
+    if (strcharinfo(0) == $MOST_HEROIC$) next;
+
+    mesq l("Hello. I am @@, and I am from a family of travellers. We travel though the whole world, looking for exotic goods.", .name$);
+    next;
+    mesq l("You can buy rare items with me, or I can tell you about different cities in our world.");
+
+L_Menu:
+    mes "";
+    menu
+        l("I want to trade with you."), L_Trade,
+        l("Tell me about Halinarzo."),  L_Halin,
+        l("Tell me about Tulimshar."),  L_Tulim,
+        l("Tell me about Hurnscald."),  L_Hurns,
+        l("Sorry, I'll pass."), L_Close;
+
+L_Tulim:
+    mes "";
+    mesn;
+    mesq l("Tulimshar is the oldest human city, and its foundation is the year zero of our calendar.");
+    next;
+    mesq l("The city only flourished because Janett Platinum had the idea to build city walls surrounding this city.");
+    next;
+    mesq l("The desert climate means you'll find mostly maggots and scorpions. Their drops include cactus drinks, cake, knifes, black pearls, gold, and other common things.");
+    next;
+    mesq l("You can find for a good price desert equipment and some kind of dyes. You find all sort of crafters, artisans and warriors here.");
+    next;
+    goto L_Menu;
+
+L_Hurns:
+    mes "";
+    mesn;
+    mesq l("Hurnscald was founded after Tulimshar, in more fertile lands. Their walls are not so sturdy as the ones of Tulimshar.");
+    next;
+    mesq l("Under the leadership of King Wusher, they were the first to accept immigrants from other races. You will find humans and non-humans there.");
+    next;
+    mesq l("The fertile climate is ideal for mushrooms. You can also find lots of wood.");
+    next;
+    mesq l("Their economy provide many edible items and potions.");
+    next;
+    goto L_Menu;
+
+L_Halin:
+    mes "";
+    mesn;
+    mesq l("Halinarzo was founded to explore Mana Stones.");
+    next;
+    mesq l("You can find both huge swamps, as huge desertic areas near and on it.");
+    next;
+    mesq l("Lizards are the main monster found, and they steal gold from innocent bypassers.");
+    next;
+    mesq l("Without any mana stone left, and because the walls were not very strong, most of the city was destroyed.");
+    next;
+    mesq l("Unlike many other cities, if you want people in eternal need of items, there is a good place to look.");
+    next;
+    goto L_Menu;
+
+
+L_Trade:
+    mesn;
+    mesq l("Use your @@ as currency!", getitemlink(StrangeCoin));
+    next;
+    openshop "Aeros Trader";
+    closedialog;
+
+L_Close:
+    close;
+
+OnInit:
+    .@npcId = getnpcid(0, .name$);
+    setunitdata(.@npcId, UDT_HEADTOP, NPCEyes);
+    setunitdata(.@npcId, UDT_HEADMIDDLE, UglyChristmasSweater);
+    setunitdata(.@npcId, UDT_HEADBOTTOM, JeansShorts);
+    setunitdata(.@npcId, UDT_WEAPON, CandorBoots); // Boots
+    setunitdata(.@npcId, UDT_HAIRSTYLE, 18);
+    setunitdata(.@npcId, UDT_HAIRCOLOR, 8);
+    npcsit;
+
+    .sex = G_FEMALE;
+    .distance = 5;
+    end;
+}
+
diff --git a/npc/011-1/_import.txt b/npc/011-1/_import.txt
new file mode 100644
index 000000000..2545a2de2
--- /dev/null
+++ b/npc/011-1/_import.txt
@@ -0,0 +1,5 @@
+// Map 011-1: Depleted Mana Stones Mine
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+"npc/011-1/_mobs.txt",
+"npc/011-1/_warps.txt",
+"npc/011-1/manastone.txt",
diff --git a/npc/011-1/_mobs.txt b/npc/011-1/_mobs.txt
new file mode 100644
index 000000000..8988adbb5
--- /dev/null
+++ b/npc/011-1/_mobs.txt
@@ -0,0 +1,6 @@
+// This file is generated automatically. All manually added changes will be removed when running the Converter.
+// Map 011-1: Depleted Mana Stones Mine mobs
+011-1,99,100,79,79	monster	Mana Ghost	1068,40,20000,20000
+011-1,98,101,79,79	monster	Fire Goblin	1067,100,60000,60000
+011-1,100,99,79,79	monster	Lava Slime	1097,75,60000,60000
+011-1,101,98,79,79	monster	Red Slime	1092,120,60000,60000
diff --git a/npc/011/_warps.txt b/npc/011-1/_warps.txt
index 72d6d408c..bba2aa0f6 100644
--- a/npc/011/_warps.txt
+++ b/npc/011-1/_warps.txt
@@ -1,3 +1,3 @@
 // This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 011: Depleted Mana Stones Mine warps
-011,177,178,0	warp	#011_177_178	0,0,009-1,119,41
+// Map 011-1: Depleted Mana Stones Mine warps
+011-1,177,178,0	warp	#011-1_177_178	0,0,009-1,119,41
diff --git a/npc/011/manastone.txt b/npc/011-1/manastone.txt
index cf2ccbe8a..0ca8e09fa 100644
--- a/npc/011/manastone.txt
+++ b/npc/011-1/manastone.txt
@@ -5,7 +5,7 @@
 //  The last Mana Stone in the whole world, which is not owned by the Magic Council
 //  or the Monster King.
 
-011,0,0,0	script	Mana Stone	NPC_MANA_STONE,{
+011-1,0,0,0	script	Mana Stone	NPC_MANA_STONE,{
 
     if (BaseLevel < 40) goto L_NotWorthy;
     mesn;
diff --git a/npc/011/_import.txt b/npc/011/_import.txt
deleted file mode 100644
index fa75f66af..000000000
--- a/npc/011/_import.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-// Map 011: Depleted Mana Stones Mine
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-"npc/011/_mobs.txt",
-"npc/011/_warps.txt",
-"npc/011/manastone.txt",
diff --git a/npc/011/_mobs.txt b/npc/011/_mobs.txt
deleted file mode 100644
index cdfb14c71..000000000
--- a/npc/011/_mobs.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually added changes will be removed when running the Converter.
-// Map 011: Depleted Mana Stones Mine mobs
-011,99,100,79,79	monster	Mana Ghost	1068,40,20000,20000
-011,98,101,79,79	monster	Fire Goblin	1067,100,60000,60000
-011,100,99,79,79	monster	Lava Slime	1097,75,60000,60000
-011,101,98,79,79	monster	Red Slime	1092,120,60000,60000
diff --git a/npc/_import.txt b/npc/_import.txt
index 55cb20f9a..08b0ffe4e 100644
--- a/npc/_import.txt
+++ b/npc/_import.txt
@@ -39,7 +39,7 @@
 @include "npc/010-1-1/_import.txt"
 @include "npc/010-1/_import.txt"
 @include "npc/010-2/_import.txt"
-@include "npc/011/_import.txt"
+@include "npc/011-1/_import.txt"
 @include "npc/boss/_import.txt"
 @include "npc/botcheck/_import.txt"
 @include "npc/sec_pri/_import.txt"