Language and friendlifying newbie quests with timing tips.

Also a minor bugfix to Nickos.

7 files changed, 59 insertions, 34 deletions

diff --git a/npc/001-1_Tulimshar/children.txt b/npc/001-1_Tulimshar/children.txt
index 701fe2b6..c8941563 100644
--- a/npc/001-1_Tulimshar/children.txt
+++ b/npc/001-1_Tulimshar/children.txt
@@ -1,4 +1,4 @@
-//
+// Aisha and Nina
 
 001-1.gat,95,29,0	script	Aisha	108,{
 	set @TEMP,rand(9);
@@ -44,7 +44,7 @@ L_6:
 
 L_7:
 	mes "[Aisha]";
-	mes "\"I want to be a Doctor when i grow up!\"";
+	mes "\"I want to be a Doctor when I grow up!\"";
 	close;
 
 L_8:
@@ -85,7 +85,7 @@ L_4:
 	close;
 
 L_5:
-	mes "\"I always take some spare Cactus Juices with me on the field.  They are heavy, though.\"";
+	mes "\"I always take some spare [Cactus Juice]s with me on the field.  They are heavy, though.\"";
 	close;
 
 L_6:
@@ -101,7 +101,7 @@ L_8:
 	close;
 
 L_9:
-	mes "\"I know a very bad word. But I must not say it, because monsters will come and get me if I do!\"";
+	mes "\"I know a very bad word.  But I must not say it, because monsters will come and get me if I do!\"";
         next;
 	menu
 		"A bad word?", L_tell,
@@ -110,10 +110,10 @@ L_9:
 
 L_tell:
 	mes "[Nina]";
-	mes "\"Yes, I heard my mother say it once. And she made me promise her to never say it. Never.\"";
+	mes "\"Yes, I heard my mother say it once.  And she made me promise her to never say it.  Never.\"";
 	next;
 	menu	"If I promise to never tell anyone, can you tell me the word?", L_keepword,
-		"I understand, you do not need to tell...", L_giveword,
+		"I understand, you do not need to tell me...", L_giveword,
 		"Goodbye!", -;
 	close;
 
@@ -124,8 +124,8 @@ L_keepword:
 
 L_giveword:
 	mes "[Nina]";
-	mes "Nina looks around as she hushes you to silence. After a few seconds she whispers to you.";
-	mes "\"I like you! So I will tell you the bad word.  But you can't tell anyone else about it! The bad word is '" + getspellinvocation("aggravate") + "'.\"";
+	mes "Nina looks around as she hushes you to silence.  After a few seconds, she whispers to you.";
+	mes "\"I like you!  So I will tell you the bad word.  But you can't tell anyone else about it!  The bad word is '" + getspellinvocation("aggravate") + "'.\"";
         next;
 
 	mes "[Nina]";
diff --git a/npc/001-1_Tulimshar/mikhail.txt b/npc/001-1_Tulimshar/mikhail.txt
index 76a1ad59..2ec8b50b 100644
--- a/npc/001-1_Tulimshar/mikhail.txt
+++ b/npc/001-1_Tulimshar/mikhail.txt
@@ -4,10 +4,17 @@
 	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...\"";
-	close;
+	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.";
 
 L_Start:	
 	mes "[Mikhail]";
diff --git a/npc/001-1_Tulimshar/sandra.txt b/npc/001-1_Tulimshar/sandra.txt
index 49d47a8a..45b91ab3 100644
--- a/npc/001-1_Tulimshar/sandra.txt
+++ b/npc/001-1_Tulimshar/sandra.txt
@@ -6,7 +6,7 @@
 	if (TMW_Quest == 10) goto L_Start;
 
 	mes "[Sandra]";
-	mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task.\"";
+	mes "\"Hunting monsters for potion ingredients can sometimes be a difficult task. Maybe you could help me at some point.\"";
 	close;
 
 L_Start:
@@ -19,19 +19,19 @@ L_Start:
 
 L_Opening0:
 	mes "[Sandra]";
-	mes "\"In the outskirts of Tulimshar, there are some scorpions. I need a favor, please help me. Will you?\"";
+	mes "\"In the outskirts of Tulimshar, there are some scorpions...  I need a favor, please help me!  Will you?\"";
 	next;
 	goto L_Ask;
 
 L_Opening1:
 	mes "[Sandra]";
-	mes "\"When you venture in the outskirts of Tulimshar, you can spot scorpions. Will you help me kill some?\"";
+	mes "\"When you venture to the outskirts of Tulimshar, you can spot scorpions.  Will you help me kill some?\"";
 	next;
 	goto L_Ask;
 
 L_Opening2:
 	mes "[Sandra]";
-	mes "\"The scorpion stinger carries many properties used in potions. Will you get some for me?\"";
+	mes "\"The [Scorpion Stinger] carries many properties used in potions.  Would you get some for me?\"";
 	next;
 	goto L_Ask;
 
@@ -43,8 +43,8 @@ L_Opening3:
 
 L_Ask:
 	menu
-		"Yes", L_Yes,
-		"No", L_No;
+		"Yes.", L_Yes,
+		"No.", L_No;
 
 L_Yes:
 	set @TEMP, rand(3);
@@ -60,27 +60,26 @@ L_Req0:
 
 L_Req1:
 	mes "[Sandra]";
-	mes "\"I heard a while ago that scorpion stingers can be used for medical purposes. I need you to help me get 5 [Scorpion Stinger]s.\"";
+	mes "\"I heard a while ago that stingers from scorpions can be used for medical purposes.  I need you to help me get 5 [Scorpion Stinger]s.\"";
 	next;
 	goto L_Set;
 
 L_Req2:
 	mes "[Sandra]";
-	mes "\"Bring me 5 [Scorpion Stinger]s. I'll give you something if you do.\"";
+	mes "\"Bring me 5 [Scorpion Stinger]s.  I'll give you something if you do!\"";
 	next;
 	goto L_Set;
 
 L_Set:
 	set TMW_Quest,11;
 	mes "[Sandra]";
-	mes "\"Please bring me them!\"";
+	mes "\"Please get them for me!\"";
 	close;
 
 L_Progress:
 	if (countitem("ScorpionStinger") < 5) goto L_NotEnough;
 	mes "[Sandra]";
-	mes "\"Excellent!";
-	mes "You brought me 5 [Scorpion Stinger]s!\"";
+	mes "\"Excellent! You brought me 5 [Scorpion Stinger]s!\"";
 	getinventorylist;
 	if (@inventorylist_count + (countitem("ScorpionStinger") == 5) - (countitem("Arrow") == 0) > 99) goto L_TooMany;
 	delitem "ScorpionStinger", 5;
@@ -105,6 +104,6 @@ L_No:
 L_TooMany:
 	next;
 	mes "[Sandra]";
-	mes "\"You don't have room for my reward. I'll wait until you do.\"";
+	mes "\"You don't have room for my reward.  I'll wait until you do.\"";
 	close;
 }
