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

Merge pull request #746 from madsboddum/Holocore-731

Browse Source 
Invulnerable faction NPCs trigger the "?"
This commit is contained in:
Josh Larson
2022-08-28 22:17:49 -05:00
committed by GitHub
parent 3a24d29512 cae8b5f7e1
commit 618b25d1bc
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -137,29 +137,30 @@ public class AIObject extends CreatureObject {
return;
playersNearby.add(player);
boolean npcIsInCombat = isInCombat();
boolean npcIsInvulnerable = hasOptionFlags(OptionFlag.INVULNERABLE);
Instant now = Instant.now();
boolean questionMarkTimerExpired = now.isAfter(questionMarkBlockedUntil);
if (!npcIsInCombat) {
boolean npcIsAggressiveTowardsPlayer = isAttackable(player);
if (npcIsAggressiveTowardsPlayer) {
boolean playerIsInLineOfSight = isLineOfSight(player);
if (!npcIsInvulnerable) {
boolean npcIsInCombat = isInCombat();
if (!npcIsInCombat) {
boolean npcIsAggressiveTowardsPlayer = isAttackable(player);
if (playerIsInLineOfSight) {
Location playerWorldLocation = player.getWorldLocation();
Location aiWorldLocation = this.getWorldLocation();
double questionMarkRange = 64;
double distanceBetweenNpcAndPlayer = aiWorldLocation.distanceTo(playerWorldLocation);
boolean playerIsInRange = distanceBetweenNpcAndPlayer <= questionMarkRange;
if (npcIsAggressiveTowardsPlayer) {
boolean playerIsInLineOfSight = isLineOfSight(player);
if (playerIsInRange) {
if (questionMarkTimerExpired) {
showQuestionMarkAboveNpc();
questionMarkBlockedUntil = Instant.now().plusSeconds(60);
if (playerIsInLineOfSight) {
Location playerWorldLocation = player.getWorldLocation();
Location aiWorldLocation = this.getWorldLocation();
double questionMarkRange = 64;
double distanceBetweenNpcAndPlayer = aiWorldLocation.distanceTo(playerWorldLocation);
boolean playerIsInRange = distanceBetweenNpcAndPlayer <= questionMarkRange;
if (playerIsInRange) {
Instant now = Instant.now();
boolean questionMarkTimerExpired = now.isAfter(questionMarkBlockedUntil);
if (questionMarkTimerExpired) {
showQuestionMarkAboveNpc();
questionMarkBlockedUntil = Instant.now().plusSeconds(60);
}
}
}
}