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

Added attack range check for left click

Browse Source 
Added attack range check for left click
Added null check for dangling target
This commit is contained in:
Collin Smith 2020-09-10 22:41:02 -07:00
parent c64042bafe
commit 39f3d5aaca
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/riiablo/engine/client/CursorMovementSystem.java
View File

@ -126,13 +126,15 @@ public class CursorMovementSystem extends BaseSystem {
if (target != null) {
int targetId = target.target;
Vector2 srcPos = mPosition.get(src).position;
if (!mPosition.has(targetId)) mTarget.remove(src);
Vector2 targetPos = mPosition.get(targetId).position;
// not interactable -> attacking? check weapon range to auto attack or cast spell
Interactable interactable = mInteractable.get(targetId);
if (interactable != null && srcPos.dst(targetPos) <= interactable.range) {
final float dst = srcPos.dst(targetPos);
if (interactable != null && dst <= interactable.range) {
setTarget(src, Engine.INVALID_ENTITY);
interactable.interactor.interact(src, targetId);
} else if (interactable == null) { // TODO: change to check targetability of targetId
} else if (interactable == null && dst <= 2) { // TODO: change to check targetability of targetId
setTarget(src, Engine.INVALID_ENTITY);
actioneer.cast(src, Riiablo.charData.getAction(Input.Buttons.LEFT), targetId, targetPos);
}