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

4 files changed, 101 insertions, 32 deletions

diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
index 3caa47a5..21364a44 100644
--- a/npc/042-1/hasan.txt
+++ b/npc/042-1/hasan.txt
@@ -2,10 +2,15 @@
 
 	set @toll, 10000;
 
-	if (hasan == 1) goto L_Toll;
+	if ($scorp) goto L_Fear;
+
+	if (hasan == 4) goto L_Thank;
+	if (hasan == 3) goto L_Trick;
+	if (hasan > 0) goto L_Toll;
 
 	mes "[Unfriendly Guy]";
 	mes "\"Hey! You can't pass here.\"";
+	next;
 	menu
 		"Why not?",-,
 		"Who says that?",-;
@@ -15,7 +20,9 @@
 L_Toll:
 	mes "[Hasan]";
 	mes "\"Give me " + @toll + "GP, and I may let you pass.\"";
-	set hasan, 1;
+	if (hasan == 0)
+		set hasan, 1;
+	next;
 	if (zeny >= @toll)
 		menu
 			"Ok, here you go.",L_Pay,
@@ -54,13 +61,54 @@ L_Cheat:
 	mes "[Hasan]";
 	mes "\"Don't dare to cheat on me!\"";
 	close;
+
+L_Trick:
+	mes "[Hasan]";
+	mes "\"Are you going to pay now? " + @toll + "GP, and I may let you pass.\"";
+	next;
+	menu
+		"I don't have so much money!",L_NoPay,
+		"No. (Scratch your head.)",-;
+	mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
+	monster "042-1.gat",110,74,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	set $scorp, 1;
+	close;
+
+L_Thank:
+	mes "[Hasan]";
+	mes "\"You - you saved me!";
+	mes "I tried to get your money and you saved me!\"";
+	next;
+	mes "\"Hey, you're a really cool person.";
+	mes "I mean, how you finished that ghastly scorpion!";
+	mes "Amazing!\"";
+	next;
+	mes "\"I tell you something: Cool persons are allowed to pass for free.";
+	mes "And you can have this.\"";
+	getitem "SharpKnife", 1;
+	//TODO: clear all vars and set flag
+	close;
+
+L_Fear:
+	mes "[Hasan]";
+	mes "\"Sc-sc-sco-scorpion! Pl-please k-kill it.\"";
+	mes "He seems close to tears.";
+	close;
+
+onScorpionDeath:
+	set $scorp, 0;
+	if (hasan != 3)
+		close;
+	set hasan, 4;
+	message strcharinfo(0), "You saved Hasan.";
+	end;
 }
 
 042-1.gat,117,76,0	script	#barrier	127,2,2{
 	//TODO: check variable
 	warp "042-1.gat", 110, 73;
+	if ($scorp)
+		message strcharinfo(0), "Hasan: \"Please help me!\"";
 	message strcharinfo(0), "Hasan: \"Stop!\"";
-	// when scorpion is spawned:
-	// message strcharinfo(0), "Hasan: \"Please help me!\"";
 	end;
 }
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
index e9ad6b0c..4aec521d 100644
--- a/npc/042-1/kaan.txt
+++ b/npc/042-1/kaan.txt
@@ -24,9 +24,10 @@ L_Tanisha:
 	mes "\"Did you already talk to Tanisha?\"";
 	if (tanisha < 3)
 		close;
+	next;
 	menu
 		"Yes, I helped her with the maggots.",-,
-		"Yeah, and she's done with the maggots.",;
+		"Yeah, and she's done with the maggots.",-;
 	mes "[Kaan]";
 	mes "\"Ah, that are good news.";
 	mes "You know, we have a lot of problems with bugs here.\"";
@@ -39,6 +40,7 @@ L_Tanisha:
 	mes "He looks very proud.";
 	next;
 	mes "\"I build this fence to keep them out.\"";
+	next;
 	menu
 		"Impressive! Just a bit... skew.",-,
 		"Wow, it looks very - ahm, unconventional.",-;
@@ -53,6 +55,7 @@ L_Tanisha:
 L_Out:
 	mes "[Kaan]";
 	mes "\"Hello! How are you? Did you already visit main Tulimshar?\"";
+	next;
 	if (hasan)
 		menu
 			"A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan,
@@ -77,8 +80,9 @@ L_Trick:
 	mes "\"Do you have an idea what Hasans weakness could be?";
 	if (hasan < 2)
 		close;
+	next;
 	menu
-		"He's afraid of scorpions",-,
+		"He's afraid of scorpions.",-,
 		"No idea.",L_Close;
 	mes "[Kaan]";
 	mes "\"Scorpions?! Right! How could I forget?";
@@ -89,6 +93,7 @@ L_Explain:
 	mes "I will catch one of the scorpions from the desert that's coming to the fence.\"";
 	next;
 	mes "\"You'll go to Hasan and give me a sign when you're ready.";
+	mes "Let's say the sign is that you're scratching your head.";
 	mes "I'll watch you from this point.\"";
 	next;
 	mes "\"When you give me the sign, I'll throw the scorpion down on him.";
@@ -104,6 +109,7 @@ L_Plan:
 	mes "[Kaan]";
 	mes "\"I'm ready. Just give me the sign when you're down there.";
 	mes "Or do you want me to explain the plan again?\"";
