From 4728aaac45fbbffa3d285d1f37ba2d8ce06b1f21 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 23 Oct 2019 19:59:28 +0000 Subject: [PATCH] Removed quest entry conditions from Kartia's Labyrinth. Contributed by Edoo. --- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- .../KartiasLabyrinth/KartiasLabyrinth.java | 62 ++++--------------- 8 files changed, 96 insertions(+), 400 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: { diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java index d2b30c20aa..bbf6f1e6b8 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java +++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/instances/KartiasLabyrinth/KartiasLabyrinth.java @@ -34,19 +34,11 @@ import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureDeath; import org.l2jmobius.gameserver.model.events.impl.creature.OnCreatureSee; import org.l2jmobius.gameserver.model.holders.SkillHolder; import org.l2jmobius.gameserver.model.instancezone.Instance; -import org.l2jmobius.gameserver.model.quest.QuestState; -import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.model.zone.ZoneType; import org.l2jmobius.gameserver.network.NpcStringId; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; import instances.AbstractInstance; -import quests.Q00494_IncarnationOfGreedZellakaGroup.Q00494_IncarnationOfGreedZellakaGroup; -import quests.Q00495_IncarnationOfJealousyPellineGroup.Q00495_IncarnationOfJealousyPellineGroup; -import quests.Q00496_IncarnationOfGluttonyKaliosGroup.Q00496_IncarnationOfGluttonyKaliosGroup; -import quests.Q00497_IncarnationOfGreedZellakaSolo.Q00497_IncarnationOfGreedZellakaSolo; -import quests.Q00498_IncarnationOfJealousyPellineSolo.Q00498_IncarnationOfJealousyPellineSolo; -import quests.Q00499_IncarnationOfGluttonyKaliosSolo.Q00499_IncarnationOfGluttonyKaliosSolo; /** * Kartia Labyrinth instance zone. @@ -217,63 +209,33 @@ public class KartiasLabyrinth extends AbstractInstance } case "request_zellaka_solo": { - final QuestState qs = player.getQuestState(Q00497_IncarnationOfGreedZellakaSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_85); + return null; } case "request_pelline_solo": { - final QuestState qs = player.getQuestState(Q00498_IncarnationOfJealousyPellineSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_90); + return null; } case "request_kalios_solo": { - final QuestState qs = player.getQuestState(Q00499_IncarnationOfGluttonyKaliosSolo.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_SOLO_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_SOLO_95); + return null; } case "request_zellaka_party": { - final QuestState qs = player.getQuestState(Q00494_IncarnationOfGreedZellakaGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_85); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_85); + return null; } case "request_pelline_party": { - final QuestState qs = player.getQuestState(Q00495_IncarnationOfJealousyPellineGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_90); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_90); + return null; } case "request_kalios_party": { - final QuestState qs = player.getQuestState(Q00496_IncarnationOfGluttonyKaliosGroup.class.getSimpleName()); - if ((qs != null) && (qs.getState() == State.STARTED) && qs.isCond(1)) - { - enterInstance(player, npc, TEMPLATE_ID_GROUP_95); - return null; - } - return "33647-9.htm"; + enterInstance(player, npc, TEMPLATE_ID_GROUP_95); + return null; } default: {