From 32095378263413ee9e11f58440c61d97b5579088 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 1 Sep 2016 19:18:49 +0000 Subject: [PATCH] Added level conditions for Kartia quests. --- .../Q00494_IncarnationOfGreedZellakaGroup.java | 16 +++------------- ...Q00495_IncarnationOfJealousyPellineGroup.java | 16 +++------------- .../Q00496_IncarnationOfGluttonyKaliosGroup.java | 16 +++------------- .../Q00497_IncarnationOfGreedZellakaSolo.java | 16 +++------------- .../Q00498_IncarnationOfJealousyPellineSolo.java | 16 +++------------- .../Q00499_IncarnationOfGluttonyKaliosSolo.java | 16 +++------------- 6 files changed, 18 insertions(+), 78 deletions(-) diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java index 11915b7466..66ed78d741 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00494_IncarnationOfGreedZellakaGroup/Q00494_IncarnationOfGreedZellakaGroup.java @@ -42,6 +42,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest super(494); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00494_IncarnationOfGreedZellakaGroup extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java index 4f44e4781e..e293e69323 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00495_IncarnationOfJealousyPellineGroup/Q00495_IncarnationOfJealousyPellineGroup.java @@ -42,6 +42,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest super(495); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00495_IncarnationOfJealousyPellineGroup extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java index 85b1024084..6968ea2726 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00496_IncarnationOfGluttonyKaliosGroup/Q00496_IncarnationOfGluttonyKaliosGroup.java @@ -42,6 +42,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest super(496); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00496_IncarnationOfGluttonyKaliosGroup extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java index f62c42d405..027c00748d 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00497_IncarnationOfGreedZellakaSolo/Q00497_IncarnationOfGreedZellakaSolo.java @@ -42,6 +42,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest super(497); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00497_IncarnationOfGreedZellakaSolo extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java index 76032b8c32..021b731eca 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00498_IncarnationOfJealousyPellineSolo/Q00498_IncarnationOfJealousyPellineSolo.java @@ -42,6 +42,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest super(498); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00498_IncarnationOfJealousyPellineSolo extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; } diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java index 75e5a451ec..15f89f1a7c 100644 --- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java +++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q00499_IncarnationOfGluttonyKaliosSolo/Q00499_IncarnationOfGluttonyKaliosSolo.java @@ -42,6 +42,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest super(499); addStartNpc(KARTIA_RESEARCHER); addTalkId(KARTIA_RESEARCHER); + addCondLevel(MIN_LEVEL, MAX_LEVEL, "33647-00.htm"); } @Override @@ -80,14 +81,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest { case State.CREATED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else - { - htmltext = "33647-01.htm"; - } + htmltext = "33647-01.htm"; break; } case State.STARTED: @@ -111,11 +105,7 @@ public class Q00499_IncarnationOfGluttonyKaliosSolo extends Quest } case State.COMPLETED: { - if ((player.getLevel() < MIN_LEVEL) || (player.getLevel() > MAX_LEVEL)) - { - htmltext = "33647-00.htm"; - } - else if (!qs.isNowAvailable()) + if (!qs.isNowAvailable()) { htmltext = "33647-07.html"; }