Change the Converter to use different folder names

And update everything to use it.

10 files changed, 0 insertions, 399 deletions

diff --git a/npc/002-1_Sandstorm/_import.txt b/npc/002-1_Sandstorm/_import.txt
deleted file mode 100644
index 749a24df..00000000
--- a/npc/002-1_Sandstorm/_import.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 002-1.gat
-npc: npc/002-1_Sandstorm/_mobs.txt
-npc: npc/002-1_Sandstorm/_warps.txt
-npc: npc/002-1_Sandstorm/lieutenant_dausen.txt
-npc: npc/002-1_Sandstorm/merchant.txt
-npc: npc/002-1_Sandstorm/nickos.txt
-npc: npc/002-1_Sandstorm/nomads.txt
-npc: npc/002-1_Sandstorm/rogue.txt
-npc: npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
-npc: npc/002-1_Sandstorm/stewen.txt
diff --git a/npc/002-1_Sandstorm/_mobs.txt b/npc/002-1_Sandstorm/_mobs.txt
deleted file mode 100644
index 0b8be241..00000000
--- a/npc/002-1_Sandstorm/_mobs.txt
+++ /dev/null
@@ -1,42 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-1 Sandstorm mobs
-
-002-1.gat,0,0,0,0	monster	Maggot	1002,20,1000,500,Mob002-1::On1002
-002-1.gat,96,98,19,13	monster	Maggot	1002,10,100000,30000,Mob002-1::On1002
-002-1.gat,94,35,11,4	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,68,59,7,6	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,57,86,15,8	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,19,94,7,8	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,44,35,3,2	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,38,29,3,2	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,62,91,24,6	monster	Maggot	1002,3,100000,30000,Mob002-1::On1002
-002-1.gat,61,74,41,43	monster	Fire Goblin	1011,15,100000,30000,Mob002-1::On1011
-002-1.gat,82,24,34,15	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,32,35,34,33	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,27,81,22,43	monster	Scorpion	1003,8,100000,30000,Mob002-1::On1003
-002-1.gat,95,75,15,17	monster	Black Scorpion	1009,1,100000,1800000,Mob002-1::On1009
-
-
-002-1.gat,0,0,0	script	Mob002-1	-1,{
-On1002:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-On1003:
-	set @mobID, 1003;
-	callfunc "MobPoints";
-	break;
-
-On1009:
-	set @mobID, 1009;
-	callfunc "MobPoints";
-	break;
-
-On1011:
-	set @mobID, 1011;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/002-1_Sandstorm/_warps.txt b/npc/002-1_Sandstorm/_warps.txt
deleted file mode 100644
index fa911e50..00000000
--- a/npc/002-1_Sandstorm/_warps.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 002-1 Sandstorm warps
-
-002-1.gat,58,12	warp	ToTulimshar	3,-1,001-1.gat,44,80
-002-1.gat,108,79	warp	ToEasternDesert	-1,1,005-1.gat,23,40
-002-1.gat,12,66	warp	ToWesternDesert	-1,3,003-1.gat,168,76
-002-1.gat,28,13	warp	ToBeach	1,-1,004-1.gat,84,111
diff --git a/npc/002-1_Sandstorm/lieutenant_dausen.txt b/npc/002-1_Sandstorm/lieutenant_dausen.txt
deleted file mode 100644
index 69502cf6..00000000
--- a/npc/002-1_Sandstorm/lieutenant_dausen.txt
+++ /dev/null
@@ -1,119 +0,0 @@
-// Lieutenant in charge of monitoring the monster threat surrounding the city.
-
-002-1.gat,54,27,0	script	Lieutenant Dausen	122,{
-
-	if (TMW_Quest == 33) goto L_LD_Key;
-	if (TMW_Quest == 19) goto L_LD_Miners;
-	if (TMW_Quest == 18) goto L_LD_Orders;
-	if (TMW_Quest == 17) goto L_LD_Nickos_Waits;
-	if (TMW_Quest == 16) goto L_LD_Nickos;
-	if (TMW_Quest == 15) goto L_LD_Waits;
-	if (TMW_Quest == 14) goto L_LD_Woe_Is_Me;
-	if (TMW_Quest == 13) goto L_LD_Drinks;
-	if (TMW_Quest == 12) goto L_LD_Start;
-        if (TMW_Quest < 12) goto L_LD_Get_Rep_First;
-
-	mes "[Lieutenant Dausen]";
-	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threat around the city to ensure the safety of its citizens.\"";
-	close;
-
-L_LD_Get_Rep_First:
-	mes "[Lieutenant Dausen]";
-	mes "\"Hello.  I am Lieutenant Dausen.  I monitor the monster threat around the city to ensure the safety of its citizens.\"";
-        next;
-	mes "[Lieutenant Dausen]";
-	mes "\"I may have a job for you, stranger, but first I would like to learn more about you. Go walk among the citizens of Tulimshar, see if any of them could use some help. Once you have established a good reputation, word will get to me.\"";
-	close;
-
-L_LD_Start:
-	set TMW_Quest, 13;
-	mes "[Lieutenant Dausen]";
-	mes "\"Out here in the desert, it sure does get hot!  My men and I get thirsty rather quickly.  [Cactus Drink]s are our favourite; if you can get some for us, we'd surely appreciate your effort.  About 10 would do.\"";
-	close;
-
-L_LD_Drinks:
-	if (countitem ("CactusDrink") < 10) goto L_LD_NotEnough_Drink;
-	getinventorylist;
-	if (@inventorylist_count - (countitem("CactusDrink") == 10) > 99) goto L_LD_TooMany;
-	set TMW_Quest, 14;
-	delitem "CactusDrink", 10;
-	getitem "Boots", 1;
-	mes "[Lieutenant Dausen]";
-	mes "\"Great!  This will help us make it through the hot day.  As a gift for your troubles, take these boots to keep your feet from burning on the sand.  Have a good day...\"";
-	next;
-	mes "Lieutenant Dausen mumbles to himself and rubs his head.";
-	next;
-	mes "\"I have another problem, though.  I mixed up the orders to my men, Nickos and Stewen.  Someone needs to let them know they're going to have to hold their post for a while longer instead of taking a break.  However, I can't leave my post!  Oh, what to do, what to do...\"";
-	menu
-		"I can help you out, since you helped me too.", L_LD_Help,
-		"Thanks for the boots, gotta run now.", L_LD_NoHelp;
-	close;
-
-L_LD_NotEnough_Drink:
-	mes "[Lieutenant Dausen]";
-	mes "\"Hi again.  My men and I sure are thirsty for our favorite drink, the [Cactus Drink].  If we had about 10, it would help us out a great deal in this sandstorm.\"";
-	close;
-
-L_LD_TooMany:
-	mes "[Lieutenant Dausen]";
-	mes "\"Oh, it seems you have too many items for me to give you a reward.  Come back after you drop or sell some items.\"";
-	close;
-
-L_LD_Woe_Is_Me:
-	mes "[Lieutenant Dausen]";
-	mes "\"I have a problem.  I mixed up the orders to my men!  Someone needs to let them know they're going to have to hold their post for a while longer instead of taking a break.  However, I can't leave my post.  Oh, what to do, what to do...\"";
-	menu
-		"I can help you out, since you helped me out too.", L_LD_Help,
-		"Bye-bye.", L_LD_NoHelp;
-	close;
-
-L_LD_Help:
-	set TMW_Quest, 15;
-	mes "[Lieutenant Dausen]";
-	mes "\"Oh!  Would you?  You are ever most helpful!  Could you let Stewen know first?  I'm the most worried about the monsters from the eastern desert and he should know first to hold his post.  Come back to me after you see him.  Hope to hear from you soon!\"";
-	close;
-
-L_LD_NoHelp:
-	mes "[Lieutenant Dausen]";
-	mes "\"See you later then.\"";
-	close;
-
-L_LD_Waits:
-	mes "[Lieutenant Dausen]";
-	mes "\"I do hope Stewen holds his post.  If you could tell them to do so, it would help me out a great deal.\"";
-	close;
-
-L_LD_Nickos:
-	set TMW_Quest, 17;
-	mes "[Lieutenant Dausen]";
-	mes "\"Thanks for letting Stewen know.  Can you now tell Nickos to hold his post too?  He guards the mine to the south, monitoring the monster threat and protecting the miners when he can.\"";
-	close;
-
-L_LD_Nickos_Waits:
-	mes "[Lieutenant Dausen]";
-	mes "\"Could you let Nickos know to hold his post?  It would be very helpful.  He is guarding the mine south of here.\"";
-	close;
-
-L_LD_Orders:
-	set TMW_Quest, 19;
-	set zeny, zeny + 500;
-	mes "[Lieutenant Dausen]";
-	mes "\"Thank you for clearing up the orders to my men!  Here's some gold for your efforts.\"";
-	next;
-	mes "\"If you think you can handle the monsters lurking out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
-	close;
-
-L_LD_Miners:
-	mes "[Lieutenant Dausen]";
-	mes "\"I monitor the monster threat around the city to ensure the safety of its citizens.\"";
-	next;
-	mes "\"If you think you can handle the monsters lurking out here, I'm sure Nickos and the miners could use some help.  Talk to you later.\"";
-	close;
-
-L_LD_Key:
-	set TMW_Quest, 34;
-	mes "[Lieutenant Dausen]";
-	mes "\"Oh, Naem lost his key?  Here, take this spare.  It should help you get into the underground palace.\"";
-	close;
-
-}
diff --git a/npc/002-1_Sandstorm/merchant.txt b/npc/002-1_Sandstorm/merchant.txt
deleted file mode 100644
index 8a84ae92..00000000
--- a/npc/002-1_Sandstorm/merchant.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-//
-
-002-1.gat,19,99,0     shop    Ishyah        109,525:800,531:3000,530:8000,1199:3,603:-1
diff --git a/npc/002-1_Sandstorm/nickos.txt b/npc/002-1_Sandstorm/nickos.txt
deleted file mode 100644
index 04713ccf..00000000
--- a/npc/002-1_Sandstorm/nickos.txt
+++ /dev/null
@@ -1,114 +0,0 @@
-// Sandstorm mine guard
-
-002-1.gat,28,94,0	script	Nickos	123,{
-
-	if (TMW_Quest == 32) goto L_Nickos_UGQ;
-	if (TMW_Quest == 31) goto L_Nickos_AS_Done;
-	if (TMW_Quest == 30) goto L_Nickos_AS_Start;
-	if (TMW_Quest >= 23) && (TMW_Quest < 30) goto L_Nickos_Guards;
-	if (TMW_Quest == 22) goto L_Nickos_Check_Happy;
-	if (TMW_Quest > 19) && (TMW_Quest < 22) goto L_Nickos_Waits;
-	if (TMW_Quest == 19) goto L_Nickos_Mine;
-	if (TMW_Quest == 18) goto L_Nickos_Orders_Received;
-	if (TMW_Quest == 17) goto L_Nickos_Orders;
-	if (TMW_Quest < 17) goto L_Nickos_See_Dausen_First;
-
-	mes "[Nickos]";
-	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
-	close;
-
-L_Nickos_See_Dausen_First:
-	mes "[Nickos]";
-	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
-	next;
-	mes "[Nickos]";
-	mes "\"The mines are closed from tourists due to the monster threat.  If you want to get in you will need to prove yourself first.  Talk to Lieutenant Dausen, my superior, if you want to make a formal complaint.\"";
-	close;
-
-
-L_Nickos_Orders:
-	set TMW_Quest, 18;
-	mes "[Nickos]";
-	mes "\"I have to hold my post longer?  Argh!  I was looking forward to my break.  Oh well, thanks for letting me know.\"";
-	close;
-
-L_Nickos_Orders_Received:
-	mes "[Nickos]";
-	mes "\"Thanks for letting me know Lieutenant Dausen wants me to stick it out for a while longer.  Even though I would've liked my break, I'm sure these miners could use my watchful eye.\"";
-	close;
-
-L_Nickos_Mine:
-	mes "[Nickos]";
-	mes "\"I haven't heard from the miners in a while, but I've got to keep to my post unless there is due reason to investigate.  Normally the miners take care of themselves without any problem.\"";
-        next;
-        mes "[Nickos]";
-        mes "\"Could you check on them for me, though?\"";
-	menu
-		"Yes.", L_Nickos_Mine_Open,
-		"No.", L_Nickos_Disappoint;
-	close;
-
-L_Nickos_Disappoint:
-	mes "Nickos looks disappointed.";
-	close;
-
-L_Nickos_Mine_Open:
-	set TMW_Quest, 20;
-	mes "[Nickos]";
-	mes "\"Excellent!  You now have my permission to enter the mine.  Your assistance helps ease my worries.\"";
-	close;
-
-L_Nickos_Waits:
-	mes "[Nickos]";
-	mes "\"Please be sure to get word from Nathan and Naem to make sure everthing is okay down there.  Your assistance helps ease my worries.\"";
-	close;
-
-L_Nickos_Check_Happy:
-	set TMW_Quest, 23;
-	set zeny, zeny + 500;
-	mes "[Nickos]";
-	mes "\"Oh, everything is okay?  That's great!  I think they are pretty busy and could use some help.  Feel free to give them a hand.  Here's some gold for your troubles.\"";
-	close;
-
-L_Nickos_Guards:
-	mes "[Nickos]";
-	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
-	next;
-	mes "\"Talk to Nathan the miner, I'm sure the miners could use some help down there.\"";
-	close;
-
-L_Nickos_AS_Start:
-	set TMW_Quest, 31;
-	mes "[Nickos]";
-	mes "\"Oh, the angry scorpions are becoming a problem?  We could thin down their numbers a bit.  I can make it worth your time, but of course, I'll need something to show your work.  Bring me 10 [Angry Scorpion Stinger]s to demonstrate your effectiveness, and you will be rewarded for your efforts.\"";
-	close;
-
-L_Nickos_AS_Done:
-	if (countitem ("AngryScorpionStinger") < 10) goto L_Nickos_AS_NotDone;
-	getinventorylist;
-	if (@inventorylist_count - (countitem("AngryScorpionStinger") == 10) > 99) goto L_Nickos_TooMany;
-	set TMW_Quest, 32;
-	delitem "AngryScorpionStinger", 10;
-	getitem "LeatherShield", 1;
-	mes "[Nickos]";
-	mes "\"Ah, you are a fine combatant!  Take this [Leather Shield], it might be useful for your future battles.\"";
-	next;
-	mes "\"You might be ready to take on the underground palace.  If you are interested, go talk to Naem about unlocking the barrier, he's got the key and the code to open it.\"";
-	close;
-
-L_Nickos_AS_NotDone:
-	mes "[Nickos]";
-	mes "\"Bring me 10 [Angry Scorpion Stinger]s and I'll know their numbers are down.  You will be rewarded for your efforts.\"";
-	close;
-
-L_Nickos_TooMany:
-	mes "[Nickos]";
-	mes "\"Oh, it seems you have too many items.  Please get rid some some and I'll give you a reward.\"";
-	close;
-
-L_Nickos_UGQ:
-	mes "[Nickos]";
-	mes "\"You might be ready to take on the underground palace.  If you are interested, talk to the miners about unlocking the barrier, they've got the key to open it.\"";
-	close;
-
-}
diff --git a/npc/002-1_Sandstorm/nomads.txt b/npc/002-1_Sandstorm/nomads.txt
deleted file mode 100644
index 0b7e7426..00000000
--- a/npc/002-1_Sandstorm/nomads.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-//
-
-002-1.gat,15,67,0	script	Samuel	132,{
-	mes "[Samuel the Nomad]";
-	mes "\"This is really a nice place.\"";
-	
-	mes "Don't you think so?\"";
-	close;
-}
-
-002-1.gat,18,68,0	script	Elijah	128,{
-	mes "[Elijah the Nomad]";
-	mes "\"If I only had a tent...\"";
-	
-	close;
-}
diff --git a/npc/002-1_Sandstorm/rogue.txt b/npc/002-1_Sandstorm/rogue.txt
deleted file mode 100644
index e5afe354..00000000
--- a/npc/002-1_Sandstorm/rogue.txt
+++ /dev/null
@@ -1,50 +0,0 @@
-//
-
-002-1.gat,22,21,0	script	Malivox	103,{
-
-//	if (ResetA_charstate == 1) goto L_Multiple;
-
-//	set @cost, 10000000 / ($ResetA_uses + 1);
-
-	set @cost, baselevel * 100;
-
-	mes "[Rogue Mage]";
-	mes "\"I have come across a spell that will";
-	mes "reset your status points.";
-	mes "Normally this spell is expensive, but";
-        mes "due to an unusual constellation of the";
-        mes "stars I can cast it very cheaply!";
-        mes "For you it will cost only "+@cost+" gp.\"";
-	next;
-
-	menu "Reset my stats",-,"Forget about it",L_Pass;
-
-	if (zeny<@cost) goto L_NoMoney;
-
-//	set $ResetA_uses, $ResetA_uses + 1;
-//	set ResetA_charstate, 1;
-
-L_Reset:
-
-	set zeny, zeny-@cost;
-
-	resetstatus;
-
-	mes "[Rogue Mage]";
-	mes "\"There you are.";
-	mes "";
-	mes "Good as new!\"";
-	close;
-
-L_Pass:
-	mes "[Rogue Mage]";
-	mes "\"Very well then, see you.\"";
-	close;
-
-L_NoMoney:
-	mes "[Rogue Mage]";
-	mes "\"Oh dear, the price cannot be bargained.";
-	mes "";
-	mes "Perhaps you can borrow from a friend?\"";
-	close;
-}
diff --git a/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt b/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
deleted file mode 100644
index 62abceac..00000000
--- a/npc/002-1_Sandstorm/sandstorm_mine_barrier.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-//Sandstorm mine barrier
-
-002-1.gat,20,94,0	script	#Sandstorm_Mine_Barrier	127,0,0,{
-
-	if (TMW_Quest >= 20) goto L_Sandstorm_Barrier_Open;
-
-	message strcharinfo(0), "Some force seems to block your entrance.";
-	end;
-	
-L_Sandstorm_Barrier_Open:
-	warp "002-3.gat",37,31;
-	end;
-
-}
diff --git a/npc/002-1_Sandstorm/stewen.txt b/npc/002-1_Sandstorm/stewen.txt
deleted file mode 100644
index 6c099b3a..00000000
--- a/npc/002-1_Sandstorm/stewen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-// East sandstorm guard
-
-002-1.gat,106,76,0	script	Stewen	123,{
-
-	if (TMW_Quest == 16) goto L_TMW_Quest_Received;
-	if (TMW_Quest == 15) goto L_TMW_Quest;
-
-	mes "[Stewen]";
-	mes "\"I'm keeping a watchful eye on the monsters to the east so they don't threaten Tulimshar's citizens.  They are pretty strong.\"";
-	close;
-
-L_TMW_Quest:
-	set TMW_Quest, 16;
-	mes "[Stewen]";
-	mes "\"I don't get a break?!  Lieutenant Dausen needs to ask the Wizard's Council for more help out here.  Either that or give me a raise!  Oh well.  Thanks for letting me know.\"";
-	close;
-
-L_TMW_Quest_Received:
-	mes "[Stewen]";
-	mes "\"Thanks again for letting me know Lieutenant Dausen isn't letting me take a break.  Once I get out of here, I'll let him know I want a raise!\"";
-	close;
-
-}