diff --git a/src/services/ai/AIActor.java b/src/services/ai/AIActor.java index c34ed1fc..99363374 100644 --- a/src/services/ai/AIActor.java +++ b/src/services/ai/AIActor.java @@ -25,13 +25,16 @@ import java.util.Map; import java.util.Vector; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import main.NGECore; import net.engio.mbassy.listener.Handler; +import engine.clients.Client; import engine.resources.objects.SWGObject; import engine.resources.scene.Point3D; import engine.resources.scene.Quaternion; +import resources.datatables.Options; import resources.objects.cell.CellObject; import resources.objects.creature.CreatureObject; import resources.objects.tangible.TangibleObject; @@ -41,8 +44,10 @@ import services.ai.states.AttackState; import services.ai.states.DeathState; import services.ai.states.IdleState; import services.ai.states.RetreatState; +import services.ai.states.StalkState; import services.combat.CombatEvents.DamageTaken; import services.spawn.MobileTemplate; +import java.util.Random; public class AIActor { @@ -56,13 +61,37 @@ public class AIActor { private Map damageMap = new ConcurrentHashMap(); private volatile boolean hasReachedPosition; private long lastAttackTimestamp; - + private ScheduledFuture regenTask; + private ScheduledFuture aggroCheckTask; + private boolean isStalking = false; + public AIActor(CreatureObject creature, Point3D spawnPosition, ScheduledExecutorService scheduler) { this.creature = creature; this.spawnPosition = spawnPosition; this.scheduler = scheduler; creature.getEventBus().subscribe(this); this.currentState = new IdleState(); + regenTask = scheduler.scheduleAtFixedRate(() -> { + if(creature.getHealth() < creature.getMaxHealth() && creature.getCombatFlag() == 0 && creature.getPosture() != 13 && creature.getPosture() != 14) + creature.setHealth(creature.getHealth() + (36 + creature.getLevel() * 4)); + }, 0, 1000, TimeUnit.MILLISECONDS); + if(creature.getOption(Options.AGGRESSIVE)) { + aggroCheckTask = scheduler.scheduleAtFixedRate(() -> { + if(creature == null || creature.getObservers().isEmpty() || creature.getCombatFlag() != 0 || isStalking) + return; + creature.getObservers().stream().map(Client::getParent).filter(obj -> obj.inRange(creature.getWorldPosition(), 10)).forEach((obj) -> { + if(new Random().nextFloat() <= 0.33 || creature.getCombatFlag() != 0 || isStalking) { + /*if(mobileTemplate.isStalker()) { + setFollowObject((CreatureObject) obj); + setCurrentState(new StalkState()); + } else */ + addDefender((CreatureObject) obj); + + } + }); + }, 0, 5000, TimeUnit.MILLISECONDS); + + } } public CreatureObject getCreature() { @@ -86,6 +115,12 @@ public class AIActor { if(followObject == null) setFollowObject(defender); setCurrentState(new AttackState()); + NGECore.getInstance().simulationService.get(creature.getPlanet(), creature.getWorldPosition().x, creature.getWorldPosition().z, 30).stream().filter((obj) -> + obj instanceof CreatureObject && + obj.getAttachment("AI") != null && + ((AIActor) obj.getAttachment("AI")).getMobileTemplate().getSocialGroup().equals(getMobileTemplate().getSocialGroup()) && + obj.inRange(creature.getWorldPosition(), ((AIActor) obj.getAttachment("AI")).getMobileTemplate().getAssistRange()) + ).forEach((obj) -> ((AIActor) obj.getAttachment("AI")).addDefender(defender)); } public void removeDefender(CreatureObject defender) { @@ -249,6 +284,7 @@ public class AIActor { public void scheduleDespawn() { scheduler.schedule(() -> { + regenTask.cancel(true); damageMap.clear(); followObject = null; creature.setAttachment("AI", null); @@ -256,5 +292,21 @@ public class AIActor { }, 30000, TimeUnit.MILLISECONDS); } + + public ScheduledFuture getRegenTask() { + return regenTask; + } + + public void setRegenTask(ScheduledFuture regenTask) { + this.regenTask = regenTask; + } + + public boolean isStalking() { + return isStalking; + } + + public void setStalking(boolean isStalking) { + this.isStalking = isStalking; + } } diff --git a/src/services/ai/states/StalkState.java b/src/services/ai/states/StalkState.java new file mode 100644 index 00000000..26b3a90a --- /dev/null +++ b/src/services/ai/states/StalkState.java @@ -0,0 +1,56 @@ +/******************************************************************************* + * Copyright (c) 2013 + * + * This File is part of NGECore2. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + * + * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. + * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination. + ******************************************************************************/ +package services.ai.states; + +import services.ai.AIActor; +import services.ai.states.AIState.StateResult; + +public class StalkState extends AIState { + + @Override + public byte onEnter(AIActor actor) throws Exception { + actor.setStalking(true); + return StateResult.UNFINISHED; + } + + @Override + public byte onExit(AIActor actor) throws Exception { + actor.setStalking(false); + return StateResult.UNFINISHED; + } + + @Override + public byte move(AIActor actor) throws Exception { + if(!actor.isStalking() || actor.getFollowObject() == null) + return StateResult.FINISHED; + return StateResult.UNFINISHED; + + } + + @Override + public byte recover(AIActor actor) throws Exception { + if(!actor.isStalking() || actor.getFollowObject() == null) + return StateResult.FINISHED; + return StateResult.UNFINISHED; + } + +} diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java index 56f6a8ae..685787dd 100644 --- a/src/services/object/ObjectService.java +++ b/src/services/object/ObjectService.java @@ -563,6 +563,8 @@ public class ObjectService implements INetworkDispatch { synchronized(objectList) { for(SWGObject obj : objectList.values()) { + if(obj == null) + continue; if(obj.getCustomName() == null) continue; if(obj.getCustomName().startsWith(customName)) @@ -584,7 +586,7 @@ public class ObjectService implements INetworkDispatch { return object; } } - + cursor.close(); return null; } diff --git a/src/services/spawn/MobileTemplate.java b/src/services/spawn/MobileTemplate.java index 7f02ff25..61098040 100644 --- a/src/services/spawn/MobileTemplate.java +++ b/src/services/spawn/MobileTemplate.java @@ -51,7 +51,10 @@ public class MobileTemplate { private int minSpawnDistance = 0; private int maxSpawnDistance = 0; private boolean deathblow = false; - + private String socialGroup; // see prima guide + private int assistRange; // use prima guide for ranges + private boolean isStalker = false; + public Vector getTemplates() { return templates; } @@ -235,4 +238,28 @@ public class MobileTemplate { public void setDeathblow(boolean deathblow) { this.deathblow = deathblow; } + + public String getSocialGroup() { + return socialGroup; + } + + public void setSocialGroup(String socialGroup) { + this.socialGroup = socialGroup; + } + + public int getAssistRange() { + return assistRange; + } + + public void setAssistRange(int assistRange) { + this.assistRange = assistRange; + } + + public boolean isStalker() { + return isStalker; + } + + public void setStalker(boolean isStalker) { + this.isStalker = isStalker; + } }