mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-21 20:18:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

NPCs will now stop when interacted with and look at player

Browse Source
This commit is contained in:
Collin Smith 2019-03-02 14:40:53 -08:00
parent d23b151149
commit 162862771c
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/gdx/diablo/ai/Npc.java
View File

@ -31,6 +31,11 @@ public class Npc extends AI {
id = name + "_greeting_inactive_1";
Diablo.audio.play(id, false);
}
actionTimer = 4;
actionPerformed = false;
entity.target().set(entity.position());
entity.lookAt(gameScreen.player);
}
public void update(float delta) {

11
core/src/gdx/diablo/entity/Entity.java
View File

@ -144,6 +144,8 @@ public class Entity {
MapGraph.MapGraphPath path = new MapGraph.MapGraphPath();
Iterator<MapGraph.Point2> targets = Collections.emptyIterator();
private static final Vector2 tmpVec2 = new Vector2();
public static Entity create(Map map, Map.Zone zone, DS1 ds1, DS1.Object obj) {
final int type = obj.type;
switch (type) {
@ -349,6 +351,15 @@ public class Entity {
return Direction.radiansToDirection(angle, numDirs);
}
public void lookAt(Entity entity) {
float x1 = +(entity.position.x * Tile.SUBTILE_WIDTH50) - (entity.position.y * Tile.SUBTILE_WIDTH50);
float y1 = -(entity.position.x * Tile.SUBTILE_HEIGHT50) - (entity.position.y * Tile.SUBTILE_HEIGHT50);
float x2 = +(position.x * Tile.SUBTILE_WIDTH50) - (position.y * Tile.SUBTILE_WIDTH50);
float y2 = -(position.x * Tile.SUBTILE_HEIGHT50) - (position.y * Tile.SUBTILE_HEIGHT50);
tmpVec2.set(x1, y1).sub(x2, y2);
setAngle(MathUtils.atan2(tmpVec2.y, tmpVec2.x));
}
public final void invalidate() {
dirty = Dirty.ALL;
}