Feed some skills to Isbamuth

3 files changed, 98 insertions, 8 deletions

diff --git a/db/re/mob_db.conf b/db/re/mob_db.conf
index bbd723053..434092eb1 100644
--- a/db/re/mob_db.conf
+++ b/db/re/mob_db.conf
@@ -8775,8 +8775,8 @@ mob_db: (
 		Dex: 71
 		Luk: 47
 	}
-	ViewRange: 9
-	ChaseRange: 12
+	ViewRange: 12
+	ChaseRange: 14
 	Race: 2
 	Element: (7, 3)
 	Mode: {
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index acf4fabc9..faf304290 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -1399,5 +1399,70 @@ SKILL_COND2 = {
 		}
     }
 
+	/**********************************************************************/
+	Isbamuth: {
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_ANY"
+			SkillLevel: 3
+			Rate: 6000
+			Delay: 90000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELT"
+			ConditionData: 3
+			val0: 1062
+		}
+		NPC_SUMMONSLAVE: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 2
+			Rate: 6000
+			CastTime: 5000
+			Delay: 90000
+			SkillTarget: "MST_SELF"
+			CastCondition: "MSC_SLAVELT"
+			ConditionData: 2
+			val0: 1153
+		}
+		AL_DECAGI: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 2
+			Rate: 9000
+			CastTime: 1000
+			Delay: 300000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+		MG_NAPALMBEAT: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 9000
+			CastTime: 1800
+			Delay: 120000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ATTACKPCGE"
+			ConditionData: 2
+		}
+		NPC_BLINDATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 2
+			Rate: 9000
+			Delay: 30000
+			Cancelable: true
+			SkillTarget: "MST_RANDOM"
+			CastCondition: "MSC_ALWAYS"
+		}
+		NPC_CURSEATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 1
+			Rate: 1000
+			Delay: 120000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_MYHPLTMAXRATE"
+			ConditionData: 60
+		}
+	}
+
 }
 )
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;