diff --git a/src/engine/Enum.java b/src/engine/Enum.java index 180ecbda..2d2c919a 100644 --- a/src/engine/Enum.java +++ b/src/engine/Enum.java @@ -2636,8 +2636,9 @@ public class Enum { TEMPLEGUARD(1575,1652, MinionClass.MELEE,"Guard","Temple"), TEMPLEMAGE(1577, 1656, MinionClass.MAGE,"Confessor","Temple"), UNDEADGUARD(980100,1674,MinionClass.MELEE,"Guard","Undead"), - UNDEADMAGE(980102,1675,MinionClass.MAGE,"Adept","Undead"); - + UNDEADMAGE(980102,1675,MinionClass.MAGE,"Adept","Undead"), + WEREWOLFGUARD(980111,0,MinionClass.MELEE,"Guard","Werewolf"), + WEREBEARGUARD(980110,0,MinionClass.MELEE,"Guard","Werebear"); private final int captainContractID; private final int equipSetID; private final MinionClass minionClass; diff --git a/src/engine/ai/MobileFSM.java b/src/engine/ai/MobileFSM.java index 5714a4f9..caae9949 100644 --- a/src/engine/ai/MobileFSM.java +++ b/src/engine/ai/MobileFSM.java @@ -385,12 +385,13 @@ public class MobileFSM { mob.updateLocation(); if (mob.BehaviourType != Enum.MobBehaviourType.Pet1) { if (mob.getCombatTarget() == null) { - if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) - return; - + if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) { + if (mob.npcOwner.isAlive() == true) { + return; + } + } Patrol(mob); - } - else { + }else { chaseTarget(mob); } } else { diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index b9b89d7a..72359434 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -707,7 +707,8 @@ public class Mob extends AbstractIntelligenceAgent { else if (guardCaptain.getRank() == 6) rank = MBServerStatics.VETERAN; else rank = MBServerStatics.ELITE; - + mob.firstName = NPC.getPirateName(mob.getMobBaseID()); + mob.lastName = rank + " " + minionType.getRace() + " " + minionType.name(); } } @@ -715,6 +716,7 @@ public class Mob extends AbstractIntelligenceAgent { // mob.setMob(); mob.isPlayerGuard = true; + DbManager.addToCache(mob); RuneBase guardRune = RuneBase.getRuneBase(252621);