From 7e9006ca925f73d3f2781a8682e5720aeffa9d1f Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 20 Nov 2019 22:32:14 +0000 Subject: [PATCH] Level condition corrections for quests 763 and 902. Contributed by Edoo. --- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java | 2 ++ .../data/scripts/quests/Q00763_ADauntingTask/noLevel.html | 2 +- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java | 2 ++ .../data/scripts/quests/Q00763_ADauntingTask/noLevel.html | 2 +- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java | 2 ++ .../data/scripts/quests/Q00763_ADauntingTask/noLevel.html | 2 +- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- .../quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java | 2 ++ .../data/scripts/quests/Q00763_ADauntingTask/noLevel.html | 2 +- .../quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java | 6 ++---- 15 files changed, 26 insertions(+), 32 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 7fb867ca3f..c667522b1f 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -60,6 +60,7 @@ public class Q00763_ADauntingTask extends Quest private static final int SP = 5026; // Misc private static final int MIN_LEVEL = 70; + private static final int MAX_LEVEL = 75; private static final QuestType QUEST_TYPE = QuestType.REPEATABLE; // REPEATABLE, ONE_TIME, DAILY public Q00763_ADauntingTask() @@ -71,6 +72,7 @@ public class Q00763_ADauntingTask extends Quest addKillId(MONSTERS_MALICE); registerQuestItems(EYE.getId(), MALICE.getId()); addCondMinLevel(MIN_LEVEL, "noLevel.html"); + addCondMaxLevel(MAX_LEVEL, "noLevel.html"); } @Override diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html index 0369ddeb1e..0a29e485a8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html @@ -1,4 +1,4 @@ Giant's Minion Janitt:
Sorry, but I need someone a little more, uh, imposing. Come back when you're stronger, ok?
-(Only characters Lv. 70 or above may undertake this quest.) +(Only characters starting at level 70 and the maximum level of player 75 can take on this quest.) \ No newline at end of file diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 7fb867ca3f..c667522b1f 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -60,6 +60,7 @@ public class Q00763_ADauntingTask extends Quest private static final int SP = 5026; // Misc private static final int MIN_LEVEL = 70; + private static final int MAX_LEVEL = 75; private static final QuestType QUEST_TYPE = QuestType.REPEATABLE; // REPEATABLE, ONE_TIME, DAILY public Q00763_ADauntingTask() @@ -71,6 +72,7 @@ public class Q00763_ADauntingTask extends Quest addKillId(MONSTERS_MALICE); registerQuestItems(EYE.getId(), MALICE.getId()); addCondMinLevel(MIN_LEVEL, "noLevel.html"); + addCondMaxLevel(MAX_LEVEL, "noLevel.html"); } @Override diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html index 0369ddeb1e..0a29e485a8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html @@ -1,4 +1,4 @@ Giant's Minion Janitt:
Sorry, but I need someone a little more, uh, imposing. Come back when you're stronger, ok?
-(Only characters Lv. 70 or above may undertake this quest.) +(Only characters starting at level 70 and the maximum level of player 75 can take on this quest.) \ No newline at end of file diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 7fb867ca3f..c667522b1f 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -60,6 +60,7 @@ public class Q00763_ADauntingTask extends Quest private static final int SP = 5026; // Misc private static final int MIN_LEVEL = 70; + private static final int MAX_LEVEL = 75; private static final QuestType QUEST_TYPE = QuestType.REPEATABLE; // REPEATABLE, ONE_TIME, DAILY public Q00763_ADauntingTask() @@ -71,6 +72,7 @@ public class Q00763_ADauntingTask extends Quest addKillId(MONSTERS_MALICE); registerQuestItems(EYE.getId(), MALICE.getId()); addCondMinLevel(MIN_LEVEL, "noLevel.html"); + addCondMaxLevel(MAX_LEVEL, "noLevel.html"); } @Override diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html index 0369ddeb1e..0a29e485a8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html @@ -1,4 +1,4 @@ Giant's Minion Janitt:
Sorry, but I need someone a little more, uh, imposing. Come back when you're stronger, ok?
-(Only characters Lv. 70 or above may undertake this quest.) +(Only characters starting at level 70 and the maximum level of player 75 can take on this quest.) \ No newline at end of file diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html": diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java index 7fb867ca3f..c667522b1f 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/Q00763_ADauntingTask.java @@ -60,6 +60,7 @@ public class Q00763_ADauntingTask extends Quest private static final int SP = 5026; // Misc private static final int MIN_LEVEL = 70; + private static final int MAX_LEVEL = 75; private static final QuestType QUEST_TYPE = QuestType.REPEATABLE; // REPEATABLE, ONE_TIME, DAILY public Q00763_ADauntingTask() @@ -71,6 +72,7 @@ public class Q00763_ADauntingTask extends Quest addKillId(MONSTERS_MALICE); registerQuestItems(EYE.getId(), MALICE.getId()); addCondMinLevel(MIN_LEVEL, "noLevel.html"); + addCondMaxLevel(MAX_LEVEL, "noLevel.html"); } @Override diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html index 0369ddeb1e..0a29e485a8 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00763_ADauntingTask/noLevel.html @@ -1,4 +1,4 @@ Giant's Minion Janitt:
Sorry, but I need someone a little more, uh, imposing. Come back when you're stronger, ok?
-(Only characters Lv. 70 or above may undertake this quest.) +(Only characters starting at level 70 and the maximum level of player 75 can take on this quest.) \ No newline at end of file diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java index 9b52947d56..1acc108d37 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q00902_ReclaimOurEra/Q00902_ReclaimOurEra.java @@ -62,6 +62,7 @@ public class Q00902_ReclaimOurEra extends Quest addStartNpc(MATHIAS); addTalkId(MATHIAS); addKillId(MONSTER_DROPS.keySet()); + addCondMinLevel(MIN_LVL, getNoQuestMsg(null)); registerQuestItems(SHATTERED_BONES, CANNIBALISTIC_STAKATO_LDR_CLAW, ANAIS_SCROLL); } @@ -89,10 +90,7 @@ public class Q00902_ReclaimOurEra extends Quest { case "31340-04.htm": { - if (qs.isCreated()) - { - htmltext = event; - } + htmltext = event; break; } case "31340-05.html":