Sync with L2jServer HighFive Mar 1st 2015.

This commit is contained in:
mobius
2015-03-01 22:48:14 +00:00
parent f14af24b41
commit 6fa0ed56e3
116 changed files with 971 additions and 676 deletions

View File

@ -30,7 +30,6 @@ import com.l2jserver.gameserver.model.MobGroup;
import com.l2jserver.gameserver.model.MobGroupTable;
import com.l2jserver.gameserver.model.actor.L2Attackable;
import com.l2jserver.gameserver.model.actor.L2Character;
import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor;
import com.l2jserver.gameserver.model.actor.L2Npc;
import com.l2jserver.gameserver.model.actor.L2Playable;
import com.l2jserver.gameserver.model.actor.instance.L2ControllableMobInstance;
@ -62,6 +61,12 @@ public final class L2ControllableMobAI extends L2AttackableAI
private L2Character _forcedTarget;
private MobGroup _targetGroup;
public L2ControllableMobAI(L2ControllableMobInstance creature)
{
super(creature);
setAlternateAI(AI_IDLE);
}
protected void thinkFollow()
{
L2Attackable me = (L2Attackable) _actor;
@ -153,7 +158,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
{
if (Util.checkIfInRange(sk.getCastRange(), _actor, getAttackTarget(), true) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
{
_accessor.doCast(sk);
_actor.doCast(sk);
return;
}
@ -203,7 +208,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
{
_accessor.doCast(sk);
_actor.doCast(sk);
return;
}
@ -217,7 +222,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
return;
}
_accessor.doAttack(target);
_actor.doAttack(target);
}
protected void thinkForceAttack()
@ -243,7 +248,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
{
_accessor.doCast(sk);
_actor.doCast(sk);
return;
}
@ -258,7 +263,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
return;
}
_accessor.doAttack(getForcedTarget());
_actor.doAttack(getForcedTarget());
}
@Override
@ -316,7 +321,7 @@ public final class L2ControllableMobAI extends L2AttackableAI
if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() > _actor.getStat().getMpConsume(sk)))
{
_accessor.doCast(sk);
_actor.doCast(sk);
return;
}
@ -358,13 +363,13 @@ public final class L2ControllableMobAI extends L2AttackableAI
if (((castRange * castRange) >= dist2) && !_actor.isSkillDisabled(sk) && (_actor.getCurrentMp() < _actor.getStat().getMpConsume(sk)))
{
_accessor.doCast(sk);
_actor.doCast(sk);
return;
}
}
}
_accessor.doAttack(getAttackTarget());
_actor.doAttack(getAttackTarget());
}
}
@ -494,12 +499,6 @@ public final class L2ControllableMobAI extends L2AttackableAI
return getGroupTarget().getRandomMob();
}
public L2ControllableMobAI(AIAccessor accessor)
{
super(accessor);
setAlternateAI(AI_IDLE);
}
public int getAlternateAI()
{
return _alternateAI;