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

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AbstractAI.java
View File

@@ -71,7 +71,7 @@ public abstract class AbstractAI implements Ctrl
protected Creature _followTarget;
/** The skill we are currently casting by INTENTION_CAST */
Skill _skill;
protected Skill _skill;
/** Different internal state flags */
private int _moveToPawnTimeout;

28
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/AttackableAI.java
View File

@@ -171,8 +171,6 @@ public class AttackableAI extends CreatureAI
return false;
}
final Attackable me = getActiveChar();
// Check if the target isn't invulnerable
if (target.isInvul())
{
@@ -195,6 +193,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() || (target.isPlayable() && !me.isInsideRadius3D(target, me.getAggroRange())))
{
return false;
@@ -682,10 +681,7 @@ public class AttackableAI extends CreatureAI
// Order to the MonsterInstance to random walk (1/100)
else if ((npc.getSpawn() != null) && (Rnd.get(RANDOM_WALK_RATE) == 0) && npc.isRandomWalkingEnabled())
{
int x1 = 0;
int y1 = 0;
int z1 = 0;
final int range = Config.MAX_DRIFT_RANGE;
for (Skill sk : npc.getTemplate().getAISkills(AISkillScope.BUFF))
{
if (cast(sk))
@@ -694,9 +690,10 @@ public class AttackableAI extends CreatureAI
}
}
x1 = npc.getSpawn().getX();
y1 = npc.getSpawn().getY();
z1 = npc.getSpawn().getZ();
int x1 = npc.getSpawn().getX();
int y1 = npc.getSpawn().getY();
int z1 = npc.getSpawn().getZ();
final int range = Config.MAX_DRIFT_RANGE;
if (!npc.isInsideRadius2D(x1, y1, 0, range))
{
npc.setReturningToSpawnPoint(true);
@@ -919,7 +916,6 @@ public class AttackableAI extends CreatureAI
}
// Initialize data
final int combinedCollision = collision + mostHate.getTemplate().getCollisionRadius();
final List<Skill> aiSuicideSkills = npc.getTemplate().getAISkills(AISkillScope.SUICIDE);
if (!aiSuicideSkills.isEmpty() && ((int) ((npc.getCurrentHp() / npc.getMaxHp()) * 100) < 30))
{
@@ -935,6 +931,7 @@ public class AttackableAI extends CreatureAI
// Note from Gnacik:
// On l2js because of that sometimes mobs don't attack player only running
// around player without any sense, so decrease chance for now
final int combinedCollision = collision + mostHate.getTemplate().getCollisionRadius();
if (!npc.isMovementDisabled() && (Rnd.get(100) <= 3))
{
for (Attackable nearby : World.getInstance().getVisibleObjects(npc, Attackable.class))
@@ -1048,7 +1045,6 @@ public class AttackableAI extends CreatureAI
final List<Skill> aiHealSkills = npc.getTemplate().getAISkills(AISkillScope.HEAL);
if (!aiHealSkills.isEmpty())
{
double percentage = (npc.getCurrentHp() / npc.getMaxHp()) * 100;
if (npc.isMinion())
{
final Creature leader = npc.getLeader();
@@ -1086,6 +1082,7 @@ public class AttackableAI extends CreatureAI
}
}
double percentage = (npc.getCurrentHp() / npc.getMaxHp()) * 100;
if (Rnd.get(100) < ((100 - percentage) / 3))
{
for (Skill sk : aiHealSkills)
@@ -1329,7 +1326,6 @@ public class AttackableAI extends CreatureAI
final double dist = caster.calculateDistance2D(attackTarget);
double dist2 = dist - attackTarget.getTemplate().getCollisionRadius();
final double range = caster.getPhysicalAttackRange() + caster.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius();
final double srange = sk.getCastRange() + caster.getTemplate().getCollisionRadius();
if (attackTarget.isMoving())
{
@@ -1452,7 +1448,6 @@ public class AttackableAI extends CreatureAI
if (sk.hasEffectType(EffectType.HEAL))
{
double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
if (caster.isMinion() && (sk.getTargetType() != TargetType.SELF))
{
final Creature leader = caster.getLeader();
@@ -1473,6 +1468,7 @@ public class AttackableAI extends CreatureAI
}
}
double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
if (Rnd.get(100) < ((100 - percentage) / 3))
{
clientStopMoving(null);
@@ -1556,6 +1552,7 @@ public class AttackableAI extends CreatureAI
{
if (sk.getTargetType() == TargetType.ONE)
{
final double range = caster.getPhysicalAttackRange() + caster.getTemplate().getCollisionRadius() + attackTarget.getTemplate().getCollisionRadius();
if (!attackTarget.isDead() && (dist2 <= srange) && ((dist2 > range) || attackTarget.isMoving()) && !attackTarget.isAffectedBySkill(sk.getId()))
{
clientStopMoving(null);
@@ -1756,20 +1753,19 @@ public class AttackableAI extends CreatureAI
private void movementDisable()
{
final Attackable npc = getActiveChar();
final Creature target = getAttackTarget();
if (target == null)
{
return;
}
final Attackable npc = getActiveChar();
if (npc.getTarget() == null)
{
npc.setTarget(target);
}
final double dist = npc.calculateDistance2D(target);
final int range = npc.getPhysicalAttackRange() + npc.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius();
// TODO(Zoey76): Review this "magic changes".
final int random = Rnd.get(100);
@@ -1804,6 +1800,7 @@ public class AttackableAI extends CreatureAI
}
// If cannot cast, try to attack.
final int range = npc.getPhysicalAttackRange() + npc.getTemplate().getCollisionRadius() + target.getTemplate().getCollisionRadius();
if ((dist <= range) && GeoEngine.getInstance().canSeeTarget(npc, target))
{
_actor.doAttack(target);
@@ -2107,6 +2104,7 @@ public class AttackableAI extends CreatureAI
{
continue;
}
try
{
dist = actor.calculateDistance2D(obj);

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/ControllableMobAI.java
View File

@@ -135,7 +135,6 @@ public class ControllableMobAI extends AttackableAI
@Override
protected void thinkCast()
{
final Attackable npc = (Attackable) _actor;
if ((getAttackTarget() == null) || getAttackTarget().isAlikeDead())
{
setAttackTarget(findNextRndTarget());
@@ -147,6 +146,7 @@ public class ControllableMobAI extends AttackableAI
return;
}
final Attackable npc = (Attackable) _actor;
npc.setTarget(getAttackTarget());
if (_actor.isMuted())

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/DoorAI.java
View File

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

8
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/FortSiegeGuardAI.java
View File

@@ -447,7 +447,6 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
Collection<Skill> skills = null;
double dist2 = 0;
int range = 0;
final DefenderInstance sGuard = _actor instanceof FortCommanderInstance ? (FortCommanderInstance) _actor : (DefenderInstance) _actor;
Creature attackTarget = getAttackTarget();
try
{
@@ -468,6 +467,7 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
}
// never attack defenders
final DefenderInstance sGuard = _actor instanceof FortCommanderInstance ? (FortCommanderInstance) _actor : (DefenderInstance) _actor;
if (attackTarget.isPlayer() && sGuard.getFort().getSiege().checkIsDefender(((PlayerInstance) attackTarget).getClan()))
{
// Cancel the target
@@ -489,13 +489,12 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(EffectType.HEAL))
{
boolean useSkillSelf = true;
if (sk.hasEffectType(EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId()))
{
useSkillSelf = false;
@@ -600,13 +599,12 @@ public class FortSiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(EffectType.HEAL))
{
boolean useSkillSelf = true;
if (sk.hasEffectType(EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId()))
{
useSkillSelf = false;

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/PlayableAI.java
View File

@@ -32,7 +32,7 @@ import org.l2jmobius.gameserver.network.SystemMessageId;
*/
public abstract class PlayableAI extends CreatureAI
{
public PlayableAI(Playable playable)
protected PlayableAI(Playable playable)
{
super(playable);
}

10
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SiegeGuardAI.java
View File

@@ -436,7 +436,6 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
Collection<Skill> skills = null;
double dist2 = 0;
int range = 0;
final DefenderInstance sGuard = (DefenderInstance) _actor;
Creature attackTarget = getAttackTarget();
try
@@ -458,6 +457,7 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
}
// never attack defenders
final DefenderInstance sGuard = (DefenderInstance) _actor;
if (attackTarget.isPlayer() && (sGuard.getConquerableHall() == null) && sGuard.getCastle().getSiege().checkIsDefender(((PlayerInstance) attackTarget).getClan()))
{
// Cancel the target
@@ -489,13 +489,12 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(EffectType.HEAL))
{
boolean useSkillSelf = true;
if (sk.hasEffectType(EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId()))
{
useSkillSelf = false;
@@ -596,13 +595,12 @@ public class SiegeGuardAI extends CreatureAI implements Runnable
final WorldObject oldTarget = _actor.getTarget();
if ((sk.isContinuous() && !sk.isDebuff()) || sk.hasEffectType(EffectType.HEAL))
{
boolean useSkillSelf = true;
if (sk.hasEffectType(EffectType.HEAL) && (_actor.getCurrentHp() > (int) (_actor.getMaxHp() / 1.5)))
{
useSkillSelf = false;
break;
}
boolean useSkillSelf = true;
if (sk.isContinuous() && !sk.isDebuff() && _actor.isAffectedBySkill(sk.getId()))
{
useSkillSelf = false;

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/SummonAI.java
View File

@@ -118,7 +118,6 @@ public class SummonAI extends PlayableAI implements Runnable
private void thinkCast()
{
final Summon summon = (Summon) _actor;
if (checkTargetLost(getCastTarget()))
{
setCastTarget(null);
@@ -132,6 +131,7 @@ public class SummonAI extends PlayableAI implements Runnable
}
clientStopMoving(null);
final Summon summon = (Summon) _actor;
summon.setFollowStatus(false);
setIntention(AI_INTENTION_IDLE);
_startFollow = val;

2
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/ai/VehicleAI.java
View File

@@ -30,7 +30,7 @@ public abstract class VehicleAI extends CreatureAI
* Simple AI for vehicles
* @param vehicle
*/
public VehicleAI(Vehicle vehicle)
protected VehicleAI(Vehicle vehicle)
{
super(vehicle);
}