Addition of newer radius calculation methods.

This commit is contained in:
MobiusDevelopment
2021-03-28 10:05:00 +00:00
parent d3c54bde15
commit 7a11ed6ffe
106 changed files with 267 additions and 275 deletions

View File

@@ -1497,7 +1497,7 @@ public class Frintezza extends Quest
{
continue;
}
if (!member.isInsideRadius(npc, 700, false, false))
if (!member.isInsideRadius2D(npc, 700))
{
continue;
}
@@ -1533,7 +1533,7 @@ public class Frintezza extends Quest
{
continue;
}
if (!member.isInsideRadius(npc, 700, false, false))
if (!member.isInsideRadius2D(npc, 700))
{
continue;
}
@@ -1559,7 +1559,7 @@ public class Frintezza extends Quest
}
}
}
else if (player.isInsideRadius(npc, 700, false, false))
else if (player.isInsideRadius2D(npc, 700))
{
synchronized (_playersInside)
{
@@ -1587,7 +1587,7 @@ public class Frintezza extends Quest
{
continue;
}
if (!member.isInsideRadius(npc, 700, false, false))
if (!member.isInsideRadius2D(npc, 700))
{
continue;
}

View File

@@ -171,7 +171,7 @@ public class Gordon extends Quest
{
for (PlayerInstance pc : chars)
{
if (pc.isCursedWeaponEquipped() && pc.isInsideRadius(npc, 5000, false, false))
if (pc.isCursedWeaponEquipped() && pc.isInsideRadius2D(npc, 5000))
{
npc.setRunning();
((Attackable) npc).addDamageHate(pc, 0, 9999);

View File

@@ -214,7 +214,7 @@ public class Orfen extends Quest
npc.teleToLocation(43577, 15985, -4396, false);
startQuestTimer("ORFEN_REFRESH", 10000, npc, null);
}
else if (npc.isInsideRadius(attacker, 1000, false, false) && !npc.isInsideRadius(attacker, 300, false, false) && (Rnd.get(10) == 0))
else if (npc.isInsideRadius2D(attacker, 1000) && !npc.isInsideRadius2D(attacker, 300) && (Rnd.get(10) == 0))
{
attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ());
npc.setTarget(attacker);

View File

@@ -247,7 +247,7 @@ public class QueenAnt extends Quest
for (int i = 0; i < _minions.size(); i++)
{
final Attackable mob = _minions.get(i);
if ((mob != null) && !mob.isInsideRadius(npc.getX(), npc.getY(), 700, false))/* !_Zone.isInsideZone(mob)) */
if ((mob != null) && !mob.isInsideRadius2D(npc.getX(), npc.getY(), npc.getZ(), 700)) /* !_Zone.isInsideZone(mob)) */
{
mob.teleToLocation(npc.getX(), npc.getY(), npc.getZ());
}
@@ -407,7 +407,7 @@ public class QueenAnt extends Quest
public void getIntoPosition(MonsterInstance nurse, MonsterInstance caller)
{
if (!nurse.isInsideRadius(caller, 300, false, false))
if (!nurse.isInsideRadius2D(caller, 300))
{
nurse.getAI().moveToPawn(caller, 300);
}