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

2 files changed, 60 insertions, 6 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.",-;