Change the Converter to use different folder names

And update everything to use it.

12 files changed, 0 insertions, 255 deletions

diff --git a/npc/021-1_Tulimshar/_import.txt b/npc/021-1_Tulimshar/_import.txt
deleted file mode 100644
index 346d975a..00000000
--- a/npc/021-1_Tulimshar/_import.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-map: 021-1.gat
-npc: npc/021-1_Tulimshar/_mobs.txt
-npc: npc/021-1_Tulimshar/_warps.txt
-npc: npc/021-1_Tulimshar/bakery.txt
-npc: npc/021-1_Tulimshar/eurni.txt
-npc: npc/021-1_Tulimshar/gate_guards.txt
-npc: npc/021-1_Tulimshar/inac.txt
-npc: npc/021-1_Tulimshar/mapflags.txt
-npc: npc/021-1_Tulimshar/north_shops.txt
-npc: npc/021-1_Tulimshar/royal_guards.txt
-npc: npc/021-1_Tulimshar/weellos.txt
-npc: npc/021-1_Tulimshar/workers.txt
diff --git a/npc/021-1_Tulimshar/_mobs.txt b/npc/021-1_Tulimshar/_mobs.txt
deleted file mode 100644
index 4879d529..00000000
--- a/npc/021-1_Tulimshar/_mobs.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-1 Tulimshar mobs
-
-021-1.gat,126,86,3,2	monster	Maggot	1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,90,65,3,2	monster	Maggot	1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,95,124,3,2	monster	Maggot	1002,2,100000,30000,Mob021-1::On1002
-021-1.gat,103,53,6,2	monster	Maggot	1002,5,100000,30000,Mob021-1::On1002
-021-1.gat,98,24,2,2	monster	Sea Slime	1033,1,150000,100000,Mob021-1::On1033
-
-
-021-1.gat,0,0,0	script	Mob021-1	-1,{
-On1002:
-	set @mobID, 1002;
-	callfunc "MobPoints";
-	break;
-
-On1033:
-	set @mobID, 1033;
-	callfunc "MobPoints";
-	break;
-
-	end;
-}
diff --git a/npc/021-1_Tulimshar/_warps.txt b/npc/021-1_Tulimshar/_warps.txt
deleted file mode 100644
index d6da764c..00000000
--- a/npc/021-1_Tulimshar/_warps.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is generated automatically. All manually changes will be removed when running the Converter.
-// 021-1 Tulimshar warps
-
-021-1.gat,55,146	warp	toBazaar	3,-1,001-1.gat,44,20
-021-1.gat,136,146	warp	toSouthTulimshar	0,-1,001-1.gat,124,21
-021-1.gat,53,134	warp	toBuilding	-1,-1,021-2.gat,27,29
-021-1.gat,55,134	warp	toBuilding	-1,-1,021-2.gat,33,29
-021-1.gat,57,134	warp	toBuilding	-1,-1,021-2.gat,39,29
-021-1.gat,103,100	warp	toBakery	-1,-1,021-2.gat,91,27
-021-1.gat,103,96	warp	toBakery	-1,-1,021-2.gat,122,23
-021-1.gat,49,63	warp	toMagicSchool	3,-1,024-1.gat,86,72
-021-1.gat,53,99	warp	toTaylor	-1,-1,021-2.gat,25,66
-021-1.gat,52,95	warp	toTaylor	-1,-1,021-2.gat,23,98
-021-1.gat,73,20	warp	ToNorthTulimshar	3,-1,022-1.gat,73,107
-021-1.gat,113,20	warp	ToNorthTulimshar	3,-1,022-1.gat,113,107
diff --git a/npc/021-1_Tulimshar/bakery.txt b/npc/021-1_Tulimshar/bakery.txt
deleted file mode 100644
index d7ca399f..00000000
--- a/npc/021-1_Tulimshar/bakery.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-// Outside the bakery
-
-021-1.gat,105,104,0	shop	Ara	163,WhiteCake :-1,ChocolateCake :-1,OrangeCake :-1,AppleCake :-1
-
-021-1.gat,108,102,0	script	Itka	114,{
-	mes "[Itka]";
-	mes "\"This bakery is the best!\"";
-	close;
-
-OnTimer300000:
-	npctalk "Come to the bakery!";
-	setnpctimer 0;
-	end;
-
-OnInit:
-	initnpctimer;
-}
diff --git a/npc/021-1_Tulimshar/eurni.txt b/npc/021-1_Tulimshar/eurni.txt
deleted file mode 100644
index 1a140e81..00000000
--- a/npc/021-1_Tulimshar/eurni.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-//
-
-021-1.gat,141,113,0	script	Eurni	136,{
-	if (BaseLevel < 10) goto L_TooYoung;
-	if (zeny < 10000) goto L_NoMoney;
-
-	mes "[Eurni the Surgeon]";
-	mes "\"Are you tired of being what you are?\"";
-	next;
-	
-	mes "[Eurni the Surgeon]";
-	mes "\"Would you maybe be interested in a sex change?\"";
-	next;
-	
-	mes "[Server]";
-	mes "Warning: All characters under this login will be changed. Once it's done, you will be kicked from the server. Don't panic, as everything is fine.";
-	next;
-	
-	menu
-		"Please do, my dear...", L_Change,
-		"Leave alone my family treasure!", -;
-	close;
-
-L_Change:
-	if (zeny < 10000) goto L_No_Money;
-	set zeny, zeny - 10000;
-	changesex;
-	close;
-
-L_TooYoung:
-	mes "[Eurni the Surgeon]";
-	mes "\"Move along, kid.\"";
-	close;
-
-L_NoMoney:
-	mes "[Eurni the Surgeon]";
-	mes "\"You don't have enough to pay for my services.\"";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/gate_guards.txt b/npc/021-1_Tulimshar/gate_guards.txt
deleted file mode 100644
index 2d0dc504..00000000
--- a/npc/021-1_Tulimshar/gate_guards.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-// Various guards at gates
-
-// Guards by the gates to the port
-021-1.gat,70,23,0	script	Guard	104,{
-	mes "[Guard]";
-	mes "\"Lots of stuff happens in the port district. Those sailors can get quite rowdy.\"";
-	close;
-}
-
-021-1.gat,110,23,0	script	Guard	104,{
-	mes "[Guard]";
-	mes "\"I'm not quite sure why I'm here, since that bridge is out.\"";
-	close;
-}
-
-// Guard near the magic school
-021-1.gat,46,65,0	script	Guard	104,{
-	mes "[Guard]";
-	mes "\"I'm just here to provide a presence for the guards at this gate. The mages here can defend themselves without problem.\"";
-	close;
-}
-
-// Guards by the gates to East Tulimshar
-021-1.gat,156,42,0	script	Guard	104,{
-	mes "[Guard]";
-	mes "\"It's still a mess in East Tulimshar. The volcano and earthquake did a lot of damage.\"";
-	close;
-}
-
-021-1.gat,156,95,0	script	Guard	104,{
-	mes "[Guard]";
-	mes "\"It can get quite dangerous east of town. But for now, the passage is closed.\"";
-	close;
-}
-
-// Near the bazaar, outside the government building
-021-1.gat,58,135,0	script	Guard	123,{
-	mes "[Guard]";
-	mes "\"This is a government building. They have some clerical and tax offices in here. There is also a jail in the subbasement.\"";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/inac.txt b/npc/021-1_Tulimshar/inac.txt
deleted file mode 100644
index 15f9eca3..00000000
--- a/npc/021-1_Tulimshar/inac.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-
-021-1.gat,53,103,0	script	Inac	156,{
-	mes "[Inac]";
-	mes "\"This cities water system is amazing. It was built centuries ago after the cataclysm that turned Tonori into this desert.\"";
-	next;
-	mes "[Inac]";
-	mes "\"They say that not much maintainence is needed, even though it's so old.\"";
-	next;
-	mes "[Inac]";
-	mes "\"They also say monsters have moved into the underground tunnels that bring and distribute water.\"";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/mapflags.txt b/npc/021-1_Tulimshar/mapflags.txt
deleted file mode 100644
index 3719ed0f..00000000
--- a/npc/021-1_Tulimshar/mapflags.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-021-1.gat mapflag no_player_drops
-021-1.gat mapflag town
diff --git a/npc/021-1_Tulimshar/north_shops.txt b/npc/021-1_Tulimshar/north_shops.txt
deleted file mode 100644
index 4fc3c481..00000000
--- a/npc/021-1_Tulimshar/north_shops.txt
+++ /dev/null
@@ -1,45 +0,0 @@
-// Northern shopping plaza
-
-// More high-end stuff to satisfy the richer people in Royal Tulimshar
-
-// Some clothing
-021-1.gat,136,38,0	shop	Inar	108,CottonShirt :-1,CottonShorts :-1,WhiteCottonBoots :-1,DesertShirt :-1,SilkRobe :-5,DesertHat :-4
-
-// Some general stuff
-021-1.gat,128,36,0	shop	Imec	162,CoinBag :-3,EmptyBottle :-6,CasinoCoins :10,CottonCloth :-6
-
-// A snobby store that won't sell to the player
-021-1.gat,138,29,0	script	Latoy	106,{
-	mes "[Latoy]";
-	mes "\"There's nothing here you could want or afford.\"";
-	close;
-}
-
-// A barber (later we can make it so certain styles need to come from him, for a price)
-021-1.gat,119,29,0	script	Issay	156,{
-	mes "[Issay the Barber]";
-	mes "\"Do you need a change of style?\"";
-	next;
-	callfunc "Barber";
-	mes "[Issay the Barber]";
-	mes "\"Come again!\"";
-	close;	
-}
-
-// Another banker
-021-1.gat,122,32,0	script	Hydusun	149,{
-	set @npcname$, "Hydusun";
-	callfunc "Banker";
-	close;
-}
-
-021-1.gat,129,40,0	script	Well	127,{
-	callfunc "WaterBottle";
-}
-
-// An officer (for security)
-021-1.gat,130,38,0	script	Officer	150,{
-	mes "[Officer]";
-	mes "I'm here for extra security for this market.";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/royal_guards.txt b/npc/021-1_Tulimshar/royal_guards.txt
deleted file mode 100644
index 02996184..00000000
--- a/npc/021-1_Tulimshar/royal_guards.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-//
-
-021-1.gat,141,23,0	script	Guard	126,{
-	mes "[Guard]";
-	mes "\"Stay away.\"";
-	close;
-}
-
-021-1.gat,147,23,0	script	Guard	126,{
-	mes "[Guard]";
-	mes "\"Stay away.\"";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/weellos.txt b/npc/021-1_Tulimshar/weellos.txt
deleted file mode 100644
index 06bb8f17..00000000
--- a/npc/021-1_Tulimshar/weellos.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-// A historian
-
-021-1.gat,130,125,0	script	Weellos	103,{
-	if isin("021-1.gat", 130, 120, 140, 125) goto L_In;
-
-        mes "[Weellos]";
-	mes "\"This is a very historic building. One of the oldest in the area.\"";
-	close;
-
-// If the player is inside the fence with Weellos
-L_In:
-        mes "[Weellos]";
-	mes "\"What did you think of the historic building?\"";
-	close;
-}
diff --git a/npc/021-1_Tulimshar/workers.txt b/npc/021-1_Tulimshar/workers.txt
deleted file mode 100644
index 24ea8f84..00000000
--- a/npc/021-1_Tulimshar/workers.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-
-021-1.gat,144,22,0	script	Construction Worker	155,{
-        mes "[Construction worker]";
-	mes "\"I can't let you beyond this gate.  The area is closed for renovation.\"";
-	close;
-}
-
-021-1.gat,156,97,0	script	Construction Worker	155,{
-        mes "[Construction worker]";
-	mes "\"East Tulimshar is closed for repairs.\"";
-	close;
-}
-
-021-1.gat,156,44,0	script	Construction Worker	155,{
-        mes "[Construction worker]";
-	mes "\"East Tulimshar is closed for repairs.\"";
-	close;
-}