Tutorial: Hasan, fix behaviour during scorpion fight

Player talking to him while doing the scorpion fight got wrong dialogue part.
Player who doesn't do the scorpion fight get usual behaviour now.

1 files changed, 2 insertions, 13 deletions

diff --git a/world/map/npc/042-1/hasan.txt b/world/map/npc/042-1/hasan.txt
index 5b5219e9..819c1873 100644
--- a/world/map/npc/042-1/hasan.txt
+++ b/world/map/npc/042-1/hasan.txt
@@ -13,14 +13,14 @@
         goto L_Tut_Done;
     if ( (@y < 64)&&(@x < 110) || (@x < 107) )
         goto L_Cliff_Up;
+    if (($@scorp) && (strcharinfo(0) == $@ScorpionFighter$))
+        goto L_Fear;
     if (hasan == 4)
         goto L_Thank;
     if (hasan == 3)
         goto L_Trick;
     if (hasan > 0)
         goto L_Toll;
-    if ($@scorp)
-        goto L_Fear;
 
     mes "[Unfriendly Guy]";
     mes "\"Hey! You can't pass here.\"";
@@ -223,25 +223,14 @@ onScorpionDeath:
     end;
 
 OnTouch:
-    end;
     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 scratches you. Maybe you shouldn'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{