bartek/base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor FollowEntityAI

Browse Source
This commit is contained in:
Bartłomiej Przemysław Pluta
2021-11-28 16:04:18 +01:00
parent f576d8fc1b
commit 225dd84b21
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
api/src/main/java/com/bartlomiejpluta/base/lib/ai/FollowEntityAI.java
View File

@@ -9,7 +9,6 @@ import com.bartlomiejpluta.base.util.path.MovementPath;
import com.bartlomiejpluta.base.util.path.PathExecutor; import com.bartlomiejpluta.base.util.path.PathExecutor;
import com.bartlomiejpluta.base.util.pathfinder.PathFinder; import com.bartlomiejpluta.base.util.pathfinder.PathFinder;
import lombok.NonNull; import lombok.NonNull;
import lombok.Setter;
public abstract class FollowEntityAI<N extends NPC, T extends Entity> implements AI { public abstract class FollowEntityAI<N extends NPC, T extends Entity> implements AI {
@@ -18,12 +17,6 @@ public abstract class FollowEntityAI<N extends NPC, T extends Entity> implements
private final N npc; private final N npc;
private final T target; private final T target;
@Setter
private AI idleAI;
@Setter
private int range = 20;
private MovementPath<N> path = null; private MovementPath<N> path = null;
protected FollowEntityAI(@NonNull PathFinder finder, @NonNull N npc, @NonNull T target) { protected FollowEntityAI(@NonNull PathFinder finder, @NonNull N npc, @NonNull T target) {
@@ -54,9 +47,9 @@ public abstract class FollowEntityAI<N extends NPC, T extends Entity> implements
if (distance == 1) { if (distance == 1) {
npc.setFaceDirection(npc.getDirectionTowards(target)); npc.setFaceDirection(npc.getDirectionTowards(target));
interact(npc, target); interact(npc, target, layer, dt);
} else if (distance < range) { } else if (sees(npc, target, layer, distance)) {
follow(npc, target); follow(npc, target, layer, dt);
if (path == null) { if (path == null) {
path = finder.findPath(layer, npc, target.getCoordinates()); path = finder.findPath(layer, npc, target.getCoordinates());
@@ -65,18 +58,16 @@ public abstract class FollowEntityAI<N extends NPC, T extends Entity> implements
executor.execute(layer, dt); executor.execute(layer, dt);
} else { } else {
idle(npc, target); idle(npc, target, layer, dt);
if (idleAI != null) {
idleAI.nextActivity(layer, dt);
}
} }
} }
} }
protected abstract void interact(N npc, T target); protected abstract boolean sees(N npc, T target, ObjectLayer layer, int distance);
protected abstract void follow(N npc, T target); protected abstract void interact(N npc, T target, ObjectLayer layer, float dt);
protected abstract void idle(N npc, T target); protected abstract void follow(N npc, T target, ObjectLayer layer, float dt);
protected abstract void idle(N npc, T target, ObjectLayer layer, float dt);
} }