putting new npcs in seperated files

some scripting and fixes

8 files changed, 75 insertions, 38 deletions

diff --git a/npc/042-1/_import.txt b/npc/042-1/_import.txt
index cfc82780..d3e2c8b2 100644
--- a/npc/042-1/_import.txt
+++ b/npc/042-1/_import.txt
@@ -2,4 +2,7 @@
 map: 042-1.gat
 npc: npc/042-1/_mobs.txt
 npc: npc/042-1/_warps.txt
-npc: npc/042-1/testnpcs.txt
+npc: npc/042-1/hasan.txt
+npc: npc/042-1/kaan.txt
+npc: npc/042-1/malik.txt
+npc: npc/042-1/valon.txt
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
new file mode 100644
index 00000000..c689213a
--- /dev/null
+++ b/npc/042-1/hasan.txt
@@ -0,0 +1,4 @@
+042-1.gat,110,74,0	script	Hasan	189,{
+//block the way to town
+end;
+}
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
new file mode 100644
index 00000000..9b002362
--- /dev/null
+++ b/npc/042-1/kaan.txt
@@ -0,0 +1,16 @@
+042-1.gat,105,72,0	script	Kaan	160,{
+
+	mes "[Young Man]";
+	mes "\"You're the person Tanisha brought here, right?";
+	mes "My name is Kaan, I'm her brother.\"";
+	next;
+	mes "\"She was babbling at me about it all the morning until I sent her to take care of the maggots in the storehouse.\"";
+	next;
+	mes "Kaan grins mischievous";
+	mes "[Kaan]";
+	mes "\"She hates maggots.\"";
+	next;
+	set kaan, 1;
+	close;
+end;
+}
diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt
new file mode 100644
index 00000000..59358aec
--- /dev/null
+++ b/npc/042-1/malik.txt
@@ -0,0 +1,10 @@
+042-1.gat,105,60,0	script	Malik	162,{
+
+	mes "reset?";
+	menu
+		"yes",-,
+		"no",L_Close;
+	set tutorial, 0;
+L_Close:
+	close;
+}
diff --git a/npc/042-1/testnpcs.txt b/npc/042-1/testnpcs.txt
deleted file mode 100644
index 6e785576..00000000
--- a/npc/042-1/testnpcs.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-//TODO: put npcs in different files and give names
-
-042-1.gat,18,80,0	script	Man	156,{
-	mes "reset?";
-	menu
-		"yes",-,
-		"no",L_Close;
-	set tutorial, 0;
-L_Close:
-	close;
-
-}
-042-1.gat,105,60,0	script	SomeGuy	162,{
-end;
-}
-042-1.gat,105,72,0	script	YoungMan	160,{
-end;
-}
-042-1.gat,110,74,0	script	ManWithShabbyClothes	189,{
-end;
-}
diff --git a/npc/042-1/valon.txt b/npc/042-1/valon.txt
new file mode 100644
index 00000000..0e6a65c0
--- /dev/null
+++ b/npc/042-1/valon.txt
@@ -0,0 +1,19 @@
+042-1.gat,17,82,0	script	Valon	156,2,1{
+
+	mes "[Valon]";
+	mes "\"Hello!\"";
+	mes "\"You're looking for adventures, right?\"";
+	next;
+	mes "\"But you shouldn't underestimate this desert, it is dangerous.\"";
+	next;
+	mes "\"It's crawling with scorpions, and the heat has overcome men tougher than you are.\"";
+	next;
+	mes "\"If you really want to challenge the desert go to main Tulimshar first to prepare yourself.\"";
+	close;
+OnTouch:
+	warp "042-1.gat", 17, 78;
+	mes "[Valon]";
+	mes "\"The desert is merciless.";
+	mes "I can't let you leave like this.\"";
+	close;
+}
diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt
index 4fe88fbe..409d8c90 100644
--- a/npc/042-2/sorfina.txt
+++ b/npc/042-2/sorfina.txt
@@ -1,23 +1,24 @@
 042-2.gat,28,26,0	script	Sorfina	154,{
 
-	if (tutorial > 2) goto L_Again;
-	if (tutorial == 1) goto L_Clothes;
+	if (sorfina == 2) goto L_Again;
+	if (sorfina == 1) goto L_Clothes;
 
-	mes "[Sorfina]";
+	mes "[Old Woman]";
 	mes "\"Ah, you're waking up. It seems you collapsed after you left the boat that brought you to Tulimshar.";
 	mes "A group of ragtags immediatly took advantage of that and stole all your stuff!\"";
 	next;
 	mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them.";
-	mes "She brought someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\"";
+	mes "She hurried to get someone to help. It was too late to catch the thieves, but at least they brought you here to recover.\"";
 	next;
-	mes "\"This area of the town is full of shady poeple, so I don't think there's a chance to get back your stuff.\"";
+	mes "\"This area of the town is full of shady people, so I don't think there's a chance to get back your stuff.\"";
 	mes "She has a sad look on her face, but then she shakes her head and smiles.";
 	next;
-	mes "[Sorfina]";
+	mes "[Old Woman]";
 	mes "\"I'm glad you're feeling better now. You're not used to the hot weather, right?";
 	mes "Are you here to look for some work? Many young people come to our Tulimshar for this reason.\"";
 	next;
 	mes "\"I can tell you some useful things, if you to hear.\"";
+	mes "\"Oh, and by the way my name is Sorfina.\"";
 	menu
 		"That would be great!",L_Tut,
 		"No, thanks. I already know how things are going.",L_SkipTut;
@@ -26,7 +27,7 @@ L_Tut:
 	mes "[Server]";
 	mes "The explanations in this tutorial are based on the official client version 0.5.2";
 	mes "If you're using another client, settings and controls may be different.";
-
+	next;
 	mes "She smiles at you.";
 	mes "[Sorfina]";
 	mes "\"A wise decision.\"";
@@ -35,7 +36,7 @@ L_Tut:
 	next;
 	mes "\"And you really should get dressed again. I gave you an old shirt of my son.\"";
 	next;
-	set tutorial, 1;
+	set sorfina, 1;
 L_Naked:
 	mes "\"Press F3 or click at the button for your equipment in the bar at the upper right corner to open your inventory.\"";
 	next;
@@ -61,7 +62,7 @@ L_Clothes:
 	next;
 	mes "\"Oh, and if you're looking for work, you should talk to Aidan when you go to main Tulimshar. They're giving rewards for monster hunting.";
 	mes "You can find him near the south gate. Well, good luck.\"";
-	set tutorial, 2;
+	set sorfina, 2;
 	close;
 
 L_Again:
diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index 598a922a..255e30d7 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -1,8 +1,9 @@
 //TODO: remove knife from beginning items
 042-2.gat,37,90,0	script	Tanisha	114,{
 
-	if (tutorial >= 4) goto L_Again;
-	if (tutorial == 4) goto L_Stats;
+	if (tanisha == 3) goto L_Again;
+	if (tanisha == 2) goto L_Stats;
+	if (tanisha == 1) goto L_Maggots;
 
 	mes "[Tanisha]";
 	mes "\"Hey! You're up again!\"";
@@ -17,7 +18,7 @@
 	mes "Hey, I have an idea.\"";
 	next;
 L_Maggots:
-	set tutorial, 3;
+	set tanisha, 1;
 	mes "\"There are some maggots eating the goods and I shall get rid of them.";
 	mes "But they're so yucky!\"";
 	next;
@@ -41,8 +42,8 @@ L_Maggots:
 	next;
 	mes "\"If you press Shift, you can abort your attack.\"";
 	next;
-	mes "\"Maggots aren't aggressive, so they won't attack you until you attacked. Take them out one by one.";
-	mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z.\"";
+	mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one.";
+	mes "Sometimes dead monsters leave some useful things. You can pick them up with pressing Z or clicking with your mouse.\"";
 	close2;
 	warp "042-2.gat", 33, 87;
 	areamonster "042-2.gat", 31, 85, 35, 89, "", 1002, 5, "Tanisha::onMaggotDeath";
@@ -72,24 +73,28 @@ L_StatsRe:
 	mes "\"Luck gives you the chance to do critical hits and lowers the chance to receive a critical hit from your opponent.\"";
 	next;
 	mes "\"Think about how you want to play before putting the points.";
+	next;
 	mes "Also I heard rumors about a strange guy lurking around in the desert south of Tulimshar, who can help you to forget your abilites!\"";
 	mes "Tanisha looks at you with wide opened eyes.";
 	next;
 	mes "[Tanisha]";
 	mes "\"But I don't think he'd do that without a service in return.\"";
 
-	if (tutorial == 4) goto L_Advice;
+	if (tanisha == 2) goto L_Advice;
 	close;
 
 L_Advice:
+	next;
 	mes "[Tanisha]";
 	mes "\"Hey, when you go to main Tulmishar, you could see Bernard. He can make a delicious soup!";
 	mes "Good luck!\"";
 	emotion 3;
+	set tanisha, 3;
 	close;
 
 L_Again:
 	mes "\"TODO: menu for fighting and stats explain again\"";
+	close;
 
 L_Blocked:
 	mes "[Tanisha]";
@@ -121,7 +126,7 @@ L_NoHeal:
 	if ($@TUT_COUNTER < 5)
 		end;
 	warp "042-2.gat", 36, 90;
-	set tutorial, 4;
+	set tanisha, 2;
 	goto L_CleanUp;
 	close;