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

Reuse of party range configuration.

Browse Source
This commit is contained in:
MobiusDev
2019-01-23 03:14:45 +00:00
parent 283f87c38e
commit bf417153d9
840 changed files with 1948 additions and 979 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Lindvior/KatoSicanus/KatoSicanus.java vendored
View File

@@ -104,7 +104,7 @@ public class KatoSicanus extends AbstractNpcAI
}
for (L2PcInstance member : members)
{
if (member.isInsideRadius3D(npc, 1500))
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(LINDVIOR_LOCATION, true);
addSpawn(INVISIBLE, 46707, -28586, -1400, 0, false, 0, false);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Trasken/Daichir/Daichir.java vendored
View File

@@ -104,7 +104,7 @@ public class Daichir extends AbstractNpcAI
}
for (L2PcInstance member : members)
{
if (member.isInsideRadius3D(npc, 1500))
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ENTER_LOCATION, true);
GrandBossManager.getInstance().setBossStatus(TRASKEN, FIGHTING);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/ai/bosses/Zaken/CavernOfThePirateCaptain.java vendored
View File

@@ -19,6 +19,7 @@ package ai.bosses.Zaken;
import java.util.ArrayList;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.StatsSet;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -267,7 +268,7 @@ public final class CavernOfThePirateCaptain extends AbstractInstance
if (npc.getId() == ZAKEN_83)
{
final long time = world.getElapsedTime();
for (L2PcInstance playersInside : world.getPlayersInsideRadius(npc, 1500))
for (L2PcInstance playersInside : world.getPlayersInsideRadius(npc, Config.ALT_PARTY_RANGE))
{
for (int[] reward : VORPAL_JEWELS)
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/PrisonOfDarkness/PrisonOfDarkness.java vendored
View File

@@ -16,6 +16,7 @@
*/
package instances.PrisonOfDarkness;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.Movie;
import com.l2jmobius.gameserver.model.Location;
import com.l2jmobius.gameserver.model.StatsSet;
@@ -216,7 +217,7 @@ public final class PrisonOfDarkness extends AbstractInstance
{
for (L2PcInstance member : player.getParty().getMembers())
{
if (member.isInsideRadius3D(npc, 1500))
if (member.isInsideRadius3D(npc, Config.ALT_PARTY_RANGE))
{
member.teleToLocation(ORBIS_LOCATION);
}

7
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00144_PailakaInjuredDragon/Q00144_PailakaInjuredDragon.java vendored
View File

@@ -294,12 +294,9 @@ public class Q00144_PailakaInjuredDragon extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if (qs != null)
if (qs != null && qs.isCond(3))
{
if (qs.isCond(3) && (npc.calculateDistance2D(killer) <= 1500))
{
qs.setCond(4, true);
}
qs.setCond(4, true);
}
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00180_InfernalFlamesBurningInCrystalPrison/Q00180_InfernalFlamesBurningInCrystalPrison.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00180_InfernalFlamesBurningInCrystalPrison;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -105,7 +106,7 @@ public class Q00180_InfernalFlamesBurningInCrystalPrison extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
giveItems(player, BELETH_MARK, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00181_DevilsStrikeBackAdventOfBalok/Q00181_DevilsStrikeBackAdventOfBalok.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00181_DevilsStrikeBackAdventOfBalok;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
@@ -139,7 +140,7 @@ public class Q00181_DevilsStrikeBackAdventOfBalok extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
giveItems(player, CONTRACT, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00186_ContractExecution/Q00186_ContractExecution.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00186_ContractExecution;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -147,7 +148,7 @@ public final class Q00186_ContractExecution extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if ((qs != null) && qs.isMemoState(2) && Util.checkIfInRange(1500, npc, killer, false) && (getRandom(100) < MONSTERS.get(npc.getId())) && !hasQuestItems(killer, LETO_LIZARDMAN_ACCESSORY))
if ((qs != null) && qs.isMemoState(2) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, false) && (getRandom(100) < MONSTERS.get(npc.getId())) && !hasQuestItems(killer, LETO_LIZARDMAN_ACCESSORY))
{
giveItems(killer, LETO_LIZARDMAN_ACCESSORY, 1);
playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00193_SevenSignsDyingMessage/Q00193_SevenSignsDyingMessage.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00193_SevenSignsDyingMessage;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.Movie;
@@ -216,7 +217,7 @@ public final class Q00193_SevenSignsDyingMessage extends Quest
}
final QuestState st = getQuestState(partyMember, false);
if (npc.isInsideRadius3D(partyMember, 1500))
if (npc.isInsideRadius3D(partyMember, Config.ALT_PARTY_RANGE))
{
giveItems(partyMember, SCULPTURE_OF_DOUBT, 1);
playSound(partyMember, QuestSound.ITEMSOUND_QUEST_FINISH);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00197_SevenSignsTheSacredBookOfSeal/Q00197_SevenSignsTheSacredBookOfSeal.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00197_SevenSignsTheSacredBookOfSeal;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.QuestSound;
@@ -231,7 +232,7 @@ public final class Q00197_SevenSignsTheSacredBookOfSeal extends Quest
}
final QuestState st = getQuestState(partyMember, false);
if (npc.isInsideRadius3D(partyMember, 1500))
if (npc.isInsideRadius3D(partyMember, Config.ALT_PARTY_RANGE))
{
giveItems(partyMember, SCULPTURE_OF_DOUBT, 1);
playSound(partyMember, QuestSound.ITEMSOUND_QUEST_FINISH);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00198_SevenSignsEmbryo/Q00198_SevenSignsEmbryo.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00198_SevenSignsEmbryo;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.Movie;
@@ -179,7 +180,7 @@ public final class Q00198_SevenSignsEmbryo extends Quest
}
final QuestState st = getQuestState(partyMember, false);
if (npc.isInsideRadius3D(partyMember, 1500))
if (npc.isInsideRadius3D(partyMember, Config.ALT_PARTY_RANGE))
{
giveItems(partyMember, SCULPTURE_OF_DOUBT, 1);
st.setCond(2, true);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00270_TheOneWhoEndsSilence/Q00270_TheOneWhoEndsSilence.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00270_TheOneWhoEndsSilence;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -445,7 +446,7 @@ public class Q00270_TheOneWhoEndsSilence extends Quest
*/
private static void giveItem(L2PcInstance player, L2Npc npc, int chance, boolean atLeastOne)
{
if ((player != null) && Util.checkIfInRange(1500, npc, player, false))
if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
final int count = ((getRandom(1000) < chance) ? 1 : 0) + (atLeastOne ? 1 : 0);
if (count > 0)

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00371_ShrieksOfGhosts/Q00371_ShrieksOfGhosts.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00371_ShrieksOfGhosts;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
@@ -185,7 +186,7 @@ public final class Q00371_ShrieksOfGhosts extends Quest
{
final QuestState qs = getQuestState(killer, false);
if ((qs == null) || !Util.checkIfInRange(1500, npc, killer, true))
if ((qs == null) || !Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true))
{
return null;
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00386_StolenDignity/Q00386_StolenDignity.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -805,7 +806,7 @@ public final class Q00386_StolenDignity extends Quest
player.getParty().getMembers().stream().forEach(pm ->
{
final QuestState qss = getQuestState(pm, false);
if ((qss != null) && qss.isStarted() && Util.checkIfInRange(1500, npc, pm, true))
if ((qss != null) && qss.isStarted() && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, pm, true))
{
candidates.add(qss);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00421_LittleWingsBigAdventure/Q00421_LittleWingsBigAdventure.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00421_LittleWingsBigAdventure;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.ai.CtrlIntention;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.QuestSound;
@@ -459,7 +460,7 @@ public final class Q00421_LittleWingsBigAdventure extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
if (Util.checkIfInRange(1500, killer, npc, true))
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, killer, npc, true))
{
for (int i = 0; i < 20; i++)
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00453_NotStrongEnoughAlone/Q00453_NotStrongEnoughAlone.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00453_NotStrongEnoughAlone;
import java.util.HashSet;
import java.util.Set;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
@@ -95,7 +96,7 @@ public final class Q00453_NotStrongEnoughAlone extends Quest
int npcId = npc.getId();
if (Util.checkIfInRange(1500, npc, player, false))
if (Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
if (CommonUtil.contains(MONSTER1, npcId) && st.isCond(2))
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00455_WingsOfSand/Q00455_WingsOfSand.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00455_WingsOfSand;
import java.util.Arrays;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -74,7 +75,7 @@ public class Q00455_WingsOfSand extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false) && (getRandom(1000) < CHANCE))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (getRandom(1000) < CHANCE))
{
giveItems(player, LARGE_BABY_DRAGON, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00456_DontKnowDontCare/Q00456_DontKnowDontCare.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.datatables.ItemTable;
import com.l2jmobius.gameserver.enums.ChatType;
@@ -301,7 +302,7 @@ public final class Q00456_DontKnowDontCare extends Quest
if (attacker.isInParty() //
&& attacker.getParty().isInCommandChannel() //
&& attacker.getParty().getCommandChannel().equals(cc) // only players from the same cc are allowed
&& Util.checkIfInRange(1500, npc, attacker, true))
&& Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, attacker, true))
{
allowedPlayers.add(attacker.getObjectId());
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00459_TheVillainOfTheUndergroundMineTeredor/Q00459_TheVillainOfTheUndergroundMineTeredor.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00459_TheVillainOfTheUndergroundMineTeredor;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -126,7 +127,7 @@ public class Q00459_TheVillainOfTheUndergroundMineTeredor extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
qs.setCond(2, true);
}

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00460_PreciousResearchMaterial/Q00460_PreciousResearchMaterial.java vendored
View File

@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.util.Util;
/**
* Precious Research Material (460)
@@ -122,8 +121,8 @@ public class Q00460_PreciousResearchMaterial extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
if (giveItemRandomly(killer, TEREDOR_EGG_FRAGMENT, 1, 20, 0.7, true))
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00468_BeLostInTheMysteriousScent/Q00468_BeLostInTheMysteriousScent.java vendored
View File

@@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.util.Util;
/**
* Be Lost in the Mysterious Scent (468)
@@ -134,7 +133,7 @@ public class Q00468_BeLostInTheMysteriousScent extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
if (qs != null)
{
switch (npc.getId())
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00469_SuspiciousGardener/Q00469_SuspiciousGardener.java vendored
View File

@@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.util.Util;
/**
* Suspicious Gardener (469)
@@ -133,8 +132,8 @@ public class Q00469_SuspiciousGardener extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
int kills = qs.getInt(Integer.toString(APHERIUS_LOOKOUT_BEWILDERED));
if (kills < 30)

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00471_BreakingThroughTheEmeraldSquare/Q00471_BreakingThroughTheEmeraldSquare.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00471_BreakingThroughTheEmeraldSquare;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -108,7 +109,7 @@ public class Q00471_BreakingThroughTheEmeraldSquare extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
qs.setCond(2, true);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00472_ChallengeSteamCorridor/Q00472_ChallengeSteamCorridor.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00472_ChallengeSteamCorridor;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -109,7 +110,7 @@ public class Q00472_ChallengeSteamCorridor extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
qs.setCond(2, true);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00473_InTheCoralGarden/Q00473_InTheCoralGarden.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00473_InTheCoralGarden;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -108,7 +109,7 @@ public class Q00473_InTheCoralGarden extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
qs.setCond(2, true);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00501_ProofOfClanAlliance/Q00501_ProofOfClanAlliance.java vendored
View File

@@ -20,6 +20,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.L2Clan;
@@ -539,7 +540,7 @@ public final class Q00501_ProofOfClanAlliance extends Quest
QuestState qs = getQuestState(player, false);
if (!player.isInParty())
{
if (!Util.checkIfInRange(1500, player, target, true))
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, player, target, true))
{
return null;
}
@@ -575,7 +576,7 @@ public final class Q00501_ProofOfClanAlliance extends Quest
}
qs = candidates.get(getRandom(candidates.size()));
if (!Util.checkIfInRange(1500, qs.getPlayer(), target, true))
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, qs.getPlayer(), target, true))
{
return null;
}

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00503_PursuitOfClanAmbition/Q00503_PursuitOfClanAmbition.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00503_PursuitOfClanAmbition;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.L2Clan;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -321,7 +322,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getQuestState(killer, false);
if ((qs == null) || !qs.isStarted() || !Util.checkIfInRange(1500, npc, killer, true))
if ((qs == null) || !qs.isStarted() || !Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true))
{
return super.onKill(npc, killer, isSummon);
}
@@ -333,7 +334,7 @@ public final class Q00503_PursuitOfClanAmbition extends Quest
}
final L2PcInstance leader = clan.getLeader().getPlayerInstance();
if ((leader == null) || !Util.checkIfInRange(1500, npc, leader, true))
if ((leader == null) || !Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, leader, true))
{
return super.onKill(npc, killer, isSummon);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00508_AClansReputation/Q00508_AClansReputation.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.L2Clan;
@@ -149,7 +150,7 @@ public class Q00508_AClansReputation extends Quest
else
{
final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance();
if ((pleader != null) && player.isInsideRadius3D(pleader, 1500))
if ((pleader != null) && player.isInsideRadius3D(pleader, Config.ALT_PARTY_RANGE))
{
qs = pleader.getQuestState(getName());
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00509_AClansFame/Q00509_AClansFame.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.L2Clan;
@@ -131,7 +132,7 @@ public class Q00509_AClansFame extends Quest
else
{
final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance();
if ((pleader != null) && player.isInsideRadius3D(pleader, 1500))
if ((pleader != null) && player.isInsideRadius3D(pleader, Config.ALT_PARTY_RANGE))
{
qs = pleader.getQuestState(getName());
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00510_AClansPrestige/Q00510_AClansPrestige.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00510_AClansPrestige;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.L2Clan;
@@ -95,7 +96,7 @@ public class Q00510_AClansPrestige extends Quest
else
{
final L2PcInstance pleader = player.getClan().getLeader().getPlayerInstance();
if ((pleader != null) && player.isInsideRadius3D(pleader, 1500))
if ((pleader != null) && player.isInsideRadius3D(pleader, Config.ALT_PARTY_RANGE))
{
qs = getQuestState(pleader, false);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00645_GhostsOfBatur;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -98,7 +99,7 @@ public class Q00645_GhostsOfBatur extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final L2PcInstance player = getRandomPartyMember(killer, 1);
if ((player != null) && Util.checkIfInRange(1500, npc, player, false) && (getRandom(1000) < CHANCES[npc.getId() - CONTAMINATED_MOREK_WARRIOR]))
if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && (getRandom(1000) < CHANCES[npc.getId() - CONTAMINATED_MOREK_WARRIOR]))
{
final QuestState qs = getQuestState(player, false);
giveItems(killer, CURSED_BURIAL_ITEMS, 1);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00662_AGameOfCards/Q00662_AGameOfCards.java vendored
View File

@@ -21,6 +21,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.Rnd;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -711,7 +712,7 @@ public final class Q00662_AGameOfCards extends Quest
}
final L2PcInstance player = players.get(Rnd.get(players.size()));
if ((player != null) && Util.checkIfInRange(1500, npc, player, false))
if ((player != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
if (MONSTERS.get(npc.getId()) < getRandom(1000))
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00751_LiberatingTheSpirits/Q00751_LiberatingTheSpirits.java vendored
View File

@@ -25,7 +25,6 @@ import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage;
import com.l2jmobius.gameserver.util.Util;
/**
* Liberating the Spirits (00751)
@@ -152,8 +151,8 @@ public final class Q00751_LiberatingTheSpirits extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
if ((giveItemRandomly(killer, DEADMANS_FLESH, 1, 40, 0.2, true)) && (qs.getMemoState() < 1))
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00754_AssistingTheRebelForces/Q00754_AssistingTheRebelForces.java vendored
View File

@@ -22,7 +22,6 @@ import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.util.Util;
/**
* @author hlwrave
@@ -131,8 +130,8 @@ public class Q00754_AssistingTheRebelForces extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00778_OperationRoaringFlame/Q00778_OperationRoaringFlame.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00778_OperationRoaringFlame;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -161,7 +162,7 @@ public class Q00778_OperationRoaringFlame extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
if ((getQuestItemsCount(player, TURAKANS_SECRET_LETTER) < 500) && (getRandom(100) < 70))
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00902_ReclaimOurEra;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -67,7 +68,7 @@ public final class Q00902_ReclaimOurEra extends Quest
private void giveItem(L2Npc npc, L2PcInstance player)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isStarted() && !qs.isCond(5) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isStarted() && !qs.isCond(5) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
giveItems(player, MONSTER_DROPS.get(npc.getId()), 1);
qs.setCond(5, true);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00903_TheCallOfAntharas/Q00903_TheCallOfAntharas.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00903_TheCallOfAntharas;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -87,7 +88,7 @@ public class Q00903_TheCallOfAntharas extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00905_RefinedDragonBlood/Q00905_RefinedDragonBlood.java vendored
View File

@@ -19,6 +19,7 @@ package quests.Q00905_RefinedDragonBlood;
import java.util.HashMap;
import java.util.Map;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -83,7 +84,7 @@ public final class Q00905_RefinedDragonBlood extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
final int itemId = MONSTERS.get(npc.getId());
if (getQuestItemsCount(player, itemId) < DRAGON_BLOOD_COUNT)

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00906_TheCallOfValakas/Q00906_TheCallOfValakas.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q00906_TheCallOfValakas;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.enums.QuestType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -55,7 +56,7 @@ public class Q00906_TheCallOfValakas extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
giveItems(player, LAVASAURUS_ALPHA_FRAGMENT, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10310_TwistedCreationTree/Q10310_TwistedCreationTree.java vendored
View File

@@ -23,7 +23,6 @@ import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.util.Util;
import quests.Q10302_UnsettlingShadowAndRumors.Q10302_UnsettlingShadowAndRumors;
@@ -176,7 +175,7 @@ public final class Q10310_TwistedCreationTree extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, 2, 3, npc);
if ((qs != null) && qs.isCond(2) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
if (qs != null)
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10369_NoblesseSoulTesting/Q10369_NoblesseSoulTesting.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10369_NoblesseSoulTesting;
import com.l2jmobius.Config;
import com.l2jmobius.commons.util.CommonUtil;
import com.l2jmobius.gameserver.enums.Movie;
import com.l2jmobius.gameserver.enums.QuestSound;
@@ -443,7 +444,7 @@ public final class Q10369_NoblesseSoulTesting extends Quest
final L2PcInstance partyMember = getRandomPartyMember(killer);
final QuestState qs = getQuestState(partyMember, false);
if (canProgress(partyMember) && (qs != null) && qs.isStarted() && (partyMember.calculateDistance2D(npc) <= 1500))
if (canProgress(partyMember) && (qs != null) && qs.isStarted() && (partyMember.calculateDistance2D(npc) <= Config.ALT_PARTY_RANGE))
{
switch (qs.getCond())
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10371_GraspThyPower/Q10371_GraspThyPower.java vendored
View File

@@ -24,7 +24,6 @@ import com.l2jmobius.gameserver.model.holders.ItemHolder;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.util.Util;
import quests.Q10370_MenacingTimes.Q10370_MenacingTimes;
@@ -126,8 +125,8 @@ public class Q10371_GraspThyPower extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10374_ThatPlaceSuccubus/Q10374_ThatPlaceSuccubus.java vendored
View File

@@ -28,7 +28,6 @@ import com.l2jmobius.gameserver.model.quest.State;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.util.Util;
/**
* That Place Succubus (10374)
@@ -193,7 +192,7 @@ public class Q10374_ThatPlaceSuccubus extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, 3, 3, npc);
if ((qs != null) && qs.isCond(3) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
if (qs != null)
{
switch (npc.getId())
{

6
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10375_SuccubusDisciples/Q10375_SuccubusDisciples.java vendored
View File

@@ -27,7 +27,6 @@ import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.network.NpcStringId;
import com.l2jmobius.gameserver.network.serverpackets.ExQuestNpcLogList;
import com.l2jmobius.gameserver.network.serverpackets.NpcSay;
import com.l2jmobius.gameserver.util.Util;
import quests.Q10374_ThatPlaceSuccubus.Q10374_ThatPlaceSuccubus;
@@ -159,7 +158,7 @@ public class Q10375_SuccubusDisciples extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
if ((qs != null) && qs.isCond(1))
{
switch (npc.getId())
{
@@ -198,8 +197,7 @@ public class Q10375_SuccubusDisciples extends Quest
playSound(killer, QuestSound.ITEMSOUND_QUEST_MIDDLE);
}
}
else if ((qs != null) && qs.isCond(3) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
else if ((qs != null) && qs.isCond(3))
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10378_WeedingWork/Q10378_WeedingWork.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10378_WeedingWork;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
@@ -126,7 +127,7 @@ public final class Q10378_WeedingWork extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10379_AnUninvitedGuest/Q10379_AnUninvitedGuest.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10379_AnUninvitedGuest;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -142,7 +143,7 @@ public final class Q10379_AnUninvitedGuest extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
switch (npc.getId())
{

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10380_TheExecutionersExecution/Q10380_TheExecutionersExecution.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10380_TheExecutionersExecution;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.ChatType;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -137,7 +138,7 @@ public final class Q10380_TheExecutionersExecution extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && Util.checkIfInRange(1500, npc, player, false) && qs.isCond(1))
if ((qs != null) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false) && qs.isCond(1))
{
switch (npc.getId())
{

5
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10382_DayOfLiberation/Q10382_DayOfLiberation.java vendored
View File

@@ -21,7 +21,6 @@ import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
import com.l2jmobius.gameserver.model.quest.QuestState;
import com.l2jmobius.gameserver.util.Util;
import quests.Q10381_ToTheSeedOfHellfire.Q10381_ToTheSeedOfHellfire;
@@ -110,8 +109,8 @@ public class Q10382_DayOfLiberation extends Quest
@Override
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, -1, 3, npc);
if ((qs != null) && qs.isStarted() && qs.isCond(1) && Util.checkIfInRange(1500, npc, qs.getPlayer(), false))
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (qs != null)
{
qs.setCond(2);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10444_TheOriginOfMonsters/Q10444_TheOriginOfMonsters.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10444_TheOriginOfMonsters;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -150,7 +151,7 @@ public final class Q10444_TheOriginOfMonsters extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
giveItems(player, CHUNK_OF_A_CROPSE, 1);
playSound(player, QuestSound.ITEMSOUND_QUEST_ITEMGET);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10446_HitAndRun/Q10446_HitAndRun.java vendored
View File

@@ -133,7 +133,7 @@ public final class Q10446_HitAndRun extends Quest
public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
{
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if ((qs != null) && qs.isCond(1))
if (qs != null)
{
int count = qs.getInt(KILL_COUNT_VAR);
qs.set(KILL_COUNT_VAR, ++count);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10447_TimingIsEverything/Q10447_TimingIsEverything.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10447_TimingIsEverything;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
@@ -147,7 +148,7 @@ public class Q10447_TimingIsEverything extends Quest
{
final QuestState qs = getRandomPartyMemberState(killer, 1, 3, npc);
if (!Util.checkIfInRange(1500, npc, killer, true))
if (!Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, killer, true))
{
return null;
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10459_ASickAmbition/Q10459_ASickAmbition.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10459_ASickAmbition;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.quest.Quest;
@@ -141,7 +142,7 @@ public class Q10459_ASickAmbition extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
qs.setCond(2, true);
}

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10501_ZakenEmbroideredSoulCloak/Q10501_ZakenEmbroideredSoulCloak.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10501_ZakenEmbroideredSoulCloak;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -54,7 +55,7 @@ public class Q10501_ZakenEmbroideredSoulCloak extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
final long currentCount = getQuestItemsCount(player, ZAKENS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10502_FreyaEmbroideredSoulCloak/Q10502_FreyaEmbroideredSoulCloak.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10502_FreyaEmbroideredSoulCloak;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -54,7 +55,7 @@ public class Q10502_FreyaEmbroideredSoulCloak extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
final long currentCount = getQuestItemsCount(player, FREYAS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10503_FrintezzaEmbroideredSoulCloak/Q10503_FrintezzaEmbroideredSoulCloak.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10503_FrintezzaEmbroideredSoulCloak;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -55,7 +56,7 @@ public class Q10503_FrintezzaEmbroideredSoulCloak extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
final long currentCount = getQuestItemsCount(player, FRINTEZZAS_SOUL_FRAGMENT);
final long count = getRandom(1, 3);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10504_JewelOfAntharas/Q10504_JewelOfAntharas.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10504_JewelOfAntharas;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -55,7 +56,7 @@ public final class Q10504_JewelOfAntharas extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
takeItems(player, CLEAR_CRYSTAL, -1);
giveItems(player, FILLED_CRYSTAL_ANTHARAS_ENERGY, 1);

3
L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10505_JewelOfValakas/Q10505_JewelOfValakas.java vendored
View File

@@ -16,6 +16,7 @@
*/
package quests.Q10505_JewelOfValakas;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.enums.QuestSound;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -55,7 +56,7 @@ public class Q10505_JewelOfValakas extends Quest
public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
{
final QuestState qs = getQuestState(player, false);
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, player, false))
if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(Config.ALT_PARTY_RANGE, npc, player, false))
{
takeItems(player, EMPTY_CRYSTAL, -1);
giveItems(player, FILLED_CRYSTAL_VALAKAS_ENERGY, 1);