diff --git a/npc/001-1_Tulimshar/sarah.txt b/npc/001-1_Tulimshar/sarah.txt
index bc02bef4..cc4126a8 100644
--- a/npc/001-1_Tulimshar/sarah.txt
+++ b/npc/001-1_Tulimshar/sarah.txt
@@ -4,11 +4,21 @@
 	if (TMW_Quest >= 8) goto L_Done;
 	if (TMW_Quest == 7) goto L_Progress;
 	if (TMW_Quest == 6) goto L_Start;
+	if (TMW_Quest < 6) goto L_Convince_Sarah_First;
 
-	mes "[Sarah]";
-	mes "\"Boy, am I hungry or what!\"";
+	// If this is shown, something is wrong with the above case handling.
+	mes "Sarah looks confused.";
 	close;
 
+L_Convince_Sarah_First:
+	mes "[Sarah]";
+	mes "\"Boy, am I hungry or what!\"";
+	mes "";
+	mes "The girl suddenly looks at you suspiciously."
+	next;
+	mes "[Sarah]";
+	mes "\"My mommy says not to talk to strangers!\";
+	
 L_Start:
 
 	set @TEMP, rand(2);
diff --git a/npc/001-1_Tulimshar/vincent.txt b/npc/001-1_Tulimshar/vincent.txt
index b2f2e98b..ffd05162 100644
--- a/npc/001-1_Tulimshar/vincent.txt
+++ b/npc/001-1_Tulimshar/vincent.txt
@@ -4,10 +4,19 @@
 	if (TMW_Quest >= 10) goto L_Done;
 	if (TMW_Quest == 9) goto L_Progress;
 	if (TMW_Quest == 8) goto L_Start;
