trying to make sorfina's dialogue shorter

correcting the debug npc

3 files changed, 16 insertions, 22 deletions

diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt
index a6a190ee..8da665de 100644
--- a/npc/042-1/malik.txt
+++ b/npc/042-1/malik.txt
@@ -9,6 +9,7 @@
 	set sorfina, 0;
 	set tanisha, 0;
 	set maggot, 0;
+	set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE;
 L_Close:
 	close;
 }
diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt
index 407279a9..d4c541d2 100644
--- a/npc/042-2/sorfina.txt
+++ b/npc/042-2/sorfina.txt
@@ -1,22 +1,21 @@
 042-2.gat,28,26,0	script	Sorfina	154,4,4{
 
-	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
+	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Again;
 	if (sorfina == 2) goto L_Again;
 	if (sorfina == 1) goto L_Clothes;
 
 	mes "[Old Woman]";
-	mes "\"Ah, you woke 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!\"";
+	mes "\"Ah, you woke up. It seems you collapsed after you left the boat that brought you to Tulimshar.\"";
 	next;
-	mes "\"My little granddaughter Tanisha saw that, but couldn't do something to stop them.";
-	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.\"";
+	mes "\"My little granddaughter Tanisha found you lying next to the road, with all your clothes gone.";
+	mes "It seems you were robbed!";
 	next;
 	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 "[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 a job? Many young people come to our Tulimshar for this reason.\"";
+	mes "Are you here to look for a job? Many young people come to Tulimshar for this reason.\"";
 	next;
 	mes "\"I can tell you some useful things, if you want to hear.";
 	mes "Oh, and by the way my name is Sorfina.\"";
@@ -45,8 +44,6 @@ L_Naked:
 	mes "\"After we talked click on the shirt and press the equip button.\"";
 	next;
 	mes "\"Talk to me again when you got dressed. You can either click on me, or press N to focus on me and T to talk.\"";
-	next;
-	mes "\"If you want to talk to other adventurers, it's a bit different. In that case, press Enter, type your message and press Enter again.\"";
 	close;
 
 L_Clothes:
@@ -54,13 +51,8 @@ L_Clothes:
 	mes "[Sorfina]";
 	mes "\"That's much better, don't you think so?\"";
 	next;
-	mes "\"You know, there are different kind of items. You can also use usable items in your inventory.\"";
-	next;
-	mes "\"But you might find it more useful to put them on a shortcut. Press F8 to open your shortcut window.\"";
-	next;
-	mes "\"You can select the item you want to put on a shortcut with your mouse and then click on the position in the shortcut window you want to place it.\"";
-	next;
-	mes "\"I think this will help you a bit. To get more informations, press the button settings and look at the controls. You can also change them as you like.\"";
+	mes "\"I think this will help you a bit. To get more informations, press the button settings and look at the controls. You can also change them as you like.";
+	mes "Talk to me again if you want me to explain more things.\"";
 	next;
 	mes "\"Now you should go to see my granddaughter, she is very worried. She's in the storehouse, that's the second building southeast from here.\"";
 	next;
@@ -71,7 +63,7 @@ L_Clothes:
 
 L_Again:
 	mes "[Sorfina]";
-	mes "\"Welcome back! Do you have any questions?\"";
+	mes "\"Make yourself at home! Do you have any questions?\"";
 	next;
 	if (hasan)
 		menu
@@ -79,7 +71,7 @@ L_Again:
 			"Yes, could you explain again about...",L_Explain,
 			"No, thanks.",L_Close;
 	menu
-		"Yes, could you explain again about...",L_Explain,
+		"Yes, could you explain about...",L_Explain,
 		"No, thanks.",L_Close;
 	close;
 
@@ -202,11 +194,6 @@ L_SkipTut:
 	set FLAGS, FLAGS | FLAG_TUTORIAL_DONE;
 	close;
 
-L_Tut_Done:
-	mes "[Sorfina]";
-	mes "\"Welcome. Please make yourself at home.\"";
-	close;
-
 L_Close:
 	close;
 
diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index 1397fa9a..f279f3ea 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -166,6 +166,12 @@ L_Tut_Done:
 	mes "\"This yucky maggots! They're eating our goods!";
 	mes "No matter how many of them you kill, they always come back.\"";
 	mes "She sighs.";
+	next;
+	mes "[Tanisha]";
+	mes "\"Do you have any questions?\"";
+		menu
+		"Yes, could you explain about...",L_Explain,
+		"No, thanks.",L_Close;
 	close;
 
 L_Crowded: