Member range check for Lindvior and Kelbim.

Contributed by Sero.
This commit is contained in:
MobiusDevelopment 2020-11-09 23:13:27 +00:00
parent f6848f43de
commit 25ff1c296e
17 changed files with 175 additions and 64 deletions

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";

View File

@ -313,7 +313,6 @@ public class Kelbim extends AbstractNpcAI
{
return "34052-1.html";
}
if (!player.isInParty())
{
final NpcHtmlMessage packet = new NpcHtmlMessage(npc.getObjectId());
@ -327,6 +326,13 @@ public class Kelbim extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, 1000))
{
return "34052-2.html";
}
}
if (!isPartyLeader)
{
return "34052-3.html";
@ -342,18 +348,18 @@ public class Kelbim extends AbstractNpcAI
{
for (PlayerInstance member : members)
{
if (member.isInsideRadius3D(npc, 1000))
if ((status == ALIVE) && member.isInsideRadius3D(npc, 1000))
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
member.teleToLocation(KELBIM_LOCATION, true);
}
else
{
return "34052-3.html";
}
}
}
if (status == ALIVE)
{
GrandBossManager.getInstance().setBossStatus(KELBIM, WAITING);
startQuestTimer("stage_1_start", Config.KELBIM_WAIT_TIME * 60 * 1000, null, null);
}
}
return super.onTalk(npc, player);
}

View File

@ -78,6 +78,13 @@ public class KatoSicanus extends AbstractNpcAI
final boolean isInCC = party.isInCommandChannel();
final List<PlayerInstance> members = (isInCC) ? party.getCommandChannel().getMembers() : party.getMembers();
final boolean isPartyLeader = (isInCC) ? party.getCommandChannel().isLeader(player) : party.isLeader(player);
for (PlayerInstance member : members)
{
if (!member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
return "33881-4.html";
}
}
if (!isPartyLeader)
{
return "33881-3.html";