lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor base AI class cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-01 22:21:53 +00:00
parent 5f13d2db66
commit 0506c469a3
165 changed files with 564 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -131,8 +131,6 @@ public class AttackableAI extends CreatureAI
return false;
}
final Attackable me = getActiveChar();
// Check if the target isn't invulnerable
if (target.isInvul())
{
@@ -155,6 +153,7 @@ public class AttackableAI extends CreatureAI
}
// Check if the target isn't dead, is in the Aggro range and is at the same height
final Attackable me = getActiveChar();
if (target.isAlikeDead() || !me.isInsideRadius2D(target, me.getAggroRange()) || (Math.abs(_actor.getZ() - target.getZ()) > 300))
{
return false;
@@ -424,15 +423,12 @@ public class AttackableAI extends CreatureAI
}
}
if ((obj instanceof PlayerInstance) || (obj instanceof Summon))
if (((obj instanceof PlayerInstance) || (obj instanceof Summon)) && !target.isAlikeDead() && !npc.isInsideRadius3D(obj, npc.getAggroRange()))
{
if (!target.isAlikeDead() && !npc.isInsideRadius3D(obj, npc.getAggroRange()))
final PlayerInstance targetPlayer = obj instanceof PlayerInstance ? (PlayerInstance) obj : ((Summon) obj).getOwner();
for (Quest quest : npc.getTemplate().getEventQuests(EventType.ON_AGGRO_RANGE_ENTER))
{
final PlayerInstance targetPlayer = obj instanceof PlayerInstance ? (PlayerInstance) obj : ((Summon) obj).getOwner();
for (Quest quest : npc.getTemplate().getEventQuests(EventType.ON_AGGRO_RANGE_ENTER))
{
quest.notifyAggroRangeEnter(npc, targetPlayer, obj instanceof Summon);
}
quest.notifyAggroRangeEnter(npc, targetPlayer, obj instanceof Summon);
}
}
@@ -555,7 +551,7 @@ public class AttackableAI extends CreatureAI
}
// Calculate a destination point in the spawn area
final int p[] = TerritoryTable.getInstance().getRandomPoint(npc.getSpawn().getLocation());
final int[] p = TerritoryTable.getInstance().getRandomPoint(npc.getSpawn().getLocation());
x1 = p[0];
y1 = p[1];
z1 = p[2];
@@ -565,7 +561,7 @@ public class AttackableAI extends CreatureAI
if (distance2 > (Config.MAX_DRIFT_RANGE * Config.MAX_DRIFT_RANGE))
{
npc.setReturningToSpawnPoint(true);
final float delay = (float) Math.sqrt(distance2) / Config.MAX_DRIFT_RANGE;
final double delay = Math.sqrt(distance2) / Config.MAX_DRIFT_RANGE;
x1 = _actor.getX() + (int) ((x1 - _actor.getX()) / delay);
y1 = _actor.getY() + (int) ((y1 - _actor.getY()) / delay);
}
@@ -660,17 +656,14 @@ public class AttackableAI extends CreatureAI
}
}
if (_attackTimeout < GameTimeTaskManager.getGameTicks())
// Check if the actor is running
if ((_attackTimeout < GameTimeTaskManager.getGameTicks()) && _actor.isRunning())
{
// Check if the actor is running
if (_actor.isRunning())
{
// Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance
_actor.setWalking();
// Calculate a new attack timeout
_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeTaskManager.getGameTicks();
}
// Set the actor movement type to walk and send Server->Client packet ChangeMoveType to all others PlayerInstance
_actor.setWalking();
// Calculate a new attack timeout
_attackTimeout = MAX_ATTACK_TIMEOUT + GameTimeTaskManager.getGameTicks();
}
// Check if target is dead or if timeout is expired to stop this attack
@@ -715,33 +708,27 @@ public class AttackableAI extends CreatureAI
// Check if the WorldObject is inside the Faction Range of the actor
if ((_actor.getAttackByList() != null) && _actor.isInsideRadius3D(npc, npc.getFactionRange()) && (npc.getAI() != null) && _actor.getAttackByList().contains(originalAttackTarget))
{
if ((npc.getAI().getIntention() == AI_INTENTION_IDLE) || (npc.getAI().getIntention() == AI_INTENTION_ACTIVE))
if (((npc.getAI().getIntention() == AI_INTENTION_IDLE) || (npc.getAI().getIntention() == AI_INTENTION_ACTIVE)) && GeoEngine.getInstance().canSeeTarget(_actor, npc) && (Math.abs(originalAttackTarget.getZ() - npc.getZ()) < 600))
{
if (GeoEngine.getInstance().canSeeTarget(_actor, npc) && (Math.abs(originalAttackTarget.getZ() - npc.getZ()) < 600))
if ((originalAttackTarget instanceof PlayerInstance) && originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift())
{
if ((originalAttackTarget instanceof PlayerInstance) && originalAttackTarget.isInParty() && originalAttackTarget.getParty().isInDimensionalRift())
final byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType();
final byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom();
if ((_actor instanceof RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(npc.getX(), npc.getY(), npc.getZ()))
{
final byte riftType = originalAttackTarget.getParty().getDimensionalRift().getType();
final byte riftRoom = originalAttackTarget.getParty().getDimensionalRift().getCurrentRoom();
if ((_actor instanceof RiftInvaderInstance) && !DimensionalRiftManager.getInstance().getRoom(riftType, riftRoom).checkIfInZone(npc.getX(), npc.getY(), npc.getZ()))
{
continue;
}
continue;
}
// Notify the WorldObject AI with EVT_AGGRESSION
npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1);
}
// Notify the WorldObject AI with EVT_AGGRESSION
npc.getAI().notifyEvent(CtrlEvent.EVT_AGGRESSION, originalAttackTarget, 1);
}
if (GeoEngine.getInstance().canSeeTarget(_actor, npc) && (Math.abs(originalAttackTarget.getZ() - npc.getZ()) < 500))
if (GeoEngine.getInstance().canSeeTarget(_actor, npc) && (Math.abs(originalAttackTarget.getZ() - npc.getZ()) < 500) && ((originalAttackTarget instanceof PlayerInstance) || (originalAttackTarget instanceof Summon)))
{
if ((originalAttackTarget instanceof PlayerInstance) || (originalAttackTarget instanceof Summon))
final PlayerInstance player = originalAttackTarget instanceof PlayerInstance ? (PlayerInstance) originalAttackTarget : ((Summon) originalAttackTarget).getOwner();
for (Quest quest : npc.getTemplate().getEventQuests(EventType.ON_FACTION_CALL))
{
final PlayerInstance player = originalAttackTarget instanceof PlayerInstance ? (PlayerInstance) originalAttackTarget : ((Summon) originalAttackTarget).getOwner();
for (Quest quest : npc.getTemplate().getEventQuests(EventType.ON_FACTION_CALL))
{
quest.notifyFactionCall(npc, (NpcInstance) _actor, player, (originalAttackTarget instanceof Summon));
}
quest.notifyFactionCall(npc, (NpcInstance) _actor, player, (originalAttackTarget instanceof Summon));
}
}
}
@@ -756,14 +743,12 @@ public class AttackableAI extends CreatureAI
// Get all information needed to chose between physical or magical attack
Collection<Skill> skills = null;
double dist2 = 0;
int range = 0;
try
{
_actor.setTarget(originalAttackTarget);
skills = _actor.getAllSkills();
// dist2 = _actor.getPlanDistanceSq(originalAttackTarget.getX(), originalAttackTarget.getY());
range = _actor.getPhysicalAttackRange() + _actor.getTemplate().getCollisionRadius() + originalAttackTarget.getTemplate().getCollisionRadius();
}
catch (NullPointerException e)
@@ -772,7 +757,6 @@ public class AttackableAI extends CreatureAI
return;
}
final Weapon weapon = _actor.getActiveWeaponItem();
final int collision = _actor.getTemplate().getCollisionRadius();
final int combinedCollision = collision + originalAttackTarget.getTemplate().getCollisionRadius();
@@ -820,6 +804,7 @@ public class AttackableAI extends CreatureAI
}
}
final Weapon weapon = _actor.getActiveWeaponItem();
if ((weapon != null) && (weapon.getItemType() == WeaponType.BOW))
{
// Micht: kepping this one otherwise we should do 2 sqrt
@@ -874,7 +859,7 @@ public class AttackableAI extends CreatureAI
setAttackTarget(hated);
}
// We should calculate new distance cuz mob can have changed the target
dist2 = _actor.calculateDistanceSq2D(hated);
final double dist2 = _actor.calculateDistanceSq2D(hated);
if (hated.isMoving())
{
range += 50;
@@ -899,13 +884,12 @@ public class AttackableAI extends CreatureAI
{
if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL))
{
boolean useSkillSelf = true;
if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.getSkillType() == Skill.SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())
@@ -958,13 +942,12 @@ public class AttackableAI extends CreatureAI
{
if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL))
{
useSkillSelf = true;
if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
useSkillSelf = true;
if (sk.getSkillType() == Skill.SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java
View File

@@ -381,12 +381,12 @@ public class ControllableMobAI extends AttackableAI
return false;
}
final Attackable me = (Attackable) _actor;
if ((target instanceof FolkInstance) || (target instanceof DoorInstance))
{
return false;
}
final Attackable me = (Attackable) _actor;
if (target.isAlikeDead() || !me.isInsideRadius2D(target, me.getAggroRange()) || (Math.abs(_actor.getZ() - target.getZ()) > 100))
{
return false;

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/DoorAI.java
View File

@@ -132,7 +132,7 @@ public class DoorAI extends CreatureAI
}
@Override
protected void onEvtArrivedBlocked(Location blocked_at_loc)
protected void onEvtArrivedBlocked(Location blockedAtLoc)
{
}

18
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
View File

@@ -185,14 +185,10 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
}
}
// Check if the target is a PlayerInstance
if (currentTarget instanceof PlayerInstance)
// Check if the target is a PlayerInstance and if the target isn't in silent move mode AND too far (>100)
if ((currentTarget instanceof PlayerInstance) && ((PlayerInstance) currentTarget).isSilentMoving() && !_actor.isInsideRadius2D(currentTarget, 250))
{
// Check if the target isn't in silent move mode AND too far (>100)
if (((PlayerInstance) currentTarget).isSilentMoving() && !_actor.isInsideRadius2D(currentTarget, 250))
{
return false;
}
return false;
}
// Los Check Here
@@ -652,12 +648,12 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL))
{
boolean useSkillSelf = true;
if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.getSkillType() == SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())
@@ -788,12 +784,12 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.getSkillType() == SkillType.BUFF) || (sk.getSkillType() == SkillType.HEAL))
{
boolean useSkillSelf = true;
if ((sk.getSkillType() == SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.getSkillType() == SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/NpcWalkerAI.java
View File

@@ -38,17 +38,17 @@ public class NpcWalkerAI extends CreatureAI implements Runnable
/**
* home points for xyz
*/
int _homeX;
private int _homeX;
/**
* home points for xyz
*/
int _homeY;
private int _homeY;
/**
* home points for xyz
*/
int _homeZ;
private int _homeZ;
/**
* route of the current npc

9
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
View File

@@ -317,7 +317,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
Collection<Skill> skills = null;
double dist2 = 0;
int range = 0;
final SiegeGuardInstance sGuard = (SiegeGuardInstance) _actor;
final Creature attackTarget = getAttackTarget();
try
@@ -335,6 +334,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
}
// never attack defenders
final SiegeGuardInstance sGuard = (SiegeGuardInstance) _actor;
if ((attackTarget instanceof PlayerInstance) && sGuard.getCastle().getSiege().checkIsDefender(((PlayerInstance) attackTarget).getClan()))
{
// Cancel the target
@@ -367,12 +367,12 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
{
if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL))
{
boolean useSkillSelf = true;
if (((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL) || ((dist2 >= ((castRange * castRange) / 9)) && (dist2 <= (castRange * castRange)) && (castRange > 70))) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() >= _actor.getStat().getMpConsume(sk)) && !sk.isPassive())
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.getSkillType() == Skill.SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())
@@ -481,13 +481,12 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
{
if ((sk.getSkillType() == Skill.SkillType.BUFF) || (sk.getSkillType() == Skill.SkillType.HEAL))
{
boolean useSkillSelf = true;
if ((sk.getSkillType() == Skill.SkillType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.getSkillType() == Skill.SkillType.BUFF)
{
for (Effect effect : _actor.getAllEffects())

2
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/ai/SummonAI.java
View File

@@ -85,7 +85,6 @@ public class SummonAI extends CreatureAI
private void thinkCast()
{
final Summon summon = (Summon) _actor;
final Creature target = getCastTarget();
if (checkTargetLost(target))
{
@@ -99,6 +98,7 @@ public class SummonAI extends CreatureAI
}
clientStopMoving(null);
final Summon summon = (Summon) _actor;
summon.setFollowStatus(false);
setIntention(AI_INTENTION_IDLE);
_accessor.doCast(skill);