scorpion fight, story about hasan in sorfina, some small fixes

1 files changed, 12 insertions, 10 deletions

diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index b95d7ede..8db46057 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -10,6 +10,7 @@
 	emotion 3;
 	next;
 	mes "\"Are you feeling better?\"";
+	next;
 	menu
 		"Yes, thank you.",-,
 		"Yeah, but all my stuff is gone.",-;
@@ -24,6 +25,7 @@ L_Maggots:
 	next;
 	mes "\"If you kill them, I'll give you my knife.";
 	mes "What do you say?\"";
+	next;
 	menu
 		"Sure!",-,
 		"That's your job.",L_Close;
@@ -37,13 +39,14 @@ L_Maggots:
 	mes "\"Ok, listen what to do.";
 	mes "Equip the knife and kill the maggots.\"";
 	next;
-	mes "\"Press A to focus on a monster. With X you can focus and attack.";
+	mes "\"Press A to focus on a monster. With X you can focus and attack the same time.";
 	mes "But it also works to click on the monster with your mouse.\"";
 	next;
 	mes "\"If you press Shift, you can abort your attack.\"";
 	next;
-	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.\"";
+	mes "\"Maggots aren't aggressive, so they won't do you harm you until you attacked them first. Take them out one by one.\"";
+	next;
+	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";
@@ -64,7 +67,7 @@ L_StatsRe:
 	next;
 	mes "\"Agility increases your attack speed and your ability to dodge attacks.\"";
 	next;
-	mes "\"Vitality gives you more Hit Points and more defense against physical attacks.\"";
+	mes "\"Vitality gives you more hit points and more defense against physical attacks.\"";
 	next;
 	mes "\"Intelligence is useful for magic attack and defense.\"";
 	next;
@@ -72,9 +75,9 @@ L_StatsRe:
 	next;
 	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.";
+	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 "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]";
@@ -86,7 +89,7 @@ L_StatsRe:
 L_Advice:
 	next;
 	mes "[Tanisha]";
-	mes "\"When you go to main Tulmishar, you could see Bernard. He can make a delicious soup!";
+	mes "\"When you go to main Tulimshar, you could see Bernard. He can make a delicious soup!";
 	mes "Good luck!\"";
 	emotion 3;
 	if (tanisha == 2)
@@ -96,7 +99,7 @@ L_Advice:
 L_Again:
 	mes "[Tanisha]";
 	mes "\"Hi there! Is everything alright? Do you have questions?\"";
-
+	next;
 	if (hasan)
 		menu
 			"A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan,
@@ -112,7 +115,7 @@ L_Explain:
 		"... how to fight?",L_Fight,
 		"... monsters?",L_Mob,
 		"... status points?",L_StatsRe,
-		"... what to do in main Tulimshar",L_Advice,
+		"... what to do in main Tulimshar?",L_Advice,
 		"... nevermind.",L_Close;
 
 L_Fight:
@@ -150,7 +153,6 @@ L_Hasan:
 
 L_Blocked:
 	mes "[Tanisha]";
-	//TODO: make this more plausible
 	mes "\"Oh, someone else is already in there. Let's wait a short while.\"";
 	close;