2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-20 05:20:22 -07:00
Code Issues Projects Releases Packages Wiki Activity

Implemented NPC aggression tolerance

Browse source
This commit is contained in:
ceikry 2021-07-16 21:04:40 -05:00
parent d334a12b33
commit fb2256d6e6
4 changed files with 32 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Server/src/main/java/core/game/node/entity/npc/agg/AggressiveBehavior.java
View file

@ -62,6 +62,12 @@ public class AggressiveBehavior {
* @return {@code True} if the NPC can select the entity as a target.
*/
public boolean canSelectTarget(Entity entity, Entity target) {
int regionId = target.getLocation().getRegionId();
if(target instanceof Player) {
if (RegionManager.forId(regionId).isTolerated(target.asPlayer())) {
return false;
}
}
if (!target.isActive() || DeathTask.isDead(target)) {
return false;
}

3
Server/src/main/java/core/game/node/entity/npc/agg/AggressiveHandler.java
View file

@ -81,9 +81,10 @@ public final class AggressiveHandler {
Entity target = behavior.getLogicalTarget(entity, behavior.getPossibleTargets(entity, radius));
if (target instanceof Player) {
if (target.getAttribute("ignore_aggression", false)) {
if (((Player) target).getRights().equals(Rights.ADMINISTRATOR)) {
return false;
}
if (((Player) target).getRights().equals(Rights.ADMINISTRATOR)) {
return false;
}
}
if (target != null) {

6
Server/src/main/java/core/game/node/entity/npc/other/RockCrabNPC.java
View file

@ -5,7 +5,9 @@ import core.game.node.entity.combat.BattleState;
import core.game.node.entity.npc.AbstractNPC;
import core.game.node.entity.npc.agg.AggressiveBehavior;
import core.game.node.entity.npc.agg.AggressiveHandler;
import core.game.node.entity.player.Player;
import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.plugin.Initializable;
import core.tools.RandomFunction;
@ -22,6 +24,10 @@ public final class RockCrabNPC extends AbstractNPC {
private static final AggressiveBehavior AGGRO_BEHAVIOR = new AggressiveBehavior() {
@Override
public boolean canSelectTarget(Entity entity, Entity target) {
int regionId = target.getLocation().getRegionId();
if(target instanceof Player){
if(RegionManager.forId(regionId).isTolerated(target.asPlayer())) return false;
}
RockCrabNPC npc = (RockCrabNPC) entity;
if (entity.getLocation().withinDistance(target.getLocation(), 3)) {
npc.aggresor = true;

16
Server/src/main/java/core/game/world/map/Region.java
View file

@ -16,7 +16,9 @@ import rs09.game.world.repository.Repository;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;
/**
* Represents a region.
@ -60,6 +62,11 @@ public class Region {
*/
private final List<MusicZone> musicZones = new ArrayList<>(20);
/**
* Keeps track of players and time in region for tolerance purposes
*/
private final HashMap<String,Long> tolerances = new HashMap<>();
/**
* If the region is active.
*/
@ -146,6 +153,7 @@ public class Region {
*/
public void add(Player player) {
planes[player.getLocation().getZ()].add(player);
tolerances.put(player.getUsername(), System.currentTimeMillis());
flagActive();
}
@ -175,9 +183,17 @@ public class Region {
*/
public void remove(Player player) {
player.getViewport().getCurrentPlane().remove(player);
tolerances.remove(player.getUsername());
checkInactive();
}
/**
* Checks if player is tolerated by enemies in this region
*/
public boolean isTolerated(Player player){
return System.currentTimeMillis() - tolerances.getOrDefault(player.getUsername(), System.currentTimeMillis()) > TimeUnit.MINUTES.toMillis(1);
}
/**
* Checks if the region is inactive, if so it will start the inactivity flagging.
* @return {@code True} if the region is inactive.