From 8bb7dac4276ecd86dcbdef35dfd1a2413de26206 Mon Sep 17 00:00:00 2001 From: FatBoy-DOTC Date: Tue, 25 Mar 2025 20:16:50 -0500 Subject: [PATCH] admins dont appear on track --- .../mobileAI/MobHandlers/MobHandler.java | 9 ++++++ .../mobileAI/MobHandlers/PetHandler.java | 10 +++++++ .../MobHandlers/PlayerGuardHandler.java | 9 ++++++ .../mobileAI/MobHandlers/SiegeHandler.java | 19 ++++++++++++ src/engine/mobileAI/SuperSimpleMobAI.java | 29 +++++++++++++++++++ src/engine/powers/RangeBasedAwo.java | 2 +- 6 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/engine/mobileAI/MobHandlers/MobHandler.java create mode 100644 src/engine/mobileAI/MobHandlers/PetHandler.java create mode 100644 src/engine/mobileAI/MobHandlers/PlayerGuardHandler.java create mode 100644 src/engine/mobileAI/MobHandlers/SiegeHandler.java create mode 100644 src/engine/mobileAI/SuperSimpleMobAI.java diff --git a/src/engine/mobileAI/MobHandlers/MobHandler.java b/src/engine/mobileAI/MobHandlers/MobHandler.java new file mode 100644 index 00000000..a47894a0 --- /dev/null +++ b/src/engine/mobileAI/MobHandlers/MobHandler.java @@ -0,0 +1,9 @@ +package engine.mobileAI.MobHandlers; + +import engine.objects.Mob; + +public class MobHandler { + public static void run(Mob mob){ + + } +} diff --git a/src/engine/mobileAI/MobHandlers/PetHandler.java b/src/engine/mobileAI/MobHandlers/PetHandler.java new file mode 100644 index 00000000..fef53515 --- /dev/null +++ b/src/engine/mobileAI/MobHandlers/PetHandler.java @@ -0,0 +1,10 @@ +package engine.mobileAI.MobHandlers; + +import engine.objects.Mob; + +public class PetHandler { + + public static void run(Mob pet){ + + } +} diff --git a/src/engine/mobileAI/MobHandlers/PlayerGuardHandler.java b/src/engine/mobileAI/MobHandlers/PlayerGuardHandler.java new file mode 100644 index 00000000..e062d753 --- /dev/null +++ b/src/engine/mobileAI/MobHandlers/PlayerGuardHandler.java @@ -0,0 +1,9 @@ +package engine.mobileAI.MobHandlers; + +import engine.objects.Mob; + +public class PlayerGuardHandler { + public static void run(Mob guard){ + + } +} diff --git a/src/engine/mobileAI/MobHandlers/SiegeHandler.java b/src/engine/mobileAI/MobHandlers/SiegeHandler.java new file mode 100644 index 00000000..2dc41f36 --- /dev/null +++ b/src/engine/mobileAI/MobHandlers/SiegeHandler.java @@ -0,0 +1,19 @@ +package engine.mobileAI.MobHandlers; + +import engine.Enum; +import engine.objects.Mob; + +public class SiegeHandler { + public static void run(Mob engine){ + + if(!engine.isAlive()) + return; + + if(engine.getOwner() == null || !engine.getOwner().isAlive()) + return; + + if(engine.combatTarget == null || !engine.combatTarget.getObjectType().equals(Enum.GameObjectType.Building)) + return; + + } +} diff --git a/src/engine/mobileAI/SuperSimpleMobAI.java b/src/engine/mobileAI/SuperSimpleMobAI.java new file mode 100644 index 00000000..e18b34c2 --- /dev/null +++ b/src/engine/mobileAI/SuperSimpleMobAI.java @@ -0,0 +1,29 @@ +package engine.mobileAI; + +import engine.mobileAI.MobHandlers.MobHandler; +import engine.mobileAI.MobHandlers.PetHandler; +import engine.mobileAI.MobHandlers.PlayerGuardHandler; +import engine.mobileAI.MobHandlers.SiegeHandler; +import engine.objects.Mob; + +public class SuperSimpleMobAI { + + public static void run(Mob mob){ + if(mob.isPet() && !mob.isSiege()) { + PetHandler.run(mob); + return; + } + if (mob.isSiege()) { + SiegeHandler.run(mob); + return; + } + if(mob.isPlayerGuard()){ + PlayerGuardHandler.run(mob); + return; + } + MobHandler.run(mob); + } + + //##generic methods for all mobs + +} diff --git a/src/engine/powers/RangeBasedAwo.java b/src/engine/powers/RangeBasedAwo.java index 66a499c8..6709df8d 100644 --- a/src/engine/powers/RangeBasedAwo.java +++ b/src/engine/powers/RangeBasedAwo.java @@ -78,7 +78,7 @@ public class RangeBasedAwo implements Comparable { AbstractWorldObject awo = rba.awo; if (awo.getObjectType().equals(GameObjectType.PlayerCharacter)) - if (((PlayerCharacter) awo).isCSR()) + if (((PlayerCharacter) awo).getAccount().status.equals(Enum.AccountStatus.ADMIN)) continue; if (AbstractWorldObject.IsAbstractCharacter(awo) && !(pc.equals(awo))) {