putting new npcs in seperated files

some scripting and fixes

1 files changed, 12 insertions, 7 deletions

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;