From ebdcb531f230e5847cd16a3c00f1b5053b316f20 Mon Sep 17 00:00:00 2001 From: MagicBot Date: Sat, 26 Aug 2023 14:54:43 -0400 Subject: [PATCH] AI methods moved to ai class. --- src/engine/objects/AbstractIntelligenceAgent.java | 9 +++++++++ src/engine/objects/Mob.java | 9 +-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/engine/objects/AbstractIntelligenceAgent.java b/src/engine/objects/AbstractIntelligenceAgent.java index dd36d3c7..e0b49454 100644 --- a/src/engine/objects/AbstractIntelligenceAgent.java +++ b/src/engine/objects/AbstractIntelligenceAgent.java @@ -9,6 +9,7 @@ package engine.objects; +import ch.claude_martin.enumbitset.EnumBitSet; import engine.Enum; import engine.Enum.GameObjectType; import engine.Enum.ModType; @@ -33,6 +34,14 @@ public abstract class AbstractIntelligenceAgent extends AbstractCharacter { public Enum.AIAgentType agentType = Enum.AIAgentType.MOBILE; public boolean isPlayerGuard = false; public AbstractCharacter guardCaptain; + public EnumBitSet notEnemy = EnumBitSet.noneOf(Enum.MonsterType.class); + public EnumBitSet enemy = EnumBitSet.noneOf(Enum.MonsterType.class); + ; + public Enum.MobBehaviourType behaviourType; + public ArrayList patrolPoints; + public int lastPatrolPointIndex = 0; + public long stopPatrolTime = 0; + public City guardedCity; public AbstractIntelligenceAgent() { super(); diff --git a/src/engine/objects/Mob.java b/src/engine/objects/Mob.java index 6cf00017..effde051 100644 --- a/src/engine/objects/Mob.java +++ b/src/engine/objects/Mob.java @@ -64,14 +64,7 @@ public class Mob extends AbstractIntelligenceAgent { public int equipmentSetID = 0; public int runeSet = 0; public int bootySet = 0; - public EnumBitSet notEnemy = EnumBitSet.noneOf(MonsterType.class); - public EnumBitSet enemy = EnumBitSet.noneOf(MonsterType.class); - ; - public MobBehaviourType behaviourType; - public ArrayList patrolPoints; - public int lastPatrolPointIndex = 0; - public long stopPatrolTime = 0; - public City guardedCity; + public int loadID; public float spawnRadius; //used by static mobs