From 3afe0d648b60e926ef864baf0529955a7526e23b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 15 Dec 2016 13:07:56 +0000 Subject: [PATCH] Added some missing arrow hacks. --- .../Q10320_LetsGoToTheCentralSquare.java | 2 + .../Q10321_QualificationsOfTheSeeker.java | 2 + .../Q10333_DisappearedSakum.java | 52 ++++++------- ...4_ReportingTheStatusOfTheWindmillHill.java | 16 ++-- .../Q10337_SakumsImpact.java | 74 +++++++++++++------ .../Q10341_DayOfDestinyHumansFate.java | 20 ++--- .../Q10342_DayOfDestinyElvenFate.java | 20 ++--- .../Q10343_DayOfDestinyDarkElfsFate.java | 20 ++--- .../Q10344_DayOfDestinyOrcsFate.java | 20 ++--- .../Q10345_DayOfDestinyDwarfsFate.java | 20 ++--- .../Q10346_DayOfDestinyKamaelsFate.java | 20 ++--- .../Q10368_RebellionOfMonsters.java | 54 +++++++------- 12 files changed, 184 insertions(+), 136 deletions(-) diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java index 76a8101003..f7952fb9f2 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10320_LetsGoToTheCentralSquare/Q10320_LetsGoToTheCentralSquare.java @@ -74,6 +74,8 @@ public final class Q10320_LetsGoToTheCentralSquare extends Quest case "32972-03.html": { qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_001_Radar_01.htm", TutorialShowHtml.LARGE_WINDOW)); htmltext = event; break; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java index 838910f40b..f70fa3c5ca 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10321_QualificationsOfTheSeeker/Q10321_QualificationsOfTheSeeker.java @@ -63,6 +63,8 @@ public final class Q10321_QualificationsOfTheSeeker extends Quest case "32975-03.html": { qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); player.sendPacket(new TutorialShowHtml(npc.getObjectId(), "..\\L2Text\\QT_027_Quest_01.htm", TutorialShowHtml.LARGE_WINDOW)); htmltext = event; break; diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java index d9959e4f91..c63915df10 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10333_DisappearedSakum/Q10333_DisappearedSakum.java @@ -67,8 +67,8 @@ public final class Q10333_DisappearedSakum extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -87,26 +87,28 @@ public final class Q10333_DisappearedSakum extends Quest } case "30332-05.html": { - st.startQuest(); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); htmltext = event; break; } case "33176-03.html": { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = event; - st.setCond(2, true); + qs.setCond(2, true); } break; } case "33508-03.html": { - if (st.isCond(3)) + if (qs.isCond(3)) { giveAdena(player, 800, true); addExpAndSp(player, 180000, 43); - st.exitQuest(false, true); + qs.exitQuest(false, true); htmltext = event; } break; @@ -119,9 +121,9 @@ public final class Q10333_DisappearedSakum extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); - switch (st.getState()) + switch (qs.getState()) { case State.CREATED: { @@ -137,20 +139,20 @@ public final class Q10333_DisappearedSakum extends Quest { case BATHIS: { - htmltext = st.isCond(0) ? "30332-06.html" : "30332-07.html"; + htmltext = qs.isCond(0) ? "30332-06.html" : "30332-07.html"; break; } case VENT: { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "33176-01.html"; } - else if (st.isCond(2)) + else if (qs.isCond(2)) { htmltext = "33176-04.html"; } - else if (st.isCond(3)) + else if (qs.isCond(3)) { htmltext = "33176-05.html"; } @@ -158,7 +160,7 @@ public final class Q10333_DisappearedSakum extends Quest } case SCHUNAIN: { - if (st.isCond(3)) + if (qs.isCond(3)) { htmltext = "33508-01.html"; } @@ -196,12 +198,12 @@ public final class Q10333_DisappearedSakum extends Quest @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - final QuestState st = getQuestState(killer, false); + final QuestState qs = getQuestState(killer, false); - if ((st != null) && st.isStarted() && st.isCond(2)) + if ((qs != null) && qs.isStarted() && qs.isCond(2)) { - int killedLizardmen = st.getInt("killed_" + LIZARDMEN); - int killedVakuOrc = st.getInt("killed_" + VAKU_ORC); + int killedLizardmen = qs.getInt("killed_" + LIZARDMEN); + int killedVakuOrc = qs.getInt("killed_" + VAKU_ORC); switch (npc.getId()) { @@ -210,7 +212,7 @@ public final class Q10333_DisappearedSakum extends Quest if (killedLizardmen < 7) { killedLizardmen++; - st.set("killed_" + LIZARDMEN, killedLizardmen); + qs.set("killed_" + LIZARDMEN, killedLizardmen); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -220,7 +222,7 @@ public final class Q10333_DisappearedSakum extends Quest if (killedVakuOrc < 5) { killedVakuOrc++; - st.set("killed_" + VAKU_ORC, killedVakuOrc); + qs.set("killed_" + VAKU_ORC, killedVakuOrc); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -238,7 +240,7 @@ public final class Q10333_DisappearedSakum extends Quest if ((getQuestItemsCount(killer, BADGE) == 5) && (killedLizardmen == 7) && (killedVakuOrc == 5)) { - st.setCond(3, true); + qs.setCond(3, true); } sendNpcLogList(killer); } @@ -248,12 +250,12 @@ public final class Q10333_DisappearedSakum extends Quest @Override public Set getNpcLogList(L2PcInstance activeChar) { - final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isStarted() && st.isCond(2)) + final QuestState qs = getQuestState(activeChar, false); + if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final Set npcLogList = new HashSet<>(2); - npcLogList.add(new NpcLogListHolder(LIZARDMEN, false, st.getInt("killed_" + LIZARDMEN))); - npcLogList.add(new NpcLogListHolder(VAKU_ORC, false, st.getInt("killed_" + VAKU_ORC))); + npcLogList.add(new NpcLogListHolder(LIZARDMEN, false, qs.getInt("killed_" + LIZARDMEN))); + npcLogList.add(new NpcLogListHolder(VAKU_ORC, false, qs.getInt("killed_" + VAKU_ORC))); return npcLogList; } return super.getNpcLogList(activeChar); diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java index f6ca590bb4..cb62c9066c 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10334_ReportingTheStatusOfTheWindmillHill/Q10334_ReportingTheStatusOfTheWindmillHill.java @@ -51,8 +51,8 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -68,17 +68,19 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest } case "33508-03.html": { - st.startQuest(); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); htmltext = event; break; } case "30332-03.html": { - if (st.isCond(1)) + if (qs.isCond(1)) { giveAdena(player, 850, true); addExpAndSp(player, 200000, 48); - st.exitQuest(false, true); + qs.exitQuest(false, true); htmltext = event; } break; @@ -91,9 +93,9 @@ public final class Q10334_ReportingTheStatusOfTheWindmillHill extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); - switch (st.getState()) + switch (qs.getState()) { case State.CREATED: { diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java index 46d37f7129..e63a8660db 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10337_SakumsImpact/Q10337_SakumsImpact.java @@ -59,8 +59,8 @@ public final class Q10337_SakumsImpact extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -76,26 +76,28 @@ public final class Q10337_SakumsImpact extends Quest } case "31795-03.html": { - st.startQuest(); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); htmltext = event; break; } case "33178-03.html": { - if (st.isCond(1)) + if (qs.isCond(1)) { - st.setCond(2); + qs.setCond(2); htmltext = event; } break; } case "33510-04.html": { - if (st.isCond(3)) + if (qs.isCond(3)) { giveAdena(player, 1030, true); addExpAndSp(player, 650000, 156); - st.exitQuest(false, true); + qs.exitQuest(false, true); htmltext = event; } break; @@ -108,9 +110,9 @@ public final class Q10337_SakumsImpact extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); - switch (st.getState()) + switch (qs.getState()) { case State.CREATED: { @@ -122,21 +124,27 @@ public final class Q10337_SakumsImpact extends Quest } case State.STARTED: { - switch (st.getCond()) + switch (qs.getCond()) { case 1: { switch (npc.getId()) { case ADVENTURE_GUILDSMAN: + { htmltext = "31795-04.html"; break; + } case SILVAN: + { htmltext = "33178-01.html"; break; + } case LEF: + { htmltext = "33510-01.html"; break; + } } break; } @@ -145,14 +153,20 @@ public final class Q10337_SakumsImpact extends Quest switch (npc.getId()) { case ADVENTURE_GUILDSMAN: + { htmltext = "31795-04.html"; break; + } case SILVAN: + { htmltext = "33178-04.html"; break; + } case LEF: + { htmltext = "33510-02.html"; break; + } } break; } @@ -161,14 +175,20 @@ public final class Q10337_SakumsImpact extends Quest switch (npc.getId()) { case ADVENTURE_GUILDSMAN: + { htmltext = "31795-04.html"; break; + } case SILVAN: + { htmltext = "33178-05.html"; break; + } case LEF: + { htmltext = "33510-03.html"; break; + } } break; } @@ -180,14 +200,20 @@ public final class Q10337_SakumsImpact extends Quest switch (npc.getId()) { case ADVENTURE_GUILDSMAN: + { htmltext = "31795-05.html"; break; + } case SILVAN: + { htmltext = "33178-06.html"; break; + } case LEF: + { htmltext = "33510-05.html"; break; + } } break; } @@ -198,13 +224,13 @@ public final class Q10337_SakumsImpact extends Quest @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - final QuestState st = getQuestState(killer, false); + final QuestState qs = getQuestState(killer, false); - if ((st != null) && st.isStarted() && st.isCond(2)) + if ((qs != null) && qs.isStarted() && qs.isCond(2)) { - int killedWarriors = st.getInt("killed_" + SKELETON_WARRIOR); - int killedImps = st.getInt("killed_" + RUIN_IMP); - int killedBats = st.getInt("killed_" + BAT); + int killedWarriors = qs.getInt("killed_" + SKELETON_WARRIOR); + int killedImps = qs.getInt("killed_" + RUIN_IMP); + int killedBats = qs.getInt("killed_" + BAT); switch (npc.getId()) { @@ -213,7 +239,7 @@ public final class Q10337_SakumsImpact extends Quest if (killedWarriors < 15) { killedWarriors++; - st.set("killed_" + SKELETON_WARRIOR, killedWarriors); + qs.set("killed_" + SKELETON_WARRIOR, killedWarriors); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -223,7 +249,7 @@ public final class Q10337_SakumsImpact extends Quest if (killedImps < 20) { killedImps++; - st.set("killed_" + RUIN_IMP, killedImps); + qs.set("killed_" + RUIN_IMP, killedImps); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -234,7 +260,7 @@ public final class Q10337_SakumsImpact extends Quest if (killedBats < 25) { killedBats++; - st.set("killed_" + BAT, killedBats); + qs.set("killed_" + BAT, killedBats); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -243,7 +269,7 @@ public final class Q10337_SakumsImpact extends Quest if ((killedWarriors == 15) && (killedImps == 20) && (killedBats == 25)) { - st.setCond(3, true); + qs.setCond(3, true); } sendNpcLogList(killer); } @@ -253,13 +279,13 @@ public final class Q10337_SakumsImpact extends Quest @Override public Set getNpcLogList(L2PcInstance activeChar) { - final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isStarted() && st.isCond(2)) + final QuestState qs = getQuestState(activeChar, false); + if ((qs != null) && qs.isStarted() && qs.isCond(2)) { final Set npcLogList = new HashSet<>(3); - npcLogList.add(new NpcLogListHolder(SKELETON_WARRIOR, false, st.getInt("killed_" + SKELETON_WARRIOR))); - npcLogList.add(new NpcLogListHolder(RUIN_IMP, false, st.getInt("killed_" + RUIN_IMP))); - npcLogList.add(new NpcLogListHolder(27458, false, st.getInt("killed_" + BAT))); // NOTE: Somehow quest log react on bad ID, maybe client bug + npcLogList.add(new NpcLogListHolder(SKELETON_WARRIOR, false, qs.getInt("killed_" + SKELETON_WARRIOR))); + npcLogList.add(new NpcLogListHolder(RUIN_IMP, false, qs.getInt("killed_" + RUIN_IMP))); + npcLogList.add(new NpcLogListHolder(27458, false, qs.getInt("killed_" + BAT))); // NOTE: Somehow quest log react on bad ID, maybe client bug return npcLogList; } return super.getNpcLogList(activeChar); diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java index 848bb4505a..e48ab4ea05 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10341_DayOfDestinyHumansFate/Q10341_DayOfDestinyHumansFate.java @@ -50,8 +50,8 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest } case "30857-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10341_DayOfDestinyHumansFate extends ThirdClassTransferQuest public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == ORVEN) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "30857-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "30857-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "30857-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java index ff23e75316..8a2b3b6f2d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10342_DayOfDestinyElvenFate/Q10342_DayOfDestinyElvenFate.java @@ -50,8 +50,8 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest } case "30856-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10342_DayOfDestinyElvenFate extends ThirdClassTransferQuest public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == WINONIN) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "30856-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "30856-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "30856-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java index 837d5e3e1a..c698bd481f 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10343_DayOfDestinyDarkElfsFate/Q10343_DayOfDestinyDarkElfsFate.java @@ -50,8 +50,8 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue } case "30862-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10343_DayOfDestinyDarkElfsFate extends ThirdClassTransferQue public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == OLTRAN) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "30862-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "30862-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "30862-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java index 937dca65b6..b95b53beb0 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10344_DayOfDestinyOrcsFate/Q10344_DayOfDestinyOrcsFate.java @@ -50,8 +50,8 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest } case "30865-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10344_DayOfDestinyOrcsFate extends ThirdClassTransferQuest public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == LADANZA) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "30865-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "30865-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "30865-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java index dbc19b0028..5061822416 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10345_DayOfDestinyDwarfsFate/Q10345_DayOfDestinyDwarfsFate.java @@ -50,8 +50,8 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest } case "30847-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10345_DayOfDestinyDwarfsFate extends ThirdClassTransferQuest public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == FERRIS) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "30847-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "30847-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "30847-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java index fd7dd2e9c2..4667197973 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10346_DayOfDestinyKamaelsFate/Q10346_DayOfDestinyKamaelsFate.java @@ -50,8 +50,8 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -69,8 +69,10 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues } case "32221-05.htm": { - st.startQuest(); - st.set("STARTED_CLASS", player.getClassId().getId()); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); + qs.set("STARTED_CLASS", player.getClassId().getId()); htmltext = event; break; } @@ -86,21 +88,21 @@ public final class Q10346_DayOfDestinyKamaelsFate extends ThirdClassTransferQues public String onTalk(L2Npc npc, L2PcInstance player, boolean isSimulated) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); if (npc.getId() == BROME) { - if (st.getState() == State.CREATED) + if (qs.getState() == State.CREATED) { htmltext = "32221-01.htm"; } - else if (st.getState() == State.STARTED) + else if (qs.getState() == State.STARTED) { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "32221-06.html"; } - else if (st.isCond(13)) + else if (qs.isCond(13)) { htmltext = "32221-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java index e43644e0b3..8bcb9ea19a 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10368_RebellionOfMonsters/Q10368_RebellionOfMonsters.java @@ -55,8 +55,8 @@ public final class Q10368_RebellionOfMonsters extends Quest @Override public String onAdvEvent(String event, L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); - if (st == null) + final QuestState qs = getQuestState(player, false); + if (qs == null) { return null; } @@ -71,17 +71,19 @@ public final class Q10368_RebellionOfMonsters extends Quest } case "33179-03.htm": { - st.startQuest(); + qs.startQuest(); + qs.setCond(2); // arrow hack + qs.setCond(1); htmltext = event; break; } case "33179-06.html": { - if (st.isCond(2)) + if (qs.isCond(2)) { giveAdena(player, 990, true); addExpAndSp(player, 750000, 180); - st.exitQuest(false, true); + qs.exitQuest(false, true); } break; } @@ -93,9 +95,9 @@ public final class Q10368_RebellionOfMonsters extends Quest public String onTalk(L2Npc npc, L2PcInstance player) { String htmltext = getNoQuestMsg(player); - final QuestState st = getQuestState(player, true); + final QuestState qs = getQuestState(player, true); - switch (st.getState()) + switch (qs.getState()) { case State.CREATED: { @@ -104,11 +106,11 @@ public final class Q10368_RebellionOfMonsters extends Quest } case State.STARTED: { - if (st.isCond(1)) + if (qs.isCond(1)) { htmltext = "33179-04.html"; } - else if (st.isCond(2)) + else if (qs.isCond(2)) { htmltext = "33179-05.html"; } @@ -126,14 +128,14 @@ public final class Q10368_RebellionOfMonsters extends Quest @Override public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon) { - final QuestState st = getQuestState(killer, false); + final QuestState qs = getQuestState(killer, false); - if ((st != null) && st.isStarted() && st.isCond(1)) + if ((qs != null) && qs.isStarted() && qs.isCond(1)) { - int killedJaguar = st.getInt("killed_" + WEARY_JAGUAR); - int killedJaguarScout = st.getInt("killed_" + WEARY_JAGUAR_SCOUT); - int killedSoldier = st.getInt("killed_" + ANT_SOLDIER); - int killedCaptain = st.getInt("killed_" + ANT_WARRIOR_CAPTAIN); + int killedJaguar = qs.getInt("killed_" + WEARY_JAGUAR); + int killedJaguarScout = qs.getInt("killed_" + WEARY_JAGUAR_SCOUT); + int killedSoldier = qs.getInt("killed_" + ANT_SOLDIER); + int killedCaptain = qs.getInt("killed_" + ANT_WARRIOR_CAPTAIN); switch (npc.getId()) { @@ -142,7 +144,7 @@ public final class Q10368_RebellionOfMonsters extends Quest if (killedJaguar < 10) { killedJaguar++; - st.set("killed_" + WEARY_JAGUAR, killedJaguar); + qs.set("killed_" + WEARY_JAGUAR, killedJaguar); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -152,7 +154,7 @@ public final class Q10368_RebellionOfMonsters extends Quest if (killedJaguarScout < 15) { killedJaguarScout++; - st.set("killed_" + WEARY_JAGUAR_SCOUT, killedJaguarScout); + qs.set("killed_" + WEARY_JAGUAR_SCOUT, killedJaguarScout); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -162,7 +164,7 @@ public final class Q10368_RebellionOfMonsters extends Quest if (killedSoldier < 15) { killedSoldier++; - st.set("killed_" + ANT_SOLDIER, killedSoldier); + qs.set("killed_" + ANT_SOLDIER, killedSoldier); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -172,7 +174,7 @@ public final class Q10368_RebellionOfMonsters extends Quest if (killedCaptain < 20) { killedCaptain++; - st.set("killed_" + ANT_WARRIOR_CAPTAIN, killedCaptain); + qs.set("killed_" + ANT_WARRIOR_CAPTAIN, killedCaptain); playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET); } break; @@ -181,7 +183,7 @@ public final class Q10368_RebellionOfMonsters extends Quest if ((killedJaguar == 10) && (killedJaguarScout == 15) && (killedSoldier == 15) && (killedCaptain == 20)) { - st.setCond(2, true); + qs.setCond(2, true); } sendNpcLogList(killer); } @@ -191,14 +193,14 @@ public final class Q10368_RebellionOfMonsters extends Quest @Override public Set getNpcLogList(L2PcInstance activeChar) { - final QuestState st = getQuestState(activeChar, false); - if ((st != null) && st.isStarted() && st.isCond(1)) + final QuestState qs = getQuestState(activeChar, false); + if ((qs != null) && qs.isStarted() && qs.isCond(1)) { final Set npcLogList = new HashSet<>(4); - npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR, false, st.getInt("killed_" + WEARY_JAGUAR))); - npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR_SCOUT, false, st.getInt("killed_" + WEARY_JAGUAR_SCOUT))); - npcLogList.add(new NpcLogListHolder(ANT_SOLDIER, false, st.getInt("killed_" + ANT_SOLDIER))); - npcLogList.add(new NpcLogListHolder(ANT_WARRIOR_CAPTAIN, false, st.getInt("killed_" + ANT_WARRIOR_CAPTAIN))); + npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR, false, qs.getInt("killed_" + WEARY_JAGUAR))); + npcLogList.add(new NpcLogListHolder(WEARY_JAGUAR_SCOUT, false, qs.getInt("killed_" + WEARY_JAGUAR_SCOUT))); + npcLogList.add(new NpcLogListHolder(ANT_SOLDIER, false, qs.getInt("killed_" + ANT_SOLDIER))); + npcLogList.add(new NpcLogListHolder(ANT_WARRIOR_CAPTAIN, false, qs.getInt("killed_" + ANT_WARRIOR_CAPTAIN))); return npcLogList; } return super.getNpcLogList(activeChar);