From fb861c24a795acd989d831cc3e87fc7dd2fe44be Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 30 Mar 2018 02:42:02 +0000 Subject: [PATCH] Removed some redundant quest checks. --- .../Q10522_TheDarkSecretOfVarkaSilenos.java | 37 +++++++++---------- ...sassinationOfTheVarkaSilenosCommander.java | 37 +++++++++---------- ...nationOfTheVarkaSilenosCommanderChief.java | 37 +++++++++---------- .../Q10526_TheDarkSecretOfTheKetraOrcs.java | 37 +++++++++---------- ...heAssassinationOfTheKetraOrcCommander.java | 37 +++++++++---------- ...28_TheAssassinationOfTheKetraOrcChief.java | 37 +++++++++---------- 6 files changed, 102 insertions(+), 120 deletions(-) diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java index 06f29cbbe5..b50103f27d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10522_TheDarkSecretOfVarkaSilenos/Q10522_TheDarkSecretOfVarkaSilenos.java @@ -121,32 +121,29 @@ public class Q10522_TheDarkSecretOfVarkaSilenos extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == HANSEN) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33853-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33853-01.htm"; - break; + htmltext = "33853-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33853-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33853-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33853-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java index b4f651c15b..ef20191977 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10523_TheAssassinationOfTheVarkaSilenosCommander/Q10523_TheAssassinationOfTheVarkaSilenosCommander.java @@ -103,32 +103,29 @@ public class Q10523_TheAssassinationOfTheVarkaSilenosCommander extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == HANSEN) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33853-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33853-01.htm"; - break; + htmltext = "33853-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33853-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33853-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33853-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java index 5410ea1ad6..eb3362559e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief/Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief.java @@ -106,32 +106,29 @@ public class Q10524_TheAssassinationOfTheVarkaSilenosCommanderChief extends Ques { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == HANSEN) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33853-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33853-01.htm"; - break; + htmltext = "33853-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33853-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33853-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33853-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java index 65c6f5e7a0..73eaa61249 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10526_TheDarkSecretOfTheKetraOrcs/Q10526_TheDarkSecretOfTheKetraOrcs.java @@ -126,32 +126,29 @@ public class Q10526_TheDarkSecretOfTheKetraOrcs extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == LUGONNES) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33852-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33852-01.htm"; - break; + htmltext = "33852-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33852-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33852-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33852-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java index 4b4a67609f..f508466faf 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10527_TheAssassinationOfTheKetraOrcCommander/Q10527_TheAssassinationOfTheKetraOrcCommander.java @@ -104,32 +104,29 @@ public class Q10527_TheAssassinationOfTheKetraOrcCommander extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == LUGONNES) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33852-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33852-01.htm"; - break; + htmltext = "33852-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33852-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33852-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33852-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java index 70cdf552c8..3cbeffc8d7 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10528_TheAssassinationOfTheKetraOrcChief/Q10528_TheAssassinationOfTheKetraOrcChief.java @@ -107,32 +107,29 @@ public class Q10528_TheAssassinationOfTheKetraOrcChief extends Quest { String htmltext = getNoQuestMsg(player); final QuestState qs = getQuestState(player, true); - if (npc.getId() == LUGONNES) + switch (qs.getState()) { - switch (qs.getState()) + case State.CREATED: { - case State.CREATED: + htmltext = "33852-01.htm"; + break; + } + case State.STARTED: + { + if (qs.isCond(1)) { - htmltext = "33852-01.htm"; - break; + htmltext = "33852-05.html"; } - case State.STARTED: + else if (qs.isCond(2)) { - if (qs.isCond(1)) - { - htmltext = "33852-05.html"; - } - else if (qs.isCond(2)) - { - htmltext = "33852-06.html"; - } - break; - } - case State.COMPLETED: - { - htmltext = getAlreadyCompletedMsg(player); - break; + htmltext = "33852-06.html"; } + break; + } + case State.COMPLETED: + { + htmltext = getAlreadyCompletedMsg(player); + break; } } return htmltext;