Change the Converter to use different folder names

And update everything to use it.

7 files changed, 0 insertions, 255 deletions

diff --git a/npc/024-1_Tulimshar_Canyon/_import.txt b/npc/024-1_Tulimshar_Canyon/_import.txt
deleted file mode 100644
index 2e29ca1f..00000000
--- a/npc/024-1_Tulimshar_Canyon/_import.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 024-1.gat
-npc: npc/024-1_Tulimshar_Canyon/_mobs.txt
-npc: npc/024-1_Tulimshar_Canyon/_warps.txt
-npc: npc/024-1_Tulimshar_Canyon/ched.txt
-npc: npc/024-1_Tulimshar_Canyon/eomie.txt
-npc: npc/024-1_Tulimshar_Canyon/tinris.txt
-npc: npc/024-1_Tulimshar_Canyon/tondar.txt
diff --git a/npc/024-1_Tulimshar_Canyon/_mobs.txt b/npc/024-1_Tulimshar_Canyon/_mobs.txt
deleted file mode 100644
index 6309a08c..00000000
--- a/npc/024-1_Tulimshar_Canyon/_mobs.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-1 Tulimshar Canyon mobs
-
-024-1.gat,89,52,3,2	monster	Maggot	1002,2,100000,30000,Mob024-1::On1002
-024-1.gat,40,45,3,2	monster	Maggot	1002,2,100000,30000,Mob024-1::On1002
-024-1.gat,90,37,10,7	monster	Maggot	1002,4,100000,30000,Mob024-1::On1002
-024-1.gat,96,25,3,10	monster	Sea Sime	1033,1,100000,30000,Mob024-1::On1033
-024-1.gat,33,45,24,20	monster	Black Scorpion	1009,3,100000,30000,Mob024-1::On1009
-024-1.gat,93,35,5,6	monster	Gian Maggot	1006,1,100000,30000,Mob024-1::On1006
-024-1.gat,63,54,3,6	monster	Maggot	1002,1,100000,30000,Mob024-1::On1002
-
-
-024-1.gat,0,0,0	script	Mob024-1	-1,{
-On1002:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-On1006:
-	set @mobID, 1006;
-	callfunc "MobPoints";
-	break;
-
-On1009:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-On1033:
-	set @mobID, 1033;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/024-1_Tulimshar_Canyon/_warps.txt b/npc/024-1_Tulimshar_Canyon/_warps.txt
deleted file mode 100644
index b1b545bb..00000000
--- a/npc/024-1_Tulimshar_Canyon/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 024-1 Tulimshar Canyon warps
-
-024-1.gat,86,73	warp	toCentralTulimshar	3,-1,021-1.gat,49,64
-024-1.gat,80,48	warp	toBuilding	0,-1,024-2.gat,26,26
-024-1.gat,86,48	warp	toBuilding	-1,-1,024-2.gat,42,27
diff --git a/npc/024-1_Tulimshar_Canyon/ched.txt b/npc/024-1_Tulimshar_Canyon/ched.txt
deleted file mode 100644
index 43dd832e..00000000
--- a/npc/024-1_Tulimshar_Canyon/ched.txt
+++ /dev/null
@@ -1,48 +0,0 @@
-// Student at Tulimshar's magic academy
-
-024-1.gat,69,56,0	script	Ched	113,{
-	if (isin("024-1.gat", 62, 52, 65, 57)) goto L_Garden;
-	if (isin("024-1.gat", 66, 43, 80, 54)) goto L_Canyon;
-
-	mes "[Ched]";
-        mes "\"I'm trying to get a spell to work.  It's supposed to combine two potions, but I can't seem to figure out which two those are...\"";
-        next;
-
-        menu
-        	"Well, good luck with that!", L_Done,
-                "What spell is that?", -;
-
-
-	mes "[Ched]";
-        mes "\"Well, I don't know what it's called... I took it out of `Timbleweed's Advanced Transmutations.'  It seems awfully hard to cast, somehow.\"";
-        next;
-
-	mes "[Ched]";
-        mes "\"Well, the invocation is `" + getspellinvocation("merge-concentration-potions") + "'.  You're supposed to just hold up the potions and cast it, and then they're supposed to merge.\"";
-	close;
-
-	mes "[Ched]";
-        mes "\"Maybe I should go back to `detect magic' until I can cast that one properly.\"";
-	close;
-
-L_Done:
-        close;
-
-L_Garden:
-	if (BaseLevel < 40) goto L_Warp;
-	mes "[Ched]";
-	mes "\"Be careful of those plants. They can be dangerous,\"";
-	close;
-
-L_Canyon:
-	if (BaseLevel < 40) goto L_Warp;
-	mes "[Ched]";
-	mes "\"I'm not allowed back there.\"";
-	close;
-
-L_Warp:
-	warp "024-1.gat", 71, 56;
-	mes "[Ched]";
-	mes "\"You can't be back there.\"";
-	close;
-}
diff --git a/npc/024-1_Tulimshar_Canyon/eomie.txt b/npc/024-1_Tulimshar_Canyon/eomie.txt
deleted file mode 100644
index f2b716ac..00000000
--- a/npc/024-1_Tulimshar_Canyon/eomie.txt
+++ /dev/null
@@ -1,90 +0,0 @@
-// A professor at Tulimshar's magic academy
-
-024-1.gat,72,94,0	script	Eomie	164,{
-
-// lines belong to easter 2011:
-//	set @month, 4;
-//	set @start_day, 15;
-//	set @end_day, 30;
-
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 4) goto L_Grass;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 5) goto L_MakeGrass;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 6) goto L_SeeBunny;
-
-L_Greeting:
-	mes "[Eomie]";
-	mes "";
-	mes "\"I maintain this little spot of grass in the desert.\"";
-	close;
-
-L_Grass:
-	mes "[Eomie]";
-	mes "";
-	mes "\"I maintain this little spot of grass in the desert.\"";
-	next;
-	menu
-		"It looks beautiful. I wish I could find a [Grass Liner] like this.", -;
-	mes "\"A [Grass Liner]? Last year I helped the Easter Bunny with a [Grass Liner] for his basket... It was really easy...  Is this liner for yourself?\"";
-	next;
-	menu
-		"No. Actually, it is for the Easter Bunny again...", -;
-	mes "\"Why didn't you say so before? I can help you make the [Grass Liner] for the basket if you wish.\"";
-	menu
-		"I would really appreciate that!", -,
-		"Nah, I decided not to do that stupid quest.", L_End;
-	set QUEST_Easter11, 5;
-
-L_MakeGrass:
-	mes "[Eomie]";
-	mes "";
-	mes "\"I will need you to bring me some [Grass Seed]s.\"";
-	mes "\"I think 5 seeds should be enough.\"";
-	mes "\"Squirrels tend to pick those up as they gather food.\"";
-	menu
-		"I have some seeds...", -,
-		"Ok, I will be back soon.", L_End,
-		"I changed my mind, forget about it.", L_End;
-
-	if(countitem("GrassSeed") < 5) goto L_EasterNotEnough;
-	if(countitem("GrassSeed") >= 5) goto L_EasterEnough;
-	close;
-
-L_EasterNotEnough:
-	mes "[Eomie]";
-	mes "";
-	mes "\"You do not have enough [Grass Seed]s for me to work with yet.\"";
-	mes "\"Please go get more.\"";
-	close;
-
-L_EasterEnough:
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("GrassSeed") > 10) goto L_EasterTooMany;
-	if(countitem("GrassSeed") < 5) goto L_EasterNotEnough;
-        delitem "GrassSeed", 5;
-	getitem "GrassLiner", 1;
-	set QUEST_Easter11, 6;
-	mes "[Eomie]";
-	mes "";
-	mes "\"You have gathered enough [Grass Seed]s for me to grow the liner.\"";
-	mes "She plants the seeds and murmurs a spell over them.";
-	mes "You both watch the grass grow tall and when it's done growing,";
-	mes "she deftly gathers it for you.";
-	mes "\"Here is your [Grass Liner].\"";
-	close;
-
-L_EasterTooMany:
-	mes "[Eomie]";
-	mes "";
-	mes "\"You don't have enough room for the [Grass Liner]. Come back later.\"";
-	close;
-
-L_SeeBunny:
-	mes "[Eomie]";
-	mes "";
-	mes "\"You need to return to the Easter Bunny now.\"";
-	close;
-
-L_End:
-	close;
-
-}
diff --git a/npc/024-1_Tulimshar_Canyon/tinris.txt b/npc/024-1_Tulimshar_Canyon/tinris.txt
deleted file mode 100644
index 29381f57..00000000
--- a/npc/024-1_Tulimshar_Canyon/tinris.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// A gardener at Tulimshar's magic academy
-
-024-1.gat,82,64,0	script	Tinris	160,{
-	mes "[Tinris]";
-	mes "\"This is a magic school.\"";
-	close;
-}
diff --git a/npc/024-1_Tulimshar_Canyon/tondar.txt b/npc/024-1_Tulimshar_Canyon/tondar.txt
deleted file mode 100644
index 585806df..00000000
--- a/npc/024-1_Tulimshar_Canyon/tondar.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-// A professor at Tulimshar's magic academy
-
-024-1.gat,83,51,0	script	Tondar	168,{
-	mes "[Tondar]";
-	mes "\"We're not accepting any new students right now.\"";
-        if (getskilllv(SKILL_MAGIC) > 0)
-		goto L_may_ask;
-
-	close;
-
-L_may_ask:
-        next;
-        menu
-		"Can you teach me a spell?", L_askspell,
-                "Do you have a magic library?", L_library,
-		"Are you sure?  I can pay well...", L_nopay,
-                "That's unfortunate.", -,
-                "Goodbye, then.", -;
-
-	close;
-
-L_library:
-	mes "[Tondar]";
-	mes "\"Of course we do.  It is only for graduate students, alumni, and faculty.\"";
-        next;
-        menu
-		"Thank you, and goodbye.", L_end,
-		"Nobody else is allowed inside?", -;
-
-
-	mes "[Tondar]";
-	mes "\"Well, it is possible to get a special permit from the headmaster.  But he is currently on sabbatical.\"";
-        close;
-        
-
-L_askspell:
-	mes "[Tondar]";
-	mes "\"We only teach spells to students.\"";
-        next;
-
-        menu
-		"Oh, come on... just one little spell!", L_nopay,
-                "Pretty please?", L_spell,
-		"I can pay you, too...", L_nopay;
-
-
-L_spell:
-	mes "[Tondar]";
-	mes "\"Well, all right; this one can't do much harm.  Press your hands together and say `" + getspellinvocation("ask-magic-exp") + "'.\"";
-        mes "\"This will release a steady flow of magic within you.  Focus and try to control it; it is a good meditative practice.\"";
-        close;
-
-
-L_nopay:
-	mes "[Tondar]";
-        mes "The wizard frowns angrily.";
-	mes "\"Do not tempt me to teach you a different kind of lesson, young one!  Begone!\"";
-
-L_end:
-        close;
-}