diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/AbstractSagaQuest.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/AbstractSagaQuest.java index 36e4347fed..1c94554594 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/AbstractSagaQuest.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/AbstractSagaQuest.java @@ -624,33 +624,10 @@ public abstract class AbstractSagaQuest extends Quest } } - int[] Archon_Hellisha_Norm = - { - 18212, - 18214, - 18215, - 18216, - 18218 - }; - for (int element : Archon_Hellisha_Norm) - { - if (npcId == element) - { - QuestState st1 = findQuest(player); - if (st1 != null) - { - if (st1.isCond(15)) - { - // This is just a guess....not really sure what it actually says, if anything - autoChat(npc, Text[4].replace("PLAYERNAME", st1.getPlayer().getName())); - giveItems(st1.getPlayer(), Items[8], 1); - takeItems(st1.getPlayer(), Items[3], -1); - st1.setCond(16, true); - } - } - return super.onKill(npc, player, isSummon); - } - } + /* + * int[] Archon_Hellisha_Norm = { 18212, 18214, 18215, 18216, 18218 }; for (int element : Archon_Hellisha_Norm) { if (npcId == element) { QuestState st1 = findQuest(player); if (st1 != null) { if (st1.isCond(15)) { // This is just a guess....not really sure what it actually says, if anything + * autoChat(npc, Text[4].replace("PLAYERNAME", st1.getPlayer().getName())); giveItems(st1.getPlayer(), Items[8], 1); takeItems(st1.getPlayer(), Items[3], -1); st1.setCond(16, true); } } return super.onKill(npc, player, isSummon); } } + */ for (int Guardian_Angel = 27214; Guardian_Angel < 27217; Guardian_Angel++) { @@ -1039,15 +1016,9 @@ public abstract class AbstractSagaQuest extends Quest { addKillId(Archon_Minion); } - int[] Archon_Hellisha_Norm = - { - 18212, - 18214, - 18215, - 18216, - 18218 - }; - addKillId(Archon_Hellisha_Norm); + /* + * int[] Archon_Hellisha_Norm = { 18212, 18214, 18215, 18216, 18218 }; addKillId(Archon_Hellisha_Norm); + */ for (int Guardian_Angel = 27214; Guardian_Angel < 27217; Guardian_Angel++) { addKillId(Guardian_Angel); diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java index 6cf39926b4..318f6ae0a5 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00070_SagaOfThePhoenixKnight/Q00070_SagaOfThePhoenixKnight.java @@ -54,10 +54,10 @@ public class Q00070_SagaOfThePhoenixKnight extends AbstractSagaQuest 7299, 7330, 7361, - 7392, - 7423, + 0, // FIXME: 7392 - Resonance Amulet - 5 + 0, // FIXME: 7423 - Resonance Amulet - 6 7093, - 6482 + 0, // FIXME: 6482 - Big White Fat Fish }; Mob = new int[] { diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java index 5e4c084fdf..614e9cab74 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00071_SagaOfEvasTemplar/Q00071_SagaOfEvasTemplar.java @@ -33,7 +33,7 @@ public class Q00071_SagaOfEvasTemplar extends AbstractSagaQuest { 30852, 31624, - 31278, + 0, // FIXME 31278 - Bronwyn 30852, 31638, 31646, @@ -54,10 +54,10 @@ public class Q00071_SagaOfEvasTemplar extends AbstractSagaQuest 7300, 7331, 7362, - 7393, - 7424, + 0, // FIXME: 7393 - Resonance Amulet - 5 + 0, // FIXME: 7424 - Resonance Amulet - 6 7094, - 6482 + 0, // FIXME: 6482 - Big White Fat Fish }; Mob = new int[] { diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java index adad27190c..0fd5074b31 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00072_SagaOfTheSwordMuse/Q00072_SagaOfTheSwordMuse.java @@ -33,15 +33,15 @@ public class Q00072_SagaOfTheSwordMuse extends AbstractSagaQuest { 30853, 31624, - 31583, - 31537, + 0, // FIXME: 31583 - Feynn + 0, // FIXME: 31537 - Tunatun 31618, 31646, 31649, 31652, 31654, 31655, - 31659, + 0, // FIXME: 31659 - Tablet of Vision 31281 }; Items = new int[] @@ -54,10 +54,10 @@ public class Q00072_SagaOfTheSwordMuse extends AbstractSagaQuest 7301, 7332, 7363, - 7394, - 7425, + 0, // FIXME: 7394 - Resonance Amulet - 5 + 0, // FIXME: 7425 - Resonance Amulet - 6 7095, - 6482 + 0, // FIXME: 6482 - Big White Fat Fish }; Mob = new int[] { diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java index 7db81d1eb3..53812dda7d 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00073_SagaOfTheDuelist/Q00073_SagaOfTheDuelist.java @@ -17,9 +17,6 @@ package quests.Q00073_SagaOfTheDuelist; import com.l2jmobius.gameserver.model.Location; -import com.l2jmobius.gameserver.model.actor.L2Npc; -import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance; -import com.l2jmobius.gameserver.model.quest.QuestState; import quests.AbstractSagaQuest; @@ -32,8 +29,8 @@ public class Q00073_SagaOfTheDuelist extends AbstractSagaQuest /** * Third Class Transfer Quest - Duelist: The quest asks for "Top-grade Meat" which can now be acquired directly through NPC Tunatun, instead of through an additional quest from NPC Tunatun. */ - private final int TUNATUN = 31537; - private final int TOPQUALITYMEAT = 7546; + // private final int TUNATUN = 31537; + // private final int TOPQUALITYMEAT = 7546; public Q00073_SagaOfTheDuelist() { @@ -43,7 +40,7 @@ public class Q00073_SagaOfTheDuelist extends AbstractSagaQuest 30849, 31624, 31226, - 31331, + 0, // FIXME: 31331 - Valdis 31639, 31646, 31647, @@ -63,10 +60,10 @@ public class Q00073_SagaOfTheDuelist extends AbstractSagaQuest 7302, 7333, 7364, - 7395, - 7426, + 0, // FIXME: 7395 - Resonance Amulet - 5 + 0, // FIXME: 7426 - Resonance Amulet - 6 7096, - 7546 + 0, // FIXME: 7546 - Top Quality Meat }; Mob = new int[] { @@ -111,27 +108,11 @@ public class Q00073_SagaOfTheDuelist extends AbstractSagaQuest }; registerNPCs(); - addTalkId(TUNATUN); + // addTalkId(TUNATUN); } - @Override - public String onTalk(L2Npc npc, L2PcInstance player) - { - if (npc.getId() == TUNATUN) - { - String htmltext = getNoQuestMsg(player); - QuestState st = getQuestState(player, false); - if ((st != null) && st.isCond(3)) - { - if (!hasQuestItems(player, TOPQUALITYMEAT)) - { - giveItems(player, TOPQUALITYMEAT, 1); - return "tunatun_01.htm"; - } - return "tunatun_02.htm"; - } - return htmltext; - } - return super.onTalk(npc, player); - } + /* + * @Override public String onTalk(L2Npc npc, L2PcInstance player) { if (npc.getId() == TUNATUN) { String htmltext = getNoQuestMsg(player); QuestState st = getQuestState(player, false); if ((st != null) && st.isCond(3)) { if (!hasQuestItems(player, TOPQUALITYMEAT)) { giveItems(player, + * TOPQUALITYMEAT, 1); return "tunatun_01.htm"; } return "tunatun_02.htm"; } return htmltext; } return super.onTalk(npc, player); } + */ } diff --git a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/0-03.htm b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/0-03.htm index 3ee0a4c43f..5d39a6b6f2 100644 --- a/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/0-03.htm +++ b/L2J_Mobius_Classic/dist/game/data/scripts/quests/Q00074_SagaOfTheDreadnought/0-03.htm @@ -1,4 +1,4 @@
Master Aiken: