guard work

This commit is contained in:
2023-04-30 16:54:39 -05:00
parent 9fefebd4a3
commit 0b932119b0
3 changed files with 12 additions and 8 deletions
+3 -2
View File
@@ -2636,8 +2636,9 @@ public class Enum {
TEMPLEGUARD(1575,1652, MinionClass.MELEE,"Guard","Temple"), TEMPLEGUARD(1575,1652, MinionClass.MELEE,"Guard","Temple"),
TEMPLEMAGE(1577, 1656, MinionClass.MAGE,"Confessor","Temple"), TEMPLEMAGE(1577, 1656, MinionClass.MAGE,"Confessor","Temple"),
UNDEADGUARD(980100,1674,MinionClass.MELEE,"Guard","Undead"), 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 captainContractID;
private final int equipSetID; private final int equipSetID;
private final MinionClass minionClass; private final MinionClass minionClass;
+6 -5
View File
@@ -385,12 +385,13 @@ public class MobileFSM {
mob.updateLocation(); mob.updateLocation();
if (mob.BehaviourType != Enum.MobBehaviourType.Pet1) { if (mob.BehaviourType != Enum.MobBehaviourType.Pet1) {
if (mob.getCombatTarget() == null) { if (mob.getCombatTarget() == null) {
if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) if (mob.BehaviourType.ordinal() == Enum.MobBehaviourType.GuardMinion.ordinal()) {
return; if (mob.npcOwner.isAlive() == true) {
return;
}
}
Patrol(mob); Patrol(mob);
} }else {
else {
chaseTarget(mob); chaseTarget(mob);
} }
} else { } else {
+3 -1
View File
@@ -707,7 +707,8 @@ public class Mob extends AbstractIntelligenceAgent {
else if (guardCaptain.getRank() == 6) rank = MBServerStatics.VETERAN; else if (guardCaptain.getRank() == 6) rank = MBServerStatics.VETERAN;
else rank = MBServerStatics.ELITE; 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.setMob();
mob.isPlayerGuard = true; mob.isPlayerGuard = true;
DbManager.addToCache(mob); DbManager.addToCache(mob);
RuneBase guardRune = RuneBase.getRuneBase(252621); RuneBase guardRune = RuneBase.getRuneBase(252621);