Tulimshar fixes by argul

NPC bug fixes in early level quests on 001-1 map.

2 files changed, 59 insertions, 57 deletions

diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1_Tulimshar/mikhail.txt
index 2ec8b50b..6514c07d 100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -1,67 +1,68 @@
 //
 
-001-1.gat,50,46,0	script	Mikhail	120,{
-	if (TMW_Quest == 6) goto L_Done;
-	if (TMW_Quest == 5) goto L_Progress;
-	if (TMW_Quest == 4) goto L_Start;
-	if (TMW_Quest < 4) goto L_Convince_Mikhail_First;
-	
-	// If this happens, something is wrong with the above case handling.
-	mes "Mikhail looks confused.";
-	close;
+001-1.gat,50,46,0	script	Mikhail	120,	{
+    if (TMW_Quest >= 6) goto L_Done;
+    if (TMW_Quest == 5) goto L_Progress;
+    if (TMW_Quest == 4) goto L_Start;
+    if (TMW_Quest < 4) goto L_Convince_Mikhail_First;
+
+    // If this happens, something is wrong with the above case handling.
+    mes "Mikhail looks confused.";
+    close;
 
 L_Convince_Mikhail_First:
-	mes "[Mikhail]";
-	mes "\"Hello...\"";
-	mes "";
-	mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    mes "[Mikhail]";
+    mes "\"Hello...\"";
+    mes "";
+    mes "It seems that the boy would like to say more, but does not dare to open up to you. Maybe you should help someone else first, so that he sees your intentions are good.";
+    close;
+
+L_Start:
+    mes "[Mikhail]";
+    mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
+    next;
+    mes "\"You look like a nice person.  Would you go get them for me?\"";
+    menu
+        "Of course, I'll go get them for you.", L_accept,
+        "I've got other things to do right now.", L_close;
+    close;
 
-L_Start:	
-	mes "[Mikhail]";
-	mes "\"My grandma sent me to get five [Maggot Slime]s from the maggots in the desert, but they scare me so bad!\"";
-	next;
-	mes "\"You look like a nice person.  Would you go get them for me?\"";	
-	menu
-		"Of course, I'll go get them for you.", L_accept,
-		"I've got other things to do right now.", L_close;
-	close;
-	
 L_close:
-	close;
-	
+    close;
+
 L_accept:
-	mes "[Mikhail]";
-	mes "\"Thank you so much!  I'll wait for you here.\"";
-	set TMW_Quest, 5;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thank you so much!  I'll wait for you here.\"";
+    set TMW_Quest, 5;
+    close;
+
 L_Progress:
-	mes "[Mikhail]";
-	mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
-	next;
-	menu
-		"Yes, here they are, kiddo!", L_try,
-		"Not yet, but I'll be back soon.", L_close;
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Did you bring me the five [Maggot Slime]s i need?\"";
+    next;
+    menu
+        "Yes, here they are, kiddo!", L_try,
+        "Not yet, but I'll be back soon.", L_close;
+    close;
+
 L_try:
-	if countitem("MaggotSlime") >= 5 goto L_get;
-	mes "[Mikhail]";
-	mes "\"It doesn't look like you have them all...\"";
-	close;
-	
+    if countitem("MaggotSlime") >= 5 goto L_get;
+    mes "[Mikhail]";
+    mes "\"It doesn't look like you have them all...\"";
+    close;
+
 L_get:
-	delitem "MaggotSlime", 5;
-	set TMW_Quest, 6;
-	mes "[Mikhail]";
-	mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
-	next;
-	getexp 100, 0;
-	mes "You get 100 xp.";
-	close;
-	
+    delitem "MaggotSlime", 5;
+    set TMW_Quest, 6;
+    mes "[Mikhail]";
+    mes "\"Ooh!  Thank you so much!  I can get back to my grandma now!\"";
+    next;
+    getexp 100, 0;
+    mes "You get 100 xp.";
+    close;
+
 L_Done:
-	mes "[Mikhail]";
-	mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
-	close;
-	
+    mes "[Mikhail]";
+    mes "\"Thanks again for helping me get those [Maggot Slime]s!\"";
+    close;
+}
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
index 86ed8db6..7a109fa6 100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -17,7 +17,8 @@ L_Convince_Sarah_First:
 	mes "\"The girl suddenly looks at you suspiciously.\"";
 	next;
 	mes "\"My mommy says not to talk to strangers!\"";
-	
+	close;
+
 L_Start:
 
 	set @TEMP, rand(2);