Preston/prestonbane
1
0
Fork 0
forked from MagicBane/Server
Code Issues Pull Requests Projects Releases Wiki Activity

consolidated all guards to GuardLogic

Browse Source
This commit is contained in:
FatBoy-DOTC
2023-09-09 10:37:40 -05:00
parent 967303d2de
commit 96231260bc
1 changed files with 17 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/mobileAI/MobAI.java
+17 -26
View File
@@ -616,10 +616,8 @@ public class MobAI {
switch (mob.behaviourType) {
case GuardCaptain:
case GuardMinion:
GuardLogic(mob);
break;
case GuardWallArcher:
GuardWallArcherLogic(mob);
GuardLogic(mob);
break;
case Pet1:
case SiegeEngine:
@@ -953,40 +951,33 @@ public class MobAI {
public static void GuardLogic(Mob mob) {
try {
if (mob.getCombatTarget() == null)
if (mob.getCombatTarget() == null) {
CheckForPlayerGuardAggro(mob);
} else {
//do not need to look to change target if target is already null
AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
AbstractWorldObject newTarget = ChangeTargetFromHateValue(mob);
if (newTarget != null) {
if (newTarget != null) {
if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
if (newTarget.getObjectType().equals(Enum.GameObjectType.PlayerCharacter)) {
if (GuardCanAggro(mob, (PlayerCharacter) newTarget))
mob.setCombatTarget(newTarget);
} else
mob.setCombatTarget(newTarget);
} else
mob.setCombatTarget(newTarget);
}
}
CheckMobMovement(mob);
CheckForAttack(mob);
if(mob.behaviourType.canRoam)
CheckMobMovement(mob);//all guards that can move check to move
if(mob.combatTarget != null)
CheckForAttack(mob); //only check to attack if combat target is not null
} catch (Exception e) {
Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardLogic" + " " + e.getMessage());
}
}
public static void GuardWallArcherLogic(Mob mob) {
try {
if (mob.getCombatTarget() == null)
CheckForPlayerGuardAggro(mob);
else
CheckForAttack(mob);
} catch (Exception e) {
Logger.info(mob.getObjectUUID() + " " + mob.getName() + " Failed At: GuardWallArcherLogic" + " " + e.getMessage());
}
}
private static void PetLogic(Mob mob) {
try {