Make kaan react normally when you are not the one doing the quest.

Set some more detailed messages in the barriers and remove the parts when he can give the players the impression that they have to kill the scorpion when not doing the quest.

2 files changed, 21 insertions, 6 deletions

diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
index e39ad986..db32179d 100644
--- a/npc/042-1/hasan.txt
+++ b/npc/042-1/hasan.txt
@@ -134,7 +134,7 @@ L_Directions:
 
 L_Fear:
 	mes "[Hasan]";
-	mes "\"Sc-sc-sco-scorpion! Pl-please k-kill it.\"";
+	mes "\"Sc-sc-sco-scorpion!\"";
 	mes "He seems close to tears.";
 	close;
 
@@ -218,11 +218,24 @@ OnInit:
 	end;
 
 OnTouch:
-	if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp || (hasan == 4))
+	if ($@scorp && $@ScorpionFighter$ == strcharinfo(0)) 
 		end;
+	if ((FLAGS & FLAG_TUTORIAL_DONE) || (hasan == 4))
+		end;
+	if ($@scorp && $@ScorpionFighter$ != strcharinfo(0)) 
+		goto L_Scared;
+
+L_Normal:
 	warp "042-1.gat", 112, 64;
 	message strcharinfo(0), "Hasan: \"Stop!\"";
 	end;
+
+L_Scared:
+	warp "042-1.gat", 112, 64;
+	message strcharinfo(0), "Hasan seems to be completely irrational. He waves his sharp knife in the air with his eyes closed and hits you. Maybe you shoudn't get too close or you are going to get hurt.";
+	percentheal -10, 0;
+	end;
+
 }
 
 042-1.gat,117,76,0	script	#barrier	45,0,2{
@@ -231,9 +244,11 @@ OnTouch:
 	if (FLAGS & FLAG_TUTORIAL_DONE)
 		goto L_Tut;
 	warp "042-1.gat", 115, 76;
-	if ($@scorp)
-		message strcharinfo(0), "Hasan: \"Please help me!\"";
-	if (!$@scorp)
+	if ($@scorp && $@ScorpionFighter$ == strcharinfo(0))
+		message strcharinfo(0), "Hasan: \" " + strcharinfo(0) + "! Please help me!\"";
+	if ($@scorp && $@ScorpionFighter$ != strcharinfo(0))
+		message strcharinfo(0), "Hasan: \"Hey! Stop right there!\"";
+	if (!$@scorp && hasan == 4)
 		message strcharinfo(0), "Hasan: \"Please wait a moment!\"";
 	end;
 L_Tut:
diff --git a/npc/042-1/kaan.txt b/npc/042-1/kaan.txt
index 8af50cd5..494dc874 100644
--- a/npc/042-1/kaan.txt
+++ b/npc/042-1/kaan.txt
@@ -5,7 +5,7 @@
 
 	if (FLAGS & FLAG_TUTORIAL_DONE) goto L_Tut_Done;
 	if (hasan == 4) goto L_Hasan_Saved;
-	if ($@scorp) goto L_Run;
+	if ($@ScorpionFighter$ == strcharinfo(0)) goto L_Run;
 	if (kaan == 4) goto L_Plan;
 	if (kaan == 3) goto L_Trick;
 	if (kaan == 2) goto L_Out;