From 68f333ebf4ed92b35768c9f6460b40b04fbe6da8 Mon Sep 17 00:00:00 2001
From: Jesusaves <cpntb1@ymail.com>
Date: Tue, 18 Jun 2019 12:22:50 -0300
Subject: Feed some skills to Isbamuth

---
 npc/023-3-1/logic.txt | 37 +++++++++++++++++++++++++++++++------
 1 file changed, 31 insertions(+), 6 deletions(-)

(limited to 'npc/023-3-1/logic.txt')

diff --git a/npc/023-3-1/logic.txt b/npc/023-3-1/logic.txt
index e1bd9b611..5b2858217 100644
--- a/npc/023-3-1/logic.txt
+++ b/npc/023-3-1/logic.txt
@@ -88,11 +88,11 @@ OnEvent01:
     .@n$=instance_npcname(.name$);
 
     slide 45, 45;
-    @ISBAMUTH=monster(.@m$, 45, 34, l("Isbamuth"), Isbamuth, 1);
-    .@g1=monster(.@m$, 42, 37, l("Assassin"), HoodedNinja, 1);
-    .@g2=monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1);
-    .@g3=monster(.@m$, 39, 40, l("Assassin"), Assassin, 1);
-    .@g4=monster(.@m$, 51, 40, l("Assassin"), Assassin, 1);
+    @ISBAMUTH=monster(.@m$, 45, 34, l("Isbamuth"), Isbamuth, 1, .@n$+"::OnMobDie");
+    .@g1=monster(.@m$, 42, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie");
+    .@g2=monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie");
+    .@g3=monster(.@m$, 39, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie");
+    .@g4=monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie");
 
     // Block everyone for cutscene (includes invencibility boost)
     setpcblock(255, true);
@@ -100,7 +100,7 @@ OnEvent01:
     sc_start(SC_STUN, 7500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .@g1);
     sc_start(SC_STUN, 7500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .@g2);
     sc_start(SC_STUN, 7500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .@g3);
-    sc_start(SC_STUN, 4500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .@g4);
+    sc_start(SC_STUN, 7500, 1, 10000, SCFLAG_NOAVOID|SCFLAG_FIXEDTICK, .@g4);
 
     unittalk(@ISBAMUTH, l("Seems like the rat have come after the cheese."));
     addtimer(1500, .@n$+"::OnE02");
@@ -150,8 +150,11 @@ OnE06:
     unittalk(@ISBAMUTH, l("LET'S DANCE!"));
 
     addtimer(15000, .@n$+"::OnW01");
+    addtimer(60000, .@n$+"::OnW02");
+    addtimer(180000, .@n$+"::OnE07");
     end;
 
+// War events
 OnW01:
     .@m$=getmap();
     .@n$=instance_npcname(.name$);
@@ -162,6 +165,28 @@ OnW01:
     addtimer(45000, .@n$+"::OnW01");
     end;
 
+OnW02:
+    .@m$=getmap();
+    .@n$=instance_npcname(.name$);
+
+    unittalk(@ISBAMUTH, l("Come to my aid! Vanish this fool!"));
+    monster(.@m$, 42, 37, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .@n$+"::OnMobDie");
+    monster(.@m$, 48, 37, l("Assassin"), HoodedNinja, 1, .@n$+"::OnMobDie");
+    monster(.@m$, 39, 40, l("Assassin"), any(Assassin,Bandit,RobinBandit), 1, .@n$+"::OnMobDie");
+    monster(.@m$, 51, 40, l("Assassin"), Assassin, 1, .@n$+"::OnMobDie");
+
+    addtimer(60000, .@n$+"::OnW02");
+    end;
+
+// Secret events
+OnIsbamuthDefeat:
+    dispbottom l("Are you crazy?");
+    end;
+
+// For mobcount() only
+OnMobDie:
+    end;
+
 OnTimer1000:
     if (getmapusers(instance_mapname("023-3-1")))
         initnpctimer;
-- 
cgit v1.2.3-70-g09d2