Some cleanup at Hasan but I really cannot understand Micksha's report

1 files changed, 10 insertions, 3 deletions

diff --git a/npc/029-1/hasan.txt b/npc/029-1/hasan.txt
index 0a3dde08..86bb82e5 100644
--- a/npc/029-1/hasan.txt
+++ b/npc/029-1/hasan.txt
@@ -148,15 +148,20 @@ OnCommandHasanSpawn:
     goto L_Summon;
 
 L_Summon:
-    monster "029-1",33,33,"WeakScorpion",1046,1, "#ScorpionTrigger::OnScorpionDeath";
+    monster "029-1", 33, 33, "Weak Scorpion", TameScorpion, 1, "#ScorpionTrigger::OnScorpionDeath";
     initnpctimer;
     end;
 
 L_SummonAgain:
-    message strcharinfo(0), "Kaan is mad at you for your interference! He summons a rock above your head, then summons another scorpion near Hasan!";
-    heal -Hp, 0;
+    message strcharinfo(0), l("Kaan is mad at you for your interference! He summons a rock above your head, then summons another scorpion near Hasan!");
+    addtimer 10, "#ScorpionTrigger::OnKillYou";
+    detachrid();
     goto L_Summon;
 
+OnKillYou:
+    heal -Hp, 0;
+    end;
+
 OnTimer5000:
     if (attachrid($@ScorpionFighter) == 0)
         goto L_Clean;
@@ -169,6 +174,8 @@ OnTimer5000:
     end;
 
 OnScorpionDeath:
+    if (!playerattached())
+        goto L_Summon;
     if (getcharid(3) != $@ScorpionFighter)
         goto L_SummonAgain;
     if (QL_BEGIN != 12)