Change the Converter to use different folder names

And update everything to use it.

6 files changed, 0 insertions, 357 deletions

diff --git a/npc/013-2_Magic_house/_import.txt b/npc/013-2_Magic_house/_import.txt
deleted file mode 100644
index d4b34905..00000000
--- a/npc/013-2_Magic_house/_import.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 013-2.gat
-npc: npc/013-2_Magic_house/_mobs.txt
-npc: npc/013-2_Magic_house/_warps.txt
-npc: npc/013-2_Magic_house/apprentice.txt
-npc: npc/013-2_Magic_house/notes.txt
-npc: npc/013-2_Magic_house/wizard.txt
diff --git a/npc/013-2_Magic_house/_mobs.txt b/npc/013-2_Magic_house/_mobs.txt
deleted file mode 100644
index ef17f929..00000000
--- a/npc/013-2_Magic_house/_mobs.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-2 Magic house mobs
-
-
-
-013-2.gat,0,0,0	script	Mob013-2	-1,{
-	end;
-}
diff --git a/npc/013-2_Magic_house/_warps.txt b/npc/013-2_Magic_house/_warps.txt
deleted file mode 100644
index 22654434..00000000
--- a/npc/013-2_Magic_house/_warps.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 013-2 Magic house warps
-
-013-2.gat,63,43	warp	toOutside	-1,-1,013-1.gat,42,91
-013-2.gat,67,36	warp	toRoom	-1,-1,013-2.gat,21,41
-013-2.gat,21,42	warp	toRoom	-1,-1,013-2.gat,67,37
diff --git a/npc/013-2_Magic_house/apprentice.txt b/npc/013-2_Magic_house/apprentice.txt
deleted file mode 100644
index 830b5171..00000000
--- a/npc/013-2_Magic_house/apprentice.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-013-2.gat,25,37,0	script	Fabius	115,{
-	mes "[Fabius]";
-	mes "\"Hey! Wanna have a drink or something? High quality, low cost. A poor fella like me needs a bit of extra cash, ye know.\"";
-	next;
-	menu
-		"Yes please!", L_Yes,
-		"No thanks.", L_No,
-		"No way, I thought it was for free!", L_Not_Free;
-
-L_Yes:
-	mes "[Fabius]";
-	mes "\"So what would ya like, then?\"";
-	next;
-	menu
-		"A beer", L_Beer,
-		"A milk", L_Milk,
-		"Nevermind", -;
-
-L_No:
-	mes "[Fabius]";
-	mes "\"Suit yourself.\"";
-	next;
-	goto L_Finish;
-
-L_Not_Free:
-	mes "[Fabius]";
-	mes "\"Oh, you stupid git! ... But hey, let me tell ya something...\"";
-	next;
-	mes "[Fabius]";
-	mes "\"There's notes flying around in the room up there. Did ya try reading some?\"";
-	close;
-
-L_Beer:
-	mes "[Fabius]";
-	mes "\"That'll be 175 GP.\"";
-	next;
-	menu
-		"Here you are", L_Beer_yes,
-		"No thanks", L_Beer_no;
-
-L_Beer_yes:
-	if (zeny < 175) goto L_Low_money;
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Beer") == 0) goto L_TooMany;
-
-	getitem "Beer", 1;
-	set zeny, zeny - 175;
-	goto L_Finish;
-
-L_Beer_no:
-	mes "[Fabius]";
-	mes "\"No beer, no civilization!\"";
-	next;
-	goto L_Finish;
-
-L_Milk:
-	mes "[Fabius]";
-	mes "\"That'll be 300 GP.\"";
-	next;
-	menu
-		"Here you are", L_Milk_yes,
-		"No thanks", L_Milk_no;
-
-L_Milk_yes:
-	if (zeny < 300) goto L_Low_money;
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("Milk") == 0) goto L_TooMany;
-	getitem "Milk", 1;
-	set zeny, zeny - 300;
-	goto L_Finish;
-
-L_Milk_no:
-	mes "[Fabius]";
-	mes "\"Oh alright. Milk is a deadly poison anyway...\"";
-	next;
-	goto L_Finish;
-
-L_Low_money:
-	mes "[Fabius]";
-	mes "\"Aw, you don't have enough gold on you!\"";
-	next;
-	goto L_Finish;
-
-L_Finish:
-	mes "[Fabius]";
-	mes "\"By the way, have you seen those flying notes and the mirror in the room next door? They're WAY COOL! Try reading some of the notes!\"";
-	close;
-
-L_TooMany:
-	mes "[Fabius]";
-	mes "\"You don't have room for it.\"";
-	close;
-}
diff --git a/npc/013-2_Magic_house/notes.txt b/npc/013-2_Magic_house/notes.txt
deleted file mode 100644
index f45b2554..00000000
--- a/npc/013-2_Magic_house/notes.txt
+++ /dev/null
@@ -1,113 +0,0 @@
-//
-
-013-2.gat,23,32,0	script	Motto	127,{
-	mes "Mid pleasures and palaces though we may roam,";
-	mes "Be it ever so humble, there's no place like home.";
-	close;
-}
-
-013-2.gat,30,32,0	script	Note	127,{
-	mes "Please do not open.";
-	close;
-}
-
-013-2.gat,38,20,0	script	Saying	127,{
-	mes "The early bird catcheth the worm.";
-	close;
-}
-	
-013-2.gat,27,21,0	script	Mirror	127,{
-	mes "You say: \"Mirror mirror on the wall, who has the nicest haircut of them all?\"";
-	next;
-	mes "\"Oh fair adventurer, your hair indeed looks nice. But wouldn't it look much better, after I have rolled my dice?\"";
-	next;
-	mes "Your looks suddenly change...";
-	next;
-	set @style,rand(6);
-	set @color,rand(9);
-	setlook 1,@style+1;
-	setlook 6,@color;
-	close;
-}
-
-// Warp to north-eastern woods
-013-2.gat,25,23,0	script	Spell	127,{
-	mes "You read: \"I see trees of green, red roses too. I see them bloom for me and you. And I think to myself: \'What a wonderful world\'\"";
-	next;
-	mes "You think: \"Huh?\"";
-	next;
-	mes "The spell fulfills its inevitable purpose...";
-	next;
-	warp "013-1.gat",128,28;
-	close;
-}
-
-// Warp to Indian in south-eastern desert
-013-2.gat,27,24,0	script	Spell	127,{
-	mes "You read: \"A red-coloured fellow smoking his pipe - down in the desert - that's what I like!\"";
-	next;
-	mes "You feel the floor disappear below your feet...";
-	next;
-	warp "006-1.gat",33,93;
-	if (QUEST_MIRIAM_start != 0) goto L_cheat;
-	close;
-
-// If you try to use the notes to warp to pachua the quest will fail.
-
-L_cheat:
-	set QUEST_MIRIAM_cheat, 1;
-	set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
-	set QUEST_MIRIAM_start, 0;
-	message strcharinfo(0), "You were supposed to actually run to this place. You are not sure if this is going to work for Miriam...";
-	close;
-}
-
-// Warp to snake pit
-013-2.gat,25,27,0	script	Spell	127,{
-	mes "You read: \"Slithering and scales make a poisonous bite - Where you go fills me with fright!\"";
-	next;
-	mes "You feel yourself getting lighter...";
-	next;
-	warp "005-3.gat",86,33;
-	close;
-}
-
-// Warp to Dimond
-013-2.gat,27,27,0	script	Spell	127,{
-	mes "You read: \"People and cosiness, lively and fun - that's where I've gone!\"";
-	next;
-	mes "The world around you slowly dissolves...";
-	next;
-	warp "010-2.gat",34,42;
-	close;
-}
-
-// Warp to mines level 2
-013-2.gat,26,28,0	script	Spell	127,{
-	mes "You read: \"Darkness and legs, eight of them each - I'd rather not go there, but now it's too late...\"";
-	next;
-	mes "For a moment everything turns black...";
-	next;
-	warp "013-3.gat",127,70;
-	close;
-}
-
-// Death
-013-2.gat,21,29,0	script	Spell	127,{
-	mes "You read: \"Heart stops pumping, breath begone - life is stopping, death has come!\"";
-	next;
-	mes "You're losing control of your body... everything turns black... while slipping to the floor, you hear a faraway scream... suddenly, you see THE LIGHT!";
-	next;
-	heal -Hp, 0;
-	close;
-}
-
-// Naked
-013-2.gat,28,29,0	script	Spell	127,{
-	mes "You read: \"Cotton, steel, leather and wool - have I ever seen a greater fool?\"";
-	next;
-	mes "You suddenly feel naked; you ARE naked!";
-	next;
-	nude;
-	close;
-}
diff --git a/npc/013-2_Magic_house/wizard.txt b/npc/013-2_Magic_house/wizard.txt
deleted file mode 100644
index 927ddfc4..00000000
--- a/npc/013-2_Magic_house/wizard.txt
+++ /dev/null
@@ -1,130 +0,0 @@
-013-2.gat,66,39,0	script	Old Wizard#_W	116,{
-	set @has_magic, getskilllv(SKILL_MAGIC);
-        set MAGIC_FLAGS, MAGIC_FLAGS | MFLAG_KNOWS_OLD_WIZARD;
-
-        mes "[Old Wizard]";
-        mes "\"Welcome, dear wanderer! Come into my humble home. Take a rest, eat and drink.\"";
-        next;
-
-        menu
-        	"Thanks, that's very kind of you!",thanks,
-                "Can you teach me magic?", L_teach_rude,
-        	"Oh, shut up!",shutup;
-        close;
-
-L_teach_rude:
-        mes "[Old Wizard]";
-        mes "\"I certainly could, but I already have an apprentice.\"";
-        close;
-
-shutup:
-        mes "[Old Wizard]";
-        mes "\"That attitude isn't going to get you very far, my dear.\"";
-        close;
-thanks:
-        mes "[Old Wizard]";
-        mes "\"Behind this door, my apprentice will serve you.\"";
-        next;
-        if (@has_magic)
-            menu
-	        "Alright.",ok,
-                "I am studying magic, can you help?", L_new_student,
-	        "Your apprentice? ... No thanks.",nothx;
-        if (!@has_magic)
-            menu
-	        "Alright.",ok,
-	        "Your apprentice? ... No thanks.",nothx;
-nothx:
-        mes "[Old Wizard]";
-        mes "\"Goodbye, then!\"";
-        close;
-
-L_new_student:
-        mes "[Old Wizard]";
-        mes "\"Studying is always an excellent use of one's mind! I fear that I can't offer too much assistance to you, however. But if you are interested, I could perhaps teach you a simple spell?\"";
-        next;
-
-        // check if the player has the knowledge of any skill
-        if (!(getskilllv(SKILL_POOL)))
-            menu
-                "That would be very kind of you!", L_teachspell,
-                "No, but thank you!", nothx;
-
-        if (getskilllv(SKILL_POOL))
-            menu
-                "That would be very kind of you!", L_teachspell,
-                "Actually I am looking for someone teaching me some more magic skills.", L_astralsoul,
-                "No, but thank you!", nothx;
-
-L_teachspell:
-        mes "[Old Wizard]";
-        mes "\"This one may not seem too powerful, but it can be quite handy; it's the 'hide' spell. It will shield you from some forms of detection magic.\"";
-        next;
-
-        mes "[Old Wizard]";
-        mes "\"Put a piece of cotton cloth on your head, and speak out '" + getspellinvocation("hide") + "', loudly and clearly. The protection lasts quite long, but you may have to renew it on occasion.\"";
-        next;
-
-        mes "[Old Wizard]";
-        mes "\"You can also cast it on others, of course. Just speak their name after you prononuce the invocation.\"";
-        next;
-
-        mes "[Old Wizard]";
-        mes "\"You may find it useful for getting a little peace and quiet at times, but it can also get in the way of friends trying to find you, so use it with care.\"";
-        next;
-
-        if (getskilllv(SKILL_MAGIC_ASTRAL) >= 2)
-		close;
-
-        mes "[Old Wizard]";
-        mes "\"I'm not sure if you are experienced enough to cast it yet, though.  You may need to first learn astral magic.\"";
-        close;
-
-L_astralsoul:
-        mes "[Old Wizard]";
-        mes "\"Oh yes, there are lots of ways to improve your magic. Skills -some people say mental focus for that- are another way to improve your magic. Of course learning more and more spells is also a need for good mages.\"";
-        next;
-        mes "\"I can teach you the ability to focus on magical stuff.\"";
-        next;
-        mes "\"To do so, I am in need of a pearl and about 100 acorns.\"";
-
-        menu "Here we go.", -,
-             "Ok be right back. I'll get them", nothx;
-
-        if (countitem("Pearl") < 1 || countitem("Acorn") < 100) goto L_NotEnough;
-        delitem "Pearl", 1;
-        delitem "Acorn", 100;
-
-        mes "[Old Wizard]";
-        mes "\"Okay, listen:\"";
-        next;
-        mes "\"Some parts of your brain is still unused. These parts will now get the ability to get focused to magic.\"";
-        next;
-        mes "\"To do so, think of a magic spell!\"";
-        next;
-        mes "The old wizard mumbles some invocations";
-        next;
-        set @SUP_lvl, 1;
-        set @SUP_id, SKILL_ASTRAL_SOUL;
-        set @SUP_name$, "Astral Soul";
-        set @SUP_xp, 2500;
-        callfunc "SkillUp";
-        mes "\"Now go and try to find someone who can actually activate that focus.\"";
-        next;
-        mes "\"You have the powers to focus on magic, but you need to get magic focused now.\"";
-        close;
-
-L_NotEnough:
-        mes "[Old Wizard]";
-        mes "\"Please learn to count.\"";
-        next;
-        mes "\"When you are done with that, come back again.\"";
-        close;
-ok:
-        mes "[Old Wizard]";
-        mes "\"Beware the flying notes though, some of them are really dangerous. I haven't been able to persuade them to get back into their book. And avoid the mirror, it's been acting strange lately.\"";
-        next;
-        mes "\"Oh, and please don't take my apprentice too seriously. He still has a lot to learn.\"";
-        close;
-}
-