3 files changed, 58 insertions, 24 deletions
diff --git a/npc/042-1/hasan.txt b/npc/042-1/hasan.txt
index 5d70fc23..202581f7 100644
--- a/npc/042-1/hasan.txt
+++ b/npc/042-1/hasan.txt
@@ -1,4 +1,4 @@
-042-1.gat,111,68,0	script	Hasan	189,2,2{
+042-1.gat,111,68,0	script	Hasan	189,{
 
 	set @toll, 10000;
 	set @x, getx(0);
@@ -80,7 +80,9 @@ L_Trick:
 	mes "While you're scratching your head, you see Kaan coming nearer to the cliff above you.";
 	close2;
 	monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	set $@ScorpionFighter$, strcharinfo(0);
 	set $@scorp, 1;
+	startnpctimer;
 	end;
 
 L_Thank:
@@ -147,19 +149,57 @@ L_Cliff_Up:
 	mes "You see a guy in shaby clothes when you look down the cliff.";
 	close;
 
-OnTouch:
-	if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp)
-		end;
+L_SummonAgain:
+	message strcharinfo(0), "Kaan is mad with your interference! He comes near the cliff and throws a rock on the top of your head, and let another scorpion run just near Hasan!";
+	percentheal -100, 0;
+	attachrid(getcharid(3,$@ScorpionFighter$));	
+	message strcharinfo(0), "Kaan: \"Just go while he is distracted and no one is interfering!\"";
+	monster "042-1.gat",110,70,"Scorpion",1003,1, "Hasan::onScorpionDeath";
+	end;
+
+L_Clean:
+	killmonster "042-1.gat", "Hasan::onScorpionDeath";
+	set $@ScorpionTimer, 0;
+	set $@ScorpionFighter$, "";
+	set $@scorp, 0;
+	attachrid(getcharid(3,$@ScorpionFighter$));
+	message strcharinfo(0), "Hasan, with his eyes almost closed, trembling with fear, runs toward the scorpion and stabs it with all his strenght! Seems like it took too long and the plan didn't work this time.";
 	warp "042-1.gat", 112, 64;
-	message strcharinfo(0), "Hasan: \"Stop!\"";
+	message strcharinfo(0), "Hasan: \"Hey you! I told you you cannot pass!\"";
+	end;
+
+OnTimer5000:
+	set $@ScorpionTimer, $@ScorpionTimer + 5;
+	if ($@ScorpionTimer >= 300) goto L_Clean;
+	setnpctimer 0;
 	end;
 
 onScorpionDeath:
+	if (strcharinfo(0) != $@ScorpionFighter$) goto L_SummonAgain;
 	set $@scorp, 0;
 	if (hasan != 3)
 		close;
 	set hasan, 4;
 	message strcharinfo(0), "You saved Hasan.";
+	set $@ScorpionTimer, 0;
+	set $@ScorpionFighter$, "";
+	end;
+
+OnInit:
+	initnpctimer;
+	stopnpctimer;
+
+}
+
+042-1.gat,111,68,0	script	#Toll	127,2,2,{
+
+	end;
+
+OnTouch:
+	if ((FLAGS & FLAG_TUTORIAL_DONE) || $@scorp || (hasan == 4))
+		end;
+	warp "042-1.gat", 112, 64;
+	message strcharinfo(0), "Hasan: \"Stop!\"";
 	end;
 }
 
@@ -177,4 +217,6 @@ OnTouch:
 L_Tut:
 	warp "022-1.gat", 23, 38;
 	end;
+
+
 }
diff --git a/npc/042-1/malik.txt b/npc/042-1/malik.txt
index 8da665de..389d3233 100644
--- a/npc/042-1/malik.txt
+++ b/npc/042-1/malik.txt
@@ -1,9 +1,9 @@
 042-1.gat,105,60,0	script	Malik	162,{
 
-	mes "reset?";
 	menu
-		"yes",-,
-		"no",L_Close;
+		"Reset",-,
+		"Test Scorpion Fight", L_Scorp,
+		"close",L_Close;
 	set hasan, 0;
 	set kaan, 0;
 	set sorfina, 0;
@@ -12,4 +12,10 @@
 	set FLAGS, FLAGS & ~FLAG_TUTORIAL_DONE;
 L_Close:
 	close;
+
+L_Scorp:
+	set sorfina, 4;
+	set kaan, 4;
+	set hasan, 3;
+	close;
 }
diff --git a/npc/042-2/tanisha.txt b/npc/042-2/tanisha.txt
index b75bc99d..6fc7de1d 100644
--- a/npc/042-2/tanisha.txt
+++ b/npc/042-2/tanisha.txt
@@ -1,21 +1,5 @@
 042-2.gat,37,90,0	script	Tanisha	114,{
 
-// Comments(Remove it later): 
-
-// 1) I used a temporary variable to count the kills, so if the player relog he will have to 
-// kill the 5 maggots in a single fight. 
-
-// 2) Changed the maggots spawn to one by one, at the exact place the player is standing, so
-// there is less chances of someone getting your kills from outside (It is possible when the
-// maggots are in the corner). And if someone insists in killing your maggots during the fight,
-// all that will happen is this person will finish the fight quickly leaving you alone with your maggots.
-
-// 3) Also, in the L_noheal label, I put a check so when there is no one fighting the npc timer
-// is stopped and set to zero.
-
-// 4) And I put a message in the middle of the fight, with tanisha commenting about the way the
-// maggots just keep popping out from nowhere.
-
 	set @playerlimit, 4;
 
 	if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) goto L_Fighting;
@@ -275,7 +259,9 @@ L_NoHeal:
 	close;
 
 onMaggotDeath:
+	if (@maggot == 1) message strcharinfo(0), "Tanisha: Aaahhhh... another one! It will crawl up your legs!";
 	if (@maggot == 2) message strcharinfo(0), "Tanisha: Ohh... Irrhk... Eeeeww... They just appear from nowhere!";
+	if (@maggot == 3) message strcharinfo(0), "Tanisha: Yuck... I think I am getting sick.";
 	if ((getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) set @maggot, @maggot + 1;
 	if (@maggot < 5 && (getx(0) <= 29) || (getx(0) >= 37) || (gety(0) <= 84) || (gety(0) >= 90)) monster "042-2.gat", 33, 87, "", 1002, 1, "Tanisha::onMaggotDeath";
 	if (@maggot < 5 && (getx(0) > 29) && (getx(0) < 37) && (gety(0) > 84) && (gety(0) < 90)) monster "042-2.gat", getx(0), gety(0), "", 1002, 1, "Tanisha::onMaggotDeath";