Change the Converter to use different folder names

And update everything to use it.

5 files changed, 0 insertions, 399 deletions

diff --git a/npc/006-1_Desert_mountains/_import.txt b/npc/006-1_Desert_mountains/_import.txt
deleted file mode 100644
index 655acae9..00000000
--- a/npc/006-1_Desert_mountains/_import.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 006-1.gat
-npc: npc/006-1_Desert_mountains/_mobs.txt
-npc: npc/006-1_Desert_mountains/_warps.txt
-npc: npc/006-1_Desert_mountains/mika.txt
-npc: npc/006-1_Desert_mountains/pachua.txt
diff --git a/npc/006-1_Desert_mountains/_mobs.txt b/npc/006-1_Desert_mountains/_mobs.txt
deleted file mode 100644
index ae13bb84..00000000
--- a/npc/006-1_Desert_mountains/_mobs.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-1 Desert mountains mobs
-
-006-1.gat,25,34,12,31	monster	Snake	1010,3,100000,30000,Mob006-1::On1010
-006-1.gat,36,29,9,16	monster	Snake	1010,1,100000,30000,Mob006-1::On1010
-006-1.gat,34,41,4,6	monster	Mountain Snake	1026,1,30000,75000,Mob006-1::On1026
-006-1.gat,55,37,27,23	monster	Mountain Snake	1026,3,150000,10000,Mob006-1::On1026
-006-1.gat,89,26,33,13	monster	Mountain Snake	1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,118,43,22,40	monster	Mountain Snake	1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,115,49,6,3	monster	Mountain Snake	1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,88,47,36,11	monster	Mountain Snake	1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,105,72,25,16	monster	Mountain Snake	1026,3,15000,75000,Mob006-1::On1026
-006-1.gat,75,106,16,22	monster	Mountain Snake	1026,4,15000,75000,Mob006-1::On1026
-006-1.gat,102,97,36,29	monster	Mountain Snake	1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,65,65,49,30	monster	Mountain Snake	1026,8,15000,75000,Mob006-1::On1026
-006-1.gat,95,120,38,13	monster	Mountain Snake	1026,5,15000,75000,Mob006-1::On1026
-006-1.gat,54,120,29,7	monster	Mountain Snake	1026,4,15000,75000,Mob006-1::On1026
-006-1.gat,36,98,33,35	monster	Scorpion	1003,10,100000,30000,Mob006-1::On1003
-
-
-006-1.gat,0,0,0	script	Mob006-1	-1,{
-On1003:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-On1010:
-	set @mobID, 1010;
-	callfunc "MobPoints";
-	break;
-
-On1026:
-	set @mobID, 1026;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/006-1_Desert_mountains/_warps.txt b/npc/006-1_Desert_mountains/_warps.txt
deleted file mode 100644
index 3dd14f00..00000000
--- a/npc/006-1_Desert_mountains/_warps.txt
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 006-1 Desert mountains warps
-
-006-1.gat,28,21	warp	ToDesert	-1,-1,005-1.gat,175,96
-006-1.gat,27,22	warp	ToDesert	-1,-1,005-1.gat,174,97
-006-1.gat,30,19	warp	ToDesert	-1,-1,005-1.gat,177,94
-006-1.gat,29,20	warp	ToDesert	-1,-1,005-1.gat,176,95
-006-1.gat,26,23	warp	ToDesert	-1,-1,005-1.gat,173,98
-006-1.gat,25,24	warp	ToDesert	-1,-1,005-1.gat,172,99
-006-1.gat,23,26	warp	ToDesert	-1,-1,005-1.gat,170,101
-006-1.gat,24,25	warp	ToDesert	-1,-1,005-1.gat,171,100
-006-1.gat,22,27	warp	ToDesert	-1,-1,005-1.gat,169,102
-006-1.gat,21,28	warp	ToDesert	-1,-1,005-1.gat,168,103
-006-1.gat,20,29	warp	ToDesert	-1,-1,005-1.gat,167,104
-006-1.gat,19,30	warp	ToDesert	-1,-1,005-1.gat,166,105
-006-1.gat,18,31	warp	ToDesert	-1,-1,005-1.gat,165,106
-006-1.gat,40,26	warp	ToCave	-1,-1,006-3.gat,40,27
-006-1.gat,60,58	warp	ToCave	-1,-1,006-3.gat,60,69
-006-1.gat,62,30	warp	ToCave	-1,-1,006-3.gat,62,31
-006-1.gat,55,27	warp	ToCave	-1,-1,006-3.gat,55,28
-006-1.gat,77,44	warp	ToCave	-1,-1,006-3.gat,77,45
-006-1.gat,86,24	warp	ToCave	-1,-1,006-3.gat,86,25
-006-1.gat,91,24	warp	ToCave	-1,-1,006-3.gat,91,25
-006-1.gat,104,44	warp	ToCave	-1,-1,006-3.gat,104,45
-006-1.gat,122,24	warp	ToCave	-1,-1,006-3.gat,122,25
-006-1.gat,114,49	warp	ToCave	-1,-1,006-3.gat,114,50
-006-1.gat,110,56	warp	ToCave	-1,-1,006-3.gat,110,57
-006-1.gat,125,59	warp	ToCave	-1,-1,006-3.gat,125,60
-006-1.gat,92,63	warp	ToCave	-1,-1,006-3.gat,92,64
-006-1.gat,112,74	warp	ToCave	-1,-1,006-3.gat,112,75
-006-1.gat,121,110	warp	ToCave	-1,-1,006-3.gat,121,111
-006-1.gat,79,120	warp	ToCave	-1,-1,006-3.gat,79,121
-006-1.gat,38,121	warp	ToCave	-1,-1,006-3.gat,38,122
-006-1.gat,74,90	warp	ToCave	-1,-1,006-3.gat,74,91
-006-1.gat,51,90	warp	ToCave	-1,-1,006-3.gat,51,91
-006-1.gat,30,123	warp	ToCave	-1,-1,032-3.gat,128,31
diff --git a/npc/006-1_Desert_mountains/mika.txt b/npc/006-1_Desert_mountains/mika.txt
deleted file mode 100644
index fc2e6f44..00000000
--- a/npc/006-1_Desert_mountains/mika.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-006-1.gat,39,27,0	script	Mika	114,{
-    mes "[Mika]";
-    mes "\"My father told me about a man living in this desert who makes clothes out of snake skin.\"";
-    next;
-    mes "[Mika]";
-    mes "\"Maybe you can find him, but be careful you don't get lost in the tunnels!\"";
-    close;
-}
diff --git a/npc/006-1_Desert_mountains/pachua.txt b/npc/006-1_Desert_mountains/pachua.txt
deleted file mode 100644
index a827205f..00000000
--- a/npc/006-1_Desert_mountains/pachua.txt
+++ /dev/null
@@ -1,311 +0,0 @@
-006-1.gat,23,100,0	script	Pachua	143,{
-
-	set @LEATHER_PATCH_PRICE, 300;
-	set @wants_leather_patch, QUEST_Forestbow_state & NIBBLE_4_MASK;
-
-// lines belong to easter 2011:
-//	set @month, 4;
-//	set @start_day, 15;
-//	set @end_day, 30;
-
-	if (QUEST_MIRIAM_cheat != 0) goto L_warp_cheat;
-	if (QUEST_MIRIAM_start != 0) goto L_smoke;
-
-// lines belong to easter 2011:
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 1) goto L_Basket;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 2) goto L_MakeBasket;
-//	if (gettime(6) == @month && gettime(5) >= @start_day && gettime(5) <= @end_day && QUEST_Easter11 == 3) goto L_SeeBunny;
-
-L_Begin:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"How!\"";
-	next;
-
-	if (getequipid(equip_head) == 643 || getequipid(equip_head) == 644) goto L_WearingCowboy;
-	if (getequipid(equip_legs) == 642) goto L_WearingChaps;
-
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"For generations my tribe has been crafting special clothes out of different items.\"";
-	next;
-
-L_Check_Shops:
-	if((countitem("JeansShorts") > 0 && countitem("SnakeSkin") > 9) && (countitem("FancyHat") > 0 && countitem("SnakeSkin") > 1)) goto L_Super_store;
-	if(countitem("JeansShorts") > 0 && countitem("SnakeSkin") > 9) goto L_Chaps_store;
-	if(countitem("FancyHat") > 0 && countitem("SnakeSkin") > 1) goto L_Cowboy_store;
-
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Maybe if you bring me the right materials I can make something for you.\"";
-        next;
-
-        if (@wants_leather_patch)
-		menu	"Wait, can you make a leather patch for me?", L_leather_patch,
-                	"OK, bye.", -;
-
-	close;
-
-L_CheckStuff:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Let me see what you have there.\"";
-	next;
-	return;
-
-L_Super_store:
-	callsub L_CheckStuff;
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Ahh you have lots of good items to work with.\"";
-	mes "";
-	mes "\"With them I can make you either";
-	mes "a Cowboy hat or Snake Skin Chaps\"";
-	next;
-	if (@wants_leather_patch)
-		menu
-			"Cowboy hat, please.", L_BuyCowboy,
-			"Snake Skin Chaps sound good.", L_BuyChaps,
-			"Can you make a leather patch?", L_leather_patch,
-			"Not now, maybe later.", L_NoDeal;
-	if (!@wants_leather_patch)
-		menu
-			"Cowboy hat, please.", L_BuyCowboy,
-			"Snake Skin Chaps sound good.", L_BuyChaps,
-			"Not now, maybe later.", L_NoDeal;
-
-L_Cowboy_store:
-	callsub L_CheckStuff;
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"To make you a Cowboy hat I will need:";
-	mes "1 Fancy hat";
-	mes "2 Snake skins";
-	mes "5.000 GP\"";
-	mes "";
-	mes "\"Do we have a deal?\"";
-	next;
-	if (@wants_leather_patch)
-		menu
-			"Yes, that's fine.", L_BuyCowboy,
-			"Can you make a leather patch?", L_leather_patch,
-			"On second thought, maybe later.", L_NoDeal;
-	if (!@wants_leather_patch)
-		menu
-			"Yes, that's fine.", L_BuyCowboy,
-			"On second thought, maybe later.", L_NoDeal;
-
-L_Chaps_store:
-	callsub L_CheckStuff;
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"To make you a pair of Snake Skin Chaps I will need:";
-	mes "1 Jeans Shorts";
-	mes "10 Snake skins";
-	mes "10.000 GP\"";
-	mes "";
-	mes "\"Do we have a deal?\"";
-	next;
-	if (!@wants_leather_patch)
-		menu
-			"Yes, that's fine.", L_BuyChaps,
-			"On second thought, maybe later.", L_NoDeal;
-	if (@wants_leather_patch)
-		menu
-			"Yes, that's fine.", L_BuyChaps,
-			"Can you make a leather patch?", L_leather_patch,
-			"On second thought, maybe later.", L_NoDeal;
-
-L_BuyChaps:
-	if (zeny < 10000) goto L_NoMoney;
-	if (countitem("JeansShorts") < 1) goto L_NoJeans;
-	if (countitem("SnakeSkin") < 10) goto L_NoSkin;
-	set zeny, zeny - 10000;
-	delitem "SnakeSkin", 10;
-	delitem "JeansShorts", 1;
-	getitem "JeansChaps", 1;
-	goto L_DealDone;
-
-L_BuyCowboy:
-	if (zeny < 5000) goto L_NoMoney;
-	if (countitem("FancyHat") < 1) goto L_NoFancy;
-	if (countitem("SnakeSkin") < 2) goto L_NoSkin;
-	set zeny, zeny - 5000;
-	delitem "SnakeSkin", 2;
-	delitem "FancyHat", 1;
-	set @temp,rand(2);
-	if(@temp == 0) goto L_Cowboy_white;
-	goto L_Cowboy_black;
-
-L_Cowboy_white:
-	getitem "WhiteCowboyHat", 1;
-	goto L_DealDone;
-
-L_Cowboy_black:
-	getitem "BlackCowboyHat", 1;
-	goto L_DealDone;
-
-L_leather_patch:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"If you just want a piece of leather, then yes, I can make that.  Bring me a snake skin and " + @LEATHER_PATCH_PRICE + " GP.\"";
-        next;
-
-        menu	"Here you are.", -,
-		"OK, I'll be back later.", L_End,
-		"That's too expensive!.", L_NoDeal;
-
-	if (countitem("SnakeSkin") < 1) goto L_NoSkins;
-	if (zeny < @LEATHER_PATCH_PRICE) goto L_NoMoney;
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("SnakeSkin") > 1) goto L_TooMany;
-
-        set zeny, zeny - @LEATHER_PATCH_PRICE;
-        delitem "SnakeSkin", 1;
-        getitem "LeatherPatch", 1;
-        goto L_DealDone;
-
-L_DealDone:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Here you are!\"";
-	mes "";
-	mes "\"Come back any time.\"";
-	close;
-
-L_NoDeal:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Alright, but you won't get a better deal anywhere else!\"";
-	close;
-
-L_NoMoney:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Oh dear, it seems you don't have enough money.\"";
-	close;
-
-L_NoJeans:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Oh dear, it seems you don't have enough jeans shorts.\"";
-	close;
-
-L_NoFancy:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Oh dear, it seems you don't have enough fancy hats.\"";
-	close;
-
-L_NoSkins:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Oh dear, it seems you don't have enough snake skins.\"";
-	close;
-
-L_WearingCowboy:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Ah, I see that you are wearing a hat made with the ancient methods of my tribe.\"";
-	next;
-	goto L_Check_Shops;
-
-L_WearingChaps:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"Ah, I see that you are wearing pants made by my tribe.\"";
-	next;
-	goto L_Check_Shops;
-
-L_End:
-	close;
-
-L_TooMany:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"You don't have room for a leather patch. Come back later.\"";
-	close;
-
-L_smoke:
-	message strcharinfo(0), "Pachua quickly inhales from his pipe and releases a ring of smoke towards the sky!";
-	set QUEST_MIRIAM_run, gettimetick(1) - QUEST_MIRIAM_start;
-	set QUEST_MIRIAM_start, 0;
-	end;
-
-L_warp_cheat:
-	if (@warp_cheat == 1) goto L_Begin;
-	message strcharinfo(0), "Pachua releases a ring of smoke towards the sky! But, by the look on his face, you can tell he is suspicious about your methods...";
-	set @warp_cheat, 1;
-	end;
-
-L_Basket:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"For generations my tribe has been crafting special clothes out of different items.\"";
-	mes "\"Maybe if you bring me the right materials I can make something for you.\"";
-        next;
-	menu
-		"Do you work only with clothes? Because I was looking for a basket.", -;
-	mes "\"A basket? In our tribe, we craft baskets of all kinds using only reeds. This basket, you need it to carry your items?\"";
-	menu
-		"No. It is for the Easter Bunny. I offered to get him one.", -;
-	mes "\"I appreciate your attitude. Maybe I can help you with that.\"";
-	menu
-		"I would be really grateful if you could do that!", -,
-		"Nah, I decided not to do that stupid quest.", L_End,
-		"I would prefer to talk to you about other stuff.", L_Begin; //should go to pachuas's regular chat
-	set QUEST_Easter11, 2;
-
-L_MakeBasket:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"I will need you to gather reeds for me.\"";
-	mes "\"5 bundles should do it.\"";
-	mes "\"You should be able to get those from mouboos as they graze.\"";
-	menu
-		"I have the Reeds!", -,
-		"Ok, I will be back soon", L_End,
-		"I changed my mind, forget about it", L_End,
-		"Can I talk to you about another stuff?", L_Begin; //should go to pachuas's regular chat
-
-	if(countitem("ReedBundle") < 5) goto L_EasterNotEnough;
-	if(countitem("ReedBundle") >= 5) goto L_EasterEnough;
-	close;
-
-L_EasterNotEnough:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"You do not have enough [Reed Bundle]s for me to work with.\"";
-	mes "\"Go gather more.\"";
-	close;
-
-L_EasterEnough:
-	getinventorylist;
-	if (@inventorylist_count == 100 && countitem("ReedBundle") > 5) goto L_EasterTooMany;
-	if(countitem("ReedBundle") < 5) goto L_EasterNotEnough;
-        delitem "ReedBundle", 5;
-	getitem "EasterBasket", 1;
-	set QUEST_Easter11, 3;
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"You have gathered enough reeds for me to make the basket.\"";
-	mes "He skillfully soaks the reeds you brought him,";
-	mes "then swiftly weaves them into a basket shape.";
-	mes "Next, he places the damp basket in the sun to dry for a minute before handing it over to you.";
-	mes "\"Here is your [Easter Basket].\"";
-	close;
-
-L_EasterTooMany:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"You don't have room for the [Easter Basket]. Come back later.\"";
-	close;
-
-L_SeeBunny:
-	mes "[Chief Pachua]";
-	mes "";
-	mes "\"You need to return to the Easter Bunny now.\"";
-	next;
-	goto L_Begin;
-
-}