From edc4166a8d902f36ea9de9749c063241b8a5af84 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Fri, 22 Feb 2019 22:11:47 -0800 Subject: [PATCH] Added Idle AI (default AI) Added Idle AI (default AI) -- does nothing Changed default angle for entities to align with correct default direction --- core/src/gdx/diablo/ai/AI.java | 1 + core/src/gdx/diablo/ai/Idle.java | 10 ++++++++++ core/src/gdx/diablo/entity/Entity.java | 4 +++- core/src/gdx/diablo/entity/Monster.java | 4 +++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 core/src/gdx/diablo/ai/Idle.java diff --git a/core/src/gdx/diablo/ai/AI.java b/core/src/gdx/diablo/ai/AI.java index ad0cb225..bec1a3a8 100644 --- a/core/src/gdx/diablo/ai/AI.java +++ b/core/src/gdx/diablo/ai/AI.java @@ -3,6 +3,7 @@ package gdx.diablo.ai; import gdx.diablo.entity.Monster; public abstract class AI { + public static final AI IDLE = new Idle(); protected Monster entity; diff --git a/core/src/gdx/diablo/ai/Idle.java b/core/src/gdx/diablo/ai/Idle.java new file mode 100644 index 00000000..d47a468b --- /dev/null +++ b/core/src/gdx/diablo/ai/Idle.java @@ -0,0 +1,10 @@ +package gdx.diablo.ai; + +public class Idle extends AI { + public Idle() { + super(null); + } + + @Override + public void update(float delta) {} +} diff --git a/core/src/gdx/diablo/entity/Entity.java b/core/src/gdx/diablo/entity/Entity.java index f8b3fcb7..f1b33a52 100644 --- a/core/src/gdx/diablo/entity/Entity.java +++ b/core/src/gdx/diablo/entity/Entity.java @@ -127,7 +127,7 @@ public class Entity { String weaponClass; Vector3 position = new Vector3(); Vector3 velocity = new Vector3(); - float angle = MathUtils.PI * 3 / 2; + float angle = MathUtils.atan2(-1, -2);//MathUtils.PI * 3 / 2; boolean running = false; float walkSpeed = 6; @@ -529,4 +529,6 @@ public class Entity { public String getName() { return name; } + + public void select(Player player) {} } diff --git a/core/src/gdx/diablo/entity/Monster.java b/core/src/gdx/diablo/entity/Monster.java index 031de0aa..1b5176c4 100644 --- a/core/src/gdx/diablo/entity/Monster.java +++ b/core/src/gdx/diablo/entity/Monster.java @@ -60,7 +60,9 @@ public class Monster extends Entity { //if (!object.Draw) return null; // TODO: Not yet Monster monster = new Monster(map, obj, monstats); - if (monstats.AI.equalsIgnoreCase("Npc")) { + if (monstats.AI.equalsIgnoreCase("Idle")) { + monster.ai = AI.IDLE; + } else if (monstats.AI.equalsIgnoreCase("Npc")) { monster.ai = new Npc(monster); }