+	next;
 	menu
 		"Yes please.",L_Explain,
 		"No, everything's alright.",-;
diff --git a/npc/042-2/sorfina.txt b/npc/042-2/sorfina.txt
index d82dc588..ab5dd9f5 100644
--- a/npc/042-2/sorfina.txt
+++ b/npc/042-2/sorfina.txt
@@ -17,8 +17,9 @@
 	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 some work? Many young people come to our Tulimshar for this reason.\"";
 	next;
-	mes "\"I can tell you some useful things, if you to hear.\"";
+	mes "\"I can tell you some useful things, if you want to hear.\"";
 	mes "\"Oh, and by the way my name is Sorfina.\"";
+	next;
 	menu
 		"That would be great!",L_Tut,
 		"No, thanks. I already know how things are going.",L_SkipTut;
@@ -70,7 +71,7 @@ L_Clothes:
 L_Again:
 	mes "[Sorfina]";
 	mes "\"Welcome back! Do you have any questions?\"";
-
+	next;
 	if (hasan)
 		menu
 			"A guy named Hasan doesn't let me enter main Tulimshar.",L_Hasan,
@@ -106,8 +107,8 @@ L_Talk:
 	mes "\"If you want to talk to other adventurers, press Enter to open your chat window.";
 	mes "Then type your message and press Enter to send.\"";
 	next;
-	mes "\"You may want to talk privately to another adventuerer sometimes. In that case you can whisper.";
-	mes "After pressing Enter, type '/whisper [name] [message]'.";
+	mes "\"You may want to talk privately to another adventurer sometimes. In that case you can whisper.";
+	mes "After pressing Enter type '/whisper [name] [message]'.";
 	mes "Or you can right click on someone and choose the whisper option.\"";
 	next;
 	mes "\"Press F7 to show and hide your chat window.\"";
@@ -116,16 +117,15 @@ L_Talk:
 L_Items:
 	mes "[Sorfina]";
 	mes "\"There are three types of items.";
-	mes "They can be Consumables, Equipment, or Miscellaneous\"";
+	mes "They can be Consumables, Equipment, or Miscellaneous.\"";
 	next;
 	mes "\"Consumable items such as Potions, can be used only once.";
-	mes "After use, they will disappear from your inventory.\"";
+	mes "After use, they will disappear from your inventory.";
+	mes "There are some rare items that can be used but don't get consumed.";
 	next;
-	mes "\"Equipment items like Armors, Weapons, Accessories";
-	mes "can be equipped for fashionable purposes or to raise your status.\"";
+	mes "\"Equipment items like Armors, Weapons, Accessories can be equipped for fashionable purposes or to raise your status.\"";
 	next;
-	mes "\"Miscellaneous items such as maggot slime, are used";
-	mes "in creating other items, or just to trade and sell.\"";
+	mes "\"Miscellaneous items such as maggot slime, are used in creating other items, or just to trade and sell.\"";
 	next;
 	mes "\"Press F3 to open your inventory.";
 	mes "When placing your cursor over an item there, you can see a box with some informations about that item.\"";
@@ -149,7 +149,7 @@ L_Aidan:
 	mes "We're in the north of Tulimshar here, so you have to walk across the town.\"";
 	next;
 	mes "\"When you leave this area to the Southeast, you'll come to the docks.";
-	mes "Follow the street to the south to pass the old towen gates.\"";
+	mes "Follow the street to the south to pass the old town gates.\"";
 	next;
 	mes "\"Turn West at the next intersection. You'll pass by the gates of Tulimshar's famos magic school there.";
 	mes "Just follow the street to the south and you'll reach the bazaar.\"";
@@ -164,11 +164,23 @@ L_Hasan:
 	mes "She shakes her head.";
 	next;
 	mes "[Sorfina]";
-	mes "\This guy was a plague ever since. TODO: add story\"";
-	// some backstory, hasan living here as a child, always making trouble
-	// but unfortunately very strong
-	// player question: weak point
-	// answer: frightened of scropions
+	mes "\This guy was a plague ever since. He's always causing trouble.\"";
+	next;
+	mes "\"And his father... Well, one day his father thought he should teach Hasan a lesson.\"";
+	next;
+	mes "\"He took him in the desert and then left him there!";
+	mes "Hasan was only seven years old!\"";
+	next;
+	mes "\"I never understood how someone can do something like that to a child, even if it's a rascal like Hasan.\"";
+	next;
+	mes "\"Anyway, Hasan tried to find his way back home, but stumbled in a nest of scorpions!\"";
+	mes "She shakes her head.";
+	next;
+	mes "\"If Valon wouldn't have come along that moment, Hasan would have died that day.\"";
+	next;
+	mes "\"However, the scorpions poison caused a bad fever and after Hasan had recovered from that, he was even more malicious than before.\"";
+	mes "She sighs.";
+	next;
 	if (hasan == 1)
 		set hasan, 2;
 	close;
@@ -176,6 +188,7 @@ L_Hasan:
 L_SkipTut:
 	mes "[Sorfina]";
 	mes "\"Really? You seem quite unexperienced. Listening to some advices won't hurt.\"";
+	next;
 	menu
 		"Thinking about it twice... please tell me.",L_Tut,
 		"Yeah, but thanks for the offer. Bye",-;
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;