projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-01-17 00:06:00 -05:00
Code Issues Projects Releases Wiki Activity

Aggressive NPCs ignore players that have been incapacitated recently #3

Browse Source
This commit is contained in:
Ziggy
2020-11-29 13:09:21 +01:00
parent a601a0387b
commit c8bc5c84d3
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/projectswg/holocore/resources/support/objects/swg/custom/AIObject.java
View File

@@ -32,6 +32,7 @@ import com.projectswg.holocore.intents.support.npc.ai.StartNpcCombatIntent;
import com.projectswg.holocore.resources.support.npc.spawn.Spawner;
import com.projectswg.holocore.resources.support.objects.ObjectCreator;
import com.projectswg.holocore.resources.support.objects.swg.SWGObject;
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureDifficulty;
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureObject;
import com.projectswg.holocore.resources.support.objects.swg.creature.CreatureState;
import com.projectswg.holocore.resources.support.objects.swg.tangible.OptionFlag;
@@ -132,7 +133,7 @@ public class AIObject extends CreatureObject {
}
private void checkAwareAttack(CreatureObject player) {
if (isAttackable(player)) {
if (isAttackable(player) && !isPlayerIgnored(player)) {
double distance = getLocation().flatDistanceTo(player.getLocation());
double maxAggroDistance;
if (player.isLoggedInPlayer())
@@ -253,4 +254,19 @@ public class AIObject extends CreatureObject {
}
}
private boolean isPlayerIgnored(CreatureObject player) {
CreatureDifficulty difficulty = getDifficulty();
if (difficulty == CreatureDifficulty.NORMAL) {
// Normal difficulty NPCs will let the player escape if the player has recently been incapacitated
return isPlayerRecentlyIncapacitated(player);
}
return false;
}
private boolean isPlayerRecentlyIncapacitated(CreatureObject player) {
return player.hasBuff("incapWeaken");
}
}