+	if (TMW_Quest < 8) goto L_Convince_Vincent_First;
 
+	// If this happens, something is wrong with the above code.
+	mes "Vincent looks confused.";
+	close;
+
+L_Convince_Vincent_First:
 	mes "[Vincent]";
 	mes "\"I'm making an action figure.  I'm almost done with it.\"";
+	mes "";
+	mes "Vincent seems distracted with his near-completed figurine for now.";
 	close;
+	
 
 L_Start:
 
diff --git a/npc/002-1_Sandstorm/nickos.txt b/npc/002-1_Sandstorm/nickos.txt
index a6a12926..04713ccf 100644
--- a/npc/002-1_Sandstorm/nickos.txt
+++ b/npc/002-1_Sandstorm/nickos.txt
@@ -17,7 +17,7 @@
 	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
 	close;
 
-L_See_Dausen_First:
+L_Nickos_See_Dausen_First:
 	mes "[Nickos]";
 	mes "\"I'm watching this mine to make sure the monsters don't harm the miners.\"";
 	next;
diff --git a/npc/011-3_Hermits_cave/hermit.txt b/npc/011-3_Hermits_cave/hermit.txt
index 6dccccf4..4b582cc4 100644
--- a/npc/011-3_Hermits_cave/hermit.txt
+++ b/npc/011-3_Hermits_cave/hermit.txt
@@ -4,8 +4,8 @@
         mes "[Arkim the Hermit]";
         mes "\"Do you want to go back outside?\"";
         menu
-        	"Yes please", L_Sure,
-        	"Not yet", -,
+        	"Yes, please!", L_Sure,
+        	"Not yet.", -,
 		"Actually... Why do you live here?", L_Interested;
         close;
 
@@ -15,32 +15,32 @@ L_Sure:
 
 L_Interested:
 	mes "[Arkim the Hermit]";
-	mes "\"Oh my, never really thought about it\"";
+	mes "\"Oh my, never really thought about it!\"";
 	next;
 	mes "[Arkim the Hermit]";
-	mes "\"I guess mostly I enjoy experimenting with bats here\"";
+	mes "\"I guess mostly I enjoy experimenting with the bats here.\"";
 
 	menu
-		"I see", -,
+		"I see...", -,
 		"What type of experimenting?", L_Experiment;
 	close;
 
 L_Experiment:
 	mes "[Arkim the Hermit]";
-	mes "\"Never really thought about it...\"";
+	mes "\"Never really thought about it either...\"";
 
 	next;
 
-	mes "*You watch as his old, lazy eyes open wide.  And the old man comes alive with engery*";
+	mes "You watch as the hermit's old, lazy eyes open wide, and the old man comes alive with energy.";
 
 	next;
 
 	mes "[Arkim the Hermit]";
-	mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!! HAHAHA!\"";
+	mes "\"I GUESS I REALLY LIKE CUTTING THEM UP TO SEE HOW THEY WORK!!  HAHAHA!\"";
 
 	menu
 		"YOU'RE CRAZY!", -,
-		"Right... me too.  Can I help?", L_Quest;
+		"Right... me too!  Can I help?", L_Quest;
 	close;
 
 L_Quest:
@@ -57,6 +57,6 @@ L_Quest:
 	next;	
 
 	mes "[Arkim the Hermit]";
-	mes "\"And remember never lend your tooth brush to a slime!\"";
+	mes "\"And remember: never lend your toothbrush to a slime!\"";
 	close;
 }