diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/default/29025.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/default/29025.htm index ce9c197e38..118b94aff5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/default/29025.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/default/29025.htm @@ -1,5 +1,5 @@ As you approach the statue, you hear a familiar voice whispering in your ear. It says,
All right. It's almost completed... If you wish to possess the secret of immortality, ancient treasures, and the secret of the seal, then call his name...
-Wake Baium +Wake Baium diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/html/default/31862.htm b/L2J_Mobius_C6_Interlude/dist/game/data/html/default/31862.htm index e05ace6be3..8519bb6770 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/html/default/31862.htm +++ b/L2J_Mobius_C6_Interlude/dist/game/data/html/default/31862.htm @@ -1,4 +1,4 @@ Angelic Vortex:
The Angelic Vortex emits a faint light, and in the midst of the light an image appears. In the deepest part of a specious area, a gigantic stone statue is visible. The statue has a human-like appearance and is in a seated position, as though it was being held by some invisible force against its will.
-Go where the Angelic Vortex leads. +Go where the Angelic Vortex leads. \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java index 56c68580b4..a52404308b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java @@ -48,7 +48,7 @@ public class HotSprings extends Quest private HotSprings() { - super(-1, "HotSprings", "ai/areas"); + super(-1, "ai/areas"); addAttackId(BANDERSNATCHLING, FLAVA, ATROXSPAWN, NEPENTHES, ATROX, BANDERSNATCH); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index 012e629b3c..1ba619a1a8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -125,9 +125,9 @@ public class Antharas extends Quest protected static BossZone _Zone; // Boss: Antharas - public Antharas(int id, String name, String descr) + public Antharas() { - super(id, name, descr); + super(-1, "ai/bosses"); final int[] mob = { ANTHARASOLDID, @@ -1007,6 +1007,6 @@ public class Antharas extends Quest public static void main(String[] args) { - new Antharas(-1, "antharas", "ai"); + new Antharas(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 33a6c2f1ab..7590bb748b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -93,9 +93,9 @@ public class Baium extends Quest private final List _minions = new CopyOnWriteArrayList<>(); protected BossZone _zone; - public Baium(int questId, String name, String descr) + public Baium() { - super(questId, name, descr); + super(-1, "ai/bosses"); final int[] mob = { @@ -344,9 +344,9 @@ public class Baium extends Quest return "Angelic Vortex:
You may not enter while flying a wyvern"; } - if ((status == ASLEEP) && (player.getQuestState("baium").getQuestItemsCount(4295) > 0)) // bloody fabric + if ((status == ASLEEP) && (player.getQuestState(getName()).getQuestItemsCount(4295) > 0)) // bloody fabric { - player.getQuestState("baium").takeItems(4295, 1); + player.getQuestState(getName()).takeItems(4295, 1); // allow entry for the player for the next 30 secs (more than enough time for the TP to happen) // Note: this just means 30secs to get in, no limits on how long it takes before we get out. _zone.allowPlayerEntry(player, 30); @@ -687,6 +687,6 @@ public class Baium extends Quest public static void main(String[] args) { - new Baium(-1, "baium", "ai"); + new Baium(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Barakiel.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Barakiel.java index 52228e1b4d..7af31d97a7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Barakiel.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Barakiel.java @@ -26,9 +26,9 @@ public class Barakiel extends Quest // Barakiel NpcID private static final int BARAKIEL = 25325; - public Barakiel(int questId, String name, String descr) + public Barakiel() { - super(questId, name, descr); + super(-1, "ai/bosses"); addEventId(BARAKIEL, Quest.QuestEventType.ON_ATTACK); } @@ -37,6 +37,6 @@ public class Barakiel extends Quest public static void main(String[] args) { - new Barakiel(-1, "Barakiel", "ai"); + new Barakiel(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java index 6db0f8f393..fa9b2e27b1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Benom.java @@ -131,7 +131,7 @@ public class Benom extends Quest public Benom() { - super(-1, "Benom", "ai/bosses"); + super(-1, "ai/bosses"); addStartNpc(BENOM_TELEPORT); addTalkId(BENOM_TELEPORT); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java index 82357533b7..376bd30800 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Core.java @@ -79,9 +79,9 @@ public class Core extends Quest private static final Collection _minions = ConcurrentHashMap.newKeySet(); - public Core(int id, String name, String descr) + public Core() { - super(id, name, descr); + super(-1, "ai/bosses"); final int[] mobs = { @@ -256,6 +256,6 @@ public class Core extends Quest public static void main(String[] args) { - new Core(-1, "core", "ai"); + new Core(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/DrChaos.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/DrChaos.java index f50d697f5d..17927f6211 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/DrChaos.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/DrChaos.java @@ -43,7 +43,7 @@ public class DrChaos extends Quest private DrChaos() { - super(-1, "DrChaos", "ai/bosses"); + super(-1, "ai/bosses"); addFirstTalkId(DR_CHAOS); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index c3f23f8e6d..750bfb2a3a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -279,9 +279,9 @@ public class Frintezza extends Quest private final Collection _minions = ConcurrentHashMap.newKeySet(); // Boss: Frintezza - public Frintezza(int id, String name, String descr) + public Frintezza() { - super(id, name, descr); + super(-1, "ai/bosses"); final int[] mob = { SCARLET1, @@ -1878,6 +1878,6 @@ public class Frintezza extends Quest public static void main(String[] args) { - new Frintezza(-1, "Frintezza", "ai"); + new Frintezza(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Golkonda.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Golkonda.java index eeaefed5cd..a2a55dbc1c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Golkonda.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Golkonda.java @@ -26,9 +26,9 @@ public class Golkonda extends Quest // Golkonda NpcID private static final int GOLKONDA = 25126; - public Golkonda(int questId, String name, String descr) + public Golkonda() { - super(questId, name, descr); + super(-1, "ai/bosses"); addEventId(GOLKONDA, Quest.QuestEventType.ON_ATTACK); } @@ -37,6 +37,6 @@ public class Golkonda extends Quest public static void main(String[] args) { - new Golkonda(-1, "Golkonda", "ai"); + new Golkonda(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gordon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gordon.java index 5402e41684..e061610b19 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gordon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gordon.java @@ -107,9 +107,9 @@ public class Gordon extends Quest private static boolean _isAttacked = false; private static boolean _isSpawned = false; - public Gordon(int id, String name, String descr) + public Gordon() { - super(id, name, descr); + super(-1, "ai/bosses"); addEventId(GORDON, Quest.QuestEventType.ON_KILL); addEventId(GORDON, Quest.QuestEventType.ON_ATTACK); @@ -292,6 +292,6 @@ public class Gordon extends Quest public static void main(String[] args) { - new Gordon(-1, "Gordon", "ai"); + new Gordon(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gustav.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gustav.java index 808089c9de..3a4050d979 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gustav.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Gustav.java @@ -39,7 +39,7 @@ public class Gustav extends Quest private Gustav() { - super(-1, "Gustav", "ai/bosses"); + super(-1, "ai/bosses"); addTalkId(MESSENGER); addStartNpc(MESSENGER); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Hallate.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Hallate.java index 0cf87c0fbc..98ef4cf90f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Hallate.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Hallate.java @@ -26,9 +26,9 @@ public class Hallate extends Quest // Hallate NpcID private static final int HALLATE = 25220; - public Hallate(int questId, String name, String descr) + public Hallate() { - super(questId, name, descr); + super(-1, "ai/bosses"); addEventId(HALLATE, Quest.QuestEventType.ON_ATTACK); } @@ -37,6 +37,6 @@ public class Hallate extends Quest public static void main(String[] args) { - new Hallate(-1, "Hallate", "ai"); + new Hallate(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java index db13c284ee..3ac0989a18 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/IceFairySirra.java @@ -51,9 +51,9 @@ public class IceFairySirra extends Quest protected Collection _allMobs = ConcurrentHashMap.newKeySet(); protected Future _onDeadEventTask = null; - public IceFairySirra(int id, String name, String descr) + public IceFairySirra() { - super(id, name, descr); + super(-1, "ai/bosses"); final int[] mobs = { STEWARD, @@ -76,7 +76,7 @@ public class IceFairySirra extends Quest @Override public String onFirstTalk(NpcInstance npc, PlayerInstance player) { - if (player.getQuestState("IceFairySirra") == null) + if (player.getQuestState(getName()) == null) { newQuestState(player); } @@ -449,6 +449,6 @@ public class IceFairySirra extends Quest public static void main(String[] args) { - new IceFairySirra(-1, "IceFairySirra", "ai"); + new IceFairySirra(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Kernon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Kernon.java index 9f1caccf4b..469b8c58ab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Kernon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Kernon.java @@ -26,9 +26,9 @@ public class Kernon extends Quest // Kernon NpcID private static final int KERNON = 25054; - public Kernon(int questId, String name, String descr) + public Kernon() { - super(questId, name, descr); + super(-1, "ai/bosses"); addEventId(KERNON, Quest.QuestEventType.ON_ATTACK); } @@ -37,6 +37,6 @@ public class Kernon extends Quest public static void main(String[] args) { - new Kernon(-1, "Kernon", "ai"); + new Kernon(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Nurka.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Nurka.java index 0bda5f4223..fa7bfcbcfb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Nurka.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Nurka.java @@ -39,7 +39,7 @@ public class Nurka extends Quest private Nurka() { - super(-1, "Nurka", "ai/bosses"); + super(-1, "ai/bosses"); addTalkId(MESSENGER); addStartNpc(MESSENGER); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java index 861e61e56c..26261394af 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java @@ -50,14 +50,9 @@ public class Orfen extends Quest ORFEN_RETURN } - /** - * @param questId - * @param name - * @param descr - */ - public Orfen(int questId, String name, String descr) + public Orfen() { - super(questId, name, descr); + super(-1, "ai/bosses"); final StatsSet info = GrandBossManager.getInstance().getStatsSet(ORFEN); final Integer status = GrandBossManager.getInstance().getBossStatus(ORFEN); @@ -264,6 +259,6 @@ public class Orfen extends Quest public static void main(String[] args) { - new Orfen(-1, "Orfen", "ai"); + new Orfen(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 70a96ac9b6..aa34dd4a4a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -70,9 +70,9 @@ public class QueenAnt extends Quest HEAL } - public QueenAnt(int questId, String name, String descr) + public QueenAnt() { - super(questId, name, descr); + super(-1, "ai/bosses"); final int[] mobs = { @@ -434,6 +434,6 @@ public class QueenAnt extends Quest public static void main(String[] args) { - new QueenAnt(-1, "queen_ant", "ai"); + new QueenAnt(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Sailren.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Sailren.java index 0fd69d330c..9d54243924 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Sailren.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Sailren.java @@ -46,7 +46,7 @@ public class Sailren extends Quest private Sailren() { - super(-1, "Sailren", "ai/bosses"); + super(-1, "ai/bosses"); addStartNpc(STATUE); addTalkId(STATUE); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java index a4c9fbf5b2..55fbfb34fa 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Tyrannosaurus.java @@ -53,7 +53,7 @@ public class Tyrannosaurus extends Quest public Tyrannosaurus() { - super(-1, "Tyrannosaurus", "ai/bosses"); + super(-1, "ai/bosses"); addKillId(TREX); addSpawn(TREX[Rnd.get(TREX.length)], SPAWNS[Rnd.get(SPAWNS.length)], false, 0); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java index ecb055fd85..3fb33f8500 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java @@ -75,9 +75,9 @@ public class Valakas extends Quest private static BossZone _Zone; // Boss: Valakas - public Valakas(int id, String name, String descr) + public Valakas() { - super(id, name, descr); + super(-1, "ai/bosses"); final int[] mob = { VALAKAS @@ -1567,6 +1567,6 @@ public class Valakas extends Quest public static void main(String[] args) { - new Valakas(-1, "valakas", "ai"); + new Valakas(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 3adfe458cc..cb1e1f776c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -113,9 +113,9 @@ public class VanHalter extends Quest private static final byte ALIVE = 2; // Initialize - public VanHalter(int questId, String name, String descr) + public VanHalter() { - super(questId, name, descr); + super(-1, "ai/bosses"); final int[] mobs = { @@ -1759,6 +1759,6 @@ public class VanHalter extends Quest public static void main(String[] args) { - new VanHalter(-1, "vanhalter", "ai"); + new VanHalter(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java index c5f0ee5343..15564b5ca7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java @@ -125,9 +125,9 @@ public class Zaken extends Quest private static BossZone _Zone; - public Zaken(int questId, String name, String descr) + public Zaken() { - super(questId, name, descr); + super(-1, "ai/bosses"); // Zaken doors handling ThreadPool.scheduleAtFixedRate(() -> @@ -997,6 +997,6 @@ public class Zaken extends Quest public static void main(String[] args) { - new Zaken(-1, "Zaken", "ai"); + new Zaken(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java index b312bb2403..037326971c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java @@ -32,9 +32,9 @@ public class AncientEgg extends Quest // Skill private static final int SIGNAL = 5088; // Signal - private AncientEgg(int questId, String name, String descr) + private AncientEgg() { - super(questId, name, descr); + super(-1, "ai"); addAttackId(EGG); } @@ -48,6 +48,6 @@ public class AncientEgg extends Quest public static void main(String[] args) { - new AncientEgg(-1, "AncientEgg", "ai"); + new AncientEgg(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java index 42ec5de810..0a30fedfcf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/CatsEyeBandit.java @@ -33,7 +33,7 @@ public class CatsEyeBandit extends Quest private CatsEyeBandit() { - super(-1, "CatsEyeBandit", "ai/others"); + super(-1, "ai/others"); addKillId(CATS_EYE_BANDIT); addAttackId(CATS_EYE_BANDIT); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java index 6b1ad421b4..38d94994a3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Chests.java @@ -52,7 +52,7 @@ public class Chests extends Quest private Chests() { - super(-1, "Chests", "ai/others"); + super(-1, "ai/others"); addSkillUseId(CHESTS); addAttackId(CHESTS); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java index dd3eb04f22..2295c5aeb2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialAgent.java @@ -33,7 +33,7 @@ public class DeluLizardmanSpecialAgent extends Quest private DeluLizardmanSpecialAgent() { - super(-1, "DeluLizardmanSpecialAgent", "ai/others"); + super(-1, "ai/others"); addAttackId(DELU_LIZARDMAN_SPECIAL_AGENT); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java index 03dab54e39..b2037815d2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/DeluLizardmanSpecialCommander.java @@ -33,7 +33,7 @@ public class DeluLizardmanSpecialCommander extends Quest private DeluLizardmanSpecialCommander() { - super(-1, "DeluLizardmanSpecialCommander", "ai/others"); + super(-1, "ai/others"); addAttackId(DELU_LIZARDMAN_SPECIAL_COMMANDER); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java index 8e9f057514..51c01367ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/EvaBox.java @@ -52,7 +52,7 @@ public class EvaBox extends Quest private EvaBox() { - super(-1, "EvaBox", "ai/others"); + super(-1, "ai/others"); addKillId(BOX); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java index 526c021139..1ed9e3842e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/FeedableBeasts.java @@ -164,7 +164,7 @@ public class FeedableBeasts extends Quest private FeedableBeasts() { - super(-1, "FeedableBeasts", "ai/others"); + super(-1, "ai/others"); addKillId(FEEDABLE_BEASTS); addSkillUseId(FEEDABLE_BEASTS); @@ -404,7 +404,7 @@ public class FeedableBeasts extends Quest nextNpc.setRunning(); // If player has Q020 going, give quest item - QuestState st = player.getQuestState(Q020_BringUpWithLove.qn); + QuestState st = player.getQuestState(Q020_BringUpWithLove.class.getSimpleName()); if ((st != null) && (Rnd.get(100) < 5) && !st.hasQuestItems(7185)) { st.giveItems(7185, 1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java index b1d5205c1c..9346748d4d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/KarulBugbear.java @@ -33,7 +33,7 @@ public class KarulBugbear extends Quest private KarulBugbear() { - super(-1, "KarulBugbear", "ai/others"); + super(-1, "ai/others"); addAttackId(KARUL_BUGBEAR); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java index 0a5d043851..40505ce2b2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java @@ -60,9 +60,9 @@ public class Monastery extends Quest "name! How dare you defy the will of Einhasad!" }; - public Monastery(int questId, String name, String descr) + public Monastery() { - super(questId, name, descr); + super(-1, "ai"); registerMobs(mobs1, QuestEventType.ON_AGGRO_RANGE_ENTER, QuestEventType.ON_SPAWN, QuestEventType.ON_SPELL_FINISHED); registerMobs(mobs2, QuestEventType.ON_SPELL_FINISHED); } @@ -187,6 +187,6 @@ public class Monastery extends Quest public static void main(String[] args) { - new Monastery(-1, "monastery", "ai"); + new Monastery(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java index 38c9a8c29a..4b1f8ce3cf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/NewbieHelper/NewbieHelper.java @@ -28,11 +28,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import ai.others.Tutorial.Tutorial; + public class NewbieHelper extends Quest { - private final static String qn = "NewbieHelper"; - private final static String qnTutorial = "Tutorial"; - // Quest Items // Human private final static int RECOMMENDATION_01 = 1067; @@ -91,7 +90,7 @@ public class NewbieHelper extends Quest public NewbieHelper() { - super(-1, qn, "ai/others"); + super(-1, "ai/others"); addStartNpc(30009, 30019, 30131, 30400, 30530, 30575); @@ -172,8 +171,8 @@ public class NewbieHelper extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - final QuestState qs1 = player.getQuestState(qn); - final QuestState qs2 = player.getQuestState(qnTutorial); + final QuestState qs1 = player.getQuestState(getName()); + final QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); if ((qs1 == null) || (qs2 == null)) { return null; @@ -253,8 +252,8 @@ public class NewbieHelper extends Quest public String onFirstTalk(NpcInstance npc, PlayerInstance player) { String htmltext = ""; - QuestState qs1 = player.getQuestState(qn); - QuestState qs2 = player.getQuestState(qnTutorial); + QuestState qs1 = player.getQuestState(getName()); + QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); if (qs1 == null) { qs1 = newQuestState(player); @@ -398,8 +397,8 @@ public class NewbieHelper extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - final QuestState qs1 = player.getQuestState(qn); - final QuestState qs2 = player.getQuestState(qnTutorial); + final QuestState qs1 = player.getQuestState(getName()); + final QuestState qs2 = player.getQuestState(Tutorial.class.getSimpleName()); if ((qs1 == null) || (qs2 == null)) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java index 45ff6c727c..fe447cafb2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/OlMahumGeneral.java @@ -33,7 +33,7 @@ public class OlMahumGeneral extends Quest private OlMahumGeneral() { - super(-1, "OlMahumGeneral", "ai/others"); + super(-1, "ai/others"); addAttackId(OL_MAHUM_GENERAL); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java index 034de21a42..e0423f57db 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/RetreatOnAttack.java @@ -43,7 +43,7 @@ public class RetreatOnAttack extends Quest private RetreatOnAttack() { - super(-1, "RetreatOnAttack", "ai/others"); + super(-1, "ai/others"); addAttackId(EPLY, OL_MAHUM_GUARD); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java index 05cc2bf6ac..fffabec033 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ScarletStakatoNoble.java @@ -33,7 +33,7 @@ public class ScarletStakatoNoble extends Quest private ScarletStakatoNoble() { - super(-1, "ScarletStakatoNoble", "ai/others"); + super(-1, "ai/others"); addKillId(SCARLET_STAKATO_NOBLE); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java index 5ea885ddb6..558284370e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Splendor.java @@ -52,7 +52,7 @@ public class Splendor extends Quest private Splendor() { - super(-1, "Splendor", "ai/others"); + super(-1, "ai/others"); for (int npcId : NPCS.keySet()) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java index a14e6d88e0..9461be5cda 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/SummonMinions.java @@ -113,9 +113,9 @@ public class SummonMinions extends Quest }); // Pythia } - public SummonMinions(int questId, String name, String descr) + public SummonMinions() { - super(questId, name, descr); + super(-1, "ai"); final int[] mobs = { 20767, @@ -269,6 +269,6 @@ public class SummonMinions extends Quest public static void main(String[] args) { - new SummonMinions(-1, "SummonMinions", "ai"); + new SummonMinions(); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java index 942cc0e490..24283d4717 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcOverlord.java @@ -33,7 +33,7 @@ public class TimakOrcOverlord extends Quest private TimakOrcOverlord() { - super(-1, "TimakOrcOverlord", "ai/others"); + super(-1, "ai/others"); addAttackId(TIMAK_ORC_OVERLORD); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java index 23aebc494a..36f8e3a3b6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TimakOrcTroopLeader.java @@ -33,7 +33,7 @@ public class TimakOrcTroopLeader extends Quest private TimakOrcTroopLeader() { - super(-1, "TimakOrcTroopLeader", "ai/others"); + super(-1, "ai/others"); addAttackId(TIMAK_ORC_TROOP_LEADER); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java index 0abebb5deb..95b1b84ad2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Transform.java @@ -77,9 +77,9 @@ public class Transform extends Quest "This time at the last! The end!" }; - public Transform(int questId, String name, String descr) + public Transform() { - super(questId, name, descr); + super(-1, "ai"); _mobs.add(new Transformer(21261, 21262, 1, 5)); // 1st mutation Ol Mahum Transcender _mobs.add(new Transformer(21262, 21263, 1, 5)); // 2st mutation Ol Mahum Transcender @@ -228,6 +228,6 @@ public class Transform extends Quest public static void main(String[] args) { - new Transform(-1, "transform", "ai"); + new Transform(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java index 5b48b8a754..0543a528b3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcFootman.java @@ -33,7 +33,7 @@ public class TurekOrcFootman extends Quest private TurekOrcFootman() { - super(-1, "TurekOrcFootman", "ai/others"); + super(-1, "ai/others"); addAttackId(TUREK_ORC_FOOTMAN); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java index d2660c9473..f69e10d763 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcSupplier.java @@ -33,7 +33,7 @@ public class TurekOrcSupplier extends Quest private TurekOrcSupplier() { - super(-1, "TurekOrcSupplier", "ai/others"); + super(-1, "ai/others"); addAttackId(TUREK_ORC_SUPPLIER); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java index c2d025a231..27584cd464 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/TurekOrcWarlord.java @@ -33,7 +33,7 @@ public class TurekOrcWarlord extends Quest private TurekOrcWarlord() { - super(-1, "TurekOrcWarlord", "ai/others"); + super(-1, "ai/others"); addAttackId(TUREK_ORC_WARLORD); } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Tutorial/Tutorial.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Tutorial/Tutorial.java index bdd20440ee..644fc1d1fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Tutorial/Tutorial.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Tutorial/Tutorial.java @@ -152,17 +152,15 @@ public class Tutorial extends Quest TCLc.put(50, "tutorial_22kb.htm"); } - private static final String qn = "Tutorial"; - public Tutorial() { - super(-1, qn, "ai/others"); + super(-1, "ai/others"); } @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if ((qs == null) || Config.DISABLE_TUTORIAL) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java index d59e26544a..e8385b7eb4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/ZombieGatekeepers.java @@ -31,9 +31,9 @@ import org.l2jmobius.gameserver.model.quest.Quest; public class ZombieGatekeepers extends Quest { - public ZombieGatekeepers(int questId, String name, String descr) + public ZombieGatekeepers() { - super(questId, name, descr); + super(-1, "ai"); addAttackId(22136); addAggroRangeEnterId(22136); } @@ -108,6 +108,6 @@ public class ZombieGatekeepers extends Quest public static void main(String[] args) { - new ZombieGatekeepers(-1, "ZombieGatekeepers", "ai"); + new ZombieGatekeepers(); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java index 1e6ca4820c..735be96798 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/EchoCrystals/EchoCrystals.java @@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.util.Util; */ public class EchoCrystals extends Quest { - private static final String qn = "EchoCrystals"; - private static final int ADENA = 57; private static final int COST = 200; @@ -51,7 +49,7 @@ public class EchoCrystals extends Quest public EchoCrystals() { - super(-1, qn, "custom"); + super(-1, "custom"); addStartNpc(31042, 31043); addTalkId(31042, 31043); @@ -61,7 +59,7 @@ public class EchoCrystals extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = ""; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if ((st != null) && Util.isDigit(event)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroCirclet/HeroCirclet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroCirclet/HeroCirclet.java index 9a6a297fe3..2b7061a1ff 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroCirclet/HeroCirclet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroCirclet/HeroCirclet.java @@ -25,7 +25,7 @@ public class HeroCirclet extends Quest { public HeroCirclet() { - super(-1, "HeroCirclet", "custom"); + super(-1, "custom"); addStartNpc(31690, 31769, 31770, 31771, 31772); addTalkId(31690, 31769, 31770, 31771, 31772); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroWeapon/HeroWeapon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroWeapon/HeroWeapon.java index 011133871a..8dc7d155a3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroWeapon/HeroWeapon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/HeroWeapon/HeroWeapon.java @@ -41,7 +41,7 @@ public class HeroWeapon extends Quest public HeroWeapon() { - super(-1, "HeroWeapon", "custom"); + super(-1, "custom"); addStartNpc(31690, 31769, 31770, 31771, 31772, 31773); addTalkId(31690, 31769, 31770, 31771, 31772, 31773); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 1bd895075d..0ac002b8fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -43,8 +43,6 @@ import org.l2jmobius.gameserver.util.Util; */ public class KetraOrcSupport extends Quest { - private static final String qn = "KetraOrcSupport"; - private static final int KADUN = 31370; // Hierarch private static final int WAHKAN = 31371; // Messenger private static final int ASEFA = 31372; // Soul Guide @@ -134,7 +132,7 @@ public class KetraOrcSupport extends Quest public KetraOrcSupport() { - super(-1, qn, "custom"); + super(-1, "custom"); addFirstTalkId(KADUN, WAHKAN, ASEFA, ATAN, JAFF, JUMARA, KURFA); addTalkId(ASEFA, JAFF, KURFA); @@ -202,7 +200,7 @@ public class KetraOrcSupport extends Quest public String onFirstTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { st = newQuestState(player); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java index 411d805c1b..6f2360f65a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/MissQueen/MissQueen.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class MissQueen extends Quest { - private static final String qn = "MissQueen"; - // Rewards private static final int COUPON_ONE = 7832; private static final int COUPON_TWO = 7833; @@ -49,7 +47,7 @@ public class MissQueen extends Quest public MissQueen() { - super(-1, qn, "custom"); + super(-1, "custom"); // Spawn the 11 NPCs. for (Location loc : LOCATIONS) @@ -66,7 +64,7 @@ public class MissQueen extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (event.equals("newbie_coupon")) { @@ -117,7 +115,7 @@ public class MissQueen extends Quest @Override public String onFirstTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { st = newQuestState(player); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java index 656bb5b45e..bfd18d77de 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/NpcLocationInfo/NpcLocationInfo.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.util.Util; */ public class NpcLocationInfo extends Quest { - private static final String qn = "NpcLocationInfo"; - private static final int[] RADARS = { // Talking Island @@ -208,7 +206,7 @@ public class NpcLocationInfo extends Quest public NpcLocationInfo() { - super(-1, qn, "custom"); + super(-1, "custom"); addStartNpc(30598, 30599, 30600, 30601, 30602); addTalkId(30598, 30599, 30600, 30601, 30602); @@ -218,7 +216,7 @@ public class NpcLocationInfo extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java index 2a8490b94a..2db6a35df3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/RaidbossInfo/RaidbossInfo.java @@ -32,7 +32,6 @@ import org.l2jmobius.gameserver.util.Util; public class RaidbossInfo extends Quest { - private static final String qn = "RaidbossInfo"; private static final String BOSS_CLASS_TYPE = "RaidBoss"; private static final Map RADARS = new HashMap<>(); @@ -120,7 +119,7 @@ public class RaidbossInfo extends Quest public RaidbossInfo() { - super(-1, qn, "custom"); + super(-1, "custom"); for (int npcId : NPCs) { @@ -142,7 +141,7 @@ public class RaidbossInfo extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return event; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/ShadowWeapon/ShadowWeapon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/ShadowWeapon/ShadowWeapon.java index 347c0eaeda..2b5c8a9e17 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/ShadowWeapon/ShadowWeapon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/ShadowWeapon/ShadowWeapon.java @@ -29,15 +29,13 @@ import village_master.SecondClassChange.SecondClassChange; */ public class ShadowWeapon extends Quest { - private static final String qn = "ShadowWeapon"; - // itemId for shadow weapon coupons, it's not used more than once but increases readability private static final int D_COUPON = 8869; private static final int C_COUPON = 8870; public ShadowWeapon() { - super(-1, qn, "custom"); + super(-1, "custom"); addStartNpc(FirstClassChange.FIRSTCLASSNPCS); addTalkId(FirstClassChange.FIRSTCLASSNPCS); @@ -49,7 +47,7 @@ public class ShadowWeapon extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index 2ee74efd59..7eb69b89a3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -42,8 +42,6 @@ import org.l2jmobius.gameserver.util.Util; */ public class VarkaSilenosSupport extends Quest { - private static final String qn = "VarkaSilenosSupport"; - private static final int ASHAS = 31377; // Hierarch private static final int NARAN = 31378; // Messenger private static final int UDAN = 31379; // Buffer @@ -133,7 +131,7 @@ public class VarkaSilenosSupport extends Quest public VarkaSilenosSupport() { - super(-1, qn, "custom"); + super(-1, "custom"); addFirstTalkId(ASHAS, NARAN, UDAN, DIYABU, HAGOS, SHIKON, TERANU); addTalkId(UDAN, HAGOS, TERANU); @@ -201,7 +199,7 @@ public class VarkaSilenosSupport extends Quest public String onFirstTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { st = newQuestState(player); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q001_LettersOfLove/Q001_LettersOfLove.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q001_LettersOfLove/Q001_LettersOfLove.java index 0867bc193a..e6e89de703 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q001_LettersOfLove/Q001_LettersOfLove.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q001_LettersOfLove/Q001_LettersOfLove.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q001_LettersOfLove extends Quest { - private static final String qn = "Q001_LettersOfLove"; - // Npcs private static final int DARIN = 30048; private static final int ROXXY = 30006; @@ -42,7 +40,7 @@ public class Q001_LettersOfLove extends Quest public Q001_LettersOfLove() { - super(1, qn, "Letters of Love"); + super(1, "Letters of Love"); registerQuestItems(DARIN_LETTER, ROXXY_KERCHIEF, DARIN_RECEIPT, BAULRO_POTION); @@ -54,7 +52,7 @@ public class Q001_LettersOfLove extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q001_LettersOfLove extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java index d463f9fe94..79bceb944f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q002_WhatWomenWant/Q002_WhatWomenWant.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q002_WhatWomenWant extends Quest { - private static final String qn = "Q002_WhatWomenWant"; - // NPCs private static final int ARUJIEN = 30223; private static final int MIRABEL = 30146; @@ -45,7 +43,7 @@ public class Q002_WhatWomenWant extends Quest public Q002_WhatWomenWant() { - super(2, qn, "What Women Want"); + super(2, "What Women Want"); registerQuestItems(ARUJIEN_LETTER_1, ARUJIEN_LETTER_2, ARUJIEN_LETTER_3, POETRY_BOOK, GREENIS_LETTER); @@ -57,7 +55,7 @@ public class Q002_WhatWomenWant extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -92,7 +90,7 @@ public class Q002_WhatWomenWant extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java index 37af174adb..0339d1deac 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q003_WillTheSealBeBroken/Q003_WillTheSealBeBroken.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q003_WillTheSealBeBroken extends Quest { - private static final String qn = "Q003_WillTheSealBeBroken"; - // Items private static final int ONYX_BEAST_EYE = 1081; private static final int TAINT_STONE = 1082; @@ -37,7 +35,7 @@ public class Q003_WillTheSealBeBroken extends Quest public Q003_WillTheSealBeBroken() { - super(3, qn, "Will the Seal be Broken?"); + super(3, "Will the Seal be Broken?"); registerQuestItems(ONYX_BEAST_EYE, TAINT_STONE, SUCCUBUS_BLOOD); @@ -51,7 +49,7 @@ public class Q003_WillTheSealBeBroken extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -70,7 +68,7 @@ public class Q003_WillTheSealBeBroken extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java index 4cc0b56619..8e70e5940a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q004_LongliveThePaagrioLord/Q004_LongliveThePaagrioLord.java @@ -28,9 +28,7 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q004_LongliveThePaagrioLord extends Quest { - private static final String qn = "Q004_LongliveThePaagrioLord"; - - private static final Map NPC_GIFTS = new HashMap<>(); + private static final Map NPC_GIFTS = new HashMap<>(); static { NPC_GIFTS.put(30585, 1542); @@ -43,7 +41,7 @@ public class Q004_LongliveThePaagrioLord extends Quest public Q004_LongliveThePaagrioLord() { - super(4, qn, "Long live the Pa'agrio Lord!"); + super(4, "Long live the Pa'agrio Lord!"); registerQuestItems(1541, 1542, 1543, 1544, 1545, 1546); @@ -55,7 +53,7 @@ public class Q004_LongliveThePaagrioLord extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q004_LongliveThePaagrioLord extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q005_MinersFavor/Q005_MinersFavor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q005_MinersFavor/Q005_MinersFavor.java index ae335940d0..49f0e62cd1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q005_MinersFavor/Q005_MinersFavor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q005_MinersFavor/Q005_MinersFavor.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q005_MinersFavor extends Quest { - private static final String qn = "Q005_MinersFavor"; - // NPCs private static final int BOLTER = 30554; private static final int SHARI = 30517; @@ -46,7 +44,7 @@ public class Q005_MinersFavor extends Quest public Q005_MinersFavor() { - super(5, qn, "Miner's Favor"); + super(5, "Miner's Favor"); registerQuestItems(BOLTERS_LIST, MINING_BOOTS, MINERS_PICK, BOOMBOOM_POWDER, REDSTONE_BEER, BOLTERS_SMELLY_SOCKS); @@ -58,7 +56,7 @@ public class Q005_MinersFavor extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -94,7 +92,7 @@ public class Q005_MinersFavor extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java index 283bacce9c..89452d3ba7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q006_StepIntoTheFuture/Q006_StepIntoTheFuture.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q006_StepIntoTheFuture extends Quest { - private static final String qn = "Q006_StepIntoTheFuture"; - // NPCs private static final int ROXXY = 30006; private static final int BAULRO = 30033; @@ -41,7 +39,7 @@ public class Q006_StepIntoTheFuture extends Quest public Q006_StepIntoTheFuture() { - super(6, qn, "Step into the Future"); + super(6, "Step into the Future"); registerQuestItems(BAULRO_LETTER); @@ -53,7 +51,7 @@ public class Q006_StepIntoTheFuture extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -98,7 +96,7 @@ public class Q006_StepIntoTheFuture extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java index 9d6d62eea4..f7d5528093 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q007_ATripBegins/Q007_ATripBegins.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q007_ATripBegins extends Quest { - private static final String qn = "Q007_ATripBegins"; - // NPCs private static final int MIRABEL = 30146; private static final int ARIEL = 30148; @@ -41,7 +39,7 @@ public class Q007_ATripBegins extends Quest public Q007_ATripBegins() { - super(7, qn, "A Trip Begins"); + super(7, "A Trip Begins"); registerQuestItems(ARIEL_RECO); @@ -53,7 +51,7 @@ public class Q007_ATripBegins extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -91,7 +89,7 @@ public class Q007_ATripBegins extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java index c33a3c72d5..67ec258407 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q008_AnAdventureBegins/Q008_AnAdventureBegins.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q008_AnAdventureBegins extends Quest { - private static final String qn = "Q008_AnAdventureBegins"; - // NPCs private static final int JASMINE = 30134; private static final int ROSELYN = 30355; @@ -41,7 +39,7 @@ public class Q008_AnAdventureBegins extends Quest public Q008_AnAdventureBegins() { - super(8, qn, "An Adventure Begins"); + super(8, "An Adventure Begins"); registerQuestItems(ROSELYN_NOTE); @@ -53,7 +51,7 @@ public class Q008_AnAdventureBegins extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -91,7 +89,7 @@ public class Q008_AnAdventureBegins extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java index 6d09c31141..38d9d142cf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q009_IntoTheCityOfHumans/Q009_IntoTheCityOfHumans.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q009_IntoTheCityOfHumans extends Quest { - private static final String qn = "Q009_IntoTheCityOfHumans"; - // NPCs private final int PETUKAI = 30583; private final int TANAPI = 30571; @@ -38,7 +36,7 @@ public class Q009_IntoTheCityOfHumans extends Quest public Q009_IntoTheCityOfHumans() { - super(9, qn, "Into the City of Humans"); + super(9, "Into the City of Humans"); addStartNpc(PETUKAI); addTalkId(PETUKAI, TANAPI, TAMIL); @@ -48,7 +46,7 @@ public class Q009_IntoTheCityOfHumans extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -79,7 +77,7 @@ public class Q009_IntoTheCityOfHumans extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java index 22b1da230e..178b6d0d12 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q010_IntoTheWorld/Q010_IntoTheWorld.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q010_IntoTheWorld extends Quest { - private static final String qn = "Q010_IntoTheWorld"; - // Items private static final int VERY_EXPENSIVE_NECKLACE = 7574; @@ -41,7 +39,7 @@ public class Q010_IntoTheWorld extends Quest public Q010_IntoTheWorld() { - super(10, qn, "Into the World"); + super(10, "Into the World"); registerQuestItems(VERY_EXPENSIVE_NECKLACE); @@ -53,7 +51,7 @@ public class Q010_IntoTheWorld extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -97,7 +95,7 @@ public class Q010_IntoTheWorld extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java index bf1e06ec54..eb02ffd28a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q011_SecretMeetingWithKetraOrcs/Q011_SecretMeetingWithKetraOrcs.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q011_SecretMeetingWithKetraOrcs extends Quest { - private static final String qn = "Q011_SecretMeetingWithKetraOrcs"; - // Npcs private static final int CADMON = 31296; private static final int LEON = 31256; @@ -36,7 +34,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest public Q011_SecretMeetingWithKetraOrcs() { - super(11, qn, "Secret Meeting With Ketra Orcs"); + super(11, "Secret Meeting With Ketra Orcs"); registerQuestItems(MUNITIONS_BOX); @@ -48,7 +46,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -80,7 +78,7 @@ public class Q011_SecretMeetingWithKetraOrcs extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q012_SecretMeetingWithVarkaSilenos/Q012_SecretMeetingWithVarkaSilenos.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q012_SecretMeetingWithVarkaSilenos/Q012_SecretMeetingWithVarkaSilenos.java index 6e7b0cabbd..7175651441 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q012_SecretMeetingWithVarkaSilenos/Q012_SecretMeetingWithVarkaSilenos.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q012_SecretMeetingWithVarkaSilenos/Q012_SecretMeetingWithVarkaSilenos.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q012_SecretMeetingWithVarkaSilenos extends Quest { - private static final String qn = "Q012_SecretMeetingWithVarkaSilenos"; - // NPCs private static final int CADMON = 31296; private static final int HELMUT = 31258; @@ -36,7 +34,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest public Q012_SecretMeetingWithVarkaSilenos() { - super(12, qn, "Secret Meeting With Varka Silenos"); + super(12, "Secret Meeting With Varka Silenos"); registerQuestItems(MUNITIONS_BOX); @@ -48,7 +46,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -80,7 +78,7 @@ public class Q012_SecretMeetingWithVarkaSilenos extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q013_ParcelDelivery/Q013_ParcelDelivery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q013_ParcelDelivery/Q013_ParcelDelivery.java index 4e00d2f17e..9b63e1219d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q013_ParcelDelivery/Q013_ParcelDelivery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q013_ParcelDelivery/Q013_ParcelDelivery.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q013_ParcelDelivery extends Quest { - private static final String qn = "Q013_ParcelDelivery"; - // NPCs private static final int FUNDIN = 31274; private static final int VULCAN = 31539; @@ -35,7 +33,7 @@ public class Q013_ParcelDelivery extends Quest public Q013_ParcelDelivery() { - super(13, qn, "Parcel Delivery"); + super(13, "Parcel Delivery"); registerQuestItems(PACKAGE); @@ -47,7 +45,7 @@ public class Q013_ParcelDelivery extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q013_ParcelDelivery extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q014_WhereaboutsOfTheArchaeologist/Q014_WhereaboutsOfTheArchaeologist.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q014_WhereaboutsOfTheArchaeologist/Q014_WhereaboutsOfTheArchaeologist.java index 3bcbef5750..78a94eb0ef 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q014_WhereaboutsOfTheArchaeologist/Q014_WhereaboutsOfTheArchaeologist.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q014_WhereaboutsOfTheArchaeologist/Q014_WhereaboutsOfTheArchaeologist.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q014_WhereaboutsOfTheArchaeologist extends Quest { - private static final String qn = "Q014_WhereaboutsOfTheArchaeologist"; - // NPCs private static final int LIESEL = 31263; private static final int GHOST_OF_ADVENTURER = 31538; @@ -35,7 +33,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest public Q014_WhereaboutsOfTheArchaeologist() { - super(14, qn, "Whereabouts of the Archaeologist"); + super(14, "Whereabouts of the Archaeologist"); registerQuestItems(LETTER); @@ -47,7 +45,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q014_WhereaboutsOfTheArchaeologist extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q015_SweetWhispers/Q015_SweetWhispers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q015_SweetWhispers/Q015_SweetWhispers.java index 98c341549e..449b717278 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q015_SweetWhispers/Q015_SweetWhispers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q015_SweetWhispers/Q015_SweetWhispers.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q015_SweetWhispers extends Quest { - private static final String qn = "Q015_SweetWhispers"; - // NPCs private static final int VLADIMIR = 31302; private static final int HIERARCH = 31517; @@ -33,7 +31,7 @@ public class Q015_SweetWhispers extends Quest public Q015_SweetWhispers() { - super(15, qn, "Sweet Whispers"); + super(15, "Sweet Whispers"); addStartNpc(VLADIMIR); addTalkId(VLADIMIR, HIERARCH, MYSTERIOUS_NECRO); @@ -43,7 +41,7 @@ public class Q015_SweetWhispers extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q015_SweetWhispers extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q016_TheComingDarkness/Q016_TheComingDarkness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q016_TheComingDarkness/Q016_TheComingDarkness.java index f87674ff15..b20c9f1c93 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q016_TheComingDarkness/Q016_TheComingDarkness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q016_TheComingDarkness/Q016_TheComingDarkness.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q016_TheComingDarkness extends Quest { - private static final String qn = "Q016_TheComingDarkness"; - // NPCs private static final int HIERARCH = 31517; private static final int EVIL_ALTAR_1 = 31512; @@ -39,7 +37,7 @@ public class Q016_TheComingDarkness extends Quest public Q016_TheComingDarkness() { - super(16, qn, "The Coming Darkness"); + super(16, "The Coming Darkness"); registerQuestItems(CRYSTAL_OF_SEAL); @@ -51,7 +49,7 @@ public class Q016_TheComingDarkness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -102,7 +100,7 @@ public class Q016_TheComingDarkness extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q017_LightAndDarkness/Q017_LightAndDarkness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q017_LightAndDarkness/Q017_LightAndDarkness.java index 7efdd16177..b4c1f9dc6c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q017_LightAndDarkness/Q017_LightAndDarkness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q017_LightAndDarkness/Q017_LightAndDarkness.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q017_LightAndDarkness extends Quest { - private static final String qn = "Q017_LightAndDarkness"; - // Items private static final int BLOOD_OF_SAINT = 7168; @@ -38,7 +36,7 @@ public class Q017_LightAndDarkness extends Quest public Q017_LightAndDarkness() { - super(17, qn, "Light and Darkness"); + super(17, "Light and Darkness"); registerQuestItems(BLOOD_OF_SAINT); @@ -50,7 +48,7 @@ public class Q017_LightAndDarkness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -123,7 +121,7 @@ public class Q017_LightAndDarkness extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q018_MeetingWithTheGoldenRam/Q018_MeetingWithTheGoldenRam.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q018_MeetingWithTheGoldenRam/Q018_MeetingWithTheGoldenRam.java index 1ceabf40f8..c4cf8c8aef 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q018_MeetingWithTheGoldenRam/Q018_MeetingWithTheGoldenRam.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q018_MeetingWithTheGoldenRam/Q018_MeetingWithTheGoldenRam.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q018_MeetingWithTheGoldenRam extends Quest { - private static final String qn = "Q018_MeetingWithTheGoldenRam"; - // Items private static final int SUPPLY_BOX = 7245; @@ -36,7 +34,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest public Q018_MeetingWithTheGoldenRam() { - super(18, qn, "Meeting with the Golden Ram"); + super(18, "Meeting with the Golden Ram"); registerQuestItems(SUPPLY_BOX); @@ -48,7 +46,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +80,7 @@ public class Q018_MeetingWithTheGoldenRam extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q019_GoToThePastureland/Q019_GoToThePastureland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q019_GoToThePastureland/Q019_GoToThePastureland.java index ec6fd23d89..99408f9bf7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q019_GoToThePastureland/Q019_GoToThePastureland.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q019_GoToThePastureland/Q019_GoToThePastureland.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q019_GoToThePastureland extends Quest { - private static final String qn = "Q019_GoToThePastureland"; - // Items private static final int YOUNG_WILD_BEAST_MEAT = 7547; @@ -35,7 +33,7 @@ public class Q019_GoToThePastureland extends Quest public Q019_GoToThePastureland() { - super(19, qn, "Go to the Pastureland!"); + super(19, "Go to the Pastureland!"); registerQuestItems(YOUNG_WILD_BEAST_MEAT); @@ -47,7 +45,7 @@ public class Q019_GoToThePastureland extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +80,7 @@ public class Q019_GoToThePastureland extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q020_BringUpWithLove/Q020_BringUpWithLove.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q020_BringUpWithLove/Q020_BringUpWithLove.java index ee75f1717b..f1414132a9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q020_BringUpWithLove/Q020_BringUpWithLove.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q020_BringUpWithLove/Q020_BringUpWithLove.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q020_BringUpWithLove extends Quest { - public static final String qn = "Q020_BringUpWithLove"; - // Item private static final int JEWEL_OF_INNOCENCE = 7185; public Q020_BringUpWithLove() { - super(20, qn, "Bring Up With Love"); + super(20, "Bring Up With Love"); registerQuestItems(JEWEL_OF_INNOCENCE); @@ -43,7 +41,7 @@ public class Q020_BringUpWithLove extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -70,7 +68,7 @@ public class Q020_BringUpWithLove extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q021_HiddenTruth/Q021_HiddenTruth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q021_HiddenTruth/Q021_HiddenTruth.java index 01d1a4c8bc..04d7b39ba0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q021_HiddenTruth/Q021_HiddenTruth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q021_HiddenTruth/Q021_HiddenTruth.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q021_HiddenTruth extends Quest { - private static final String qn = "Q021_HiddenTruth"; - // NPCs private static final int MYSTERIOUS_WIZARD = 31522; private static final int TOMBSTONE = 31523; @@ -55,7 +53,7 @@ public class Q021_HiddenTruth extends Quest public Q021_HiddenTruth() { - super(21, qn, "Hidden Truth"); + super(21, "Hidden Truth"); registerQuestItems(CROSS_OF_EINHASAD); @@ -67,7 +65,7 @@ public class Q021_HiddenTruth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -170,7 +168,7 @@ public class Q021_HiddenTruth extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java index 83e243079b..cf25ee3e8f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q022_TragedyInVonHellmannForest/Q022_TragedyInVonHellmannForest.java @@ -24,10 +24,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q021_HiddenTruth.Q021_HiddenTruth; + public class Q022_TragedyInVonHellmannForest extends Quest { - private static final String qn = "Q022_TragedyInVonHellmannForest"; - // NPCs private static final int WELL = 31527; private static final int TIFAREN = 31334; @@ -52,7 +52,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest public Q022_TragedyInVonHellmannForest() { - super(22, qn, "Tragedy in von Hellmann Forest"); + super(22, "Tragedy in von Hellmann Forest"); registerQuestItems(LOST_SKULL_OF_ELF, REPORT_BOX, SEALED_REPORT_BOX, LETTER_OF_INNOCENTIN, RED_JEWEL_OF_ADVENTURER, GREEN_JEWEL_OF_ADVENTURER); @@ -67,7 +67,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +75,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest if (event.equals("31334-03.htm")) { - QuestState st2 = player.getQuestState("Q021_HiddenTruth"); + QuestState st2 = player.getQuestState(Q021_HiddenTruth.class.getSimpleName()); if ((st2 != null) && st2.isCompleted() && (player.getLevel() >= 63)) { htmltext = "31334-02.htm"; @@ -198,7 +198,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -210,7 +210,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest switch (npc.getNpcId()) { case INNOCENTIN: - QuestState st2 = player.getQuestState("Q021_HiddenTruth"); + QuestState st2 = player.getQuestState(Q021_HiddenTruth.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { if (!st.hasQuestItems(CROSS_OF_EINHASAD)) @@ -421,7 +421,7 @@ public class Q022_TragedyInVonHellmannForest extends Quest @Override public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet) { - QuestState st = attacker.getQuestState(qn); + QuestState st = attacker.getQuestState(getName()); if ((st == null) || !st.isStarted() || isPet) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q023_LidiasHeart/Q023_LidiasHeart.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q023_LidiasHeart/Q023_LidiasHeart.java index 4e6ce5f353..2f00c4f115 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q023_LidiasHeart/Q023_LidiasHeart.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q023_LidiasHeart/Q023_LidiasHeart.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q022_TragedyInVonHellmannForest.Q022_TragedyInVonHellmannForest; + public class Q023_LidiasHeart extends Quest { - private static final String qn = "Q023_LidiasHeart"; - // NPCs private static final int INNOCENTIN = 31328; private static final int BROKEN_BOOKSHELF = 31526; @@ -46,7 +46,7 @@ public class Q023_LidiasHeart extends Quest public Q023_LidiasHeart() { - super(23, qn, "Lidia's Heart"); + super(23, "Lidia's Heart"); registerQuestItems(FOREST_OF_DEADMAN_MAP, SILVER_KEY, LIDIA_DIARY, SILVER_SPEAR); @@ -58,7 +58,7 @@ public class Q023_LidiasHeart extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -171,7 +171,7 @@ public class Q023_LidiasHeart extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -180,7 +180,7 @@ public class Q023_LidiasHeart extends Quest switch (st.getState()) { case State.CREATED: - QuestState st2 = player.getQuestState("Q022_TragedyInVonHellmannForest"); + QuestState st2 = player.getQuestState(Q022_TragedyInVonHellmannForest.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { if (player.getLevel() >= 64) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q024_InhabitantsOfTheForrestOfTheDead/Q024_InhabitantsOfTheForrestOfTheDead.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q024_InhabitantsOfTheForrestOfTheDead/Q024_InhabitantsOfTheForrestOfTheDead.java index ead4aeffa1..6838952472 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q024_InhabitantsOfTheForrestOfTheDead/Q024_InhabitantsOfTheForrestOfTheDead.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q024_InhabitantsOfTheForrestOfTheDead/Q024_InhabitantsOfTheForrestOfTheDead.java @@ -23,14 +23,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; +import quests.Q023_LidiasHeart.Q023_LidiasHeart; + /** * @author Mobius * @note Based on python script */ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest { - private static final String qn = "Q024_InhabitantsOfTheForrestOfTheDead"; - // NPCs private static final int DORIAN = 31389; private static final int WIZARD = 31522; @@ -47,7 +47,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest public Q024_InhabitantsOfTheForrestOfTheDead() { - super(24, qn, "Inhabitants of the Forest of the Dead"); + super(24, "Inhabitants of the Forest of the Dead"); addStartNpc(DORIAN); addTalkId(DORIAN, TOMBSTONE, MAID_OF_LIDIA, WIZARD); @@ -59,7 +59,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -146,7 +146,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -170,7 +170,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest { if (state == State.CREATED) { - final QuestState qs2 = player.getQuestState("Q023_LidiasHeart"); + final QuestState qs2 = player.getQuestState(Q023_LidiasHeart.class.getSimpleName()); if (qs2 != null) { if ((qs2.getState() == State.COMPLETED) && (player.getLevel() >= 65)) @@ -266,7 +266,7 @@ public class Q024_InhabitantsOfTheForrestOfTheDead extends Quest else { npc.getAttackByList().remove(player); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if ((qs != null) && (qs.getQuestItemsCount(SILVER_CROSS) > 0)) { qs.takeItems(SILVER_CROSS, -1); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q025_HidingBehindTheTruth/Q025_HidingBehindTheTruth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q025_HidingBehindTheTruth/Q025_HidingBehindTheTruth.java index a1d287eb65..cfba0abf7f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q025_HidingBehindTheTruth/Q025_HidingBehindTheTruth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q025_HidingBehindTheTruth/Q025_HidingBehindTheTruth.java @@ -25,14 +25,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; +import quests.Q024_InhabitantsOfTheForrestOfTheDead.Q024_InhabitantsOfTheForrestOfTheDead; + /** * @author Mobius * @note Based on python script */ public class Q025_HidingBehindTheTruth extends Quest { - private static final String qn = "Q025_HidingBehindTheTruth"; - // NPCs private static final int AGRIPEL = 31348; private static final int BENEDICT = 31349; @@ -53,7 +53,7 @@ public class Q025_HidingBehindTheTruth extends Quest public Q025_HidingBehindTheTruth() { - super(25, qn, "Hiding Behind the Truth"); + super(25, "Hiding Behind the Truth"); addStartNpc(BENEDICT); addTalkId(AGRIPEL, BENEDICT, BOOKSHELF, BOOKSHELF2, BOOKSHELF3, WIZARD, LIDIA, TOMBSTONE, COFFIN); @@ -65,7 +65,7 @@ public class Q025_HidingBehindTheTruth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -222,7 +222,7 @@ public class Q025_HidingBehindTheTruth extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -239,7 +239,7 @@ public class Q025_HidingBehindTheTruth extends Quest { if (npcId == BENEDICT) { - final QuestState qs2 = player.getQuestState("Q024_InhabitantsOfTheForrestOfTheDead"); + final QuestState qs2 = player.getQuestState(Q024_InhabitantsOfTheForrestOfTheDead.class.getSimpleName()); if (qs2 != null) { if ((qs2.getState() == State.COMPLETED) && (player.getLevel() >= 66)) @@ -428,7 +428,7 @@ public class Q025_HidingBehindTheTruth extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q027_ChestCaughtWithABaitOfWind/Q027_ChestCaughtWithABaitOfWind.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q027_ChestCaughtWithABaitOfWind/Q027_ChestCaughtWithABaitOfWind.java index e535b12138..0163f3617b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q027_ChestCaughtWithABaitOfWind/Q027_ChestCaughtWithABaitOfWind.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q027_ChestCaughtWithABaitOfWind/Q027_ChestCaughtWithABaitOfWind.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q050_LanoscosSpecialBait.Q050_LanoscosSpecialBait; + public class Q027_ChestCaughtWithABaitOfWind extends Quest { - private static final String qn = "Q027_ChestCaughtWithABaitOfWind"; - // NPCs private static final int LANOSCO = 31570; private static final int SHALING = 31442; @@ -37,7 +37,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest public Q027_ChestCaughtWithABaitOfWind() { - super(27, qn, "Chest caught with a bait of wind"); + super(27, "Chest caught with a bait of wind"); registerQuestItems(STRANGE_BLUEPRINT); @@ -49,7 +49,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +96,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -112,7 +112,7 @@ public class Q027_ChestCaughtWithABaitOfWind extends Quest } else { - QuestState st2 = player.getQuestState("Q050_LanoscosSpecialBait"); + QuestState st2 = player.getQuestState(Q050_LanoscosSpecialBait.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { htmltext = "31570-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q028_ChestCaughtWithABaitOfIcyAir/Q028_ChestCaughtWithABaitOfIcyAir.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q028_ChestCaughtWithABaitOfIcyAir/Q028_ChestCaughtWithABaitOfIcyAir.java index 8678ff8699..e4a32a5777 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q028_ChestCaughtWithABaitOfIcyAir/Q028_ChestCaughtWithABaitOfIcyAir.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q028_ChestCaughtWithABaitOfIcyAir/Q028_ChestCaughtWithABaitOfIcyAir.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q051_OFullesSpecialBait.Q051_OFullesSpecialBait; + public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest { - private static final String qn = "Q028_ChestCaughtWithABaitOfIcyAir"; - // NPCs private static final int OFULLE = 31572; private static final int KIKI = 31442; @@ -37,7 +37,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest public Q028_ChestCaughtWithABaitOfIcyAir() { - super(28, qn, "Chest caught with a bait of icy air"); + super(28, "Chest caught with a bait of icy air"); registerQuestItems(KIKI_LETTER); @@ -49,7 +49,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +96,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -112,7 +112,7 @@ public class Q028_ChestCaughtWithABaitOfIcyAir extends Quest } else { - QuestState st2 = player.getQuestState("Q051_OFullesSpecialBait"); + QuestState st2 = player.getQuestState(Q051_OFullesSpecialBait.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { htmltext = "31572-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q029_ChestCaughtWithABaitOfEarth/Q029_ChestCaughtWithABaitOfEarth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q029_ChestCaughtWithABaitOfEarth/Q029_ChestCaughtWithABaitOfEarth.java index 734aeff710..a18ab1a805 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q029_ChestCaughtWithABaitOfEarth/Q029_ChestCaughtWithABaitOfEarth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q029_ChestCaughtWithABaitOfEarth/Q029_ChestCaughtWithABaitOfEarth.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q052_WilliesSpecialBait.Q052_WilliesSpecialBait; + public class Q029_ChestCaughtWithABaitOfEarth extends Quest { - private static final String qn = "Q029_ChestCaughtWithABaitOfEarth"; - // NPCs private static final int WILLIE = 31574; private static final int ANABEL = 30909; @@ -37,7 +37,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest public Q029_ChestCaughtWithABaitOfEarth() { - super(29, qn, "Chest caught with a bait of earth"); + super(29, "Chest caught with a bait of earth"); registerQuestItems(SMALL_GLASS_BOX); @@ -49,7 +49,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +96,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -112,7 +112,7 @@ public class Q029_ChestCaughtWithABaitOfEarth extends Quest } else { - QuestState st2 = player.getQuestState("Q052_WilliesSpecialBait"); + QuestState st2 = player.getQuestState(Q052_WilliesSpecialBait.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { htmltext = "31574-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q030_ChestCaughtWithABaitOfFire/Q030_ChestCaughtWithABaitOfFire.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q030_ChestCaughtWithABaitOfFire/Q030_ChestCaughtWithABaitOfFire.java index a86b7261f9..b5d75748e6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q030_ChestCaughtWithABaitOfFire/Q030_ChestCaughtWithABaitOfFire.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q030_ChestCaughtWithABaitOfFire/Q030_ChestCaughtWithABaitOfFire.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q053_LinnaeusSpecialBait.Q053_LinnaeusSpecialBait; + public class Q030_ChestCaughtWithABaitOfFire extends Quest { - private static final String qn = "Q030_ChestCaughtWithABaitOfFire"; - // NPCs private static final int LINNAEUS = 31577; private static final int RUKAL = 30629; @@ -37,7 +37,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest public Q030_ChestCaughtWithABaitOfFire() { - super(30, qn, "Chest caught with a bait of fire"); + super(30, "Chest caught with a bait of fire"); registerQuestItems(MUSICAL_SCORE); @@ -49,7 +49,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +96,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -112,7 +112,7 @@ public class Q030_ChestCaughtWithABaitOfFire extends Quest } else { - QuestState st2 = player.getQuestState("Q053_LinnaeusSpecialBait"); + QuestState st2 = player.getQuestState(Q053_LinnaeusSpecialBait.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { htmltext = "31577-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q031_SecretBuriedInTheSwamp/Q031_SecretBuriedInTheSwamp.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q031_SecretBuriedInTheSwamp/Q031_SecretBuriedInTheSwamp.java index 5d1f03cb20..f6c639306b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q031_SecretBuriedInTheSwamp/Q031_SecretBuriedInTheSwamp.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q031_SecretBuriedInTheSwamp/Q031_SecretBuriedInTheSwamp.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q031_SecretBuriedInTheSwamp extends Quest { - private static final String qn = "Q031_SecretBuriedInTheSwamp"; - // Item private static final int KRORIN_JOURNAL = 7252; @@ -39,7 +37,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest public Q031_SecretBuriedInTheSwamp() { - super(31, qn, "Secret Buried in the Swamp"); + super(31, "Secret Buried in the Swamp"); registerQuestItems(KRORIN_JOURNAL); @@ -51,7 +49,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -109,7 +107,7 @@ public class Q031_SecretBuriedInTheSwamp extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q032_AnObviousLie/Q032_AnObviousLie.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q032_AnObviousLie/Q032_AnObviousLie.java index a2880e6bc8..f1f8bcff03 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q032_AnObviousLie/Q032_AnObviousLie.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q032_AnObviousLie/Q032_AnObviousLie.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q032_AnObviousLie extends Quest { - private static final String qn = "Q032_AnObviousLie"; - // Items private static final int SUEDE = 1866; private static final int THREAD = 1868; @@ -45,7 +43,7 @@ public class Q032_AnObviousLie extends Quest public Q032_AnObviousLie() { - super(32, qn, "An Obvious Lie"); + super(32, "An Obvious Lie"); registerQuestItems(MAP, MEDICINAL_HERB); @@ -59,7 +57,7 @@ public class Q032_AnObviousLie extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -171,7 +169,7 @@ public class Q032_AnObviousLie extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q033_MakeAPairOfDressShoes/Q033_MakeAPairOfDressShoes.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q033_MakeAPairOfDressShoes/Q033_MakeAPairOfDressShoes.java index a24362ebb7..e8de4beaa0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q033_MakeAPairOfDressShoes/Q033_MakeAPairOfDressShoes.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q033_MakeAPairOfDressShoes/Q033_MakeAPairOfDressShoes.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; + public class Q033_MakeAPairOfDressShoes extends Quest { - private static final String qn = "Q033_MakeAPairOfDressShoes"; - // NPCs private static final int WOODLEY = 30838; private static final int IAN = 30164; @@ -41,7 +41,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest public Q033_MakeAPairOfDressShoes() { - super(33, qn, "Make a Pair of Dress Shoes"); + super(33, "Make a Pair of Dress Shoes"); addStartNpc(WOODLEY); addTalkId(WOODLEY, IAN, LEIKAR); @@ -51,7 +51,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -114,7 +114,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -126,7 +126,7 @@ public class Q033_MakeAPairOfDressShoes extends Quest case State.CREATED: if (player.getLevel() >= 60) { - QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); + QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); if ((fwear != null) && (fwear.getInt("cond") == 7)) { htmltext = "30838-0.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q034_InSearchOfCloth/Q034_InSearchOfCloth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q034_InSearchOfCloth/Q034_InSearchOfCloth.java index c80c0a4944..b4595bf3b4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q034_InSearchOfCloth/Q034_InSearchOfCloth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q034_InSearchOfCloth/Q034_InSearchOfCloth.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; + public class Q034_InSearchOfCloth extends Quest { - private static final String qn = "Q034_InSearchOfCloth"; - // NPCs private static final int RADIA = 30088; private static final int RALFORD = 30165; @@ -46,7 +46,7 @@ public class Q034_InSearchOfCloth extends Quest public Q034_InSearchOfCloth() { - super(34, qn, "In Search of Cloth"); + super(34, "In Search of Cloth"); registerQuestItems(SPINNERET, SPIDERSILK); @@ -60,7 +60,7 @@ public class Q034_InSearchOfCloth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -117,7 +117,7 @@ public class Q034_InSearchOfCloth extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -129,7 +129,7 @@ public class Q034_InSearchOfCloth extends Quest case State.CREATED: if (player.getLevel() >= 60) { - QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); + QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); if ((fwear != null) && (fwear.getInt("cond") == 6)) { htmltext = "30088-0.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q035_FindGlitteringJewelry/Q035_FindGlitteringJewelry.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q035_FindGlitteringJewelry/Q035_FindGlitteringJewelry.java index 0503401182..fb60c9f085 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q035_FindGlitteringJewelry/Q035_FindGlitteringJewelry.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q035_FindGlitteringJewelry/Q035_FindGlitteringJewelry.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; + public class Q035_FindGlitteringJewelry extends Quest { - private static final String qn = "Q035_FindGlitteringJewelry"; - // NPCs private static final int ELLIE = 30091; private static final int FELTON = 30879; @@ -41,7 +41,7 @@ public class Q035_FindGlitteringJewelry extends Quest public Q035_FindGlitteringJewelry() { - super(35, qn, "Find Glittering Jewelry"); + super(35, "Find Glittering Jewelry"); registerQuestItems(ROUGH_JEWEL); @@ -55,7 +55,7 @@ public class Q035_FindGlitteringJewelry extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -101,7 +101,7 @@ public class Q035_FindGlitteringJewelry extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -113,7 +113,7 @@ public class Q035_FindGlitteringJewelry extends Quest case State.CREATED: if (player.getLevel() >= 60) { - QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); + QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); if ((fwear != null) && (fwear.getInt("cond") == 6)) { htmltext = "30091-0.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q036_MakeASewingKit/Q036_MakeASewingKit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q036_MakeASewingKit/Q036_MakeASewingKit.java index 2e8a4dcaf3..67fe402df6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q036_MakeASewingKit/Q036_MakeASewingKit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q036_MakeASewingKit/Q036_MakeASewingKit.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q037_MakeFormalWear.Q037_MakeFormalWear; + public class Q036_MakeASewingKit extends Quest { - private static final String qn = "Q036_MakeASewingKit"; - // Items private static final int REINFORCED_STEEL = 7163; private static final int ARTISANS_FRAME = 1891; @@ -36,7 +36,7 @@ public class Q036_MakeASewingKit extends Quest public Q036_MakeASewingKit() { - super(36, qn, "Make a Sewing Kit"); + super(36, "Make a Sewing Kit"); registerQuestItems(REINFORCED_STEEL); @@ -50,7 +50,7 @@ public class Q036_MakeASewingKit extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -90,7 +90,7 @@ public class Q036_MakeASewingKit extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -102,7 +102,7 @@ public class Q036_MakeASewingKit extends Quest case State.CREATED: if (player.getLevel() >= 60) { - QuestState fwear = player.getQuestState("Q037_MakeFormalWear"); + QuestState fwear = player.getQuestState(Q037_MakeFormalWear.class.getSimpleName()); if ((fwear != null) && (fwear.getInt("cond") == 6)) { htmltext = "30847-0.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q037_MakeFormalWear/Q037_MakeFormalWear.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q037_MakeFormalWear/Q037_MakeFormalWear.java index 11274a300f..e43f202332 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q037_MakeFormalWear/Q037_MakeFormalWear.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q037_MakeFormalWear/Q037_MakeFormalWear.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q037_MakeFormalWear extends Quest { - private static final String qn = "Q037_MakeFormalWear"; - // NPCs private static final int ALEXIS = 30842; private static final int LEIKAR = 31520; @@ -46,7 +44,7 @@ public class Q037_MakeFormalWear extends Quest public Q037_MakeFormalWear() { - super(37, qn, "Make Formal Wear"); + super(37, "Make Formal Wear"); registerQuestItems(SIGNET_RING, ICE_WINE, BOX_OF_COOKIES); @@ -58,7 +56,7 @@ public class Q037_MakeFormalWear extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -123,7 +121,7 @@ public class Q037_MakeFormalWear extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java index 3b76d44ce2..921adff7b7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q038_DragonFangs/Q038_DragonFangs.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q038_DragonFangs extends Quest { - private static final String qn = "Q038_DragonFangs"; - // Items private static final int FEATHER_ORNAMENT = 7173; private static final int TOOTH_OF_TOTEM = 7174; @@ -64,7 +62,7 @@ public class Q038_DragonFangs extends Quest }; // Droplist - private static final Map DROPLIST = new HashMap<>(); + private static final Map DROPLIST = new HashMap<>(); static { DROPLIST.put(21100, new int[] @@ -99,7 +97,7 @@ public class Q038_DragonFangs extends Quest public Q038_DragonFangs() { - super(38, qn, "Dragon Fangs"); + super(38, "Dragon Fangs"); registerQuestItems(FEATHER_ORNAMENT, TOOTH_OF_TOTEM, TOOTH_OF_DRAGON, LETTER_OF_IRIS, LETTER_OF_ROHMER); @@ -116,7 +114,7 @@ public class Q038_DragonFangs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -189,7 +187,7 @@ public class Q038_DragonFangs extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q039_RedEyedInvaders/Q039_RedEyedInvaders.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q039_RedEyedInvaders/Q039_RedEyedInvaders.java index d80f04c24a..f2edb32b24 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q039_RedEyedInvaders/Q039_RedEyedInvaders.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q039_RedEyedInvaders/Q039_RedEyedInvaders.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q039_RedEyedInvaders extends Quest { - private static final String qn = "Q039_RedEyedInvaders"; - // NPCs private static final int BABENCO = 30334; private static final int BATHIS = 30332; @@ -46,7 +44,7 @@ public class Q039_RedEyedInvaders extends Quest private static final int GEM_OF_MAILLE = 7181; // First droplist - private static final Map FIRST_DP = new HashMap<>(); + private static final Map FIRST_DP = new HashMap<>(); static { FIRST_DP.put(MAILLE_LIZARDMAN_GUARD, new int[] @@ -67,7 +65,7 @@ public class Q039_RedEyedInvaders extends Quest } // Second droplist - private static final Map SECOND_DP = new HashMap<>(); + private static final Map SECOND_DP = new HashMap<>(); static { SECOND_DP.put(ARANEID, new int[] @@ -97,7 +95,7 @@ public class Q039_RedEyedInvaders extends Quest public Q039_RedEyedInvaders() { - super(39, qn, "Red-Eyed Invaders"); + super(39, "Red-Eyed Invaders"); registerQuestItems(BLACK_BONE_NECKLACE, RED_BONE_NECKLACE, INCENSE_POUCH, GEM_OF_MAILLE); @@ -111,7 +109,7 @@ public class Q039_RedEyedInvaders extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -153,7 +151,7 @@ public class Q039_RedEyedInvaders extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -214,7 +212,7 @@ public class Q039_RedEyedInvaders extends Quest PlayerInstance partyMember = getRandomPartyMember(player, npc, "2"); if ((partyMember != null) && (npcId != ARANEID)) { - final QuestState st = partyMember.getQuestState(qn); + final QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; @@ -231,7 +229,7 @@ public class Q039_RedEyedInvaders extends Quest partyMember = getRandomPartyMember(player, npc, "4"); if ((partyMember != null) && (npcId != MAILLE_LIZARDMAN)) { - final QuestState st = partyMember.getQuestState(qn); + final QuestState st = partyMember.getQuestState(getName()); final int[] list = SECOND_DP.get(npcId); if (st.dropItems(list[0], 1, 30, list[2]) && (st.getQuestItemsCount(list[1]) == 30)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q042_HelpTheUncle/Q042_HelpTheUncle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q042_HelpTheUncle/Q042_HelpTheUncle.java index e6b5d08e38..208eef9fd2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q042_HelpTheUncle/Q042_HelpTheUncle.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q042_HelpTheUncle/Q042_HelpTheUncle.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q042_HelpTheUncle extends Quest { - private static final String qn = "Q042_HelpTheUncle"; - // NPCs private static final int WATERS = 30828; private static final int SOPHYA = 30735; @@ -42,7 +40,7 @@ public class Q042_HelpTheUncle extends Quest public Q042_HelpTheUncle() { - super(42, qn, "Help the Uncle!"); + super(42, "Help the Uncle!"); registerQuestItems(MAP_PIECE, MAP); @@ -56,7 +54,7 @@ public class Q042_HelpTheUncle extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -100,7 +98,7 @@ public class Q042_HelpTheUncle extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q043_HelpTheSister/Q043_HelpTheSister.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q043_HelpTheSister/Q043_HelpTheSister.java index b592d6067b..4cb872e11b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q043_HelpTheSister/Q043_HelpTheSister.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q043_HelpTheSister/Q043_HelpTheSister.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q043_HelpTheSister extends Quest { - private static final String qn = "Q043_HelpTheSister"; - // NPCs private static final int COOPER = 30829; private static final int GALLADUCCI = 30097; @@ -42,7 +40,7 @@ public class Q043_HelpTheSister extends Quest public Q043_HelpTheSister() { - super(43, qn, "Help the Sister!"); + super(43, "Help the Sister!"); registerQuestItems(MAP_PIECE, MAP); @@ -56,7 +54,7 @@ public class Q043_HelpTheSister extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -100,7 +98,7 @@ public class Q043_HelpTheSister extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q044_HelpTheSon/Q044_HelpTheSon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q044_HelpTheSon/Q044_HelpTheSon.java index 7c4d3eb154..294c4d762b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q044_HelpTheSon/Q044_HelpTheSon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q044_HelpTheSon/Q044_HelpTheSon.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q044_HelpTheSon extends Quest { - private static final String qn = "Q044_HelpTheSon"; - // Npcs private static final int LUNDY = 30827; private static final int DRIKUS = 30505; @@ -43,7 +41,7 @@ public class Q044_HelpTheSon extends Quest public Q044_HelpTheSon() { - super(44, qn, "Help the Son!"); + super(44, "Help the Son!"); registerQuestItems(GEMSTONE_FRAGMENT, GEMSTONE); @@ -57,7 +55,7 @@ public class Q044_HelpTheSon extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -101,7 +99,7 @@ public class Q044_HelpTheSon extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java index a979b3caec..f61ed14091 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q045_ToTalkingIsland/Q045_ToTalkingIsland.java @@ -21,8 +21,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q045_ToTalkingIsland extends Quest { - private static final String qn = "Q045_ToTalkingIsland"; - // Npcs private static final int GALLADUCCI = 30097; private static final int GENTLER = 30094; @@ -41,7 +39,7 @@ public class Q045_ToTalkingIsland extends Quest public Q045_ToTalkingIsland() { - super(45, qn, "To Talking Island"); + super(45, "To Talking Island"); registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); @@ -53,7 +51,7 @@ public class Q045_ToTalkingIsland extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -116,7 +114,7 @@ public class Q045_ToTalkingIsland extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java index 6e50a6c2ac..1e97eddfcc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q046_OnceMoreInTheArmsOfTheMotherTree/Q046_OnceMoreInTheArmsOfTheMotherTree.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest { - private static final String qn = "Q046_OnceMoreInTheArmsOfTheMotherTree"; - // NPCs private static final int GALLADUCCI = 30097; private static final int GENTLER = 30094; @@ -45,7 +43,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest public Q046_OnceMoreInTheArmsOfTheMotherTree() { - super(46, qn, "Once More In the Arms of the Mother Tree"); + super(46, "Once More In the Arms of the Mother Tree"); registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); @@ -57,7 +55,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +118,7 @@ public class Q046_OnceMoreInTheArmsOfTheMotherTree extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java index 005f6519d1..3db7c070ad 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q047_IntoTheDarkForest/Q047_IntoTheDarkForest.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q047_IntoTheDarkForest extends Quest { - private static final String qn = "Q047_IntoTheDarkForest"; - // NPCs private static final int GALLADUCCI = 30097; private static final int GENTLER = 30094; @@ -45,7 +43,7 @@ public class Q047_IntoTheDarkForest extends Quest public Q047_IntoTheDarkForest() { - super(47, qn, "Into the Dark Forest"); + super(47, "Into the Dark Forest"); registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); @@ -57,7 +55,7 @@ public class Q047_IntoTheDarkForest extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +118,7 @@ public class Q047_IntoTheDarkForest extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java index eae6a20e4e..f16fb439f1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q048_ToTheImmortalPlateau/Q048_ToTheImmortalPlateau.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q048_ToTheImmortalPlateau extends Quest { - private static final String qn = "Q048_ToTheImmortalPlateau"; - // NPCs private static final int GALLADUCCI = 30097; private static final int GENTLER = 30094; @@ -45,7 +43,7 @@ public class Q048_ToTheImmortalPlateau extends Quest public Q048_ToTheImmortalPlateau() { - super(48, qn, "To the Immortal Plateau"); + super(48, "To the Immortal Plateau"); registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); @@ -57,7 +55,7 @@ public class Q048_ToTheImmortalPlateau extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +118,7 @@ public class Q048_ToTheImmortalPlateau extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java index c0496022ef..30b60f5e04 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q049_TheRoadHome/Q049_TheRoadHome.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q049_TheRoadHome extends Quest { - private static final String qn = "Q049_TheRoadHome"; - // NPCs private static final int GALLADUCCI = 30097; private static final int GENTLER = 30094; @@ -45,7 +43,7 @@ public class Q049_TheRoadHome extends Quest public Q049_TheRoadHome() { - super(49, qn, "The Road Home"); + super(49, "The Road Home"); registerQuestItems(ORDER_DOCUMENT_1, ORDER_DOCUMENT_2, ORDER_DOCUMENT_3, MAGIC_SWORD_HILT, GEMSTONE_POWDER, PURIFIED_MAGIC_NECKLACE); @@ -57,7 +55,7 @@ public class Q049_TheRoadHome extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +118,7 @@ public class Q049_TheRoadHome extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q050_LanoscosSpecialBait/Q050_LanoscosSpecialBait.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q050_LanoscosSpecialBait/Q050_LanoscosSpecialBait.java index b6aa5a0ee2..ea3c87655d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q050_LanoscosSpecialBait/Q050_LanoscosSpecialBait.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q050_LanoscosSpecialBait/Q050_LanoscosSpecialBait.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q050_LanoscosSpecialBait extends Quest { - private static final String qn = "Q050_LanoscosSpecialBait"; - // Item private static final int ESSENCE_OF_WIND = 7621; @@ -34,7 +32,7 @@ public class Q050_LanoscosSpecialBait extends Quest public Q050_LanoscosSpecialBait() { - super(50, qn, "Lanosco's Special Bait"); + super(50, "Lanosco's Special Bait"); registerQuestItems(ESSENCE_OF_WIND); @@ -48,7 +46,7 @@ public class Q050_LanoscosSpecialBait extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q050_LanoscosSpecialBait extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q051_OFullesSpecialBait/Q051_OFullesSpecialBait.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q051_OFullesSpecialBait/Q051_OFullesSpecialBait.java index fa8a94e330..75becfac93 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q051_OFullesSpecialBait/Q051_OFullesSpecialBait.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q051_OFullesSpecialBait/Q051_OFullesSpecialBait.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q051_OFullesSpecialBait extends Quest { - private static final String qn = "Q051_OFullesSpecialBait"; - // Item private static final int LOST_BAIT = 7622; @@ -34,7 +32,7 @@ public class Q051_OFullesSpecialBait extends Quest public Q051_OFullesSpecialBait() { - super(51, qn, "O'Fulle's Special Bait"); + super(51, "O'Fulle's Special Bait"); registerQuestItems(LOST_BAIT); @@ -48,7 +46,7 @@ public class Q051_OFullesSpecialBait extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q051_OFullesSpecialBait extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q052_WilliesSpecialBait/Q052_WilliesSpecialBait.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q052_WilliesSpecialBait/Q052_WilliesSpecialBait.java index 56d9207ead..58ba1424dd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q052_WilliesSpecialBait/Q052_WilliesSpecialBait.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q052_WilliesSpecialBait/Q052_WilliesSpecialBait.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q052_WilliesSpecialBait extends Quest { - private static final String qn = "Q052_WilliesSpecialBait"; - // Item private static final int TARLK_EYE = 7623; @@ -34,7 +32,7 @@ public class Q052_WilliesSpecialBait extends Quest public Q052_WilliesSpecialBait() { - super(52, qn, "Willie's Special Bait"); + super(52, "Willie's Special Bait"); registerQuestItems(TARLK_EYE); @@ -48,7 +46,7 @@ public class Q052_WilliesSpecialBait extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q052_WilliesSpecialBait extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q053_LinnaeusSpecialBait/Q053_LinnaeusSpecialBait.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q053_LinnaeusSpecialBait/Q053_LinnaeusSpecialBait.java index 0f07162d91..f6baa1dc8a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q053_LinnaeusSpecialBait/Q053_LinnaeusSpecialBait.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q053_LinnaeusSpecialBait/Q053_LinnaeusSpecialBait.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q053_LinnaeusSpecialBait extends Quest { - private static final String qn = "Q053_LinnaeusSpecialBait"; - // Item private static final int CRIMSON_DRAKE_HEART = 7624; @@ -34,7 +32,7 @@ public class Q053_LinnaeusSpecialBait extends Quest public Q053_LinnaeusSpecialBait() { - super(53, qn, "Linnaeus' Special Bait"); + super(53, "Linnaeus' Special Bait"); registerQuestItems(CRIMSON_DRAKE_HEART); @@ -48,7 +46,7 @@ public class Q053_LinnaeusSpecialBait extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q053_LinnaeusSpecialBait extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q070_SagaOfThePhoenixKnight/Q070_SagaOfThePhoenixKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q070_SagaOfThePhoenixKnight/Q070_SagaOfThePhoenixKnight.java index c14b776add..e7fa9b5a22 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q070_SagaOfThePhoenixKnight/Q070_SagaOfThePhoenixKnight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q070_SagaOfThePhoenixKnight/Q070_SagaOfThePhoenixKnight.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q070_SagaOfThePhoenixKnight extends SagasSuperClass { - public static String qn1 = "Q070_SagaOfThePhoenixKnight"; - public static int qnu = 70; - public static String qna = "Saga of the Phoenix Knight"; - public Q070_SagaOfThePhoenixKnight() { - super(qnu, qn1, qna); + super(70, "Saga of the Phoenix Knight"); NPC = new int[] { 30849, @@ -66,7 +62,6 @@ public class Q070_SagaOfThePhoenixKnight extends SagasSuperClass 27219, 27278 }; - qn = qn1; classid = new int[] { 90 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q071_SagaOfEvasTemplar/Q071_SagaOfEvasTemplar.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q071_SagaOfEvasTemplar/Q071_SagaOfEvasTemplar.java index b3bef7d209..2cba5e903f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q071_SagaOfEvasTemplar/Q071_SagaOfEvasTemplar.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q071_SagaOfEvasTemplar/Q071_SagaOfEvasTemplar.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q071_SagaOfEvasTemplar extends SagasSuperClass { - public static String qn1 = "Q071_SagaOfEvasTemplar"; - public static int qnu = 71; - public static String qna = "Saga of Eva's Templar"; - public Q071_SagaOfEvasTemplar() { - super(qnu, qn1, qna); + super(71, "Saga of Eva's Templar"); NPC = new int[] { 30852, @@ -66,7 +62,6 @@ public class Q071_SagaOfEvasTemplar extends SagasSuperClass 27220, 27279 }; - qn = qn1; classid = new int[] { 99 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q072_SagaOfTheSwordMuse/Q072_SagaOfTheSwordMuse.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q072_SagaOfTheSwordMuse/Q072_SagaOfTheSwordMuse.java index a4f8167f60..40c3d7762d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q072_SagaOfTheSwordMuse/Q072_SagaOfTheSwordMuse.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q072_SagaOfTheSwordMuse/Q072_SagaOfTheSwordMuse.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q072_SagaOfTheSwordMuse extends SagasSuperClass { - public static String qn1 = "Q072_SagaOfTheSwordMuse"; - public static int qnu = 72; - public static String qna = "Saga of the Sword Muse"; - public Q072_SagaOfTheSwordMuse() { - super(qnu, qn1, qna); + super(72, "Saga of the Sword Muse"); NPC = new int[] { 30853, @@ -66,7 +62,6 @@ public class Q072_SagaOfTheSwordMuse extends SagasSuperClass 27221, 27280 }; - qn = qn1; classid = new int[] { 100 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q073_SagaOfTheDuelist/Q073_SagaOfTheDuelist.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q073_SagaOfTheDuelist/Q073_SagaOfTheDuelist.java index 1e393ee07b..05260a38b4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q073_SagaOfTheDuelist/Q073_SagaOfTheDuelist.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q073_SagaOfTheDuelist/Q073_SagaOfTheDuelist.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q073_SagaOfTheDuelist extends SagasSuperClass { - public static String qn1 = "Q073_SagaOfTheDuelist"; - public static int qnu = 73; - public static String qna = "Saga of the Duelist"; - public Q073_SagaOfTheDuelist() { - super(qnu, qn1, qna); + super(73, "Saga of the Duelist"); NPC = new int[] { 30849, @@ -66,7 +62,6 @@ public class Q073_SagaOfTheDuelist extends SagasSuperClass 27222, 27281 }; - qn = qn1; classid = new int[] { 88 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q074_SagaOfTheDreadnought/Q074_SagaOfTheDreadnought.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q074_SagaOfTheDreadnought/Q074_SagaOfTheDreadnought.java index a4ab50f5cd..e0991215f7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q074_SagaOfTheDreadnought/Q074_SagaOfTheDreadnought.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q074_SagaOfTheDreadnought/Q074_SagaOfTheDreadnought.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q074_SagaOfTheDreadnought extends SagasSuperClass { - public static String qn1 = "Q074_SagaOfTheDreadnought"; - public static int qnu = 74; - public static String qna = "Saga of the Dreadnought"; - public Q074_SagaOfTheDreadnought() { - super(qnu, qn1, qna); + super(74, "Saga of the Dreadnought"); NPC = new int[] { 30850, @@ -66,7 +62,6 @@ public class Q074_SagaOfTheDreadnought extends SagasSuperClass 27223, 27282 }; - qn = qn1; classid = new int[] { 89 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q075_SagaOfTheTitan/Q075_SagaOfTheTitan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q075_SagaOfTheTitan/Q075_SagaOfTheTitan.java index 7554a26691..b9ae5fab4c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q075_SagaOfTheTitan/Q075_SagaOfTheTitan.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q075_SagaOfTheTitan/Q075_SagaOfTheTitan.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q075_SagaOfTheTitan extends SagasSuperClass { - public static String qn1 = "Q075_SagaOfTheTitan"; - public static int qnu = 75; - public static String qna = "Saga of the Titan"; - public Q075_SagaOfTheTitan() { - super(qnu, qn1, qna); + super(75, "Saga of the Titan"); NPC = new int[] { 31327, @@ -66,7 +62,6 @@ public class Q075_SagaOfTheTitan extends SagasSuperClass 27224, 27283 }; - qn = qn1; classid = new int[] { 113 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q076_SagaOfTheGrandKhavatari/Q076_SagaOfTheGrandKhavatari.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q076_SagaOfTheGrandKhavatari/Q076_SagaOfTheGrandKhavatari.java index 1c584d4e36..3abcc94f60 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q076_SagaOfTheGrandKhavatari/Q076_SagaOfTheGrandKhavatari.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q076_SagaOfTheGrandKhavatari/Q076_SagaOfTheGrandKhavatari.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q076_SagaOfTheGrandKhavatari extends SagasSuperClass { - public static String qn1 = "Q076_SagaOfTheGrandKhavatari"; - public static int qnu = 76; - public static String qna = "Saga of the Grand Khavatari"; - public Q076_SagaOfTheGrandKhavatari() { - super(qnu, qn1, qna); + super(76, "Saga of the Grand Khavatari"); NPC = new int[] { 31339, @@ -66,7 +62,6 @@ public class Q076_SagaOfTheGrandKhavatari extends SagasSuperClass 27226, 27284 }; - qn = qn1; classid = new int[] { 114 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q077_SagaOfTheDominator/Q077_SagaOfTheDominator.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q077_SagaOfTheDominator/Q077_SagaOfTheDominator.java index 0794738977..3cd03526b4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q077_SagaOfTheDominator/Q077_SagaOfTheDominator.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q077_SagaOfTheDominator/Q077_SagaOfTheDominator.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q077_SagaOfTheDominator extends SagasSuperClass { - public static String qn1 = "Q077_SagaOfTheDominator"; - public static int qnu = 77; - public static String qna = "Saga of the Dominator"; - public Q077_SagaOfTheDominator() { - super(qnu, qn1, qna); + super(77, "Saga of the Dominator"); NPC = new int[] { 31336, @@ -66,7 +62,6 @@ public class Q077_SagaOfTheDominator extends SagasSuperClass 27226, 27262 }; - qn = qn1; classid = new int[] { 115 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q078_SagaOfTheDoomcryer/Q078_SagaOfTheDoomcryer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q078_SagaOfTheDoomcryer/Q078_SagaOfTheDoomcryer.java index 3110bb83e4..2438aa04ff 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q078_SagaOfTheDoomcryer/Q078_SagaOfTheDoomcryer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q078_SagaOfTheDoomcryer/Q078_SagaOfTheDoomcryer.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q078_SagaOfTheDoomcryer extends SagasSuperClass { - public static String qn1 = "Q078_SagaOfTheDoomcryer"; - public static int qnu = 78; - public static String qna = "Saga of the Doomcryer"; - public Q078_SagaOfTheDoomcryer() { - super(qnu, qn1, qna); + super(78, "Saga of the Doomcryer"); NPC = new int[] { 31336, @@ -67,7 +63,6 @@ public class Q078_SagaOfTheDoomcryer extends SagasSuperClass 27227, 27285 }; - qn = qn1; classid = new int[] { 116 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q079_SagaOfTheAdventurer/Q079_SagaOfTheAdventurer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q079_SagaOfTheAdventurer/Q079_SagaOfTheAdventurer.java index 6f5a509c2c..32882ed813 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q079_SagaOfTheAdventurer/Q079_SagaOfTheAdventurer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q079_SagaOfTheAdventurer/Q079_SagaOfTheAdventurer.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q079_SagaOfTheAdventurer extends SagasSuperClass { - public static String qn1 = "Q079_SagaOfTheAdventurer"; - public static int qnu = 79; - public static String qna = "Saga of the Adventurer"; - public Q079_SagaOfTheAdventurer() { - super(qnu, qn1, qna); + super(79, "Saga of the Adventurer"); NPC = new int[] { 31603, @@ -66,7 +62,6 @@ public class Q079_SagaOfTheAdventurer extends SagasSuperClass 27228, 27302 }; - qn = qn1; classid = new int[] { 93 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q080_SagaOfTheWindRider/Q080_SagaOfTheWindRider.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q080_SagaOfTheWindRider/Q080_SagaOfTheWindRider.java index fa9216f846..8a12980e26 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q080_SagaOfTheWindRider/Q080_SagaOfTheWindRider.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q080_SagaOfTheWindRider/Q080_SagaOfTheWindRider.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q080_SagaOfTheWindRider extends SagasSuperClass { - public static String qn1 = "Q080_SagaOfTheWindRider"; - public static int qnu = 80; - public static String qna = "Saga of the Wind Rider"; - public Q080_SagaOfTheWindRider() { - super(qnu, qn1, qna); + super(80, "Saga of the Wind Rider"); NPC = new int[] { 31603, @@ -66,7 +62,6 @@ public class Q080_SagaOfTheWindRider extends SagasSuperClass 27229, 27303 }; - qn = qn1; classid = new int[] { 101 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q081_SagaOfTheGhostHunter/Q081_SagaOfTheGhostHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q081_SagaOfTheGhostHunter/Q081_SagaOfTheGhostHunter.java index a47c67954e..5cf5f69eeb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q081_SagaOfTheGhostHunter/Q081_SagaOfTheGhostHunter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q081_SagaOfTheGhostHunter/Q081_SagaOfTheGhostHunter.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q081_SagaOfTheGhostHunter extends SagasSuperClass { - public static String qn1 = "Q081_SagaOfTheGhostHunter"; - public static int qnu = 81; - public static String qna = "Saga of the Ghost Hunter"; - public Q081_SagaOfTheGhostHunter() { - super(qnu, qn1, qna); + super(81, "Saga of the Ghost Hunter"); NPC = new int[] { 31603, @@ -66,7 +62,6 @@ public class Q081_SagaOfTheGhostHunter extends SagasSuperClass 27230, 27304 }; - qn = qn1; classid = new int[] { 108 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q082_SagaOfTheSagittarius/Q082_SagaOfTheSagittarius.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q082_SagaOfTheSagittarius/Q082_SagaOfTheSagittarius.java index bac5e660e9..b176b432b5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q082_SagaOfTheSagittarius/Q082_SagaOfTheSagittarius.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q082_SagaOfTheSagittarius/Q082_SagaOfTheSagittarius.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q082_SagaOfTheSagittarius extends SagasSuperClass { - public static String qn1 = "Q082_SagaOfTheSagittarius"; - public static int qnu = 82; - public static String qna = "Saga of the Sagittarius"; - public Q082_SagaOfTheSagittarius() { - super(qnu, qn1, qna); + super(82, "Saga of the Sagittarius"); NPC = new int[] { 30702, @@ -67,7 +63,6 @@ public class Q082_SagaOfTheSagittarius extends SagasSuperClass 27231, 27305 }; - qn = qn1; classid = new int[] { 92 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q083_SagaOfTheMoonlightSentinel/Q083_SagaOfTheMoonlightSentinel.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q083_SagaOfTheMoonlightSentinel/Q083_SagaOfTheMoonlightSentinel.java index bedff4c87a..328676d053 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q083_SagaOfTheMoonlightSentinel/Q083_SagaOfTheMoonlightSentinel.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q083_SagaOfTheMoonlightSentinel/Q083_SagaOfTheMoonlightSentinel.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q083_SagaOfTheMoonlightSentinel extends SagasSuperClass { - public static String qn1 = "Q083_SagaOfTheMoonlightSentinel"; - public static int qnu = 83; - public static String qna = "Saga of the Moonlight Sentinel"; - public Q083_SagaOfTheMoonlightSentinel() { - super(qnu, qn1, qna); + super(83, "Saga of the Moonlight Sentinel"); NPC = new int[] { 30702, @@ -66,7 +62,6 @@ public class Q083_SagaOfTheMoonlightSentinel extends SagasSuperClass 27232, 27306 }; - qn = qn1; classid = new int[] { 102 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q084_SagaOfTheGhostSentinel/Q084_SagaOfTheGhostSentinel.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q084_SagaOfTheGhostSentinel/Q084_SagaOfTheGhostSentinel.java index a508f7e5dc..60e453da6d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q084_SagaOfTheGhostSentinel/Q084_SagaOfTheGhostSentinel.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q084_SagaOfTheGhostSentinel/Q084_SagaOfTheGhostSentinel.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q084_SagaOfTheGhostSentinel extends SagasSuperClass { - public static String qn1 = "Q084_SagaOfTheGhostSentinel"; - public static int qnu = 84; - public static String qna = "Saga of the Ghost Sentinel"; - public Q084_SagaOfTheGhostSentinel() { - super(qnu, qn1, qna); + super(84, "Saga of the Ghost Sentinel"); NPC = new int[] { 30702, @@ -67,7 +63,6 @@ public class Q084_SagaOfTheGhostSentinel extends SagasSuperClass 27233, 27307 }; - qn = qn1; classid = new int[] { 109 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q085_SagaOfTheCardinal/Q085_SagaOfTheCardinal.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q085_SagaOfTheCardinal/Q085_SagaOfTheCardinal.java index abe173d9bd..f01a422032 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q085_SagaOfTheCardinal/Q085_SagaOfTheCardinal.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q085_SagaOfTheCardinal/Q085_SagaOfTheCardinal.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q085_SagaOfTheCardinal extends SagasSuperClass { - public static String qn1 = "Q085_SagaOfTheCardinal"; - public static int qnu = 85; - public static String qna = "Saga of the Cardinal"; - public Q085_SagaOfTheCardinal() { - super(qnu, qn1, qna); + super(85, "Saga of the Cardinal"); NPC = new int[] { 30191, @@ -66,7 +62,6 @@ public class Q085_SagaOfTheCardinal extends SagasSuperClass 27234, 27274 }; - qn = qn1; classid = new int[] { 97 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q086_SagaOfTheHierophant/Q086_SagaOfTheHierophant.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q086_SagaOfTheHierophant/Q086_SagaOfTheHierophant.java index 46a9c65a6e..4b0112db06 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q086_SagaOfTheHierophant/Q086_SagaOfTheHierophant.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q086_SagaOfTheHierophant/Q086_SagaOfTheHierophant.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q086_SagaOfTheHierophant extends SagasSuperClass { - public static String qn1 = "Q086_SagaOfTheHierophant"; - public static int qnu = 86; - public static String qna = "Saga of the Hierophant"; - public Q086_SagaOfTheHierophant() { - super(qnu, qn1, qna); + super(86, "Saga of the Hierophant"); NPC = new int[] { 30191, @@ -66,7 +62,6 @@ public class Q086_SagaOfTheHierophant extends SagasSuperClass 27235, 27275 }; - qn = qn1; classid = new int[] { 98 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q087_SagaOfEvasSaint/Q087_SagaOfEvasSaint.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q087_SagaOfEvasSaint/Q087_SagaOfEvasSaint.java index 81a89f5649..2752642b26 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q087_SagaOfEvasSaint/Q087_SagaOfEvasSaint.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q087_SagaOfEvasSaint/Q087_SagaOfEvasSaint.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q087_SagaOfEvasSaint extends SagasSuperClass { - public static String qn1 = "Q087_SagaOfEvasSaint"; - public static int qnu = 87; - public static String qna = "Saga of Eva's Saint"; - public Q087_SagaOfEvasSaint() { - super(qnu, qn1, qna); + super(87, "Saga of Eva's Saint"); NPC = new int[] { 30191, @@ -66,7 +62,6 @@ public class Q087_SagaOfEvasSaint extends SagasSuperClass 27236, 27276 }; - qn = qn1; classid = new int[] { 105 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q088_SagaOfTheArchmage/Q088_SagaOfTheArchmage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q088_SagaOfTheArchmage/Q088_SagaOfTheArchmage.java index e7c74bb351..457e9b1aa8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q088_SagaOfTheArchmage/Q088_SagaOfTheArchmage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q088_SagaOfTheArchmage/Q088_SagaOfTheArchmage.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q088_SagaOfTheArchmage extends SagasSuperClass { - public static String qn1 = "Q088_SagaOfTheArchmage"; - public static int qnu = 88; - public static String qna = "Saga of the Archmage"; - public Q088_SagaOfTheArchmage() { - super(qnu, qn1, qna); + super(88, "Saga of the Archmage"); NPC = new int[] { 30176, @@ -66,7 +62,6 @@ public class Q088_SagaOfTheArchmage extends SagasSuperClass 27237, 27254 }; - qn = qn1; classid = new int[] { 94 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q089_SagaOfTheMysticMuse/Q089_SagaOfTheMysticMuse.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q089_SagaOfTheMysticMuse/Q089_SagaOfTheMysticMuse.java index a50eb3897b..3b2b3fe372 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q089_SagaOfTheMysticMuse/Q089_SagaOfTheMysticMuse.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q089_SagaOfTheMysticMuse/Q089_SagaOfTheMysticMuse.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q089_SagaOfTheMysticMuse extends SagasSuperClass { - public static String qn1 = "Q089_SagaOfTheMysticMuse"; - public static int qnu = 89; - public static String qna = "Saga of the Mystic Muse"; - public Q089_SagaOfTheMysticMuse() { - super(qnu, qn1, qna); + super(89, "Saga of the Mystic Muse"); NPC = new int[] { 30174, @@ -66,7 +62,6 @@ public class Q089_SagaOfTheMysticMuse extends SagasSuperClass 27238, 27255 }; - qn = qn1; classid = new int[] { 103 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q090_SagaOfTheStormScreamer/Q090_SagaOfTheStormScreamer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q090_SagaOfTheStormScreamer/Q090_SagaOfTheStormScreamer.java index d333819467..3d99b5feb7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q090_SagaOfTheStormScreamer/Q090_SagaOfTheStormScreamer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q090_SagaOfTheStormScreamer/Q090_SagaOfTheStormScreamer.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q090_SagaOfTheStormScreamer extends SagasSuperClass { - public static String qn1 = "Q090_SagaOfTheStormScreamer"; - public static int qnu = 90; - public static String qna = "Saga of the Storm Screamer"; - public Q090_SagaOfTheStormScreamer() { - super(qnu, qn1, qna); + super(90, "Saga of the Storm Screamer"); NPC = new int[] { 30175, @@ -66,7 +62,6 @@ public class Q090_SagaOfTheStormScreamer extends SagasSuperClass 27239, 27256 }; - qn = qn1; classid = new int[] { 110 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q091_SagaOfTheArcanaLord/Q091_SagaOfTheArcanaLord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q091_SagaOfTheArcanaLord/Q091_SagaOfTheArcanaLord.java index 855aa9ef59..1624270f40 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q091_SagaOfTheArcanaLord/Q091_SagaOfTheArcanaLord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q091_SagaOfTheArcanaLord/Q091_SagaOfTheArcanaLord.java @@ -23,13 +23,9 @@ import quests.SagasSuperClass; */ public class Q091_SagaOfTheArcanaLord extends SagasSuperClass { - public static String qn1 = "Q091_SagaOfTheArcanaLord"; - public static int qnu = 91; - public static String qna = "Saga of the Arcana Lord"; - public Q091_SagaOfTheArcanaLord() { - super(qnu, qn1, qna); + super(91, "Saga of the Arcana Lord"); NPC = new int[] { 31605, @@ -66,7 +62,6 @@ public class Q091_SagaOfTheArcanaLord extends SagasSuperClass 27240, 27310 }; - qn = qn1; classid = new int[] { 96 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q092_SagaOfTheElementalMaster/Q092_SagaOfTheElementalMaster.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q092_SagaOfTheElementalMaster/Q092_SagaOfTheElementalMaster.java index 4ad1027028..a1452cbb4e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q092_SagaOfTheElementalMaster/Q092_SagaOfTheElementalMaster.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q092_SagaOfTheElementalMaster/Q092_SagaOfTheElementalMaster.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q092_SagaOfTheElementalMaster extends SagasSuperClass { - public static String qn1 = "Q092_SagaOfTheElementalMaster"; - public static int qnu = 92; - public static String qna = "Saga of the Elemental Master"; - public Q092_SagaOfTheElementalMaster() { - super(qnu, qn1, qna); + super(92, "Saga of the Elemental Master"); NPC = new int[] { 30174, @@ -67,7 +63,6 @@ public class Q092_SagaOfTheElementalMaster extends SagasSuperClass 27241, 27311 }; - qn = qn1; classid = new int[] { 104 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q093_SagaOfTheSpectralMaster/Q093_SagaOfTheSpectralMaster.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q093_SagaOfTheSpectralMaster/Q093_SagaOfTheSpectralMaster.java index 68ac01f9f4..bde27b094b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q093_SagaOfTheSpectralMaster/Q093_SagaOfTheSpectralMaster.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q093_SagaOfTheSpectralMaster/Q093_SagaOfTheSpectralMaster.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q093_SagaOfTheSpectralMaster extends SagasSuperClass { - public static String qn1 = "Q093_SagaOfTheSpectralMaster"; - public static int qnu = 93; - public static String qna = "Saga of the Spectral Master"; - public Q093_SagaOfTheSpectralMaster() { - super(qnu, qn1, qna); + super(93, "Saga of the Spectral Master"); NPC = new int[] { 30175, @@ -67,7 +63,6 @@ public class Q093_SagaOfTheSpectralMaster extends SagasSuperClass 27242, 27312 }; - qn = qn1; classid = new int[] { 111 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q094_SagaOfTheSoultaker/Q094_SagaOfTheSoultaker.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q094_SagaOfTheSoultaker/Q094_SagaOfTheSoultaker.java index efb16307c3..4a3ce48127 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q094_SagaOfTheSoultaker/Q094_SagaOfTheSoultaker.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q094_SagaOfTheSoultaker/Q094_SagaOfTheSoultaker.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q094_SagaOfTheSoultaker extends SagasSuperClass { - public static String qn1 = "Q094_SagaOfTheSoultaker"; - public static int qnu = 94; - public static String qna = "Saga of the Soultaker"; - public Q094_SagaOfTheSoultaker() { - super(qnu, qn1, qna); + super(94, "Saga of the Soultaker"); NPC = new int[] { 30832, @@ -67,7 +63,6 @@ public class Q094_SagaOfTheSoultaker extends SagasSuperClass 27243, 27265 }; - qn = qn1; classid = new int[] { 95 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q095_SagaOfTheHellKnight/Q095_SagaOfTheHellKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q095_SagaOfTheHellKnight/Q095_SagaOfTheHellKnight.java index 7feacab800..d12765e1a7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q095_SagaOfTheHellKnight/Q095_SagaOfTheHellKnight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q095_SagaOfTheHellKnight/Q095_SagaOfTheHellKnight.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q095_SagaOfTheHellKnight extends SagasSuperClass { - public static String qn1 = "Q095_SagaOfTheHellKnight"; - public static int qnu = 95; - public static String qna = "Saga of the Hell Knight"; - public Q095_SagaOfTheHellKnight() { - super(qnu, qn1, qna); + super(95, "Saga of the Hell Knight"); NPC = new int[] { 31582, @@ -67,7 +63,6 @@ public class Q095_SagaOfTheHellKnight extends SagasSuperClass 27244, 27263 }; - qn = qn1; classid = new int[] { 91 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q096_SagaOfTheSpectralDancer/Q096_SagaOfTheSpectralDancer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q096_SagaOfTheSpectralDancer/Q096_SagaOfTheSpectralDancer.java index 476817be7c..8c2f39e37b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q096_SagaOfTheSpectralDancer/Q096_SagaOfTheSpectralDancer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q096_SagaOfTheSpectralDancer/Q096_SagaOfTheSpectralDancer.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q096_SagaOfTheSpectralDancer extends SagasSuperClass { - public static String qn1 = "Q096_SagaOfTheSpectralDancer"; - public static int qnu = 96; - public static String qna = "Saga of the Spectral Dancer"; - public Q096_SagaOfTheSpectralDancer() { - super(qnu, qn1, qna); + super(96, "Saga of the Spectral Dancer"); NPC = new int[] { 31582, @@ -67,7 +63,6 @@ public class Q096_SagaOfTheSpectralDancer extends SagasSuperClass 27245, 27264 }; - qn = qn1; classid = new int[] { 107 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q097_SagaOfTheShillienTemplar/Q097_SagaOfTheShillienTemplar.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q097_SagaOfTheShillienTemplar/Q097_SagaOfTheShillienTemplar.java index e375909ce7..bcdd4659c4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q097_SagaOfTheShillienTemplar/Q097_SagaOfTheShillienTemplar.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q097_SagaOfTheShillienTemplar/Q097_SagaOfTheShillienTemplar.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q097_SagaOfTheShillienTemplar extends SagasSuperClass { - public static String qn1 = "Q097_SagaOfTheShillienTemplar"; - public static int qnu = 97; - public static String qna = "Saga of the Shillien Templar"; - public Q097_SagaOfTheShillienTemplar() { - super(qnu, qn1, qna); + super(97, "Saga of the Shillien Templar"); NPC = new int[] { 31580, @@ -67,7 +63,6 @@ public class Q097_SagaOfTheShillienTemplar extends SagasSuperClass 27246, 27273 }; - qn = qn1; classid = new int[] { 106 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q098_SagaOfTheShillienSaint/Q098_SagaOfTheShillienSaint.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q098_SagaOfTheShillienSaint/Q098_SagaOfTheShillienSaint.java index 9409f3eee5..81e6217137 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q098_SagaOfTheShillienSaint/Q098_SagaOfTheShillienSaint.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q098_SagaOfTheShillienSaint/Q098_SagaOfTheShillienSaint.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q098_SagaOfTheShillienSaint extends SagasSuperClass { - public static String qn1 = "Q098_SagaOfTheShillienSaint"; - public static int qnu = 98; - public static String qna = "Saga of the Shillien Saint"; - public Q098_SagaOfTheShillienSaint() { - super(qnu, qn1, qna); + super(98, "Saga of the Shillien Saint"); NPC = new int[] { 31581, @@ -67,7 +63,6 @@ public class Q098_SagaOfTheShillienSaint extends SagasSuperClass 27247, 27277 }; - qn = qn1; classid = new int[] { 112 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q099_SagaOfTheFortuneSeeker/Q099_SagaOfTheFortuneSeeker.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q099_SagaOfTheFortuneSeeker/Q099_SagaOfTheFortuneSeeker.java index e881c8da3a..5465941f23 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q099_SagaOfTheFortuneSeeker/Q099_SagaOfTheFortuneSeeker.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q099_SagaOfTheFortuneSeeker/Q099_SagaOfTheFortuneSeeker.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q099_SagaOfTheFortuneSeeker extends SagasSuperClass { - public static String qn1 = "Q099_SagaOfTheFortuneSeeker"; - public static int qnu = 99; - public static String qna = "Saga of the Fortune Seeker"; - public Q099_SagaOfTheFortuneSeeker() { - super(qnu, qn1, qna); + super(99, "Saga of the Fortune Seeker"); NPC = new int[] { 31594, @@ -67,7 +63,6 @@ public class Q099_SagaOfTheFortuneSeeker extends SagasSuperClass 27248, 27309 }; - qn = qn1; classid = new int[] { 117 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q100_SagaOfTheMaestro/Q100_SagaOfTheMaestro.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q100_SagaOfTheMaestro/Q100_SagaOfTheMaestro.java index ddc836dabb..e3f3f02ae7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q100_SagaOfTheMaestro/Q100_SagaOfTheMaestro.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q100_SagaOfTheMaestro/Q100_SagaOfTheMaestro.java @@ -24,13 +24,9 @@ import quests.SagasSuperClass; */ public class Q100_SagaOfTheMaestro extends SagasSuperClass { - public static String qn1 = "Q100_SagaOfTheMaestro"; - public static int qnu = 100; - public static String qna = "Saga of the Maestro"; - public Q100_SagaOfTheMaestro() { - super(qnu, qn1, qna); + super(100, "Saga of the Maestro"); NPC = new int[] { 31592, @@ -67,7 +63,6 @@ public class Q100_SagaOfTheMaestro extends SagasSuperClass 27249, 27308 }; - qn = qn1; classid = new int[] { 118 diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java index 2be5630069..62bfc5f6f5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q101_SwordOfSolidarity/Q101_SwordOfSolidarity.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q101_SwordOfSolidarity extends Quest { - private static final String qn = "Q101_SwordOfSolidarity"; - // NPCs private static final int ROIEN = 30008; private static final int ALTRAN = 30283; @@ -52,7 +50,7 @@ public class Q101_SwordOfSolidarity extends Quest public Q101_SwordOfSolidarity() { - super(101, qn, "Sword of Solidarity"); + super(101, "Sword of Solidarity"); registerQuestItems(BROKEN_SWORD_HANDLE, BROKEN_BLADE_BOTTOM, BROKEN_BLADE_TOP); @@ -66,7 +64,7 @@ public class Q101_SwordOfSolidarity extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -124,7 +122,7 @@ public class Q101_SwordOfSolidarity extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java index cd11d23cf1..d1c0f5756c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q102_SeaOfSporesFever/Q102_SeaOfSporesFever.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q102_SeaOfSporesFever extends Quest { - private static final String qn = "Q102_SeaOfSporesFever"; - // Items private static final int ALBERIUS_LETTER = 964; private static final int EVERGREEN_AMULET = 965; @@ -61,7 +59,7 @@ public class Q102_SeaOfSporesFever extends Quest public Q102_SeaOfSporesFever() { - super(102, qn, "Sea of Spores Fever"); + super(102, "Sea of Spores Fever"); registerQuestItems(ALBERIUS_LETTER, EVERGREEN_AMULET, DRYAD_TEARS, COBENDELL_MEDICINE_1, COBENDELL_MEDICINE_2, COBENDELL_MEDICINE_3, COBENDELL_MEDICINE_4, COBENDELL_MEDICINE_5, ALBERIUS_LIST); @@ -75,7 +73,7 @@ public class Q102_SeaOfSporesFever extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +94,7 @@ public class Q102_SeaOfSporesFever extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java index 5e53a61e4e..5d5ddc0de7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q103_SpiritOfCraftsman/Q103_SpiritOfCraftsman.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q103_SpiritOfCraftsman extends Quest { - private static final String qn = "Q103_SpiritOfCraftsman"; - // Items private static final int KARROD_LETTER = 968; private static final int CECKTINON_VOUCHER_1 = 969; @@ -58,7 +56,7 @@ public class Q103_SpiritOfCraftsman extends Quest public Q103_SpiritOfCraftsman() { - super(103, qn, "Spirit of Craftsman"); + super(103, "Spirit of Craftsman"); registerQuestItems(KARROD_LETTER, CECKTINON_VOUCHER_1, CECKTINON_VOUCHER_2, BONE_FRAGMENT, SOUL_CATCHER, PRESERVING_OIL, ZOMBIE_HEAD, STEELBENDER_HEAD); @@ -72,7 +70,7 @@ public class Q103_SpiritOfCraftsman extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -93,7 +91,7 @@ public class Q103_SpiritOfCraftsman extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java index 275425cb57..57205db5f2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q104_SpiritOfMirrors/Q104_SpiritOfMirrors.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q104_SpiritOfMirrors extends Quest { - private static final String qn = "Q104_SpiritOfMirrors"; - // Items private static final int GALLINS_OAK_WAND = 748; private static final int WAND_SPIRITBOUND_1 = 1135; @@ -56,7 +54,7 @@ public class Q104_SpiritOfMirrors extends Quest public Q104_SpiritOfMirrors() { - super(104, qn, "Spirit of Mirrors"); + super(104, "Spirit of Mirrors"); registerQuestItems(GALLINS_OAK_WAND, WAND_SPIRITBOUND_1, WAND_SPIRITBOUND_2, WAND_SPIRITBOUND_3); @@ -70,7 +68,7 @@ public class Q104_SpiritOfMirrors extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -93,7 +91,7 @@ public class Q104_SpiritOfMirrors extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java index 58b2758376..7b7bca6da9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q105_SkirmishWithTheOrcs/Q105_SkirmishWithTheOrcs.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q105_SkirmishWithTheOrcs extends Quest { - private static final String qn = "Q105_SkirmishWithTheOrcs"; - // Item private static final int KENDELL_ORDER_1 = 1836; private static final int KENDELL_ORDER_2 = 1837; @@ -64,7 +62,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest public Q105_SkirmishWithTheOrcs() { - super(105, qn, "Skirmish with the Orcs"); + super(105, "Skirmish with the Orcs"); registerQuestItems(KENDELL_ORDER_1, KENDELL_ORDER_2, KENDELL_ORDER_3, KENDELL_ORDER_4, KENDELL_ORDER_5, KENDELL_ORDER_6, KENDELL_ORDER_7, KENDELL_ORDER_8, KABOO_CHIEF_TORC_1, KABOO_CHIEF_TORC_2); @@ -78,7 +76,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -97,7 +95,7 @@ public class Q105_SkirmishWithTheOrcs extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java index f2b86d7d82..466aad8710 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q106_ForgottenTruth/Q106_ForgottenTruth.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q106_ForgottenTruth extends Quest { - private static final String qn = "Q106_ForgottenTruth"; - // NPCs private static final int THIFIELL = 30358; private static final int KARTIA = 30133; @@ -54,7 +52,7 @@ public class Q106_ForgottenTruth extends Quest public Q106_ForgottenTruth() { - super(106, qn, "Forgotten Truth"); + super(106, "Forgotten Truth"); registerQuestItems(ONYX_TALISMAN_1, ONYX_TALISMAN_2, ANCIENT_SCROLL, ANCIENT_CLAY_TABLET, KARTIA_TRANSLATION); @@ -67,7 +65,7 @@ public class Q106_ForgottenTruth extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = event; if (st == null) { @@ -87,7 +85,7 @@ public class Q106_ForgottenTruth extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java index e97a3bfcad..e2d301cc05 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q107_MercilessPunishment/Q107_MercilessPunishment.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q107_MercilessPunishment extends Quest { - private static final String qn = "Q107_MercilessPunishment"; - // NPCs private static final int HATOS = 30568; private static final int PARUGON = 30580; @@ -53,7 +51,7 @@ public class Q107_MercilessPunishment extends Quest public Q107_MercilessPunishment() { - super(107, qn, "Merciless Punishment"); + super(107, "Merciless Punishment"); registerQuestItems(HATOS_ORDER_1, HATOS_ORDER_2, HATOS_ORDER_3, LETTER_TO_HUMAN, LETTER_TO_DARKELF, LETTER_TO_ELF); @@ -66,7 +64,7 @@ public class Q107_MercilessPunishment extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = event; if (st == null) { @@ -106,7 +104,7 @@ public class Q107_MercilessPunishment extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java index 5e9bf76281..645049b3ee 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q108_JumbleTumbleDiamondFuss/Q108_JumbleTumbleDiamondFuss.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q108_JumbleTumbleDiamondFuss extends Quest { - private static final String qn = "Q108_JumbleTumbleDiamondFuss"; - // NPCs private static final int GOUPH = 30523; private static final int REEP = 30516; @@ -103,7 +101,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest public Q108_JumbleTumbleDiamondFuss() { - super(108, qn, "Jumble, Tumble, Diamond Fuss"); + super(108, "Jumble, Tumble, Diamond Fuss"); registerQuestItems(GOUPH_CONTRACT, REEP_CONTRACT, ELVEN_WINE, BRUNON_DICE, BRUNON_CONTRACT, AQUAMARINE, CHRYSOBERYL, GEM_BOX, COAL_PIECE, BRUNON_LETTER, BERRY_TART, BAT_DIAGRAM, STAR_DIAMOND); @@ -116,7 +114,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = event; if (st == null) { @@ -151,7 +149,7 @@ public class Q108_JumbleTumbleDiamondFuss extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q109_InSearchOfTheNest/Q109_InSearchOfTheNest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q109_InSearchOfTheNest/Q109_InSearchOfTheNest.java index 229c10b328..52c5e94e38 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q109_InSearchOfTheNest/Q109_InSearchOfTheNest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q109_InSearchOfTheNest/Q109_InSearchOfTheNest.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q109_InSearchOfTheNest extends Quest { - private static final String qn = "Q109_InSearchOfTheNest"; - // NPCs private static final int PIERCE = 31553; private static final int KAHMAN = 31554; @@ -38,7 +36,7 @@ public class Q109_InSearchOfTheNest extends Quest public Q109_InSearchOfTheNest() { - super(109, qn, "In Search of the Nest"); + super(109, "In Search of the Nest"); registerQuestItems(SCOUT_MEMO); @@ -50,7 +48,7 @@ public class Q109_InSearchOfTheNest extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -87,7 +85,7 @@ public class Q109_InSearchOfTheNest extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q110_ToThePrimevalIsle/Q110_ToThePrimevalIsle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q110_ToThePrimevalIsle/Q110_ToThePrimevalIsle.java index da03e8a72e..a1603575a1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q110_ToThePrimevalIsle/Q110_ToThePrimevalIsle.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q110_ToThePrimevalIsle/Q110_ToThePrimevalIsle.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q110_ToThePrimevalIsle extends Quest { - private static final String qn = "Q110_ToThePrimevalIsle"; - // NPCs private static final int ANTON = 31338; private static final int MARQUEZ = 32113; @@ -35,7 +33,7 @@ public class Q110_ToThePrimevalIsle extends Quest public Q110_ToThePrimevalIsle() { - super(110, qn, "To the Primeval Isle"); + super(110, "To the Primeval Isle"); registerQuestItems(ANCIENT_BOOK); @@ -47,7 +45,7 @@ public class Q110_ToThePrimevalIsle extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q110_ToThePrimevalIsle extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q111_ElrokianHuntersProof/Q111_ElrokianHuntersProof.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q111_ElrokianHuntersProof/Q111_ElrokianHuntersProof.java index 6c2b0f860e..d72c079ab2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q111_ElrokianHuntersProof/Q111_ElrokianHuntersProof.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q111_ElrokianHuntersProof/Q111_ElrokianHuntersProof.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q111_ElrokianHuntersProof extends Quest { - private static final String qn = "Q111_ElrokianHuntersProof"; - // NPCs private static final int MARQUEZ = 32113; private static final int MUSHIKA = 32114; @@ -42,7 +40,7 @@ public class Q111_ElrokianHuntersProof extends Quest public Q111_ElrokianHuntersProof() { - super(111, qn, "Elrokian Hunter's Proof"); + super(111, "Elrokian Hunter's Proof"); registerQuestItems(FRAGMENT, EXPEDITION_LETTER, CLAW, BONE, SKIN, PRACTICE_TRAP); @@ -56,7 +54,7 @@ public class Q111_ElrokianHuntersProof extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,7 +120,7 @@ public class Q111_ElrokianHuntersProof extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -238,7 +236,7 @@ public class Q111_ElrokianHuntersProof extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q112_WalkOfFate/Q112_WalkOfFate.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q112_WalkOfFate/Q112_WalkOfFate.java index b9071cb0f2..58c2bad5ac 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q112_WalkOfFate/Q112_WalkOfFate.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q112_WalkOfFate/Q112_WalkOfFate.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q112_WalkOfFate extends Quest { - private static final String qn = "Q112_WalkOfFate"; - // NPCs private static final int LIVINA = 30572; private static final int KARUDA = 32017; @@ -35,7 +33,7 @@ public class Q112_WalkOfFate extends Quest public Q112_WalkOfFate() { - super(112, qn, "Walk of Fate"); + super(112, "Walk of Fate"); addStartNpc(LIVINA); addTalkId(LIVINA, KARUDA); @@ -45,7 +43,7 @@ public class Q112_WalkOfFate extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -71,7 +69,7 @@ public class Q112_WalkOfFate extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q113_StatusOfTheBeaconTower/Q113_StatusOfTheBeaconTower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q113_StatusOfTheBeaconTower/Q113_StatusOfTheBeaconTower.java index 66138de780..6fbac9f21a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q113_StatusOfTheBeaconTower/Q113_StatusOfTheBeaconTower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q113_StatusOfTheBeaconTower/Q113_StatusOfTheBeaconTower.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q113_StatusOfTheBeaconTower extends Quest { - private static final String qn = "Q113_StatusOfTheBeaconTower"; - // NPCs private static final int MOIRA = 31979; private static final int TORRANT = 32016; @@ -35,7 +33,7 @@ public class Q113_StatusOfTheBeaconTower extends Quest public Q113_StatusOfTheBeaconTower() { - super(113, qn, "Status of the Beacon Tower"); + super(113, "Status of the Beacon Tower"); registerQuestItems(BOX); @@ -47,7 +45,7 @@ public class Q113_StatusOfTheBeaconTower extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q113_StatusOfTheBeaconTower extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q114_ResurrectionOfAnOldManager/Q114_ResurrectionOfAnOldManager.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q114_ResurrectionOfAnOldManager/Q114_ResurrectionOfAnOldManager.java index bd20eea1f1..396af55d17 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q114_ResurrectionOfAnOldManager/Q114_ResurrectionOfAnOldManager.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q114_ResurrectionOfAnOldManager/Q114_ResurrectionOfAnOldManager.java @@ -25,10 +25,10 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; +import quests.Q121_PavelTheGiant.Q121_PavelTheGiant; + public class Q114_ResurrectionOfAnOldManager extends Quest { - private static final String qn = "Q114_ResurrectionOfAnOldManager"; - // NPCs private static final int NEWYEAR = 31961; private static final int YUMI = 32041; @@ -48,7 +48,7 @@ public class Q114_ResurrectionOfAnOldManager extends Quest public Q114_ResurrectionOfAnOldManager() { - super(114, qn, "Resurrection of an Old Manager"); + super(114, "Resurrection of an Old Manager"); registerQuestItems(LETTER, DETECTOR, DETECTOR_2, STARSTONE, STARSTONE_2); @@ -62,7 +62,7 @@ public class Q114_ResurrectionOfAnOldManager extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -334,7 +334,7 @@ public class Q114_ResurrectionOfAnOldManager extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -344,7 +344,7 @@ public class Q114_ResurrectionOfAnOldManager extends Quest switch (st.getState()) { case State.CREATED: - QuestState pavelReq = player.getQuestState("Q121_PavelTheGiant"); + QuestState pavelReq = player.getQuestState(Q121_PavelTheGiant.class.getSimpleName()); htmltext = ((pavelReq == null) || !pavelReq.isCompleted() || (player.getLevel() < 49)) ? "32041-00.htm" : "32041-01.htm"; break; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q115_TheOtherSideOfTruth/Q115_TheOtherSideOfTruth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q115_TheOtherSideOfTruth/Q115_TheOtherSideOfTruth.java index 0ba7c0b25f..892cebd8e3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q115_TheOtherSideOfTruth/Q115_TheOtherSideOfTruth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q115_TheOtherSideOfTruth/Q115_TheOtherSideOfTruth.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.CreatureSay; */ public class Q115_TheOtherSideOfTruth extends Quest { - private static final String qn = "Q115_TheOtherSideOfTruth"; - // NPCs private static final int MISA = 32018; private static final int SUSPICIOUS = 32019; @@ -48,7 +46,7 @@ public class Q115_TheOtherSideOfTruth extends Quest public Q115_TheOtherSideOfTruth() { - super(115, qn, "The Other Side of Truth"); + super(115, "The Other Side of Truth"); addStartNpc(RAFFORTY); addTalkId(RAFFORTY, MISA, SCULPTURE1, SCULPTURE2, SCULPTURE3, SCULPTURE4, KIERRE); @@ -59,7 +57,7 @@ public class Q115_TheOtherSideOfTruth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -192,7 +190,7 @@ public class Q115_TheOtherSideOfTruth extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (qs == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java index f73b9bba12..32334b70f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q116_BeyondTheHillsOfWinter/Q116_BeyondTheHillsOfWinter.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q116_BeyondTheHillsOfWinter extends Quest { - private static final String qn = "Q116_BeyondTheHillsOfWinter"; - // NPCs private static final int FILAUR = 30535; private static final int OBI = 32052; @@ -42,7 +40,7 @@ public class Q116_BeyondTheHillsOfWinter extends Quest public Q116_BeyondTheHillsOfWinter() { - super(116, qn, "Beyond the Hills of Winter"); + super(116, "Beyond the Hills of Winter"); registerQuestItems(GOODS); @@ -54,7 +52,7 @@ public class Q116_BeyondTheHillsOfWinter extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -95,7 +93,7 @@ public class Q116_BeyondTheHillsOfWinter extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q117_TheOceanOfDistantStars/Q117_TheOceanOfDistantStars.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q117_TheOceanOfDistantStars/Q117_TheOceanOfDistantStars.java index 34702bb36e..5a4e96f61f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q117_TheOceanOfDistantStars/Q117_TheOceanOfDistantStars.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q117_TheOceanOfDistantStars/Q117_TheOceanOfDistantStars.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q117_TheOceanOfDistantStars extends Quest { - private static final String qn = "Q117_TheOceanOfDistantStars"; - // NPCs private static final int ABEY = 32053; private static final int GHOST = 32054; @@ -43,7 +41,7 @@ public class Q117_TheOceanOfDistantStars extends Quest public Q117_TheOceanOfDistantStars() { - super(117, qn, "The Ocean of Distant Stars"); + super(117, "The Ocean of Distant Stars"); registerQuestItems(GREY_STAR, ENGRAVED_HAMMER); @@ -56,7 +54,7 @@ public class Q117_TheOceanOfDistantStars extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -124,7 +122,7 @@ public class Q117_TheOceanOfDistantStars extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q118_ToLeadAndBeLed/Q118_ToLeadAndBeLed.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q118_ToLeadAndBeLed/Q118_ToLeadAndBeLed.java index 242650bc56..738275d5fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q118_ToLeadAndBeLed/Q118_ToLeadAndBeLed.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q118_ToLeadAndBeLed/Q118_ToLeadAndBeLed.java @@ -22,11 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q123_TheLeaderAndTheFollower.Q123_TheLeaderAndTheFollower; + public class Q118_ToLeadAndBeLed extends Quest { - private static final String qn = "Q118_ToLeadAndBeLed"; - private static final String qn2 = "Q123_TheLeaderAndTheFollower"; - // Npc private static final int PINTER = 30298; @@ -55,7 +54,7 @@ public class Q118_ToLeadAndBeLed extends Quest public Q118_ToLeadAndBeLed() { - super(118, qn, "To Lead and Be Led"); + super(118, "To Lead and Be Led"); registerQuestItems(BLOOD_OF_MAILLE_LIZARDMAN, LEG_OF_KING_ARANEID); @@ -69,7 +68,7 @@ public class Q118_ToLeadAndBeLed extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +119,7 @@ public class Q118_ToLeadAndBeLed extends Quest final PlayerInstance academic = getApprentice(player); if (academic != null) { - final QuestState st2 = academic.getQuestState(qn); + final QuestState st2 = academic.getQuestState(Q123_TheLeaderAndTheFollower.class.getSimpleName()); if ((st2 != null) && (st2.getInt("state") == 2)) { final int stateEx = st2.getInt("stateEx"); @@ -163,7 +162,7 @@ public class Q118_ToLeadAndBeLed extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -174,7 +173,7 @@ public class Q118_ToLeadAndBeLed extends Quest case State.CREATED: if (player.getSponsor() > 0) { - QuestState st2 = player.getQuestState(qn2); + QuestState st2 = player.getQuestState(Q123_TheLeaderAndTheFollower.class.getSimpleName()); if (st2 != null) { htmltext = (st2.isCompleted()) ? "30298-02a.htm" : "30298-02b.htm"; @@ -189,7 +188,7 @@ public class Q118_ToLeadAndBeLed extends Quest final PlayerInstance academic = getApprentice(player); if (academic != null) { - final QuestState st3 = academic.getQuestState(qn); + final QuestState st3 = academic.getQuestState(getName()); if (st3 != null) { final int state = st3.getInt("state"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q119_LastImperialPrince/Q119_LastImperialPrince.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q119_LastImperialPrince/Q119_LastImperialPrince.java index 4354fc3ede..9abc5b0275 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q119_LastImperialPrince/Q119_LastImperialPrince.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q119_LastImperialPrince/Q119_LastImperialPrince.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q119_LastImperialPrince extends Quest { - private static final String qn = "Q119_LastImperialPrince"; - // NPCs private static final int NAMELESS_SPIRIT = 31453; private static final int DEVORIN = 32009; @@ -35,7 +33,7 @@ public class Q119_LastImperialPrince extends Quest public Q119_LastImperialPrince() { - super(119, qn, "Last Imperial Prince"); + super(119, "Last Imperial Prince"); registerQuestItems(ANTIQUE_BROOCH); @@ -47,7 +45,7 @@ public class Q119_LastImperialPrince extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -93,7 +91,7 @@ public class Q119_LastImperialPrince extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q120_PavelsResearch/Q120_PavelsResearch.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q120_PavelsResearch/Q120_PavelsResearch.java index 5048c97b35..e4ca64482d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q120_PavelsResearch/Q120_PavelsResearch.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q120_PavelsResearch/Q120_PavelsResearch.java @@ -23,14 +23,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; +import quests.Q114_ResurrectionOfAnOldManager.Q114_ResurrectionOfAnOldManager; + /** * @author Mobius * @note Based on python script */ public class Q120_PavelsResearch extends Quest { - private static final String qn = "Q120_PavelsResearch"; - // NPCs private static final int YUMI = 32041; private static final int WEATHER1 = 32042; // north @@ -50,7 +50,7 @@ public class Q120_PavelsResearch extends Quest public Q120_PavelsResearch() { - super(120, qn, "Pavel's Research"); + super(120, "Pavel's Research"); addStartNpc(STONES); addTalkId(BOOKSHELF, STONES, WEATHER1, WEATHER2, WEATHER3, WENDY, YUMI); @@ -61,7 +61,7 @@ public class Q120_PavelsResearch extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -421,7 +421,7 @@ public class Q120_PavelsResearch extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -438,7 +438,7 @@ public class Q120_PavelsResearch extends Quest { if (state == State.CREATED) { - final QuestState qs2 = player.getQuestState("Q114_ResurrectionOfAnOldManager"); + final QuestState qs2 = player.getQuestState(Q114_ResurrectionOfAnOldManager.class.getSimpleName()); if (qs2 != null) { if ((player.getLevel() >= 49) && (qs2.getState() == State.COMPLETED)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q121_PavelTheGiant/Q121_PavelTheGiant.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q121_PavelTheGiant/Q121_PavelTheGiant.java index e22a2c34b5..db48a77cd1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q121_PavelTheGiant/Q121_PavelTheGiant.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q121_PavelTheGiant/Q121_PavelTheGiant.java @@ -24,15 +24,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q121_PavelTheGiant extends Quest { - private static final String qn = "Q121_PavelTheGiant"; - // NPCs private static final int NEWYEAR = 31961; private static final int YUMI = 32041; public Q121_PavelTheGiant() { - super(121, qn, "Pavel the Giant"); + super(121, "Pavel the Giant"); addStartNpc(NEWYEAR); addTalkId(NEWYEAR, YUMI); @@ -42,7 +40,7 @@ public class Q121_PavelTheGiant extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -68,7 +66,7 @@ public class Q121_PavelTheGiant extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q122_OminousNews/Q122_OminousNews.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q122_OminousNews/Q122_OminousNews.java index f8d6aeef49..00a7c0dabd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q122_OminousNews/Q122_OminousNews.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q122_OminousNews/Q122_OminousNews.java @@ -24,15 +24,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q122_OminousNews extends Quest { - private static final String qn = "Q122_OminousNews"; - // NPCs private static final int MOIRA = 31979; private static final int KARUDA = 32017; public Q122_OminousNews() { - super(122, qn, "Ominous News"); + super(122, "Ominous News"); addStartNpc(MOIRA); addTalkId(MOIRA, KARUDA); @@ -42,7 +40,7 @@ public class Q122_OminousNews extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -68,7 +66,7 @@ public class Q122_OminousNews extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q123_TheLeaderAndTheFollower/Q123_TheLeaderAndTheFollower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q123_TheLeaderAndTheFollower/Q123_TheLeaderAndTheFollower.java index 248d482aa8..ee271100e3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q123_TheLeaderAndTheFollower/Q123_TheLeaderAndTheFollower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q123_TheLeaderAndTheFollower/Q123_TheLeaderAndTheFollower.java @@ -22,11 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q118_ToLeadAndBeLed.Q118_ToLeadAndBeLed; + public class Q123_TheLeaderAndTheFollower extends Quest { - private static final String qn = "Q123_TheLeaderAndTheFollower"; - private static final String qn2 = "Q118_ToLeadAndBeLed"; - // NPC private static final int NEWYEAR = 31961; @@ -53,7 +52,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest public Q123_TheLeaderAndTheFollower() { - super(123, qn, "The Leader and the Follower"); + super(123, "The Leader and the Follower"); registerQuestItems(BRUIN_LIZARDMAN_BLOOD, PICOT_ARANEID_LEG); @@ -67,7 +66,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -118,7 +117,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest final PlayerInstance academic = getApprentice(player); if (academic != null) { - final QuestState st2 = academic.getQuestState(qn); + final QuestState st2 = academic.getQuestState(getName()); if ((st2 != null) && (st2.getInt("state") == 2)) { final int stateEx = st2.getInt("stateEx"); @@ -161,7 +160,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -172,7 +171,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest case State.CREATED: if (player.getSponsor() > 0) { - QuestState st2 = player.getQuestState(qn2); + QuestState st2 = player.getQuestState(Q118_ToLeadAndBeLed.class.getSimpleName()); if (st2 != null) { htmltext = (st2.isCompleted()) ? "31961-02a.htm" : "31961-02b.htm"; @@ -187,7 +186,7 @@ public class Q123_TheLeaderAndTheFollower extends Quest final PlayerInstance academic = getApprentice(player); if (academic != null) { - final QuestState st3 = academic.getQuestState(qn); + final QuestState st3 = academic.getQuestState(getName()); if (st3 != null) { final int state = st3.getInt("state"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q124_MeetingTheElroki/Q124_MeetingTheElroki.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q124_MeetingTheElroki/Q124_MeetingTheElroki.java index 43c33a23db..f42d48ef59 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q124_MeetingTheElroki/Q124_MeetingTheElroki.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q124_MeetingTheElroki/Q124_MeetingTheElroki.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q124_MeetingTheElroki extends Quest { - public static final String qn = "Q124_MeetingTheElroki"; - // NPCs private static final int MARQUEZ = 32113; private static final int MUSHIKA = 32114; @@ -35,7 +33,7 @@ public class Q124_MeetingTheElroki extends Quest public Q124_MeetingTheElroki() { - super(124, qn, "Meeting the Elroki"); + super(124, "Meeting the Elroki"); addStartNpc(MARQUEZ); addTalkId(MARQUEZ, MUSHIKA, ASAMAH, KARAKAWEI, MANTARASA); @@ -45,7 +43,7 @@ public class Q124_MeetingTheElroki extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -97,7 +95,7 @@ public class Q124_MeetingTheElroki extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java index fb3edc4a66..f6c7df24e4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java @@ -28,8 +28,6 @@ import quests.Q124_MeetingTheElroki.Q124_MeetingTheElroki; public class Q125_TheNameOfEvil_1 extends Quest { - public static final String qn = "Q125_TheNameOfEvil_1"; - private static final int MUSHIKA = 32114; private static final int KARAKAWEI = 32117; private static final int ULU_KAIMU = 32119; @@ -66,7 +64,7 @@ public class Q125_TheNameOfEvil_1 extends Quest public Q125_TheNameOfEvil_1() { - super(125, qn, "The Name of Evil - 1"); + super(125, "The Name of Evil - 1"); registerQuestItems(ORNITHOMIMUS_CLAW, DEINONYCHUS_BONE, EPITAPH_OF_WISDOM, GAZKH_FRAGMENT); @@ -88,7 +86,7 @@ public class Q125_TheNameOfEvil_1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -140,7 +138,7 @@ public class Q125_TheNameOfEvil_1 extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -150,7 +148,7 @@ public class Q125_TheNameOfEvil_1 extends Quest switch (st.getState()) { case State.CREATED: - QuestState first = player.getQuestState(Q124_MeetingTheElroki.qn); + QuestState first = player.getQuestState(Q124_MeetingTheElroki.class.getSimpleName()); if ((first != null) && first.isCompleted() && (player.getLevel() >= 76)) { htmltext = "32114-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/Q126_TheNameOfEvil_2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/Q126_TheNameOfEvil_2.java index 01bea498fe..7d9f7e2234 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/Q126_TheNameOfEvil_2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q126_TheNameOfEvil_2/Q126_TheNameOfEvil_2.java @@ -26,8 +26,6 @@ import quests.Q125_TheNameOfEvil_1.Q125_TheNameOfEvil_1; public class Q126_TheNameOfEvil_2 extends Quest { - public static final String qn = "Q126_TheNameOfEvil_2"; - private static final int MUSHIKA = 32114; private static final int ASAMANAH = 32115; private static final int ULU_KAIMU = 32119; @@ -41,7 +39,7 @@ public class Q126_TheNameOfEvil_2 extends Quest public Q126_TheNameOfEvil_2() { - super(126, qn, "The Name of Evil - 2"); + super(126, "The Name of Evil - 2"); addStartNpc(ASAMANAH); addTalkId(ASAMANAH, MUSHIKA, ULU_KAIMU, BALU_KAIMU, CHUTA_KAIMU, WARRIOR_GRAVE, SHILEN_STONE_STATUE); @@ -51,7 +49,7 @@ public class Q126_TheNameOfEvil_2 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -296,7 +294,7 @@ public class Q126_TheNameOfEvil_2 extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -312,7 +310,7 @@ public class Q126_TheNameOfEvil_2 extends Quest } else { - QuestState st2 = player.getQuestState(Q125_TheNameOfEvil_1.qn); + QuestState st2 = player.getQuestState(Q125_TheNameOfEvil_1.class.getSimpleName()); if ((st2 != null) && st2.isCompleted()) { htmltext = "32115-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q127_KamaelAWindowToTheFuture/Q127_KamaelAWindowToTheFuture.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q127_KamaelAWindowToTheFuture/Q127_KamaelAWindowToTheFuture.java index 9f989dc2f9..47bd425ef9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q127_KamaelAWindowToTheFuture/Q127_KamaelAWindowToTheFuture.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q127_KamaelAWindowToTheFuture/Q127_KamaelAWindowToTheFuture.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowSlideshowKamael; public class Q127_KamaelAWindowToTheFuture extends Quest { - private static final String qn = "Q127_KamaelAWindowToTheFuture"; - // NPCs private static final int DOMINIC = 31350; private static final int KLAUS = 30187; @@ -46,7 +44,7 @@ public class Q127_KamaelAWindowToTheFuture extends Quest public Q127_KamaelAWindowToTheFuture() { - super(127, qn, "Kamael: A Window to the Future"); + super(127, "Kamael: A Window to the Future"); registerQuestItems(MARK_DOMINIC, MARK_HUMAN, MARK_DWARF, MARK_ORC, MARK_DELF, MARK_ELF); @@ -58,7 +56,7 @@ public class Q127_KamaelAWindowToTheFuture extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -137,7 +135,7 @@ public class Q127_KamaelAWindowToTheFuture extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q151_CureForFeverDisease/Q151_CureForFeverDisease.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q151_CureForFeverDisease/Q151_CureForFeverDisease.java index 989c2177cb..5b5d246380 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q151_CureForFeverDisease/Q151_CureForFeverDisease.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q151_CureForFeverDisease/Q151_CureForFeverDisease.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q151_CureForFeverDisease extends Quest { - private static final String qn = "Q151_CureForFeverDisease"; - // Items private static final int POISON_SAC = 703; private static final int FEVER_MEDICINE = 704; @@ -36,7 +34,7 @@ public class Q151_CureForFeverDisease extends Quest public Q151_CureForFeverDisease() { - super(151, qn, "Cure for Fever Disease"); + super(151, "Cure for Fever Disease"); registerQuestItems(FEVER_MEDICINE, POISON_SAC); @@ -50,7 +48,7 @@ public class Q151_CureForFeverDisease extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -70,7 +68,7 @@ public class Q151_CureForFeverDisease extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q152_ShardsOfGolem/Q152_ShardsOfGolem.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q152_ShardsOfGolem/Q152_ShardsOfGolem.java index 67844272a1..7257ec5379 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q152_ShardsOfGolem/Q152_ShardsOfGolem.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q152_ShardsOfGolem/Q152_ShardsOfGolem.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q152_ShardsOfGolem extends Quest { - private static final String qn = "Q152_ShardsOfGolem"; - // Items private static final int HARRIS_RECEIPT_1 = 1008; private static final int HARRIS_RECEIPT_2 = 1009; @@ -44,7 +42,7 @@ public class Q152_ShardsOfGolem extends Quest public Q152_ShardsOfGolem() { - super(152, qn, "Shards of Golem"); + super(152, "Shards of Golem"); registerQuestItems(HARRIS_RECEIPT_1, HARRIS_RECEIPT_2, GOLEM_SHARD, TOOL_BOX); @@ -58,7 +56,7 @@ public class Q152_ShardsOfGolem extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -86,7 +84,7 @@ public class Q152_ShardsOfGolem extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java index 12955438bd..e29829f44f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q153_DeliverGoods/Q153_DeliverGoods.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q153_DeliverGoods extends Quest { - private static final String qn = "Q153_DeliverGoods"; - // NPCs private static final int JACKSON = 30002; private static final int SILVIA = 30003; @@ -47,7 +45,7 @@ public class Q153_DeliverGoods extends Quest public Q153_DeliverGoods() { - super(153, qn, "Deliver Goods"); + super(153, "Deliver Goods"); registerQuestItems(DELIVERY_LIST, HEAVY_WOOD_BOX, CLOTH_BUNDLE, CLAY_POT, JACKSON_RECEIPT, SILVIA_RECEIPT, RANT_RECEIPT); @@ -59,7 +57,7 @@ public class Q153_DeliverGoods extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +80,7 @@ public class Q153_DeliverGoods extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q154_SacrificeToTheSea/Q154_SacrificeToTheSea.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q154_SacrificeToTheSea/Q154_SacrificeToTheSea.java index f89c2847c9..e789f14ae7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q154_SacrificeToTheSea/Q154_SacrificeToTheSea.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q154_SacrificeToTheSea/Q154_SacrificeToTheSea.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q154_SacrificeToTheSea extends Quest { - private static final String qn = "Q154_SacrificeToTheSea"; - // NPCs private static final int ROCKSWELL = 30312; private static final int CRISTEL = 30051; @@ -41,7 +39,7 @@ public class Q154_SacrificeToTheSea extends Quest public Q154_SacrificeToTheSea() { - super(154, qn, "Sacrifice to the Sea"); + super(154, "Sacrifice to the Sea"); registerQuestItems(FOX_FUR, FOX_FUR_YARN, MAIDEN_DOLL); @@ -55,7 +53,7 @@ public class Q154_SacrificeToTheSea extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q154_SacrificeToTheSea extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q155_FindSirWindawood/Q155_FindSirWindawood.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q155_FindSirWindawood/Q155_FindSirWindawood.java index 0a7c984db9..fbcacce560 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q155_FindSirWindawood/Q155_FindSirWindawood.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q155_FindSirWindawood/Q155_FindSirWindawood.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q155_FindSirWindawood extends Quest { - private static final String qn = "Q155_FindSirWindawood"; - // Items private static final int OFFICIAL_LETTER = 1019; private static final int HASTE_POTION = 734; @@ -36,7 +34,7 @@ public class Q155_FindSirWindawood extends Quest public Q155_FindSirWindawood() { - super(155, qn, "Find Sir Windawood"); + super(155, "Find Sir Windawood"); registerQuestItems(OFFICIAL_LETTER); @@ -48,7 +46,7 @@ public class Q155_FindSirWindawood extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -68,7 +66,7 @@ public class Q155_FindSirWindawood extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q156_MillenniumLove/Q156_MillenniumLove.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q156_MillenniumLove/Q156_MillenniumLove.java index 20e9e3e85e..ddbaa4747c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q156_MillenniumLove/Q156_MillenniumLove.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q156_MillenniumLove/Q156_MillenniumLove.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q156_MillenniumLove extends Quest { - private static final String qn = "Q156_MillenniumLove"; - // Items private static final int LILITH_LETTER = 1022; private static final int THEON_DIARY = 1023; @@ -36,7 +34,7 @@ public class Q156_MillenniumLove extends Quest public Q156_MillenniumLove() { - super(156, qn, "Millennium Love"); + super(156, "Millennium Love"); registerQuestItems(LILITH_LETTER, THEON_DIARY); @@ -48,7 +46,7 @@ public class Q156_MillenniumLove extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -83,7 +81,7 @@ public class Q156_MillenniumLove extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q157_RecoverSmuggledGoods/Q157_RecoverSmuggledGoods.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q157_RecoverSmuggledGoods/Q157_RecoverSmuggledGoods.java index 85024b1832..e17afc7a22 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q157_RecoverSmuggledGoods/Q157_RecoverSmuggledGoods.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q157_RecoverSmuggledGoods/Q157_RecoverSmuggledGoods.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q157_RecoverSmuggledGoods extends Quest { - private static final String qn = "Q157_RecoverSmuggledGoods"; - // Item private static final int ADAMANTITE_ORE = 1024; @@ -34,7 +32,7 @@ public class Q157_RecoverSmuggledGoods extends Quest public Q157_RecoverSmuggledGoods() { - super(157, qn, "Recover Smuggled Goods"); + super(157, "Recover Smuggled Goods"); registerQuestItems(ADAMANTITE_ORE); @@ -48,7 +46,7 @@ public class Q157_RecoverSmuggledGoods extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -67,7 +65,7 @@ public class Q157_RecoverSmuggledGoods extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q158_SeedOfEvil/Q158_SeedOfEvil.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q158_SeedOfEvil/Q158_SeedOfEvil.java index 9779490320..db01b0faab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q158_SeedOfEvil/Q158_SeedOfEvil.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q158_SeedOfEvil/Q158_SeedOfEvil.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q158_SeedOfEvil extends Quest { - private static final String qn = "Q158_SeedOfEvil"; - // Item private static final int CLAY_TABLET = 1025; @@ -34,7 +32,7 @@ public class Q158_SeedOfEvil extends Quest public Q158_SeedOfEvil() { - super(158, qn, "Seed of Evil"); + super(158, "Seed of Evil"); registerQuestItems(CLAY_TABLET); @@ -48,7 +46,7 @@ public class Q158_SeedOfEvil extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -67,7 +65,7 @@ public class Q158_SeedOfEvil extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java index f6f36d0f31..713104e6e4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q159_ProtectTheWaterSource/Q159_ProtectTheWaterSource.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q159_ProtectTheWaterSource extends Quest { - private static final String qn = "Q159_ProtectTheWaterSource"; - // Items private static final int PLAGUE_DUST = 1035; private static final int HYACINTH_CHARM_1 = 1071; @@ -34,7 +32,7 @@ public class Q159_ProtectTheWaterSource extends Quest public Q159_ProtectTheWaterSource() { - super(159, qn, "Protect the Water Source"); + super(159, "Protect the Water Source"); registerQuestItems(PLAGUE_DUST, HYACINTH_CHARM_1, HYACINTH_CHARM_2); @@ -48,7 +46,7 @@ public class Q159_ProtectTheWaterSource extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -68,7 +66,7 @@ public class Q159_ProtectTheWaterSource extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java index 1e94af028c..7db1d28571 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q160_NerupasRequest/Q160_NerupasRequest.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q160_NerupasRequest extends Quest { - private static final String qn = "Q160_NerupasRequest"; - // Items private static final int SILVERY_SPIDERSILK = 1026; private static final int UNOREN_RECEIPT = 1027; @@ -44,7 +42,7 @@ public class Q160_NerupasRequest extends Quest public Q160_NerupasRequest() { - super(160, qn, "Nerupa's Request"); + super(160, "Nerupa's Request"); registerQuestItems(SILVERY_SPIDERSILK, UNOREN_RECEIPT, CREAMEES_TICKET, NIGHTSHADE_LEAF); @@ -56,7 +54,7 @@ public class Q160_NerupasRequest extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -76,7 +74,7 @@ public class Q160_NerupasRequest extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java index 1cf4b477f7..f86b0308ab 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q161_FruitOfTheMotherTree/Q161_FruitOfTheMotherTree.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q161_FruitOfTheMotherTree extends Quest { - private static final String qn = "Q161_FruitOfTheMotherTree"; - // NPCs private static final int ANDELLIA = 30362; private static final int THALIA = 30371; @@ -37,7 +35,7 @@ public class Q161_FruitOfTheMotherTree extends Quest public Q161_FruitOfTheMotherTree() { - super(161, qn, "Fruit of the Mothertree"); + super(161, "Fruit of the Mothertree"); registerQuestItems(ANDELLIA_LETTER, MOTHERTREE_FRUIT); @@ -49,7 +47,7 @@ public class Q161_FruitOfTheMotherTree extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -69,7 +67,7 @@ public class Q161_FruitOfTheMotherTree extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java index eb2fe67bbb..e46de6b86e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q162_CurseOfTheUndergroundFortress/Q162_CurseOfTheUndergroundFortress.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q162_CurseOfTheUndergroundFortress extends Quest { - private static final String qn = "Q162_CurseOfTheUndergroundFortress"; - // Monsters private static final int SHADE_HORROR = 20033; private static final int DARK_TERROR = 20345; @@ -46,7 +44,7 @@ public class Q162_CurseOfTheUndergroundFortress extends Quest private static final int BONE_SHIELD = 625; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(SHADE_HORROR, 250000); @@ -59,7 +57,7 @@ public class Q162_CurseOfTheUndergroundFortress extends Quest public Q162_CurseOfTheUndergroundFortress() { - super(162, qn, "Curse of the Underground Fortress"); + super(162, "Curse of the Underground Fortress"); registerQuestItems(BONE_FRAGMENT, ELF_SKULL); @@ -73,7 +71,7 @@ public class Q162_CurseOfTheUndergroundFortress extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -92,7 +90,7 @@ public class Q162_CurseOfTheUndergroundFortress extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java index 2caa564c1b..2577301fbe 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q163_LegacyOfThePoet/Q163_LegacyOfThePoet.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q163_LegacyOfThePoet extends Quest { - private static final String qn = "Q163_LegacyOfThePoet"; - // NPC private static final int STARDEN = 30220; @@ -70,7 +68,7 @@ public class Q163_LegacyOfThePoet extends Quest public Q163_LegacyOfThePoet() { - super(163, qn, "Legacy of the Poet"); + super(163, "Legacy of the Poet"); registerQuestItems(RUMIELS_POEMS); @@ -84,7 +82,7 @@ public class Q163_LegacyOfThePoet extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -103,7 +101,7 @@ public class Q163_LegacyOfThePoet extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java index aed0b7ad4e..a0dfe4405c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q164_BloodFiend/Q164_BloodFiend.java @@ -25,14 +25,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q164_BloodFiend extends Quest { - private static final String qn = "Q164_BloodFiend"; - // Item private static final int KIRUNAK_SKULL = 1044; public Q164_BloodFiend() { - super(164, qn, "Blood Fiend"); + super(164, "Blood Fiend"); registerQuestItems(KIRUNAK_SKULL); @@ -46,7 +44,7 @@ public class Q164_BloodFiend extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -66,7 +64,7 @@ public class Q164_BloodFiend extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java index 81e37c8a0f..ec3337c37c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q165_ShilensHunt/Q165_ShilensHunt.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q165_ShilensHunt extends Quest { - private static final String qn = "Q165_ShilensHunt"; - // Monsters private static final int ASHEN_WOLF = 20456; private static final int YOUNG_BROWN_KELTIR = 20529; @@ -41,7 +39,7 @@ public class Q165_ShilensHunt extends Quest private static final int LESSER_HEALING_POTION = 1060; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(ASHEN_WOLF, 1000000); @@ -52,7 +50,7 @@ public class Q165_ShilensHunt extends Quest public Q165_ShilensHunt() { - super(165, qn, "Shilen's Hunt"); + super(165, "Shilen's Hunt"); registerQuestItems(DARK_BEZOAR); @@ -66,7 +64,7 @@ public class Q165_ShilensHunt extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -86,7 +84,7 @@ public class Q165_ShilensHunt extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java index 8f468b24e8..b9d76e256c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q166_MassOfDarkness/Q166_MassOfDarkness.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q166_MassOfDarkness extends Quest { - private static final String qn = "Q166_MassOfDarkness"; - // NPCs private static final int UNDRIAS = 30130; private static final int IRIA = 30135; @@ -41,7 +39,7 @@ public class Q166_MassOfDarkness extends Quest public Q166_MassOfDarkness() { - super(166, qn, "Mass of Darkness"); + super(166, "Mass of Darkness"); registerQuestItems(UNDRIAS_LETTER, CEREMONIAL_DAGGER, DREVIANT_WINE, GARMIEL_SCRIPTURE); @@ -53,7 +51,7 @@ public class Q166_MassOfDarkness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -73,7 +71,7 @@ public class Q166_MassOfDarkness extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q167_DwarvenKinship/Q167_DwarvenKinship.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q167_DwarvenKinship/Q167_DwarvenKinship.java index ab16d6e295..b18792b9db 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q167_DwarvenKinship/Q167_DwarvenKinship.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q167_DwarvenKinship/Q167_DwarvenKinship.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q167_DwarvenKinship extends Quest { - private static final String qn = "Q167_DwarvenKinship"; - // Items private static final int CARLON_LETTER = 1076; private static final int NORMAN_LETTER = 1106; @@ -37,7 +35,7 @@ public class Q167_DwarvenKinship extends Quest public Q167_DwarvenKinship() { - super(167, qn, "Dwarven Kinship"); + super(167, "Dwarven Kinship"); registerQuestItems(CARLON_LETTER, NORMAN_LETTER); @@ -49,7 +47,7 @@ public class Q167_DwarvenKinship extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -91,7 +89,7 @@ public class Q167_DwarvenKinship extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java index 15d8514e0e..d4e46cb0c6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q168_DeliverSupplies/Q168_DeliverSupplies.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q168_DeliverSupplies extends Quest { - private static final String qn = "Q168_DeliverSupplies"; - // Items private static final int JENNA_LETTER = 1153; private static final int SENTRY_BLADE_1 = 1154; @@ -42,7 +40,7 @@ public class Q168_DeliverSupplies extends Quest public Q168_DeliverSupplies() { - super(168, qn, "Deliver Supplies"); + super(168, "Deliver Supplies"); registerQuestItems(JENNA_LETTER, SENTRY_BLADE_1, SENTRY_BLADE_2, SENTRY_BLADE_3, OLD_BRONZE_SWORD); @@ -54,7 +52,7 @@ public class Q168_DeliverSupplies extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q168_DeliverSupplies extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java index f3b3d90fbf..182864fd4c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q169_OffspringOfNightmares/Q169_OffspringOfNightmares.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q169_OffspringOfNightmares extends Quest { - private static final String qn = "Q169_OffspringOfNightmares"; - // Items private static final int CRACKED_SKULL = 1030; private static final int PERFECT_SKULL = 1031; @@ -34,7 +32,7 @@ public class Q169_OffspringOfNightmares extends Quest public Q169_OffspringOfNightmares() { - super(169, qn, "Offspring of Nightmares"); + super(169, "Offspring of Nightmares"); registerQuestItems(CRACKED_SKULL, PERFECT_SKULL); @@ -48,7 +46,7 @@ public class Q169_OffspringOfNightmares extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -78,7 +76,7 @@ public class Q169_OffspringOfNightmares extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java index 759af1db98..60df30ff41 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q170_DangerousSeduction/Q170_DangerousSeduction.java @@ -25,14 +25,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q170_DangerousSeduction extends Quest { - private static final String qn = "Q170_DangerousSeduction"; - // Item private static final int NIGHTMARE_CRYSTAL = 1046; public Q170_DangerousSeduction() { - super(170, qn, "Dangerous Seduction"); + super(170, "Dangerous Seduction"); registerQuestItems(NIGHTMARE_CRYSTAL); @@ -46,7 +44,7 @@ public class Q170_DangerousSeduction extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -66,7 +64,7 @@ public class Q170_DangerousSeduction extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java index 58041204e0..80ffcc4272 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q171_ActsOfEvil/Q171_ActsOfEvil.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q171_ActsOfEvil extends Quest { - private static final String qn = "Q171_ActsOfEvil"; - // Items private static final int BLADE_MOLD = 4239; private static final int TYRA_BILL = 4240; @@ -52,7 +50,7 @@ public class Q171_ActsOfEvil extends Quest private static final int BURAI = 30617; // Turek Orcs drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20496, 530000); @@ -63,7 +61,7 @@ public class Q171_ActsOfEvil extends Quest public Q171_ActsOfEvil() { - super(171, qn, "Acts of Evil"); + super(171, "Acts of Evil"); registerQuestItems(BLADE_MOLD, TYRA_BILL, RANGER_REPORT_1, RANGER_REPORT_2, RANGER_REPORT_3, RANGER_REPORT_4, WEAPON_TRADE_CONTRACT, ATTACK_DIRECTIVES, CERTIFICATE, CARGO_BOX, OL_MAHUM_HEAD); @@ -77,7 +75,7 @@ public class Q171_ActsOfEvil extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -127,7 +125,7 @@ public class Q171_ActsOfEvil extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java index 9564499b76..5097f0b2da 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q211_TrialOfTheChallenger/Q211_TrialOfTheChallenger.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q211_TrialOfTheChallenger extends Quest { - private static final String qn = "Q211_TrialOfTheChallenger"; - // Items private static final int LETTER_OF_KASH = 2628; private static final int WATCHER_EYE_1 = 2629; @@ -64,7 +62,7 @@ public class Q211_TrialOfTheChallenger extends Quest public Q211_TrialOfTheChallenger() { - super(211, qn, "Trial of the Challenger"); + super(211, "Trial of the Challenger"); registerQuestItems(LETTER_OF_KASH, WATCHER_EYE_1, WATCHER_EYE_2, SCROLL_OF_SHYSLASSYS, BROKEN_KEY); @@ -78,7 +76,7 @@ public class Q211_TrialOfTheChallenger extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -161,7 +159,7 @@ public class Q211_TrialOfTheChallenger extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java index 83c3654f47..14c3a5bf78 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q212_TrialOfDuty/Q212_TrialOfDuty.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q212_TrialOfDuty extends Quest { - private static final String qn = "Q212_TrialOfDuty"; - // Items private static final int LETTER_OF_DUSTIN = 2634; private static final int KNIGHTS_TEAR = 2635; @@ -61,7 +59,7 @@ public class Q212_TrialOfDuty extends Quest public Q212_TrialOfDuty() { - super(212, qn, "Trial of Duty"); + super(212, "Trial of Duty"); registerQuestItems(LETTER_OF_DUSTIN, KNIGHTS_TEAR, MIRROR_OF_ORPIC, TEAR_OF_CONFESSION, REPORT_PIECE_1, REPORT_PIECE_2, TEAR_OF_LOYALTY, MILITAS_ARTICLE, SAINTS_ASHES_URN, ATHEBALDT_SKULL, ATHEBALDT_RIBS, ATHEBALDT_SHIN, LETTER_OF_WINDAWOOD, OLD_KNIGHT_SWORD); @@ -75,7 +73,7 @@ public class Q212_TrialOfDuty extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -108,7 +106,7 @@ public class Q212_TrialOfDuty extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = Quest.getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java index fc353b0839..3b3ad6d6fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q213_TrialOfTheSeeker/Q213_TrialOfTheSeeker.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q213_TrialOfTheSeeker extends Quest { - private static final String qn = "Q213_TrialOfTheSeeker"; - // Items private static final int DUFNER_LETTER = 2647; private static final int TERRY_ORDER_1 = 2648; @@ -81,7 +79,7 @@ public class Q213_TrialOfTheSeeker extends Quest public Q213_TrialOfTheSeeker() { - super(213, qn, "Trial of the Seeker"); + super(213, "Trial of the Seeker"); registerQuestItems(DUFNER_LETTER, TERRY_ORDER_1, TERRY_ORDER_2, TERRY_LETTER, VIKTOR_LETTER, HAWKEYE_LETTER, MYSTERIOUS_RUNESTONE, OL_MAHUM_RUNESTONE, TUREK_RUNESTONE, ANT_RUNESTONE, TURAK_BUGBEAR_RUNESTONE, TERRY_BOX, VIKTOR_REQUEST, MEDUSA_SCALES, SHILEN_RUNESTONE, ANALYSIS_REQUEST, MARINA_LETTER, EXPERIMENT_TOOLS, ANALYSIS_RESULT, TERRY_ORDER_3, LIST_OF_HOST, ABYSS_RUNESTONE_1, ABYSS_RUNESTONE_2, ABYSS_RUNESTONE_3, ABYSS_RUNESTONE_4, TERRY_REPORT); @@ -95,7 +93,7 @@ public class Q213_TrialOfTheSeeker extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -212,7 +210,7 @@ public class Q213_TrialOfTheSeeker extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java index 510a977fe1..8b30893180 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q214_TrialOfTheScholar/Q214_TrialOfTheScholar.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q214_TrialOfTheScholar extends Quest { - private static final String qn = "Q214_TrialOfTheScholar"; - // Items private static final int MIRIEN_SIGIL_1 = 2675; private static final int MIRIEN_SIGIL_2 = 2676; @@ -109,7 +107,7 @@ public class Q214_TrialOfTheScholar extends Quest public Q214_TrialOfTheScholar() { - super(214, qn, "Trial of the Scholar"); + super(214, "Trial of the Scholar"); registerQuestItems(MIRIEN_SIGIL_1, MIRIEN_SIGIL_2, MIRIEN_SIGIL_3, MIRIEN_INSTRUCTION, MARIA_LETTER_1, MARIA_LETTER_2, LUCAS_LETTER, LUCILLA_HANDBAG, CRETA_LETTER_1, CRETA_PAINTING_1, CRETA_PAINTING_2, CRETA_PAINTING_3, BROWN_SCROLL_SCRAP, CRYSTAL_OF_PURITY_1, HIGH_PRIEST_SIGIL, GRAND_MAGISTER_SIGIL, CRONOS_SIGIL, SYLVAIN_LETTER, SYMBOL_OF_SYLVAIN, JUREK_LIST, MONSTER_EYE_DESTROYER_SKIN, SHAMAN_NECKLACE, SHACKLE_SCALP, SYMBOL_OF_JUREK, CRONOS_LETTER, DIETER_KEY, CRETA_LETTER_2, DIETER_LETTER, DIETER_DIARY, RAUT_LETTER_ENVELOPE, TRIFF_RING, SCRIPTURE_CHAPTER_1, SCRIPTURE_CHAPTER_2, SCRIPTURE_CHAPTER_3, SCRIPTURE_CHAPTER_4, VALKON_REQUEST, POITAN_NOTES, STRONG_LIQUOR, CRYSTAL_OF_PURITY_2, CASIAN_LIST, GHOUL_SKIN, MEDUSA_BLOOD, FETTERED_SOUL_ICHOR, ENCHANTED_GARGOYLE_NAIL, SYMBOL_OF_CRONOS); @@ -123,7 +121,7 @@ public class Q214_TrialOfTheScholar extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -324,7 +322,7 @@ public class Q214_TrialOfTheScholar extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java index 146d249046..2f23bb0df1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q215_TrialOfThePilgrim/Q215_TrialOfThePilgrim.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q215_TrialOfThePilgrim extends Quest { - private static final String qn = "Q215_TrialOfThePilgrim"; - // Items private static final int BOOK_OF_SAGE = 2722; private static final int VOUCHER_OF_TRIAL = 2723; @@ -67,7 +65,7 @@ public class Q215_TrialOfThePilgrim extends Quest public Q215_TrialOfThePilgrim() { - super(215, qn, "Trial of the Pilgrim"); + super(215, "Trial of the Pilgrim"); registerQuestItems(BOOK_OF_SAGE, VOUCHER_OF_TRIAL, SPIRIT_OF_FLAME, ESSENCE_OF_FLAME, BOOK_OF_GERALD, GRAY_BADGE, PICTURE_OF_NAHIR, HAIR_OF_NAHIR, STATUE_OF_EINHASAD, BOOK_OF_DARKNESS, DEBRIS_OF_WILLOW, TAG_OF_RUMOR); @@ -82,7 +80,7 @@ public class Q215_TrialOfThePilgrim extends Quest { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -148,7 +146,7 @@ public class Q215_TrialOfThePilgrim extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java index 0f6491bb58..b33f58f994 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q216_TrialOfTheGuildsman/Q216_TrialOfTheGuildsman.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q216_TrialOfTheGuildsman extends Quest { - private static final String qn = "Q216_TrialOfTheGuildsman"; - // Items private static final int RECIPE_JOURNEYMAN_RING = 3024; private static final int RECIPE_AMBER_BEAD = 3025; @@ -81,7 +79,7 @@ public class Q216_TrialOfTheGuildsman extends Quest public Q216_TrialOfTheGuildsman() { - super(216, qn, "Trial of the Guildsman"); + super(216, "Trial of the Guildsman"); registerQuestItems(RECIPE_JOURNEYMAN_RING, RECIPE_AMBER_BEAD, VALKON_RECOMMENDATION, MANDRAGORA_BERRY, ALTRAN_INSTRUCTIONS, ALTRAN_RECOMMENDATION_1, ALTRAN_RECOMMENDATION_2, NORMAN_INSTRUCTIONS, NORMAN_RECEIPT, DUNING_INSTRUCTIONS, DUNING_KEY, NORMAN_LIST, GRAY_BONE_POWDER, GRANITE_WHETSTONE, RED_PIGMENT, BRAIDED_YARN, JOURNEYMAN_GEM, PINTER_INSTRUCTIONS, AMBER_BEAD, AMBER_LUMP, JOURNEYMAN_DECO_BEADS, JOURNEYMAN_RING); @@ -96,7 +94,7 @@ public class Q216_TrialOfTheGuildsman extends Quest { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -192,7 +190,7 @@ public class Q216_TrialOfTheGuildsman extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java index 7ed114e2e1..104e606010 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q217_TestimonyOfTrust/Q217_TestimonyOfTrust.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q217_TestimonyOfTrust extends Quest { - private static final String qn = "Q217_TestimonyOfTrust"; - // Items private static final int LETTER_TO_ELF = 2735; private static final int LETTER_TO_DARK_ELF = 2736; @@ -96,7 +94,7 @@ public class Q217_TestimonyOfTrust extends Quest public Q217_TestimonyOfTrust() { - super(217, qn, "Testimony of Trust"); + super(217, "Testimony of Trust"); registerQuestItems(LETTER_TO_ELF, LETTER_TO_DARK_ELF, LETTER_TO_DWARF, LETTER_TO_ORC, LETTER_TO_SERESIN, SCROLL_OF_DARK_ELF_TRUST, SCROLL_OF_ELF_TRUST, SCROLL_OF_DWARF_TRUST, SCROLL_OF_ORC_TRUST, RECOMMENDATION_OF_HOLLINT, ORDER_OF_ASTERIOS, BREATH_OF_WINDS, SEED_OF_VERDURE, LETTER_FROM_THIFIELL, BLOOD_GUARDIAN_BASILIK, GIANT_APHID, STAKATO_FLUIDS, BASILIK_PLASMA, HONEY_DEW, STAKATO_ICHOR, ORDER_OF_CLAYTON, PARASITE_OF_LOTA, LETTER_TO_MANAKIA, LETTER_OF_MANAKIA, LETTER_TO_NIKOLA, ORDER_OF_NIKOLA, HEARTSTONE_OF_PORTA); @@ -111,7 +109,7 @@ public class Q217_TestimonyOfTrust extends Quest { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -201,7 +199,7 @@ public class Q217_TestimonyOfTrust extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java index 618d57757d..1e53204b71 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q218_TestimonyOfLife/Q218_TestimonyOfLife.java @@ -28,8 +28,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q218_TestimonyOfLife extends Quest { - private static final String qn = "Q218_TestimonyOfLife"; - + // NPCs private static final int ASTERIOS = 30154; private static final int PUSHKIN = 30300; private static final int THALIA = 30371; @@ -82,7 +81,7 @@ public class Q218_TestimonyOfLife extends Quest public Q218_TestimonyOfLife() { - super(218, qn, "Testimony of Life"); + super(218, "Testimony of Life"); registerQuestItems(TALINS_SPEAR, CARDIEN_LETTER, CAMOMILE_CHARM, HIERARCH_LETTER, MOONFLOWER_CHARM, GRAIL_DIAGRAM, THALIA_LETTER_1, THALIA_LETTER_2, THALIA_INSTRUCTIONS, PUSHKIN_LIST, PURE_MITHRIL_CUP, ARKENIA_CONTRACT, ARKENIA_INSTRUCTIONS, ADONIUS_LIST, ANDARIEL_SCRIPTURE_COPY, STARDUST, ISAEL_INSTRUCTIONS, ISAEL_LETTER, GRAIL_OF_PURITY, TEARS_OF_UNICORN, WATER_OF_LIFE, PURE_MITHRIL_ORE, ANT_SOLDIER_ACID, WYRM_TALON, SPIDER_ICHOR, HARPY_DOWN, 3166, 3167, 3168, 3169, 3170, 3171); @@ -96,7 +95,7 @@ public class Q218_TestimonyOfLife extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -194,7 +193,7 @@ public class Q218_TestimonyOfLife extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java index 5f957a6b70..599ca5eaa4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q219_TestimonyOfFate/Q219_TestimonyOfFate.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q219_TestimonyOfFate extends Quest { - private static final String qn = "Q219_TestimonyOfFate"; - // NPCs private static final int KAIRA = 30476; private static final int METHEUS = 30614; @@ -97,7 +95,7 @@ public class Q219_TestimonyOfFate extends Quest private static final int BLACK_WILLOW_LURKER = 27079; // Cond 6 drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(DEAD_SEEKER, 500000); @@ -113,7 +111,7 @@ public class Q219_TestimonyOfFate extends Quest public Q219_TestimonyOfFate() { - super(219, qn, "Testimony of Fate"); + super(219, "Testimony of Fate"); registerQuestItems(KAIRA_LETTER, METHEUS_FUNERAL_JAR, KASANDRA_REMAINS, HERBALISM_TEXTBOOK, IXIA_LIST, MEDUSA_ICHOR, MARSH_SPIDER_FLUIDS, DEAD_SEEKER_DUNG, TYRANT_BLOOD, NIGHTSHADE_ROOT, BELLADONNA, ALDER_SKULL_1, ALDER_SKULL_2, ALDER_RECEIPT, REVELATIONS_MANUSCRIPT, KAIRA_RECOMMENDATION, KAIRA_INSTRUCTIONS, PALUS_CHARM, THIFIELL_LETTER, ARKENIA_NOTE, PIXY_GARNET, GRANDIS_SKULL, KARUL_BUGBEAR_SKULL, BREKA_OVERLORD_SKULL, LETO_OVERLORD_SKULL, RED_FAIRY_DUST, BLIGHT_TREANT_SEED, BLACK_WILLOW_LEAF, BLIGHT_TREANT_SAP, ARKENIA_LETTER); @@ -127,7 +125,7 @@ public class Q219_TestimonyOfFate extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -204,7 +202,7 @@ public class Q219_TestimonyOfFate extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java index c087a971ba..5117cc1474 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q220_TestimonyOfGlory/Q220_TestimonyOfGlory.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q220_TestimonyOfGlory extends Quest { - private static final String qn = "Q220_TestimonyOfGlory"; - // Items private static final int VOKIAN_ORDER_1 = 3204; private static final int MANASHEN_SHARD = 3205; @@ -109,7 +107,7 @@ public class Q220_TestimonyOfGlory extends Quest public Q220_TestimonyOfGlory() { - super(220, qn, "Testimony of Glory"); + super(220, "Testimony of Glory"); registerQuestItems(VOKIAN_ORDER_1, MANASHEN_SHARD, TYRANT_TALON, GUARDIAN_BASILISK_FANG, VOKIAN_ORDER_2, NECKLACE_OF_AUTHORITY, CHIANTA_ORDER_1, SCEPTER_OF_BREKA, SCEPTER_OF_ENKU, SCEPTER_OF_VUKU, SCEPTER_OF_TUREK, SCEPTER_OF_TUNATH, CHIANTA_ORDER_2, CHIANTA_ORDER_3, TAMLIN_ORC_SKULL, TIMAK_ORC_HEAD, SCEPTER_BOX, PASHIKA_HEAD, VULTUS_HEAD, GLOVE_OF_VOLTAR, ENKU_OVERLORD_HEAD, GLOVE_OF_KEPRA, MAKUM_BUGBEAR_HEAD, GLOVE_OF_BURAI, MANAKIA_LETTER_1, MANAKIA_LETTER_2, KASMAN_LETTER_1, KASMAN_LETTER_2, KASMAN_LETTER_3, DRIKO_CONTRACT, STAKATO_DRONE_HUSK, TANAPI_ORDER, SCEPTER_OF_TANTOS, RITUAL_BOX); @@ -124,7 +122,7 @@ public class Q220_TestimonyOfGlory extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -357,7 +355,7 @@ public class Q220_TestimonyOfGlory extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java index 684b146353..f387432838 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q221_TestimonyOfProsperity/Q221_TestimonyOfProsperity.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q221_TestimonyOfProsperity extends Quest { - private static final String qn = "Q221_TestimonyOfProsperity"; - // Items private static final int ADENA = 57; private static final int ANIMAL_SKIN = 1867; @@ -114,7 +112,7 @@ public class Q221_TestimonyOfProsperity extends Quest public Q221_TestimonyOfProsperity() { - super(221, qn, "Testimony of Prosperity"); + super(221, "Testimony of Prosperity"); registerQuestItems(RING_OF_TESTIMONY_1, RING_OF_TESTIMONY_2, OLD_ACCOUNT_BOOK, BLESSED_SEED, EMILY_RECIPE, LILITH_ELVEN_WAFER, MAPHR_TABLET_FRAGMENT, COLLECTION_LICENSE, LOCKIRIN_NOTICE_1, LOCKIRIN_NOTICE_2, LOCKIRIN_NOTICE_3, LOCKIRIN_NOTICE_4, LOCKIRIN_NOTICE_5, CONTRIBUTION_OF_SHARI, CONTRIBUTION_OF_MION, CONTRIBUTION_OF_MARYSE, MARYSE_REQUEST, CONTRIBUTION_OF_TOMA, RECEIPT_OF_BOLTER, RECEIPT_OF_CONTRIBUTION_1, RECEIPT_OF_CONTRIBUTION_2, RECEIPT_OF_CONTRIBUTION_3, RECEIPT_OF_CONTRIBUTION_4, RECEIPT_OF_CONTRIBUTION_5, PROCURATION_OF_TOROCCO, BRIGHT_LIST, MANDRAGORA_PETAL, CRIMSON_MOSS, MANDRAGORA_BOUQUET, PARMAN_INSTRUCTIONS, PARMAN_LETTER, CLAY_DOUGH, PATTERN_OF_KEYHOLE, NIKOLAS_LIST, STAKATO_SHELL, TOAD_LORD_SAC, SPIDER_THORN, CRYSTAL_BROOCH); @@ -128,7 +126,7 @@ public class Q221_TestimonyOfProsperity extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -294,7 +292,7 @@ public class Q221_TestimonyOfProsperity extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java index c386cf860c..bb58a201a0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q222_TestOfTheDuelist/Q222_TestOfTheDuelist.java @@ -26,8 +26,7 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q222_TestOfTheDuelist extends Quest { - private static final String qn = "Q222_TestOfTheDuelist"; - + // NPC private static final int KAIEN = 30623; // Items @@ -76,7 +75,7 @@ public class Q222_TestOfTheDuelist extends Quest public Q222_TestOfTheDuelist() { - super(222, qn, "Test of the Duelist"); + super(222, "Test of the Duelist"); registerQuestItems(ORDER_GLUDIO, ORDER_DION, ORDER_GIRAN, ORDER_OREN, ORDER_ADEN, FINAL_ORDER, PUNCHER_SHARD, NOBLE_ANT_FEELER, DRONE_CHITIN, DEAD_SEEKER_FANG, OVERLORD_NECKLACE, FETTERED_SOUL_CHAIN, CHIEF_AMULET, ENCHANTED_EYE_MEAT, TAMRIN_ORC_RING, TAMRIN_ORC_ARROW, EXCURO_SKIN, KRATOR_SHARD, GRANDIS_SKIN, TIMAK_ORC_BELT, LAKIN_MACE); @@ -90,7 +89,7 @@ public class Q222_TestOfTheDuelist extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -157,7 +156,7 @@ public class Q222_TestOfTheDuelist extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java index c81ced9a23..a91bf696c4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q223_TestOfTheChampion/Q223_TestOfTheChampion.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q223_TestOfTheChampion extends Quest { - private static final String qn = "Q223_TestOfTheChampion"; - // Items private static final int ASCALON_LETTER_1 = 3277; private static final int MASON_LETTER = 3278; @@ -77,7 +75,7 @@ public class Q223_TestOfTheChampion extends Quest public Q223_TestOfTheChampion() { - super(223, qn, "Test of the Champion"); + super(223, "Test of the Champion"); registerQuestItems(MASON_LETTER, MEDUSA_VENOM, WINDSUS_BILE, WHITE_ROSE_INSIGNIA, HARPY_EGG, GROOT_LETTER, MOUEN_LETTER, ASCALON_LETTER_1, IRON_ROSE_RING, BLOODY_AXE_HEAD, ASCALON_LETTER_2, ASCALON_LETTER_3, MOUEN_ORDER_1, ROAD_RATMAN_HEAD, MOUEN_ORDER_2, LETO_LIZARDMAN_FANG); @@ -92,7 +90,7 @@ public class Q223_TestOfTheChampion extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -163,7 +161,7 @@ public class Q223_TestOfTheChampion extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java index 9b8b1666b4..2b10dfd522 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q224_TestOfSagittarius/Q224_TestOfSagittarius.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q224_TestOfSagittarius extends Quest { - private static final String qn = "Q224_TestOfSagittarius"; - // Items private static final int BERNARD_INTRODUCTION = 3294; private static final int HAMIL_LETTER_1 = 3295; @@ -86,7 +84,7 @@ public class Q224_TestOfSagittarius extends Quest public Q224_TestOfSagittarius() { - super(224, qn, "Test of Sagittarius"); + super(224, "Test of Sagittarius"); registerQuestItems(BERNARD_INTRODUCTION, HAMIL_LETTER_1, HAMIL_LETTER_2, HAMIL_LETTER_3, HUNTER_RUNE_1, HUNTER_RUNE_2, TALISMAN_OF_KADESH, TALISMAN_OF_SNAKE, MITHRIL_CLIP, STAKATO_CHITIN, REINFORCED_BOWSTRING, MANASHEN_HORN, BLOOD_OF_LIZARDMAN, CRESCENT_MOON_BOW); @@ -100,7 +98,7 @@ public class Q224_TestOfSagittarius extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -158,7 +156,7 @@ public class Q224_TestOfSagittarius extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java index 3f78af9394..c1d502198d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q225_TestOfTheSearcher/Q225_TestOfTheSearcher.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q225_TestOfTheSearcher extends Quest { - private static final String qn = "Q225_TestOfTheSearcher"; - // Items private static final int LUTHER_LETTER = 2784; private static final int ALEX_WARRANT = 2785; @@ -81,7 +79,7 @@ public class Q225_TestOfTheSearcher extends Quest public Q225_TestOfTheSearcher() { - super(225, qn, "Test of the Searcher"); + super(225, "Test of the Searcher"); registerQuestItems(LUTHER_LETTER, ALEX_WARRANT, LEIRYNN_ORDER_1, DELU_TOTEM, LEIRYNN_ORDER_2, CHIEF_KALKI_FANG, LEIRYNN_REPORT, STRANGE_MAP, LAMBERT_MAP, ALEX_LETTER, ALEX_ORDER, WINE_CATALOG, TYRA_CONTRACT, RED_SPORE_DUST, MALRUKIAN_WINE, OLD_ORDER, JAX_DIARY, TORN_MAP_PIECE_1, TORN_MAP_PIECE_2, SOLT_MAP, MAKEL_MAP, COMBINED_MAP, RUSTED_KEY, GOLD_BAR, ALEX_RECOMMEND); @@ -96,7 +94,7 @@ public class Q225_TestOfTheSearcher extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -194,7 +192,7 @@ public class Q225_TestOfTheSearcher extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java index d1c64a8176..970e071578 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q226_TestOfTheHealer/Q226_TestOfTheHealer.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q226_TestOfTheHealer extends Quest { - private static final String qn = "Q226_TestOfTheHealer"; - // Items private static final int REPORT_OF_PERRIN = 2810; private static final int KRISTINA_LETTER = 2811; @@ -73,7 +71,7 @@ public class Q226_TestOfTheHealer extends Quest public Q226_TestOfTheHealer() { - super(226, qn, "Test of the Healer"); + super(226, "Test of the Healer"); registerQuestItems(REPORT_OF_PERRIN, KRISTINA_LETTER, PICTURE_OF_WINDY, GOLDEN_STATUE, WINDY_PEBBLES, ORDER_OF_SORIUS, SECRET_LETTER_1, SECRET_LETTER_2, SECRET_LETTER_3, SECRET_LETTER_4); @@ -87,7 +85,7 @@ public class Q226_TestOfTheHealer extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -205,7 +203,7 @@ public class Q226_TestOfTheHealer extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java index e653c94797..e8e90cdfed 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q227_TestOfTheReformer/Q227_TestOfTheReformer.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q227_TestOfTheReformer extends Quest { - private static final String qn = "Q227_TestOfTheReformer"; - // Items private static final int BOOK_OF_REFORM = 2822; private static final int LETTER_OF_INTRODUCTION = 2823; @@ -95,7 +93,7 @@ public class Q227_TestOfTheReformer extends Quest public Q227_TestOfTheReformer() { - super(227, qn, "Test of the Reformer"); + super(227, "Test of the Reformer"); registerQuestItems(BOOK_OF_REFORM, LETTER_OF_INTRODUCTION, SLA_LETTER, GREETINGS, OL_MAHUM_MONEY, KATARI_LETTER, NYAKURI_LETTER, UNDEAD_LIST, RAMUS_LETTER, RIPPED_DIARY, HUGE_NAIL, LETTER_OF_BETRAYER, BONE_FRAGMENT_4, BONE_FRAGMENT_5, BONE_FRAGMENT_6, BONE_FRAGMENT_7, BONE_FRAGMENT_8, BONE_FRAGMENT_9, KAKAN_LETTER); @@ -110,7 +108,7 @@ public class Q227_TestOfTheReformer extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -242,7 +240,7 @@ public class Q227_TestOfTheReformer extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java index 0e86a13831..6dde6d5515 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q228_TestOfMagus/Q228_TestOfMagus.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q228_TestOfMagus extends Quest { - private static final String qn = "Q228_TestOfMagus"; - // Items private static final int RUKAL_LETTER = 2841; private static final int PARINA_LETTER = 2842; @@ -85,7 +83,7 @@ public class Q228_TestOfMagus extends Quest public Q228_TestOfMagus() { - super(228, qn, "Test of Magus"); + super(228, "Test of Magus"); registerQuestItems(RUKAL_LETTER, PARINA_LETTER, LILAC_CHARM, GOLDEN_SEED_1, GOLDEN_SEED_2, GOLDEN_SEED_3, SCORE_OF_ELEMENTS, DAZZLING_DROP, FLAME_CRYSTAL, HARPY_FEATHER, WYRM_WINGBONE, WINDSUS_MANE, EN_MONSTEREYE_SHELL, EN_STONEGOLEM_POWDER, EN_IRONGOLEM_SCRAP, TONE_OF_WATER, TONE_OF_FIRE, TONE_OF_WIND, TONE_OF_EARTH, SALAMANDER_CHARM, SYLPH_CHARM, UNDINE_CHARM, SERPENT_CHARM); @@ -99,7 +97,7 @@ public class Q228_TestOfMagus extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -166,7 +164,7 @@ public class Q228_TestOfMagus extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java index 0c17cd501a..d49fea9d1e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q229_TestOfWitchcraft/Q229_TestOfWitchcraft.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q229_TestOfWitchcraft extends Quest { - private static final String qn = "Q229_TestOfWitchcraft"; - // Items private static final int ORIM_DIAGRAM = 3308; private static final int ALEXANDRIA_BOOK = 3309; @@ -98,7 +96,7 @@ public class Q229_TestOfWitchcraft extends Quest public Q229_TestOfWitchcraft() { - super(229, qn, "Test of Witchcraft"); + super(229, "Test of Witchcraft"); registerQuestItems(ORIM_DIAGRAM, ALEXANDRIA_BOOK, IKER_LIST, DIRE_WYRM_FANG, LETO_LIZARDMAN_CHARM, EN_GOLEM_HEARTSTONE, LARA_MEMO, NESTLE_MEMO, LEOPOLD_JOURNAL, AKLANTOTH_GEM_1, AKLANTOTH_GEM_2, AKLANTOTH_GEM_3, AKLANTOTH_GEM_4, AKLANTOTH_GEM_5, AKLANTOTH_GEM_6, BRIMSTONE_1, ORIM_INSTRUCTIONS, ORIM_LETTER_1, ORIM_LETTER_2, SIR_VASPER_LETTER, VADIN_CRUCIFIX, TAMLIN_ORC_AMULET, VADIN_SANCTIONS, IKER_AMULET, SOULTRAP_CRYSTAL, PURGATORY_KEY, ZERUEL_BIND_CRYSTAL, BRIMSTONE_2, SWORD_OF_BINDING); @@ -113,7 +111,7 @@ public class Q229_TestOfWitchcraft extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -282,7 +280,7 @@ public class Q229_TestOfWitchcraft extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index f9ff2bde3e..b1fd601ae7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java @@ -34,8 +34,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q230_TestOfTheSummoner extends Quest { - public static final String qn = "Q230_TestOfTheSummoner"; - // Items private static final int LETO_LIZARDMAN_AMULET = 3337; private static final int SAC_OF_REDSPORES = 3338; @@ -169,7 +167,7 @@ public class Q230_TestOfTheSummoner extends Quest public Q230_TestOfTheSummoner() { - super(230, qn, "Test of the Summoner"); + super(230, "Test of the Summoner"); registerQuestItems(LETO_LIZARDMAN_AMULET, SAC_OF_REDSPORES, KARUL_BUGBEAR_TOTEM, SHARDS_OF_MANASHEN, BREKA_ORC_TOTEM, CRIMSON_BLOODSTONE, TALONS_OF_TYRANT, WINGS_OF_DRONEANT, TUSK_OF_WINDSUS, FANGS_OF_WYRM, LARA_LIST_1, LARA_LIST_2, LARA_LIST_3, LARA_LIST_4, LARA_LIST_5, GALATEA_LETTER, BEGINNER_ARCANA, ALMORS_ARCANA, CAMONIELL_ARCANA, BELTHUS_ARCANA, BASILLIA_ARCANA, CELESTIEL_ARCANA, BRYNTHEA_ARCANA, CRYSTAL_OF_PROGRESS_1, CRYSTAL_OF_INPROGRESS_1, CRYSTAL_OF_FOUL_1, CRYSTAL_OF_DEFEAT_1, CRYSTAL_OF_VICTORY_1, CRYSTAL_OF_PROGRESS_2, CRYSTAL_OF_INPROGRESS_2, CRYSTAL_OF_FOUL_2, CRYSTAL_OF_DEFEAT_2, CRYSTAL_OF_VICTORY_2, CRYSTAL_OF_PROGRESS_3, CRYSTAL_OF_INPROGRESS_3, CRYSTAL_OF_FOUL_3, CRYSTAL_OF_DEFEAT_3, CRYSTAL_OF_VICTORY_3, CRYSTAL_OF_PROGRESS_4, CRYSTAL_OF_INPROGRESS_4, CRYSTAL_OF_FOUL_4, CRYSTAL_OF_DEFEAT_4, CRYSTAL_OF_VICTORY_4, CRYSTAL_OF_PROGRESS_5, CRYSTAL_OF_INPROGRESS_5, CRYSTAL_OF_FOUL_5, CRYSTAL_OF_DEFEAT_5, CRYSTAL_OF_VICTORY_5, CRYSTAL_OF_PROGRESS_6, CRYSTAL_OF_INPROGRESS_6, CRYSTAL_OF_FOUL_6, CRYSTAL_OF_DEFEAT_6, CRYSTAL_OF_VICTORY_6); @@ -184,7 +182,7 @@ public class Q230_TestOfTheSummoner extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; @@ -359,7 +357,7 @@ public class Q230_TestOfTheSummoner extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -1034,7 +1032,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Almors", "5"); @@ -1068,7 +1066,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Camoniell", "5"); @@ -1102,7 +1100,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Belthus", "5"); @@ -1136,7 +1134,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Basilla", "5"); @@ -1170,7 +1168,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Celestiel", "5"); @@ -1204,7 +1202,7 @@ public class Q230_TestOfTheSummoner extends Quest PlayerInstance foulPlayer = duel.getAttacker(); if (foulPlayer != null) { - st = foulPlayer.getQuestState(qn); + st = foulPlayer.getQuestState(getName()); if (st != null) { st.set("Brynthea", "5"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java index 151ce7768e..02834fe199 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q231_TestOfTheMaestro/Q231_TestOfTheMaestro.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q231_TestOfTheMaestro extends Quest { - private static final String qn = "Q231_TestOfTheMaestro"; - private static final int RECOMMENDATION_OF_BALANKI = 2864; private static final int RECOMMENDATION_OF_FILAUR = 2865; private static final int RECOMMENDATION_OF_ARIN = 2866; @@ -71,7 +69,7 @@ public class Q231_TestOfTheMaestro extends Quest public Q231_TestOfTheMaestro() { - super(231, qn, "Test of the Maestro"); + super(231, "Test of the Maestro"); registerQuestItems(RECOMMENDATION_OF_BALANKI, RECOMMENDATION_OF_FILAUR, RECOMMENDATION_OF_ARIN, LETTER_OF_SOLDER_DETACHMENT, PAINT_OF_KAMURU, NECKLACE_OF_KAMURU, PAINT_OF_TELEPORT_DEVICE, TELEPORT_DEVICE, ARCHITECTURE_OF_KRUMA, REPORT_OF_KRUMA, INGREDIENTS_OF_ANTIDOTE, STINGER_WASP_NEEDLE, MARSH_SPIDER_WEB, BLOOD_OF_LEECH, BROKEN_TELEPORT_DEVICE); @@ -85,7 +83,7 @@ public class Q231_TestOfTheMaestro extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -160,7 +158,7 @@ public class Q231_TestOfTheMaestro extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java index 02e33520bc..1755dbf714 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q232_TestOfTheLord/Q232_TestOfTheLord.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q232_TestOfTheLord extends Quest { - private static final String qn = "Q232_TestOfTheLord"; - // NPCs private static final int SOMAK = 30510; private static final int MANAKIA = 30515; @@ -80,7 +78,7 @@ public class Q232_TestOfTheLord extends Quest public Q232_TestOfTheLord() { - super(232, qn, "Test of the Lord"); + super(232, "Test of the Lord"); registerQuestItems(VARKEES_CHARM, TANTUS_CHARM, HATOS_CHARM, TAKUNA_CHARM, CHIANTA_CHARM, MANAKIAS_ORDERS, BREKA_ORC_FANG, MANAKIAS_AMULET, HUGE_ORC_FANG, SUMARIS_LETTER, URUTU_BLADE, TIMAK_ORC_SKULL, SWORD_INTO_SKULL, NERUGA_AXE_BLADE, AXE_OF_CEREMONY, MARSH_SPIDER_FEELER, MARSH_SPIDER_FEET, HANDIWORK_SPIDER_BROOCH, MONSTEREYE_CORNEA, MONSTEREYE_WOODCARVING, BEAR_FANG_NECKLACE, MARTANKUS_CHARM, RAGNA_ORC_HEAD, RAGNA_ORC_HEAD, IMMORTAL_FLAME); @@ -94,7 +92,7 @@ public class Q232_TestOfTheLord extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -192,7 +190,7 @@ public class Q232_TestOfTheLord extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java index def189d2bc..4baa5133b8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q233_TestOfTheWarSpirit/Q233_TestOfTheWarSpirit.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q233_TestOfTheWarSpirit extends Quest { - private static final String qn = "Q233_TestOfTheWarSpirit"; - // Items private static final int VENDETTA_TOTEM = 2880; private static final int TAMLIN_ORC_HEAD = 2881; @@ -96,7 +94,7 @@ public class Q233_TestOfTheWarSpirit extends Quest public Q233_TestOfTheWarSpirit() { - super(233, qn, "Test of the War Spirit"); + super(233, "Test of the War Spirit"); registerQuestItems(VENDETTA_TOTEM, TAMLIN_ORC_HEAD, WARSPIRIT_TOTEM, ORIM_CONTRACT, PORTA_EYE, EXCURO_SCALE, MORDEO_TALON, BRAKI_REMAINS_1, PEKIRON_TOTEM, TONAR_SKULL, TONAR_RIBBONE, TONAR_SPINE, TONAR_ARMBONE, TONAR_THIGHBONE, TONAR_REMAINS_1, MANAKIA_TOTEM, HERMODT_SKULL, HERMODT_RIBBONE, HERMODT_SPINE, HERMODT_ARMBONE, HERMODT_THIGHBONE, HERMODT_REMAINS_1, RACOY_TOTEM, VIVYAN_LETTER, INSECT_DIAGRAM_BOOK, KIRUNA_SKULL, KIRUNA_RIBBONE, KIRUNA_SPINE, KIRUNA_ARMBONE, KIRUNA_THIGHBONE, KIRUNA_REMAINS_1, BRAKI_REMAINS_2, TONAR_REMAINS_2, HERMODT_REMAINS_2, KIRUNA_REMAINS_2); @@ -109,7 +107,7 @@ public class Q233_TestOfTheWarSpirit extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -181,7 +179,7 @@ public class Q233_TestOfTheWarSpirit extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java index 4ffff227cf..c7a06a8b1a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q234_FatesWhisper/Q234_FatesWhisper.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q234_FatesWhisper extends Quest { - private static final String qn = "Q234_FatesWhisper"; - // Items private static final int REIRIA_SOUL_ORB = 4666; private static final int KERMON_INFERNIUM_SCEPTER = 4667; @@ -50,7 +48,7 @@ public class Q234_FatesWhisper extends Quest private static final int STAR_OF_DESTINY = 5011; // Chest Spawn - private static final Map CHEST_SPAWN = new HashMap<>(); + private static final Map CHEST_SPAWN = new HashMap<>(); static { CHEST_SPAWN.put(25035, 31027); @@ -60,7 +58,7 @@ public class Q234_FatesWhisper extends Quest } // Weapons - private static final Map WEAPONS = new HashMap<>(); + private static final Map WEAPONS = new HashMap<>(); static { WEAPONS.put(79, "Sword of Damascus"); @@ -80,7 +78,7 @@ public class Q234_FatesWhisper extends Quest public Q234_FatesWhisper() { - super(234, qn, "Fate's Whisper"); + super(234, "Fate's Whisper"); registerQuestItems(PIPETTE_KNIFE, RED_PIPETTE_KNIFE); @@ -98,7 +96,7 @@ public class Q234_FatesWhisper extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -176,7 +174,7 @@ public class Q234_FatesWhisper extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q235_MimirsElixir/Q235_MimirsElixir.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q235_MimirsElixir/Q235_MimirsElixir.java index 4bbffde789..648f3fa441 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q235_MimirsElixir/Q235_MimirsElixir.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q235_MimirsElixir/Q235_MimirsElixir.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q235_MimirsElixir extends Quest { - private static final String qn = "Q235_MimirsElixir"; - // Items private static final int STAR_OF_DESTINY = 5011; private static final int PURE_SILVER = 6320; @@ -47,7 +45,7 @@ public class Q235_MimirsElixir extends Quest public Q235_MimirsElixir() { - super(235, qn, "Mimir's Elixir"); + super(235, "Mimir's Elixir"); registerQuestItems(PURE_SILVER, TRUE_GOLD, SAGE_STONE, BLOOD_FIRE, MAGISTER_MIXING_STONE, MIMIR_ELIXIR); @@ -61,7 +59,7 @@ public class Q235_MimirsElixir extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -147,7 +145,7 @@ public class Q235_MimirsElixir extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q241_PossessorOfAPreciousSoul/Q241_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q241_PossessorOfAPreciousSoul/Q241_PossessorOfAPreciousSoul.java index 8694400e6e..2c4adfd974 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q241_PossessorOfAPreciousSoul/Q241_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q241_PossessorOfAPreciousSoul/Q241_PossessorOfAPreciousSoul.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q241_PossessorOfAPreciousSoul extends Quest { - private static final String qn = "Q241_PossessorOfAPreciousSoul"; - // NPCs private static final int TALIEN = 31739; private static final int GABRIELLE = 30753; @@ -65,7 +63,7 @@ public class Q241_PossessorOfAPreciousSoul extends Quest public Q241_PossessorOfAPreciousSoul() { - super(241, qn, "Possessor of a Precious Soul - 1"); + super(241, "Possessor of a Precious Soul - 1"); registerQuestItems(LEGEND_OF_SEVENTEEN, MALRUK_SUCCUBUS_CLAW, ECHO_CRYSTAL, POETRY_BOOK, CRIMSON_MOSS, RAHORAKTI_MEDICINE); @@ -79,7 +77,7 @@ public class Q241_PossessorOfAPreciousSoul extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -220,7 +218,7 @@ public class Q241_PossessorOfAPreciousSoul extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java index 5732f76d11..3863bdc61b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q242_PossessorOfAPreciousSoul/Q242_PossessorOfAPreciousSoul.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q242_PossessorOfAPreciousSoul extends Quest { - private static final String qn = "Q242_PossessorOfAPreciousSoul"; - // NPCs private static final int VIRGIL = 31742; private static final int KASSANDRA = 31743; @@ -53,7 +51,7 @@ public class Q242_PossessorOfAPreciousSoul extends Quest public Q242_PossessorOfAPreciousSoul() { - super(242, qn, "Possessor of a Precious Soul - 2"); + super(242, "Possessor of a Precious Soul - 2"); registerQuestItems(GOLDEN_HAIR, SORCERY_INGREDIENT, ORB_OF_BINDING); @@ -67,7 +65,7 @@ public class Q242_PossessorOfAPreciousSoul extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -178,7 +176,7 @@ public class Q242_PossessorOfAPreciousSoul extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java index 86b909abc2..e9e05d2ef3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q246_PossessorOfAPreciousSoul/Q246_PossessorOfAPreciousSoul.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q246_PossessorOfAPreciousSoul extends Quest { - private static final String qn = "Q246_PossessorOfAPreciousSoul"; - // NPCs private static final int CARADINE = 31740; private static final int OSSIAN = 31741; @@ -48,7 +46,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest public Q246_PossessorOfAPreciousSoul() { - super(246, qn, "Possessor of a Precious Soul - 3"); + super(246, "Possessor of a Precious Soul - 3"); registerQuestItems(WATERBINDER, EVERGREEN, RAIN_SONG, RELIC_BOX); @@ -62,7 +60,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -135,7 +133,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -228,7 +226,7 @@ public class Q246_PossessorOfAPreciousSoul extends Quest continue; } - QuestState st = plr.getQuestState(qn); + QuestState st = plr.getQuestState(getName()); if (!st.hasQuestItems(RAIN_SONG)) { st.set("cond", "5"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q247_PossessorOfAPreciousSoul/Q247_PossessorOfAPreciousSoul.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q247_PossessorOfAPreciousSoul/Q247_PossessorOfAPreciousSoul.java index aaeb502157..75a9c3f9d8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q247_PossessorOfAPreciousSoul/Q247_PossessorOfAPreciousSoul.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q247_PossessorOfAPreciousSoul/Q247_PossessorOfAPreciousSoul.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q247_PossessorOfAPreciousSoul extends Quest { - private static final String qn = "Q247_PossessorOfAPreciousSoul"; - // NPCs private static final int CARADINE = 31740; private static final int LADY_OF_THE_LAKE = 31745; @@ -37,7 +35,7 @@ public class Q247_PossessorOfAPreciousSoul extends Quest public Q247_PossessorOfAPreciousSoul() { - super(247, qn, "Possessor of a Precious Soul - 4"); + super(247, "Possessor of a Precious Soul - 4"); addStartNpc(CARADINE); addTalkId(CARADINE, LADY_OF_THE_LAKE); @@ -47,7 +45,7 @@ public class Q247_PossessorOfAPreciousSoul extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q247_PossessorOfAPreciousSoul extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java index 85c47109f9..152d4381d4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q257_TheGuardIsBusy/Q257_TheGuardIsBusy.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q257_TheGuardIsBusy extends Quest { - private static final String qn = "Q257_TheGuardIsBusy"; - // Items private static final int GLUDIO_LORD_MARK = 1084; private static final int ORC_AMULET = 752; @@ -38,7 +36,7 @@ public class Q257_TheGuardIsBusy extends Quest public Q257_TheGuardIsBusy() { - super(257, qn, "The Guard is Busy"); + super(257, "The Guard is Busy"); registerQuestItems(ORC_AMULET, ORC_NECKLACE, WEREWOLF_FANG, GLUDIO_LORD_MARK); @@ -52,7 +50,7 @@ public class Q257_TheGuardIsBusy extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -79,7 +77,7 @@ public class Q257_TheGuardIsBusy extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java index 7cbe9c88e1..91992a5252 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q258_BringWolfPelts/Q258_BringWolfPelts.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q258_BringWolfPelts extends Quest { - private static final String qn = "Q258_BringWolfPelts"; - // Item private static final int WOLF_PELT = 702; @@ -39,7 +37,7 @@ public class Q258_BringWolfPelts extends Quest public Q258_BringWolfPelts() { - super(258, qn, "Bring Wolf Pelts"); + super(258, "Bring Wolf Pelts"); registerQuestItems(WOLF_PELT); @@ -53,7 +51,7 @@ public class Q258_BringWolfPelts extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -72,7 +70,7 @@ public class Q258_BringWolfPelts extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java index 93936df05c..2e7807a5b4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q259_RanchersPlea/Q259_RanchersPlea.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q259_RanchersPlea extends Quest { - private static final String qn = "Q259_RanchersPlea"; - // NPCs private static final int EDMOND = 30497; private static final int MARIUS = 30405; @@ -45,7 +43,7 @@ public class Q259_RanchersPlea extends Quest public Q259_RanchersPlea() { - super(259, qn, "Rancher's Plea"); + super(259, "Rancher's Plea"); registerQuestItems(GIANT_SPIDER_SKIN); @@ -59,7 +57,7 @@ public class Q259_RanchersPlea extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -114,7 +112,7 @@ public class Q259_RanchersPlea extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java index 261587ea7c..92b52e34a0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q260_HuntTheOrcs/Q260_HuntTheOrcs.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q260_HuntTheOrcs extends Quest { - private static final String qn = "Q260_HuntTheOrcs"; - // NPC private static final int RAYEN = 30221; @@ -44,7 +42,7 @@ public class Q260_HuntTheOrcs extends Quest public Q260_HuntTheOrcs() { - super(260, qn, "Hunt the Orcs"); + super(260, "Hunt the Orcs"); registerQuestItems(ORC_AMULET, ORC_NECKLACE); @@ -58,7 +56,7 @@ public class Q260_HuntTheOrcs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +80,7 @@ public class Q260_HuntTheOrcs extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q261_CollectorsDream/Q261_CollectorsDream.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q261_CollectorsDream/Q261_CollectorsDream.java index c85d58a9d4..5a8371f9e3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q261_CollectorsDream/Q261_CollectorsDream.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q261_CollectorsDream/Q261_CollectorsDream.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q261_CollectorsDream extends Quest { - private static final String qn = "Q261_CollectorsDream"; - // Items private static final int GIANT_SPIDER_LEG = 1087; public Q261_CollectorsDream() { - super(261, qn, "Collector's Dream"); + super(261, "Collector's Dream"); registerQuestItems(GIANT_SPIDER_LEG); @@ -45,7 +43,7 @@ public class Q261_CollectorsDream extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -64,7 +62,7 @@ public class Q261_CollectorsDream extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q262_TradeWithTheIvoryTower/Q262_TradeWithTheIvoryTower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q262_TradeWithTheIvoryTower/Q262_TradeWithTheIvoryTower.java index c144788f67..10af25246d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q262_TradeWithTheIvoryTower/Q262_TradeWithTheIvoryTower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q262_TradeWithTheIvoryTower/Q262_TradeWithTheIvoryTower.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q262_TradeWithTheIvoryTower extends Quest { - private static final String qn = "Q262_TradeWithTheIvoryTower"; - // Item private static final int FUNGUS_SAC = 707; public Q262_TradeWithTheIvoryTower() { - super(262, qn, "Trade with the Ivory Tower"); + super(262, "Trade with the Ivory Tower"); registerQuestItems(FUNGUS_SAC); @@ -45,7 +43,7 @@ public class Q262_TradeWithTheIvoryTower extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -65,7 +63,7 @@ public class Q262_TradeWithTheIvoryTower extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java index c8a0bac44e..d1fbd5c807 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q263_OrcSubjugation/Q263_OrcSubjugation.java @@ -25,15 +25,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q263_OrcSubjugation extends Quest { - private static final String qn = "Q263_OrcSubjugation"; - // Items private static final int ORC_AMULET = 1116; private static final int ORC_NECKLACE = 1117; public Q263_OrcSubjugation() { - super(263, qn, "Orc Subjugation"); + super(263, "Orc Subjugation"); registerQuestItems(ORC_AMULET, ORC_NECKLACE); @@ -47,7 +45,7 @@ public class Q263_OrcSubjugation extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -72,7 +70,7 @@ public class Q263_OrcSubjugation extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java index bb49ee6020..04618564cd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q264_KeenClaws/Q264_KeenClaws.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q264_KeenClaws extends Quest { - private static final String qn = "Q264_KeenClaws"; - // Item private static final int WOLF_CLAW = 1367; @@ -40,7 +38,7 @@ public class Q264_KeenClaws extends Quest public Q264_KeenClaws() { - super(264, qn, "Keen Claws"); + super(264, "Keen Claws"); registerQuestItems(WOLF_CLAW); @@ -54,7 +52,7 @@ public class Q264_KeenClaws extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q264_KeenClaws extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java index a44ad0798e..58e004980b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q265_ChainsOfSlavery/Q265_ChainsOfSlavery.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q265_ChainsOfSlavery extends Quest { - private static final String qn = "Q265_ChainsOfSlavery"; - // Item private static final int SHACKLE = 1368; @@ -36,7 +34,7 @@ public class Q265_ChainsOfSlavery extends Quest public Q265_ChainsOfSlavery() { - super(265, qn, "Chains of Slavery"); + super(265, "Chains of Slavery"); registerQuestItems(SHACKLE); @@ -50,7 +48,7 @@ public class Q265_ChainsOfSlavery extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q265_ChainsOfSlavery extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java index 9ae89fa300..b32ab2deb7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q266_PleasOfPixies/Q266_PleasOfPixies.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q266_PleasOfPixies extends Quest { - private static final String qn = "Q266_PleasOfPixies"; - // Items private static final int PREDATOR_FANG = 1334; @@ -39,7 +37,7 @@ public class Q266_PleasOfPixies extends Quest public Q266_PleasOfPixies() { - super(266, qn, "Pleas of Pixies"); + super(266, "Pleas of Pixies"); registerQuestItems(PREDATOR_FANG); @@ -53,7 +51,7 @@ public class Q266_PleasOfPixies extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -73,7 +71,7 @@ public class Q266_PleasOfPixies extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java index acb95c6980..e3d744f3d1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q267_WrathOfVerdure/Q267_WrathOfVerdure.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q267_WrathOfVerdure extends Quest { - private static final String qn = "Q267_WrathOfVerdure"; - // Items private static final int GOBLIN_CLUB = 1335; @@ -35,7 +33,7 @@ public class Q267_WrathOfVerdure extends Quest public Q267_WrathOfVerdure() { - super(267, qn, "Wrath of Verdure"); + super(267, "Wrath of Verdure"); registerQuestItems(GOBLIN_CLUB); @@ -49,7 +47,7 @@ public class Q267_WrathOfVerdure extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -74,7 +72,7 @@ public class Q267_WrathOfVerdure extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java index eba1b62151..6cb8ec5583 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q271_ProofOfValor/Q271_ProofOfValor.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q271_ProofOfValor extends Quest { - private static final String qn = "Q271_ProofOfValor"; - // Item private static final int KASHA_WOLF_FANG = 1473; @@ -37,7 +35,7 @@ public class Q271_ProofOfValor extends Quest public Q271_ProofOfValor() { - super(271, qn, "Proof of Valor"); + super(271, "Proof of Valor"); registerQuestItems(KASHA_WOLF_FANG); @@ -51,7 +49,7 @@ public class Q271_ProofOfValor extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -76,7 +74,7 @@ public class Q271_ProofOfValor extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java index 55cb1f6a8e..c2c39d6bb6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q272_WrathOfAncestors/Q272_WrathOfAncestors.java @@ -25,14 +25,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q272_WrathOfAncestors extends Quest { - private static final String qn = "Q272_WrathOfAncestors"; - // Item private static final int GRAVE_ROBBERS_HEAD = 1474; public Q272_WrathOfAncestors() { - super(272, qn, "Wrath of Ancestors"); + super(272, "Wrath of Ancestors"); registerQuestItems(GRAVE_ROBBERS_HEAD); @@ -46,7 +44,7 @@ public class Q272_WrathOfAncestors extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -66,7 +64,7 @@ public class Q272_WrathOfAncestors extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java index d9d1a21969..d6631a3461 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q273_InvadersOfTheHolyLand/Q273_InvadersOfTheHolyLand.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q273_InvadersOfTheHolyLand extends Quest { - private static final String qn = "Q273_InvadersOfTheHolyLand"; - // Items private static final int BLACK_SOULSTONE = 1475; private static final int RED_SOULSTONE = 1476; @@ -37,7 +35,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest public Q273_InvadersOfTheHolyLand() { - super(273, qn, "Invaders of the Holy Land"); + super(273, "Invaders of the Holy Land"); registerQuestItems(BLACK_SOULSTONE, RED_SOULSTONE); @@ -51,7 +49,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -76,7 +74,7 @@ public class Q273_InvadersOfTheHolyLand extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java index a31c90f16d..80bc6ba31d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q274_SkirmishWithTheWerewolves/Q274_SkirmishWithTheWerewolves.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q274_SkirmishWithTheWerewolves extends Quest { - private static final String qn = "Q274_SkirmishWithTheWerewolves"; - // Needed items private static final int NECKLACE_OF_VALOR = 1507; private static final int NECKLACE_OF_COURAGE = 1506; @@ -38,7 +36,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest public Q274_SkirmishWithTheWerewolves() { - super(274, qn, "Skirmish with the Werewolves"); + super(274, "Skirmish with the Werewolves"); registerQuestItems(MARAKU_WEREWOLF_HEAD, MARAKU_WOLFMEN_TOTEM); @@ -51,7 +49,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = event; if (st == null) { @@ -72,7 +70,7 @@ public class Q274_SkirmishWithTheWerewolves extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java index bf7b2cf6b5..dcdacdd729 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q275_DarkWingedSpies/Q275_DarkWingedSpies.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q275_DarkWingedSpies extends Quest { - private static final String qn = "Q275_DarkWingedSpies"; - // Monsters private static final int DARKWING_BAT = 20316; private static final int VARANGKA_TRACKER = 27043; @@ -38,7 +36,7 @@ public class Q275_DarkWingedSpies extends Quest public Q275_DarkWingedSpies() { - super(275, qn, "Dark Winged Spies"); + super(275, "Dark Winged Spies"); registerQuestItems(DARKWING_BAT_FANG, VARANGKA_PARASITE); @@ -52,7 +50,7 @@ public class Q275_DarkWingedSpies extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -71,7 +69,7 @@ public class Q275_DarkWingedSpies extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java index 8ce24da0c6..c4adde3742 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q276_TotemOfTheHestui/Q276_TotemOfTheHestui.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q276_TotemOfTheHestui extends Quest { - private static final String qn = "Q276_TotemOfTheHestui"; - // Items private static final int KASHA_PARASITE = 1480; private static final int KASHA_CRYSTAL = 1481; @@ -38,7 +36,7 @@ public class Q276_TotemOfTheHestui extends Quest public Q276_TotemOfTheHestui() { - super(276, qn, "Totem of the Hestui"); + super(276, "Totem of the Hestui"); registerQuestItems(KASHA_PARASITE, KASHA_CRYSTAL); @@ -52,7 +50,7 @@ public class Q276_TotemOfTheHestui extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -71,7 +69,7 @@ public class Q276_TotemOfTheHestui extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q277_GatekeepersOffering/Q277_GatekeepersOffering.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q277_GatekeepersOffering/Q277_GatekeepersOffering.java index 58314fb2d4..09744e5360 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q277_GatekeepersOffering/Q277_GatekeepersOffering.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q277_GatekeepersOffering/Q277_GatekeepersOffering.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q277_GatekeepersOffering extends Quest { - private static final String qn = "Q277_GatekeepersOffering"; - // Item private static final int STARSTONE = 1572; @@ -34,7 +32,7 @@ public class Q277_GatekeepersOffering extends Quest public Q277_GatekeepersOffering() { - super(277, qn, "Gatekeeper's Offering"); + super(277, "Gatekeeper's Offering"); addStartNpc(30576); // Tamil addTalkId(30576); @@ -46,7 +44,7 @@ public class Q277_GatekeepersOffering extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -65,7 +63,7 @@ public class Q277_GatekeepersOffering extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java index 85d209812f..a20d8e7fe9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q291_RevengeOfTheRedbonnet/Q291_RevengeOfTheRedbonnet.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q291_RevengeOfTheRedbonnet extends Quest { - private static final String qn = "Q291_RevengeOfTheRedbonnet"; - // Quest items private static final int BLACK_WOLF_PELT = 1482; @@ -39,7 +37,7 @@ public class Q291_RevengeOfTheRedbonnet extends Quest public Q291_RevengeOfTheRedbonnet() { - super(291, qn, "Revenge of the Redbonnet"); + super(291, "Revenge of the Redbonnet"); registerQuestItems(BLACK_WOLF_PELT); @@ -53,7 +51,7 @@ public class Q291_RevengeOfTheRedbonnet extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -72,7 +70,7 @@ public class Q291_RevengeOfTheRedbonnet extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java index e9e02d469b..7d92bdd611 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q292_BrigandsSweep/Q292_BrigandsSweep.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q292_BrigandsSweep extends Quest { - private static final String qn = "Q292_BrigandsSweep"; - // NPCs private static final int SPIRON = 30532; private static final int BALANKI = 30533; @@ -48,7 +46,7 @@ public class Q292_BrigandsSweep extends Quest public Q292_BrigandsSweep() { - super(292, qn, "Brigands Sweep"); + super(292, "Brigands Sweep"); registerQuestItems(GOBLIN_NECKLACE, GOBLIN_PENDANT, GOBLIN_LORD_PENDANT, SUSPICIOUS_MEMO, SUSPICIOUS_CONTRACT); @@ -62,7 +60,7 @@ public class Q292_BrigandsSweep extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -86,7 +84,7 @@ public class Q292_BrigandsSweep extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java index 6513bce26b..0f4fe7c446 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q293_TheHiddenVeins/Q293_TheHiddenVeins.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q293_TheHiddenVeins extends Quest { - private static final String qn = "Q293_TheHiddenVeins"; - // Items private static final int CHRYSOLITE_ORE = 1488; private static final int TORN_MAP_FRAGMENT = 1489; @@ -47,7 +45,7 @@ public class Q293_TheHiddenVeins extends Quest public Q293_TheHiddenVeins() { - super(293, qn, "The Hidden Veins"); + super(293, "The Hidden Veins"); registerQuestItems(CHRYSOLITE_ORE, TORN_MAP_FRAGMENT, HIDDEN_VEIN_MAP); @@ -61,7 +59,7 @@ public class Q293_TheHiddenVeins extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +94,7 @@ public class Q293_TheHiddenVeins extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java index 9c4a55c00b..9cd6505d0c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q294_CovertBusiness/Q294_CovertBusiness.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q294_CovertBusiness extends Quest { - private static final String qn = "Q294_CovertBusiness"; - // Item private static final int BAT_FANG = 1491; @@ -36,7 +34,7 @@ public class Q294_CovertBusiness extends Quest public Q294_CovertBusiness() { - super(294, qn, "Covert Business"); + super(294, "Covert Business"); registerQuestItems(BAT_FANG); @@ -50,7 +48,7 @@ public class Q294_CovertBusiness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -70,7 +68,7 @@ public class Q294_CovertBusiness extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java index 764934bfe4..bae9a6a9ec 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q295_DreamingOfTheSkies/Q295_DreamingOfTheSkies.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q295_DreamingOfTheSkies extends Quest { - private static final String qn = "Q295_DreamingOfTheSkies"; - // Item private static final int FLOATING_STONE = 1492; @@ -35,7 +33,7 @@ public class Q295_DreamingOfTheSkies extends Quest public Q295_DreamingOfTheSkies() { - super(295, qn, "Dreaming of the Skies"); + super(295, "Dreaming of the Skies"); registerQuestItems(FLOATING_STONE); @@ -49,7 +47,7 @@ public class Q295_DreamingOfTheSkies extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -68,7 +66,7 @@ public class Q295_DreamingOfTheSkies extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java index 05b5077933..cb43e03947 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q296_TarantulasSpiderSilk/Q296_TarantulasSpiderSilk.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q296_TarantulasSpiderSilk extends Quest { - private static final String qn = "Q296_TarantulasSpiderSilk"; - // NPCs private static final int MION = 30519; private static final int DEFENDER_NATHAN = 30548; @@ -41,7 +39,7 @@ public class Q296_TarantulasSpiderSilk extends Quest public Q296_TarantulasSpiderSilk() { - super(296, qn, "Tarantula's Spider Silk"); + super(296, "Tarantula's Spider Silk"); registerQuestItems(TARANTULA_SPIDER_SILK, TARANTULA_SPINNERETTE); @@ -55,7 +53,7 @@ public class Q296_TarantulasSpiderSilk extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -98,7 +96,7 @@ public class Q296_TarantulasSpiderSilk extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q297_GatekeepersFavor/Q297_GatekeepersFavor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q297_GatekeepersFavor/Q297_GatekeepersFavor.java index ab8a530a57..32d9f304a0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q297_GatekeepersFavor/Q297_GatekeepersFavor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q297_GatekeepersFavor/Q297_GatekeepersFavor.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q297_GatekeepersFavor extends Quest { - private static final String qn = "Q297_GatekeepersFavor"; - // Item private static final int STARSTONE = 1573; @@ -34,7 +32,7 @@ public class Q297_GatekeepersFavor extends Quest public Q297_GatekeepersFavor() { - super(297, qn, "Gatekeeper's Favor"); + super(297, "Gatekeeper's Favor"); registerQuestItems(STARSTONE); @@ -48,7 +46,7 @@ public class Q297_GatekeepersFavor extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -67,7 +65,7 @@ public class Q297_GatekeepersFavor extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q298_LizardmensConspiracy/Q298_LizardmensConspiracy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q298_LizardmensConspiracy/Q298_LizardmensConspiracy.java index e088c91022..6af1e52cc6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q298_LizardmensConspiracy/Q298_LizardmensConspiracy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q298_LizardmensConspiracy/Q298_LizardmensConspiracy.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q298_LizardmensConspiracy extends Quest { - private static final String qn = "Q298_LizardmensConspiracy"; - // NPCs private static final int PRAGA = 30333; private static final int ROHMER = 30344; @@ -37,7 +35,7 @@ public class Q298_LizardmensConspiracy extends Quest public Q298_LizardmensConspiracy() { - super(298, qn, "Lizardmen's Conspiracy"); + super(298, "Lizardmen's Conspiracy"); registerQuestItems(PATROL_REPORT, WHITE_GEM, RED_GEM); @@ -51,7 +49,7 @@ public class Q298_LizardmensConspiracy extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -89,7 +87,7 @@ public class Q298_LizardmensConspiracy extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -135,7 +133,7 @@ public class Q298_LizardmensConspiracy extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java index 1a9ae90bd6..ab020f7ef2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q299_GatherIngredientsForPie/Q299_GatherIngredientsForPie.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q299_GatherIngredientsForPie extends Quest { - private static final String qn = "Q299_GatherIngredientsForPie"; - // NPCs private static final int LARA = 30063; private static final int BRIGHT = 30466; @@ -38,7 +36,7 @@ public class Q299_GatherIngredientsForPie extends Quest public Q299_GatherIngredientsForPie() { - super(299, qn, "Gather Ingredients for Pie"); + super(299, "Gather Ingredients for Pie"); registerQuestItems(FRUIT_BASKET, AVELLAN_SPICE, HONEY_POUCH); @@ -52,7 +50,7 @@ public class Q299_GatherIngredientsForPie extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -110,7 +108,7 @@ public class Q299_GatherIngredientsForPie extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -207,7 +205,7 @@ public class Q299_GatherIngredientsForPie extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java index 45b4db30d3..0c74436ddf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q300_HuntingLetoLizardman/Q300_HuntingLetoLizardman.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q300_HuntingLetoLizardman extends Quest { - private static final String qn = "Q300_HuntingLetoLizardman"; - // Item private static final int BRACELET = 7139; @@ -41,7 +39,7 @@ public class Q300_HuntingLetoLizardman extends Quest private static final int LETO_LIZARDMAN_OVERLORD = 20582; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(LETO_LIZARDMAN, 300000); @@ -53,7 +51,7 @@ public class Q300_HuntingLetoLizardman extends Quest public Q300_HuntingLetoLizardman() { - super(300, qn, "Hunting Leto Lizardman"); + super(300, "Hunting Leto Lizardman"); registerQuestItems(BRACELET); @@ -67,7 +65,7 @@ public class Q300_HuntingLetoLizardman extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -111,7 +109,7 @@ public class Q300_HuntingLetoLizardman extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -141,7 +139,7 @@ public class Q300_HuntingLetoLizardman extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q303_CollectArrowheads/Q303_CollectArrowheads.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q303_CollectArrowheads/Q303_CollectArrowheads.java index 8f96b8df74..310235d54c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q303_CollectArrowheads/Q303_CollectArrowheads.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q303_CollectArrowheads/Q303_CollectArrowheads.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q303_CollectArrowheads extends Quest { - private static final String qn = "Q303_CollectArrowheads"; - // Item private static final int ORCISH_ARROWHEAD = 963; public Q303_CollectArrowheads() { - super(303, qn, "Collect Arrowheads"); + super(303, "Collect Arrowheads"); registerQuestItems(ORCISH_ARROWHEAD); @@ -45,7 +43,7 @@ public class Q303_CollectArrowheads extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -64,7 +62,7 @@ public class Q303_CollectArrowheads extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java index 340358930f..ade779a630 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q306_CrystalsOfFireAndIce/Q306_CrystalsOfFireAndIce.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q306_CrystalsOfFireAndIce extends Quest { - private static final String qn = "Q306_CrystalsOfFireAndIce"; - // Items private static final int FLAME_SHARD = 1020; private static final int ICE_SHARD = 1021; @@ -67,7 +65,7 @@ public class Q306_CrystalsOfFireAndIce extends Quest public Q306_CrystalsOfFireAndIce() { - super(306, qn, "Crystals of Fire and Ice"); + super(306, "Crystals of Fire and Ice"); registerQuestItems(FLAME_SHARD, ICE_SHARD); @@ -81,7 +79,7 @@ public class Q306_CrystalsOfFireAndIce extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -106,7 +104,7 @@ public class Q306_CrystalsOfFireAndIce extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q313_CollectSpores/Q313_CollectSpores.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q313_CollectSpores/Q313_CollectSpores.java index c526d05446..5f6bc226fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q313_CollectSpores/Q313_CollectSpores.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q313_CollectSpores/Q313_CollectSpores.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q313_CollectSpores extends Quest { - private static final String qn = "Q313_CollectSpores"; - // Item private static final int SPORE_SAC = 1118; public Q313_CollectSpores() { - super(313, qn, "Collect Spores"); + super(313, "Collect Spores"); registerQuestItems(SPORE_SAC); @@ -45,7 +43,7 @@ public class Q313_CollectSpores extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -64,7 +62,7 @@ public class Q313_CollectSpores extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java index 00aad16934..52f98fbc97 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q316_DestroyPlagueCarriers/Q316_DestroyPlagueCarriers.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q316_DestroyPlagueCarriers extends Quest { - private static final String qn = "Q316_DestroyPlagueCarriers"; - // Items private static final int WERERAT_FANG = 1042; private static final int VAROOL_FOULCLAW_FANG = 1043; @@ -38,7 +36,7 @@ public class Q316_DestroyPlagueCarriers extends Quest public Q316_DestroyPlagueCarriers() { - super(316, qn, "Destroy Plague Carriers"); + super(316, "Destroy Plague Carriers"); registerQuestItems(WERERAT_FANG, VAROOL_FOULCLAW_FANG); @@ -52,7 +50,7 @@ public class Q316_DestroyPlagueCarriers extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -77,7 +75,7 @@ public class Q316_DestroyPlagueCarriers extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java index b11ff2ad51..ed049fdbac 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q317_CatchTheWind/Q317_CatchTheWind.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q317_CatchTheWind extends Quest { - private static final String qn = "Q317_CatchTheWind"; - // Item private static final int WIND_SHARD = 1078; public Q317_CatchTheWind() { - super(317, qn, "Catch the Wind"); + super(317, "Catch the Wind"); registerQuestItems(WIND_SHARD); @@ -45,7 +43,7 @@ public class Q317_CatchTheWind extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -69,7 +67,7 @@ public class Q317_CatchTheWind extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q319_ScentOfDeath/Q319_ScentOfDeath.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q319_ScentOfDeath/Q319_ScentOfDeath.java index 1786035e39..dc19c292e1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q319_ScentOfDeath/Q319_ScentOfDeath.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q319_ScentOfDeath/Q319_ScentOfDeath.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q319_ScentOfDeath extends Quest { - private static final String qn = "Q319_ScentOfDeath"; - // Item private static final int ZOMBIE_SKIN = 1045; public Q319_ScentOfDeath() { - super(319, qn, "Scent of Death"); + super(319, "Scent of Death"); registerQuestItems(ZOMBIE_SKIN); @@ -45,7 +43,7 @@ public class Q319_ScentOfDeath extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -64,7 +62,7 @@ public class Q319_ScentOfDeath extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java index 91f13b8de4..bd8dda42d5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q320_BonesTellTheFuture/Q320_BonesTellTheFuture.java @@ -25,14 +25,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q320_BonesTellTheFuture extends Quest { - private static final String qn = "Q320_BonesTellTheFuture"; - // Quest item private final int BONE_FRAGMENT = 809; public Q320_BonesTellTheFuture() { - super(320, qn, "Bones Tell the Future"); + super(320, "Bones Tell the Future"); registerQuestItems(BONE_FRAGMENT); @@ -46,7 +44,7 @@ public class Q320_BonesTellTheFuture extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -65,7 +63,7 @@ public class Q320_BonesTellTheFuture extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q324_SweetestVenom/Q324_SweetestVenom.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q324_SweetestVenom/Q324_SweetestVenom.java index e1db36b91e..e8bea4d84f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q324_SweetestVenom/Q324_SweetestVenom.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q324_SweetestVenom/Q324_SweetestVenom.java @@ -27,13 +27,11 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q324_SweetestVenom extends Quest { - private static final String qn = "Q324_SweetestVenom"; - // Item private static final int VENOM_SAC = 1077; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20034, 220000); @@ -43,7 +41,7 @@ public class Q324_SweetestVenom extends Quest public Q324_SweetestVenom() { - super(324, qn, "Sweetest Venom"); + super(324, "Sweetest Venom"); registerQuestItems(VENOM_SAC); @@ -57,7 +55,7 @@ public class Q324_SweetestVenom extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -76,7 +74,7 @@ public class Q324_SweetestVenom extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java index 3ac1134a31..b0200dc013 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q325_GrimCollector/Q325_GrimCollector.java @@ -31,8 +31,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q325_GrimCollector extends Quest { - private static final String qn = "Q325_GrimCollector"; - // Items private static final int ANATOMY_DIAGRAM = 1349; private static final int ZOMBIE_HEAD = 1350; @@ -50,7 +48,7 @@ public class Q325_GrimCollector extends Quest private static final int VARSAK = 30342; private static final int SAMED = 30434; - private static final Map> DROPLIST = new HashMap<>(); + private static final Map> DROPLIST = new HashMap<>(); static { DROPLIST.put(20026, Arrays.asList(new ItemHolder(ZOMBIE_HEAD, 30), new ItemHolder(ZOMBIE_HEART, 50), new ItemHolder(ZOMBIE_LIVER, 75))); @@ -67,7 +65,7 @@ public class Q325_GrimCollector extends Quest public Q325_GrimCollector() { - super(325, qn, "Grim Collector"); + super(325, "Grim Collector"); registerQuestItems(ZOMBIE_HEAD, ZOMBIE_HEART, ZOMBIE_LIVER, SKULL, RIB_BONE, SPINE, ARM_BONE, THIGH_BONE, COMPLETE_SKELETON, ANATOMY_DIAGRAM); @@ -119,7 +117,7 @@ public class Q325_GrimCollector extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -188,7 +186,7 @@ public class Q325_GrimCollector extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java index c7921de5de..5e6e16332c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q326_VanquishRemnants/Q326_VanquishRemnants.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q326_VanquishRemnants extends Quest { - private static final String qn = "Q326_VanquishRemnants"; - // Items private static final int RED_CROSS_BADGE = 1359; private static final int BLUE_CROSS_BADGE = 1360; @@ -36,7 +34,7 @@ public class Q326_VanquishRemnants extends Quest public Q326_VanquishRemnants() { - super(326, qn, "Vanquish Remnants"); + super(326, "Vanquish Remnants"); registerQuestItems(RED_CROSS_BADGE, BLUE_CROSS_BADGE, BLACK_CROSS_BADGE); @@ -50,7 +48,7 @@ public class Q326_VanquishRemnants extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q326_VanquishRemnants extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java index 8c7afd2dae..a9d6144ce7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q327_RecoverTheFarmland/Q327_RecoverTheFarmland.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q327_RecoverTheFarmland extends Quest { - private static final String qn = "Q327_RecoverTheFarmland"; - // Items private static final int LEIKAN_LETTER = 5012; private static final int TUREK_DOGTAG = 1846; @@ -110,7 +108,7 @@ public class Q327_RecoverTheFarmland extends Quest }; // Exp - private static final Map EXP_REWARD = new HashMap<>(); + private static final Map EXP_REWARD = new HashMap<>(); static { EXP_REWARD.put(ANCIENT_CLAY_URN, 2766); @@ -121,7 +119,7 @@ public class Q327_RecoverTheFarmland extends Quest public Q327_RecoverTheFarmland() { - super(327, qn, "Recover the Farmland"); + super(327, "Recover the Farmland"); registerQuestItems(LEIKAN_LETTER); @@ -135,7 +133,7 @@ public class Q327_RecoverTheFarmland extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -375,7 +373,7 @@ public class Q327_RecoverTheFarmland extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java index ab45916e80..e71031a648 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q328_SenseForBusiness/Q328_SenseForBusiness.java @@ -28,15 +28,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q328_SenseForBusiness extends Quest { - private static final String qn = "Q328_SenseForBusiness"; - // Items private static final int MONSTER_EYE_LENS = 1366; private static final int MONSTER_EYE_CARCASS = 1347; private static final int BASILISK_GIZZARD = 1348; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20055, 48); @@ -49,7 +47,7 @@ public class Q328_SenseForBusiness extends Quest public Q328_SenseForBusiness() { - super(328, qn, "Sense for Business"); + super(328, "Sense for Business"); registerQuestItems(MONSTER_EYE_LENS, MONSTER_EYE_CARCASS, BASILISK_GIZZARD); @@ -63,7 +61,7 @@ public class Q328_SenseForBusiness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -87,7 +85,7 @@ public class Q328_SenseForBusiness extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java index f3fc5e0ad7..b2dd26330f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q329_CuriosityOfADwarf/Q329_CuriosityOfADwarf.java @@ -25,15 +25,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q329_CuriosityOfADwarf extends Quest { - private static final String qn = "Q329_CuriosityOfADwarf"; - // Items private static final int GOLEM_HEARTSTONE = 1346; private static final int BROKEN_HEARTSTONE = 1365; public Q329_CuriosityOfADwarf() { - super(329, qn, "Curiosity of a Dwarf"); + super(329, "Curiosity of a Dwarf"); addStartNpc(30437); // Rolento addTalkId(30437); @@ -45,7 +43,7 @@ public class Q329_CuriosityOfADwarf extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -69,7 +67,7 @@ public class Q329_CuriosityOfADwarf extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java index 7de40870b7..d41abbbadc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q330_AdeptOfTaste/Q330_AdeptOfTaste.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q330_AdeptOfTaste extends Quest { - private static final String qn = "Q330_AdeptOfTaste"; - // NPCs private static final int SONIA = 30062; private static final int GLYVKA = 30067; @@ -79,7 +77,7 @@ public class Q330_AdeptOfTaste extends Quest private static final int JONAS_STEAK_RECIPE = 1457; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20204, new int[] @@ -116,7 +114,7 @@ public class Q330_AdeptOfTaste extends Quest public Q330_AdeptOfTaste() { - super(330, qn, "Adept of Taste"); + super(330, "Adept of Taste"); registerQuestItems(INGREDIENT_LIST, RED_MANDRAGORA_SAP, WHITE_MANDRAGORA_SAP, HONEY, GOLDEN_HONEY, DIONIAN_POTATO, GREEN_MOSS_BUNDLE, BROWN_MOSS_BUNDLE, MONSTER_EYE_MEAT, MIRIEN_REVIEW_1, MIRIEN_REVIEW_2, MIRIEN_REVIEW_3, MIRIEN_REVIEW_4, MIRIEN_REVIEW_5, JONAS_STEAK_DISH_1, JONAS_STEAK_DISH_2, JONAS_STEAK_DISH_3, JONAS_STEAK_DISH_4, JONAS_STEAK_DISH_5, SONIA_BOTANY_BOOK, RED_MANDRAGORA_ROOT, WHITE_MANDRAGORA_ROOT, JACOB_INSECT_BOOK, NECTAR, ROYAL_JELLY, PANO_CONTRACT, HOBGOBLIN_AMULET, GLYVKA_BOTANY_BOOK, GREEN_MARSH_MOSS, BROWN_MARSH_MOSS, ROLANT_CREATURE_BOOK, MONSTER_EYE_BODY); @@ -130,7 +128,7 @@ public class Q330_AdeptOfTaste extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -176,7 +174,7 @@ public class Q330_AdeptOfTaste extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java index 0f88d759ae..28de437bbf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q331_ArrowOfVengeance/Q331_ArrowOfVengeance.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q331_ArrowOfVengeance extends Quest { - private static final String qn = "Q331_ArrowOfVengeance"; - // Items private static final int HARPY_FEATHER = 1452; private static final int MEDUSA_VENOM = 1453; @@ -33,7 +31,7 @@ public class Q331_ArrowOfVengeance extends Quest public Q331_ArrowOfVengeance() { - super(331, qn, "Arrow of Vengeance"); + super(331, "Arrow of Vengeance"); registerQuestItems(HARPY_FEATHER, MEDUSA_VENOM, WYRM_TOOTH); @@ -47,7 +45,7 @@ public class Q331_ArrowOfVengeance extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -72,7 +70,7 @@ public class Q331_ArrowOfVengeance extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java index e166043fd1..3fbb4efe0c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q333_HuntOfTheBlackLion/Q333_HuntOfTheBlackLion.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q333_HuntOfTheBlackLion extends Quest { - private static final String qn = "Q333_HuntOfTheBlackLion"; - // NPCs private static final int SOPHYA = 30735; private static final int REDFOOT = 30736; @@ -246,7 +244,7 @@ public class Q333_HuntOfTheBlackLion extends Quest public Q333_HuntOfTheBlackLion() { - super(333, qn, "Hunt of the Black Lion"); + super(333, "Hunt of the Black Lion"); registerQuestItems(LION_CLAW, LION_EYE, GUILD_COIN, UNDEAD_ASH, BLOODY_AXE_INSIGNIA, DELU_FANG, STAKATO_TALON, SOPHYA_LETTER_1, SOPHYA_LETTER_2, SOPHYA_LETTER_3, SOPHYA_LETTER_4); @@ -263,7 +261,7 @@ public class Q333_HuntOfTheBlackLion extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -766,7 +764,7 @@ public class Q333_HuntOfTheBlackLion extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java index 855d2bfabe..6ca80cea52 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q334_TheWishingPotion/Q334_TheWishingPotion.java @@ -96,11 +96,9 @@ public class Q334_TheWishingPotion extends Quest {3, 0, TURAK_BUGBEAR_WARRIOR, 0, BUGBEAR_BLOOD_ID, 1, 25, 1} };// @formatter:on - private static final String qn = "Q334_TheWishingPotion"; - public Q334_TheWishingPotion() { - super(334, qn, "The Wishing Potion"); + super(334, "The Wishing Potion"); addStartNpc(ALCHEMIST_MATILD); addTalkId(ALCHEMIST_MATILD, TORAI, WISDOM_CHEST, RUPINA); @@ -126,7 +124,7 @@ public class Q334_TheWishingPotion extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -311,7 +309,7 @@ public class Q334_TheWishingPotion extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -439,7 +437,7 @@ public class Q334_TheWishingPotion extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java index cbff7bf22a..ad4efba4bc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q335_TheSongOfTheHunter/Q335_TheSongOfTheHunter.java @@ -150,11 +150,9 @@ public class Q335_TheSongOfTheHunter extends Quest new Request(3768, 3810, 10, 41200, "A: 10 Swords of Cadmus").addDrop(20676, 64) }; - private static final String qn = "Q335_TheSongOfTheHunter"; - public Q335_TheSongOfTheHunter() { - super(335, qn, "Song of the Hunter"); + super(335, "Song of the Hunter"); addStartNpc(GREY); addTalkId(GREY, CYBELLIN, TOR); @@ -404,7 +402,7 @@ public class Q335_TheSongOfTheHunter extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return event; @@ -542,7 +540,7 @@ public class Q335_TheSongOfTheHunter extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java index ed9d299fc1..44c49611e5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q336_CoinsOfMagic/Q336_CoinsOfMagic.java @@ -129,11 +129,9 @@ public class Q336_CoinsOfMagic extends Quest }; // @formatter:on - private static final String qn = "Q336_CoinsOfMagic"; - public Q336_CoinsOfMagic() { - super(336, qn, "Coins of Magic"); + super(336, "Coins of Magic"); addStartNpc(SORINT); addTalkId(SORINT, BERNARD, PAGE, HAGGER, STAN, RALFORD, FERRIS, COLLOB, PANO, DUNING, LORAIN); for (int[] mob : DROPLIST) @@ -150,7 +148,7 @@ public class Q336_CoinsOfMagic extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -259,7 +257,7 @@ public class Q336_CoinsOfMagic extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java index 214710e51d..f8e1e6364f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q337_AudienceWithTheLandDragon/Q337_AudienceWithTheLandDragon.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q337_AudienceWithTheLandDragon extends Quest { - private static final String qn = "Q337_AudienceWithTheLandDragon"; - // Variables private static boolean _jewel1 = false; private static boolean _jewel2 = false; @@ -171,7 +169,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest public Q337_AudienceWithTheLandDragon() { - super(337, qn, "Audience with the Land Dragon"); + super(337, "Audience with the Land Dragon"); registerQuestItems(FEATHER_OF_GABRIELLE, MARK_OF_WATCHMAN, REMAINS_OF_SACRIFIED, TOTEM_OF_LAND_DRAGON, KRANROT_SKIN, HAMRUT_LEG, MARSH_DRAKE_TALONS, MARSH_STALKER_HORN, FIRST_FRAGMENT_OF_ABYSS_JEWEL, MARA_FANG, SECOND_FRAGMENT_OF_ABYSS_JEWEL, MUSFEL_FANG, HERALD_OF_SLAYER, THIRD_FRAGMENT_OF_ABYSS_JEWEL); @@ -186,7 +184,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -243,7 +241,7 @@ public class Q337_AudienceWithTheLandDragon extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java index 9d659d4875..bc6e2d5da1 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q338_AlligatorHunter/Q338_AlligatorHunter.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q338_AlligatorHunter extends Quest { - private static final String qn = "Q338_AlligatorHunter"; - // Item private static final int ALLIGATOR_PELT = 4337; public Q338_AlligatorHunter() { - super(338, qn, "Alligator Hunter"); + super(338, "Alligator Hunter"); registerQuestItems(ALLIGATOR_PELT); @@ -45,7 +43,7 @@ public class Q338_AlligatorHunter extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -83,7 +81,7 @@ public class Q338_AlligatorHunter extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q340_SubjugationOfLizardmen/Q340_SubjugationOfLizardmen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q340_SubjugationOfLizardmen/Q340_SubjugationOfLizardmen.java index 90235c352c..d04f481121 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q340_SubjugationOfLizardmen/Q340_SubjugationOfLizardmen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q340_SubjugationOfLizardmen/Q340_SubjugationOfLizardmen.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q340_SubjugationOfLizardmen extends Quest { - private static final String qn = "Q340_SubjugationOfLizardmen"; - // NPCs private static final int WEISZ = 30385; private static final int ADONIUS = 30375; @@ -40,7 +38,7 @@ public class Q340_SubjugationOfLizardmen extends Quest public Q340_SubjugationOfLizardmen() { - super(340, qn, "Subjugation of Lizardmen"); + super(340, "Subjugation of Lizardmen"); registerQuestItems(CARGO, HOLY, ROSARY, TOTEM); @@ -54,7 +52,7 @@ public class Q340_SubjugationOfLizardmen extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -107,7 +105,7 @@ public class Q340_SubjugationOfLizardmen extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q341_HuntingForWildBeasts/Q341_HuntingForWildBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q341_HuntingForWildBeasts/Q341_HuntingForWildBeasts.java index f2602411bf..91c65cfce6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q341_HuntingForWildBeasts/Q341_HuntingForWildBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q341_HuntingForWildBeasts/Q341_HuntingForWildBeasts.java @@ -27,13 +27,11 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q341_HuntingForWildBeasts extends Quest { - private static final String qn = "Q341_HuntingForWildBeasts"; - // Item private static final int BEAR_SKIN = 4259; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20021, 500000); // Red Bear @@ -44,7 +42,7 @@ public class Q341_HuntingForWildBeasts extends Quest public Q341_HuntingForWildBeasts() { - super(341, qn, "Hunting for Wild Beasts"); + super(341, "Hunting for Wild Beasts"); registerQuestItems(BEAR_SKIN); @@ -58,7 +56,7 @@ public class Q341_HuntingForWildBeasts extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -77,7 +75,7 @@ public class Q341_HuntingForWildBeasts extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java index b8d970b91a..f549788554 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q343_UnderTheShadowOfTheIvoryTower/Q343_UnderTheShadowOfTheIvoryTower.java @@ -50,11 +50,9 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest 41 }; - private static final String qn = "Q343_UnderTheShadowOfTheIvoryTower"; - public Q343_UnderTheShadowOfTheIvoryTower() { - super(343, qn, "Under the Shadow of the Ivory Tower"); + super(343, "Under the Shadow of the Ivory Tower"); MOBS = new int[] { 20563, @@ -76,7 +74,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -167,16 +165,22 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest switch (random1) { case 0: + { htmltext = "30934-04.htm"; st.giveItems(4364, 20); break; + } case 1: + { htmltext = "30934-05.htm"; st.giveItems(4364, 10); break; + } default: + { htmltext = "30934-06.htm"; break; + } } st.unset("playing"); } @@ -194,16 +198,22 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest switch (random1) { case 0: + { htmltext = "30934-04.htm"; st.giveItems(4364, 20); break; + } case 1: + { htmltext = "30934-06.htm"; break; + } default: + { htmltext = "30934-05.htm"; st.giveItems(4364, 10); break; + } } st.unset("playing"); } @@ -261,17 +271,25 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest switch (toss) { case 1: + { st.giveItems(4364, 10); break; + } case 2: + { st.giveItems(4364, 30); break; + } case 3: + { st.giveItems(4364, 70); break; + } case 4: + { st.giveItems(4364, 150); break; + } } } else @@ -341,7 +359,7 @@ public class Q343_UnderTheShadowOfTheIvoryTower extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java index 4d703537a7..23b99ef1d4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q344_1000YearsTheEndOfLamentation/Q344_1000YearsTheEndOfLamentation.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q344_1000YearsTheEndOfLamentation extends Quest { - private static final String qn = "Q344_1000YearsTheEndOfLamentation"; - // NPCs private static final int GILMORE = 30754; private static final int RODEMAI = 30756; @@ -45,7 +43,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest private static final int CRUCIFIX = 4273; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20236, 380000); @@ -62,7 +60,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest public Q344_1000YearsTheEndOfLamentation() { - super(344, qn, "1000 years, the End of Lamentation"); + super(344, "1000 years, the End of Lamentation"); registerQuestItems(ARTICLE_DEAD_HERO, OLD_KEY, OLD_HILT, OLD_TOTEM, CRUCIFIX); @@ -76,7 +74,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -155,7 +153,7 @@ public class Q344_1000YearsTheEndOfLamentation extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java index d75e6cb229..3f09724f5e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q345_MethodToRaiseTheDead/Q345_MethodToRaiseTheDead.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q345_MethodToRaiseTheDead extends Quest { - private static final String qn = "Q345_MethodToRaiseTheDead"; - // Items private static final int VICTIM_ARM_BONE = 4274; private static final int VICTIM_THIGH_BONE = 4275; @@ -48,7 +46,7 @@ public class Q345_MethodToRaiseTheDead extends Quest public Q345_MethodToRaiseTheDead() { - super(345, qn, "Method to Raise the Dead"); + super(345, "Method to Raise the Dead"); registerQuestItems(VICTIM_ARM_BONE, VICTIM_THIGH_BONE, VICTIM_SKULL, VICTIM_RIB_BONE, VICTIM_SPINE, POWDER_TO_SUMMON_DEAD_SOULS, USELESS_BONE_PIECES); @@ -62,7 +60,7 @@ public class Q345_MethodToRaiseTheDead extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -149,7 +147,7 @@ public class Q345_MethodToRaiseTheDead extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q347_GoGetTheCalculator/Q347_GoGetTheCalculator.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q347_GoGetTheCalculator/Q347_GoGetTheCalculator.java index 82a9a9b425..5f9a145f9d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q347_GoGetTheCalculator/Q347_GoGetTheCalculator.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q347_GoGetTheCalculator/Q347_GoGetTheCalculator.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q347_GoGetTheCalculator extends Quest { - private static final String qn = "Q347_GoGetTheCalculator"; - // NPCs private static final int BRUNON = 30526; private static final int SILVERA = 30527; @@ -39,7 +37,7 @@ public class Q347_GoGetTheCalculator extends Quest public Q347_GoGetTheCalculator() { - super(347, qn, "Go Get the Calculator"); + super(347, "Go Get the Calculator"); registerQuestItems(GEMSTONE_BEAST_CRYSTAL, CALCULATOR_QUEST); @@ -53,7 +51,7 @@ public class Q347_GoGetTheCalculator extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -118,7 +116,7 @@ public class Q347_GoGetTheCalculator extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java index 231b492391..468fb1a90f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q348_AnArrogantSearch/Q348_AnArrogantSearch.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q348_AnArrogantSearch extends Quest { - private static final String qn = "Q348_AnArrogantSearch"; - // Items private static final int TITAN_POWERSTONE = 4287; private static final int HANELLIN_FIRST_LETTER = 4288; @@ -78,7 +76,7 @@ public class Q348_AnArrogantSearch extends Quest public Q348_AnArrogantSearch() { - super(348, qn, "An Arrogant Search"); + super(348, "An Arrogant Search"); registerQuestItems(TITAN_POWERSTONE, HANELLIN_FIRST_LETTER, HANELLIN_SECOND_LETTER, HANELLIN_THIRD_LETTER, FIRST_KEY_OF_ARK, SECOND_KEY_OF_ARK, THIRD_KEY_OF_ARK, BOOK_OF_SAINT, BLOOD_OF_SAINT, BOUGH_OF_SAINT, WHITE_FABRIC_TRIBE, WHITE_FABRIC_ANGELS); @@ -95,7 +93,7 @@ public class Q348_AnArrogantSearch extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -166,7 +164,7 @@ public class Q348_AnArrogantSearch extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java index a0e02adee1..8388a60e44 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q350_EnhanceYourWeapon/Q350_EnhanceYourWeapon.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q350_EnhanceYourWeapon extends Quest { - private static final String qn = "Q350_EnhanceYourWeapon"; - // NPCs private static final int[] NPCS = { @@ -44,7 +42,7 @@ public class Q350_EnhanceYourWeapon extends Quest public Q350_EnhanceYourWeapon() { - super(350, qn, "Enhance Your Weapon"); + super(350, "Enhance Your Weapon"); addStartNpc(NPCS); addTalkId(NPCS); @@ -54,7 +52,7 @@ public class Q350_EnhanceYourWeapon extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -106,7 +104,7 @@ public class Q350_EnhanceYourWeapon extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState qs = player.getQuestState(qn); + QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java index 761dc9cbd6..6f939521dc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q351_BlackSwan/Q351_BlackSwan.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q351_BlackSwan extends Quest { - private static final String qn = "Q351_BlackSwan"; - // NPCs private static final int GOSTA = 30916; private static final int IASON_HEINE = 30969; @@ -40,7 +38,7 @@ public class Q351_BlackSwan extends Quest public Q351_BlackSwan() { - super(351, qn, "Black Swan"); + super(351, "Black Swan"); registerQuestItems(ORDER_OF_GOSTA, BARREL_OF_LEAGUE, LIZARD_FANG); @@ -54,7 +52,7 @@ public class Q351_BlackSwan extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -114,7 +112,7 @@ public class Q351_BlackSwan extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java index aa905cd0cd..bf4b3b2199 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q352_HelpRoodRaiseANewPet/Q352_HelpRoodRaiseANewPet.java @@ -25,15 +25,13 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q352_HelpRoodRaiseANewPet extends Quest { - private static final String qn = "Q352_HelpRoodRaiseANewPet"; - // Items private static final int LIENRIK_EGG_1 = 5860; private static final int LIENRIK_EGG_2 = 5861; public Q352_HelpRoodRaiseANewPet() { - super(352, qn, "Help Rood Raise A New Pet!"); + super(352, "Help Rood Raise A New Pet!"); registerQuestItems(LIENRIK_EGG_1, LIENRIK_EGG_2); @@ -47,7 +45,7 @@ public class Q352_HelpRoodRaiseANewPet extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -72,7 +70,7 @@ public class Q352_HelpRoodRaiseANewPet extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q353_PowerOfDarkness/Q353_PowerOfDarkness.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q353_PowerOfDarkness/Q353_PowerOfDarkness.java index a0214a6153..b6c50bbae0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q353_PowerOfDarkness/Q353_PowerOfDarkness.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q353_PowerOfDarkness/Q353_PowerOfDarkness.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q353_PowerOfDarkness extends Quest { - private static final String qn = "Q353_PowerOfDarkness"; - // Item private static final int STONE = 5862; public Q353_PowerOfDarkness() { - super(353, qn, "Power of Darkness"); + super(353, "Power of Darkness"); registerQuestItems(STONE); @@ -45,7 +43,7 @@ public class Q353_PowerOfDarkness extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -70,7 +68,7 @@ public class Q353_PowerOfDarkness extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java index 0c5ffba10d..2d792cbeae 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q354_ConquestOfAlligatorIsland/Q354_ConquestOfAlligatorIsland.java @@ -27,14 +27,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q354_ConquestOfAlligatorIsland extends Quest { - private static final String qn = "Q354_ConquestOfAlligatorIsland"; - // Items private static final int ALLIGATOR_TOOTH = 5863; private static final int TORN_MAP_FRAGMENT = 5864; private static final int PIRATE_TREASURE_MAP = 5915; - private static final Map DROPLIST = new HashMap<>(); + private static final Map DROPLIST = new HashMap<>(); static { DROPLIST.put(20804, new int[][] @@ -131,7 +129,7 @@ public class Q354_ConquestOfAlligatorIsland extends Quest public Q354_ConquestOfAlligatorIsland() { - super(354, qn, "Conquest of Alligator Island"); + super(354, "Conquest of Alligator Island"); registerQuestItems(ALLIGATOR_TOOTH, TORN_MAP_FRAGMENT); @@ -145,7 +143,7 @@ public class Q354_ConquestOfAlligatorIsland extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -207,7 +205,7 @@ public class Q354_ConquestOfAlligatorIsland extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -236,7 +234,7 @@ public class Q354_ConquestOfAlligatorIsland extends Quest return null; } - partyMember.getQuestState(qn).dropMultipleItems(DROPLIST.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropMultipleItems(DROPLIST.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java index e51fe404b5..89fd5273af 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q355_FamilyHonor/Q355_FamilyHonor.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q355_FamilyHonor extends Quest { - private static final String qn = "Q355_FamilyHonor"; - // NPCs private static final int GALIBREDO = 30181; private static final int PATRIN = 30929; @@ -49,7 +47,7 @@ public class Q355_FamilyHonor extends Quest private static final int STATUE_FORGERY = 4354; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(TIMAK_ORC_TROOP_LEADER, new int[] @@ -76,7 +74,7 @@ public class Q355_FamilyHonor extends Quest public Q355_FamilyHonor() { - super(355, qn, "Family Honor"); + super(355, "Family Honor"); registerQuestItems(GALIBREDO_BUST); @@ -90,7 +88,7 @@ public class Q355_FamilyHonor extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -165,7 +163,7 @@ public class Q355_FamilyHonor extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -204,7 +202,7 @@ public class Q355_FamilyHonor extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java index f4bc3cc925..b6d63b30fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q356_DigUpTheSeaOfSpores/Q356_DigUpTheSeaOfSpores.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q356_DigUpTheSeaOfSpores extends Quest { - private static final String qn = "Q356_DigUpTheSeaOfSpores"; - // Items private static final int HERB_SPORE = 5866; private static final int CARN_SPORE = 5865; @@ -36,7 +34,7 @@ public class Q356_DigUpTheSeaOfSpores extends Quest public Q356_DigUpTheSeaOfSpores() { - super(356, qn, "Dig Up the Sea of Spores!"); + super(356, "Dig Up the Sea of Spores!"); registerQuestItems(HERB_SPORE, CARN_SPORE); @@ -50,7 +48,7 @@ public class Q356_DigUpTheSeaOfSpores extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -96,7 +94,7 @@ public class Q356_DigUpTheSeaOfSpores extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q357_WarehouseKeepersAmbition/Q357_WarehouseKeepersAmbition.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q357_WarehouseKeepersAmbition/Q357_WarehouseKeepersAmbition.java index 0d916bc247..3e1553c521 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q357_WarehouseKeepersAmbition/Q357_WarehouseKeepersAmbition.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q357_WarehouseKeepersAmbition/Q357_WarehouseKeepersAmbition.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q357_WarehouseKeepersAmbition extends Quest { - private static final String qn = "Q357_WarehouseKeepersAmbition"; - // Item private static final int JADE_CRYSTAL = 5867; @@ -39,7 +37,7 @@ public class Q357_WarehouseKeepersAmbition extends Quest private static final int VALLEY_TREANT_ELDER = 20597; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(FOREST_RUNNER, 400000); @@ -50,7 +48,7 @@ public class Q357_WarehouseKeepersAmbition extends Quest public Q357_WarehouseKeepersAmbition() { - super(357, qn, "Warehouse Keeper's Ambition"); + super(357, "Warehouse Keeper's Ambition"); registerQuestItems(JADE_CRYSTAL); @@ -64,7 +62,7 @@ public class Q357_WarehouseKeepersAmbition extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -107,7 +105,7 @@ public class Q357_WarehouseKeepersAmbition extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -137,7 +135,7 @@ public class Q357_WarehouseKeepersAmbition extends Quest return null; } - partyMember.getQuestState(qn).dropItems(JADE_CRYSTAL, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(JADE_CRYSTAL, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java index 8a1ba3a4ee..0427266b69 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q358_IllegitimateChildOfAGoddess/Q358_IllegitimateChildOfAGoddess.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q358_IllegitimateChildOfAGoddess extends Quest { - private static final String qn = "Q358_IllegitimateChildOfAGoddess"; - // Item private static final int SCALE = 5868; @@ -45,7 +43,7 @@ public class Q358_IllegitimateChildOfAGoddess extends Quest public Q358_IllegitimateChildOfAGoddess() { - super(358, qn, "Illegitimate Child of A Goddess"); + super(358, "Illegitimate Child of A Goddess"); registerQuestItems(SCALE); @@ -59,7 +57,7 @@ public class Q358_IllegitimateChildOfAGoddess extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -79,7 +77,7 @@ public class Q358_IllegitimateChildOfAGoddess extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java index 466f8b49ae..18911e8ff3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q359_ForSleeplessDeadmen/Q359_ForSleeplessDeadmen.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q359_ForSleeplessDeadmen extends Quest { - private static final String qn = "Q359_ForSleeplessDeadmen"; - // Item private static final int REMAINS = 5869; @@ -52,7 +50,7 @@ public class Q359_ForSleeplessDeadmen extends Quest }; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(DOOM_SERVANT, 320000); @@ -62,7 +60,7 @@ public class Q359_ForSleeplessDeadmen extends Quest public Q359_ForSleeplessDeadmen() { - super(359, qn, "For Sleepless Deadmen"); + super(359, "For Sleepless Deadmen"); registerQuestItems(REMAINS); @@ -76,7 +74,7 @@ public class Q359_ForSleeplessDeadmen extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -102,7 +100,7 @@ public class Q359_ForSleeplessDeadmen extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q360_PlunderTheirSupplies/Q360_PlunderTheirSupplies.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q360_PlunderTheirSupplies/Q360_PlunderTheirSupplies.java index b01c79085a..9febfd6b9c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q360_PlunderTheirSupplies/Q360_PlunderTheirSupplies.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q360_PlunderTheirSupplies/Q360_PlunderTheirSupplies.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q360_PlunderTheirSupplies extends Quest { - private static final String qn = "Q360_PlunderTheirSupplies"; - // Items private static final int SUPPLY_ITEM = 5872; private static final int SUSPICIOUS_DOCUMENT = 5871; @@ -65,7 +63,7 @@ public class Q360_PlunderTheirSupplies extends Quest public Q360_PlunderTheirSupplies() { - super(360, qn, "Plunder Their Supplies"); + super(360, "Plunder Their Supplies"); registerQuestItems(RECIPE_OF_SUPPLY, SUPPLY_ITEM, SUSPICIOUS_DOCUMENT); @@ -79,7 +77,7 @@ public class Q360_PlunderTheirSupplies extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -107,7 +105,7 @@ public class Q360_PlunderTheirSupplies extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q362_BardsMandolin/Q362_BardsMandolin.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q362_BardsMandolin/Q362_BardsMandolin.java index 7509bbee63..7ea3a6cc45 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q362_BardsMandolin/Q362_BardsMandolin.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q362_BardsMandolin/Q362_BardsMandolin.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q362_BardsMandolin extends Quest { - private static final String qn = "Q362_BardsMandolin"; - // Items private static final int SWAN_FLUTE = 4316; private static final int SWAN_LETTER = 4317; @@ -38,7 +36,7 @@ public class Q362_BardsMandolin extends Quest public Q362_BardsMandolin() { - super(362, qn, "Bard's Mandolin"); + super(362, "Bard's Mandolin"); registerQuestItems(SWAN_FLUTE, SWAN_LETTER); @@ -50,7 +48,7 @@ public class Q362_BardsMandolin extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -77,7 +75,7 @@ public class Q362_BardsMandolin extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q363_SorrowfulSoundOfFlute/Q363_SorrowfulSoundOfFlute.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q363_SorrowfulSoundOfFlute/Q363_SorrowfulSoundOfFlute.java index 57b43730a2..119a0dfa0d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q363_SorrowfulSoundOfFlute/Q363_SorrowfulSoundOfFlute.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q363_SorrowfulSoundOfFlute/Q363_SorrowfulSoundOfFlute.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q363_SorrowfulSoundOfFlute extends Quest { - private static final String qn = "Q363_SorrowfulSoundOfFlute"; - // NPCs private static final int NANARIN = 30956; private static final int OPIX = 30595; @@ -45,7 +43,7 @@ public class Q363_SorrowfulSoundOfFlute extends Quest public Q363_SorrowfulSoundOfFlute() { - super(363, qn, "Sorrowful Sound of Flute"); + super(363, "Sorrowful Sound of Flute"); registerQuestItems(NANARIN_FLUTE, BLACK_BEER, CLOTHES); @@ -57,7 +55,7 @@ public class Q363_SorrowfulSoundOfFlute extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -95,7 +93,7 @@ public class Q363_SorrowfulSoundOfFlute extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java index e142c742d9..c992d0d96f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q364_JovialAccordion/Q364_JovialAccordion.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q364_JovialAccordion extends Quest { - private static final String qn = "Q364_JovialAccordion"; - // NPCs private static final int BARBADO = 30959; private static final int SWAN = 30957; @@ -44,7 +42,7 @@ public class Q364_JovialAccordion extends Quest public Q364_JovialAccordion() { - super(364, qn, "Jovial Accordion"); + super(364, "Jovial Accordion"); registerQuestItems(KEY_1, KEY_2, STOLEN_BEER, STOLEN_CLOTHES); @@ -56,7 +54,7 @@ public class Q364_JovialAccordion extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -109,7 +107,7 @@ public class Q364_JovialAccordion extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index 113c815910..384427db7b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q365_DevilsLegacy extends Quest { - private static final String qn = "Q365_DevilsLegacy"; - // NPCs private static final int RANDOLF = 30095; private static final int COLLOB = 30092; @@ -38,7 +36,7 @@ public class Q365_DevilsLegacy extends Quest public Q365_DevilsLegacy() { - super(365, qn, "Devil's Legacy"); + super(365, "Devil's Legacy"); registerQuestItems(PIRATE_TREASURE_CHEST); @@ -52,7 +50,7 @@ public class Q365_DevilsLegacy extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -166,7 +164,7 @@ public class Q365_DevilsLegacy extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = Quest.getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -215,7 +213,7 @@ public class Q365_DevilsLegacy extends Quest return null; } - partyMember.getQuestState(qn).dropItems(PIRATE_TREASURE_CHEST, 1, 0, (npc.getNpcId() == 20836) ? 360000 : 520000); + partyMember.getQuestState(getName()).dropItems(PIRATE_TREASURE_CHEST, 1, 0, (npc.getNpcId() == 20836) ? 360000 : 520000); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q366_SilverHairedShaman/Q366_SilverHairedShaman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q366_SilverHairedShaman/Q366_SilverHairedShaman.java index 5a0cd5df34..d19f6504f3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q366_SilverHairedShaman/Q366_SilverHairedShaman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q366_SilverHairedShaman/Q366_SilverHairedShaman.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q366_SilverHairedShaman extends Quest { - private static final String qn = "Q366_SilverHairedShaman"; - // NPC private static final int DIETER = 30111; @@ -36,7 +34,7 @@ public class Q366_SilverHairedShaman extends Quest private static final int HAIR = 5874; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20986, 560000); @@ -46,7 +44,7 @@ public class Q366_SilverHairedShaman extends Quest public Q366_SilverHairedShaman() { - super(366, qn, "Silver Haired Shaman"); + super(366, "Silver Haired Shaman"); registerQuestItems(HAIR); @@ -60,7 +58,7 @@ public class Q366_SilverHairedShaman extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q366_SilverHairedShaman extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -124,7 +122,7 @@ public class Q366_SilverHairedShaman extends Quest return null; } - partyMember.getQuestState(qn).dropItems(HAIR, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(HAIR, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java index c3fa67efe6..21f6f0e4b9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q367_ElectrifyingRecharge/Q367_ElectrifyingRecharge.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q367_ElectrifyingRecharge extends Quest { - private static final String qn = "Q367_ElectrifyingRecharge"; - // NPCs private static final int LORAIN = 30673; @@ -61,7 +59,7 @@ public class Q367_ElectrifyingRecharge extends Quest public Q367_ElectrifyingRecharge() { - super(367, qn, "Electrifying Recharge!"); + super(367, "Electrifying Recharge!"); registerQuestItems(LORAIN_LAMP, TITAN_LAMP_1, TITAN_LAMP_2, TITAN_LAMP_3, TITAN_LAMP_4, TITAN_LAMP_5); @@ -75,7 +73,7 @@ public class Q367_ElectrifyingRecharge extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -111,7 +109,7 @@ public class Q367_ElectrifyingRecharge extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q368_TrespassingIntoTheSacredArea/Q368_TrespassingIntoTheSacredArea.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q368_TrespassingIntoTheSacredArea/Q368_TrespassingIntoTheSacredArea.java index 793d4f3912..9b36e1a4e7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q368_TrespassingIntoTheSacredArea/Q368_TrespassingIntoTheSacredArea.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q368_TrespassingIntoTheSacredArea/Q368_TrespassingIntoTheSacredArea.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q368_TrespassingIntoTheSacredArea extends Quest { - private static final String qn = "Q368_TrespassingIntoTheSacredArea"; - // NPC private static final int RESTINA = 30926; @@ -36,7 +34,7 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest private static final int FANG = 5881; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20794, 500000); @@ -47,7 +45,7 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest public Q368_TrespassingIntoTheSacredArea() { - super(368, qn, "Trespassing into the Sacred Area"); + super(368, "Trespassing into the Sacred Area"); registerQuestItems(FANG); @@ -61,7 +59,7 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -85,7 +83,7 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -127,7 +125,7 @@ public class Q368_TrespassingIntoTheSacredArea extends Quest return null; } - partyMember.getQuestState(qn).dropItems(FANG, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(FANG, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q369_CollectorOfJewels/Q369_CollectorOfJewels.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q369_CollectorOfJewels/Q369_CollectorOfJewels.java index 4963e33103..6afc790f34 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q369_CollectorOfJewels/Q369_CollectorOfJewels.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q369_CollectorOfJewels/Q369_CollectorOfJewels.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q369_CollectorOfJewels extends Quest { - private static final String qn = "Q369_CollectorOfJewels"; - // NPC private static final int NELL = 30376; @@ -40,7 +38,7 @@ public class Q369_CollectorOfJewels extends Quest private static final int ADENA = 57; // Droplist - private static final Map DROPLIST = new HashMap<>(); + private static final Map DROPLIST = new HashMap<>(); static { DROPLIST.put(20609, new int[] @@ -77,7 +75,7 @@ public class Q369_CollectorOfJewels extends Quest public Q369_CollectorOfJewels() { - super(369, qn, "Collector of Jewels"); + super(369, "Collector of Jewels"); registerQuestItems(FLARE_SHARD, FREEZING_SHARD); @@ -94,7 +92,7 @@ public class Q369_CollectorOfJewels extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,7 +120,7 @@ public class Q369_CollectorOfJewels extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -181,7 +179,7 @@ public class Q369_CollectorOfJewels extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q370_AnElderSowsSeeds/Q370_AnElderSowsSeeds.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q370_AnElderSowsSeeds/Q370_AnElderSowsSeeds.java index 61091fbaef..3cd9842311 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q370_AnElderSowsSeeds/Q370_AnElderSowsSeeds.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q370_AnElderSowsSeeds/Q370_AnElderSowsSeeds.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q370_AnElderSowsSeeds extends Quest { - private static final String qn = "Q370_AnElderSowsSeeds"; - // NPC private static final int CASIAN = 30612; @@ -40,7 +38,7 @@ public class Q370_AnElderSowsSeeds extends Quest private static final int CHAPTER_OF_EARTH = 5920; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20082, 86000); @@ -52,7 +50,7 @@ public class Q370_AnElderSowsSeeds extends Quest public Q370_AnElderSowsSeeds() { - super(370, qn, "An Elder Sows Seeds"); + super(370, "An Elder Sows Seeds"); registerQuestItems(SPELLBOOK_PAGE, CHAPTER_OF_FIRE, CHAPTER_OF_WATER, CHAPTER_OF_WIND, CHAPTER_OF_EARTH); @@ -66,7 +64,7 @@ public class Q370_AnElderSowsSeeds extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -103,7 +101,7 @@ public class Q370_AnElderSowsSeeds extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -132,7 +130,7 @@ public class Q370_AnElderSowsSeeds extends Quest return null; } - partyMember.getQuestState(qn).dropItems(SPELLBOOK_PAGE, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(SPELLBOOK_PAGE, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java index bc156cb028..2d8643c2d8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q371_ShriekOfGhosts/Q371_ShriekOfGhosts.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q371_ShriekOfGhosts extends Quest { - private static final String qn = "Q371_ShriekOfGhosts"; - // NPCs private static final int REVA = 30867; private static final int PATRIN = 30929; @@ -39,7 +37,7 @@ public class Q371_ShriekOfGhosts extends Quest private static final int PORCELAIN = 6002; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20818, new int[] @@ -61,7 +59,7 @@ public class Q371_ShriekOfGhosts extends Quest public Q371_ShriekOfGhosts() { - super(371, qn, "Shriek of Ghosts"); + super(371, "Shriek of Ghosts"); registerQuestItems(URN, PORCELAIN); @@ -75,7 +73,7 @@ public class Q371_ShriekOfGhosts extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -156,7 +154,7 @@ public class Q371_ShriekOfGhosts extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -201,7 +199,7 @@ public class Q371_ShriekOfGhosts extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java index fe2b3e2c9a..f6c47d64ae 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q372_LegacyOfInsolence/Q372_LegacyOfInsolence.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q372_LegacyOfInsolence extends Quest { - private static final String qn = "Q372_LegacyOfInsolence"; - // NPCs private static final int WALDERAL = 30844; private static final int PATRIN = 30929; @@ -37,16 +35,14 @@ public class Q372_LegacyOfInsolence extends Quest // Monsters private static final int[][] MONSTERS_DROPS = { - // npcId - { + { // npcId 20817, 20821, 20825, 20829, 21069, 21063 - }, - // parchment (red, blue, black, white) + }, // parchment (red, blue, black, white) { 5966, 5966, @@ -54,8 +50,7 @@ public class Q372_LegacyOfInsolence extends Quest 5967, 5968, 5969 - }, - // rate + }, // rate { 300000, 400000, @@ -287,7 +282,7 @@ public class Q372_LegacyOfInsolence extends Quest public Q372_LegacyOfInsolence() { - super(372, qn, "Legacy of Insolence"); + super(372, "Legacy of Insolence"); addStartNpc(WALDERAL); addTalkId(WALDERAL, PATRIN, HOLLY, CLAUDIA, DESMOND); @@ -299,7 +294,7 @@ public class Q372_LegacyOfInsolence extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -347,7 +342,7 @@ public class Q372_LegacyOfInsolence extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -403,7 +398,7 @@ public class Q372_LegacyOfInsolence extends Quest { if (MONSTERS_DROPS[0][i] == npcId) { - partyMember.getQuestState(qn).dropItems(MONSTERS_DROPS[1][i], 1, 0, MONSTERS_DROPS[2][i]); + partyMember.getQuestState(getName()).dropItems(MONSTERS_DROPS[1][i], 1, 0, MONSTERS_DROPS[2][i]); break; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java index 4e6b1e2e57..3100ebc3e7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q373_SupplierOfReagents/Q373_SupplierOfReagents.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q373_SupplierOfReagents extends Quest { - private static final String qn = "Q373_SupplierOfReagents"; - // Variables private static final String _ingredient = "ingredient"; private static final String _catalyst = "catalyst"; @@ -98,7 +96,7 @@ public class Q373_SupplierOfReagents extends Quest *
  • LAVA_WYRM : 75% chance to drop - wyrm's blood (50,5%) and lava stone (24,5%)
    • * */ - private static final Map DROPLIST = new HashMap<>(); + private static final Map DROPLIST = new HashMap<>(); static { DROPLIST.put(PLATINUM_GUARDIAN_SHAMAN, new int[] @@ -265,7 +263,7 @@ public class Q373_SupplierOfReagents extends Quest public Q373_SupplierOfReagents() { - super(373, qn, "Supplier of Reagents"); + super(373, "Supplier of Reagents"); registerQuestItems(MIXING_STONE, MIXING_MANUAL); @@ -279,7 +277,7 @@ public class Q373_SupplierOfReagents extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -393,7 +391,7 @@ public class Q373_SupplierOfReagents extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = Quest.getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -428,7 +426,7 @@ public class Q373_SupplierOfReagents extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q374_WhisperOfDreams_Part1/Q374_WhisperOfDreams_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q374_WhisperOfDreams_Part1/Q374_WhisperOfDreams_Part1.java index e02bbc7ba4..a4b841a877 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q374_WhisperOfDreams_Part1/Q374_WhisperOfDreams_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q374_WhisperOfDreams_Part1/Q374_WhisperOfDreams_Part1.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q374_WhisperOfDreams_Part1 extends Quest { - private static final String qn = "Q374_WhisperOfDreams_Part1"; - // NPCs private static final int MANAKIA = 30515; private static final int TORAI = 30557; @@ -73,7 +71,7 @@ public class Q374_WhisperOfDreams_Part1 extends Quest public Q374_WhisperOfDreams_Part1() { - super(374, qn, "Whisper of Dreams, Part 1"); + super(374, "Whisper of Dreams, Part 1"); registerQuestItems(DEATH_WAVE_LIGHT, CAVE_BEAST_TOOTH, SEALED_MYSTERIOUS_STONE, MYSTERIOUS_STONE); @@ -87,7 +85,7 @@ public class Q374_WhisperOfDreams_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -148,7 +146,7 @@ public class Q374_WhisperOfDreams_Part1 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -214,7 +212,7 @@ public class Q374_WhisperOfDreams_Part1 extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; @@ -229,7 +227,7 @@ public class Q374_WhisperOfDreams_Part1 extends Quest return null; } - st = partyMember.getQuestState(qn); + st = partyMember.getQuestState(getName()); if (st.dropItems(SEALED_MYSTERIOUS_STONE, 1, 1, 1000)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java index 245e7887ee..99bba6a0c2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q375_WhisperOfDreams_Part2/Q375_WhisperOfDreams_Part2.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q375_WhisperOfDreams_Part2 extends Quest { - private static final String qn = "Q375_WhisperOfDreams_Part2"; - // NPCs private static final int MANAKIA = 30515; @@ -49,7 +47,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest public Q375_WhisperOfDreams_Part2() { - super(375, qn, "Whisper of Dreams, Part 2"); + super(375, "Whisper of Dreams, Part 2"); registerQuestItems(KARIK_HORN, CAVE_HOWLER_SKULL); @@ -63,7 +61,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -90,7 +88,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -130,7 +128,7 @@ public class Q375_WhisperOfDreams_Part2 extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java index 97e31a9a81..3255cdab0a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q376_ExplorationOfTheGiantsCave_Part1/Q376_ExplorationOfTheGiantsCave_Part1.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest { - private static final String qn = "Q376_ExplorationOfTheGiantsCave_Part1"; - // NPCs private static final int SOBLING = 31147; private static final int CLIFF = 30182; @@ -99,7 +97,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest public Q376_ExplorationOfTheGiantsCave_Part1() { - super(376, qn, "Exploration of the Giants' Cave, Part 1"); + super(376, "Exploration of the Giants' Cave, Part 1"); registerQuestItems(DICTIONARY_BASIC, MYSTERIOUS_BOOK); @@ -113,7 +111,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -153,7 +151,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -200,7 +198,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; @@ -215,7 +213,7 @@ public class Q376_ExplorationOfTheGiantsCave_Part1 extends Quest return null; } - st = partyMember.getQuestState(qn); + st = partyMember.getQuestState(getName()); if (st.dropItems(MYSTERIOUS_BOOK, 1, 1, 1000)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java index be0aeaf440..cacf1694f0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q377_ExplorationOfTheGiantsCave_Part2/Q377_ExplorationOfTheGiantsCave_Part2.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest { - private static final String qn = "Q377_ExplorationOfTheGiantsCave_Part2"; - // Items private static final int ANCIENT_BOOK = 5955; private static final int DICTIONARY_INTERMEDIATE = 5892; @@ -68,7 +66,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest public Q377_ExplorationOfTheGiantsCave_Part2() { - super(377, qn, "Exploration of Giants Cave, Part 2"); + super(377, "Exploration of Giants Cave, Part 2"); addStartNpc(31147); // Sobling addTalkId(31147); @@ -80,7 +78,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -109,7 +107,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -138,7 +136,7 @@ public class Q377_ExplorationOfTheGiantsCave_Part2 extends Quest return null; } - partyMember.getQuestState(qn).dropItems(ANCIENT_BOOK, 1, 0, 18000); + partyMember.getQuestState(getName()).dropItems(ANCIENT_BOOK, 1, 0, 18000); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q378_MagnificentFeast/Q378_MagnificentFeast.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q378_MagnificentFeast/Q378_MagnificentFeast.java index bfa1f2d642..8b47f09d34 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q378_MagnificentFeast/Q378_MagnificentFeast.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q378_MagnificentFeast/Q378_MagnificentFeast.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q378_MagnificentFeast extends Quest { - private static final String qn = "Q378_MagnificentFeast"; - // NPC private static final int RANSPO = 30594; @@ -43,7 +41,7 @@ public class Q378_MagnificentFeast extends Quest private static final int RITRON_DESSERT = 5959; // Rewards - private static final Map REWARDS = new HashMap<>(); + private static final Map REWARDS = new HashMap<>(); static { REWARDS.put("9", new int[] @@ -104,7 +102,7 @@ public class Q378_MagnificentFeast extends Quest public Q378_MagnificentFeast() { - super(378, qn, "Magnificent Feast"); + super(378, "Magnificent Feast"); addStartNpc(RANSPO); addTalkId(RANSPO); @@ -114,7 +112,7 @@ public class Q378_MagnificentFeast extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -234,7 +232,7 @@ public class Q378_MagnificentFeast extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java index ec255581d7..d32a4c3a39 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q379_FantasyWine/Q379_FantasyWine.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q379_FantasyWine extends Quest { - private static final String qn = "Q379_FantasyWine"; - // NPCs private static final int HARLAN = 30074; @@ -40,7 +38,7 @@ public class Q379_FantasyWine extends Quest public Q379_FantasyWine() { - super(379, qn, "Fantasy Wine"); + super(379, "Fantasy Wine"); registerQuestItems(LEAF, STONE); @@ -54,7 +52,7 @@ public class Q379_FantasyWine extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -102,7 +100,7 @@ public class Q379_FantasyWine extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java index 16584480f5..b21da17467 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q380_BringOutTheFlavorOfIngredients/Q380_BringOutTheFlavorOfIngredients.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q380_BringOutTheFlavorOfIngredients extends Quest { - private static final String qn = "Q380_BringOutTheFlavorOfIngredients"; - // Monsters private static final int DIRE_WOLF = 20205; private static final int KADIF_WEREWOLF = 20206; @@ -44,7 +42,7 @@ public class Q380_BringOutTheFlavorOfIngredients extends Quest public Q380_BringOutTheFlavorOfIngredients() { - super(380, qn, "Bring Out the Flavor of Ingredients!"); + super(380, "Bring Out the Flavor of Ingredients!"); registerQuestItems(RITRON_FRUIT, MOON_FACE_FLOWER, LEECH_FLUIDS); @@ -58,7 +56,7 @@ public class Q380_BringOutTheFlavorOfIngredients extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q380_BringOutTheFlavorOfIngredients extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q381_LetsBecomeARoyalMember/Q381_LetsBecomeARoyalMember.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q381_LetsBecomeARoyalMember/Q381_LetsBecomeARoyalMember.java index ff9dd6a9d5..262c662806 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q381_LetsBecomeARoyalMember/Q381_LetsBecomeARoyalMember.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q381_LetsBecomeARoyalMember/Q381_LetsBecomeARoyalMember.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q381_LetsBecomeARoyalMember extends Quest { - private static final String qn = "Q381_LetsBecomeARoyalMember"; - // NPCs private static final int SORINT = 30232; private static final int SANDRA = 30090; @@ -41,7 +39,7 @@ public class Q381_LetsBecomeARoyalMember extends Quest public Q381_LetsBecomeARoyalMember() { - super(381, qn, "Let's Become a Royal Member!"); + super(381, "Let's Become a Royal Member!"); registerQuestItems(KAIL_COIN, GOLDEN_CLOVER_COIN); @@ -55,7 +53,7 @@ public class Q381_LetsBecomeARoyalMember extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -78,7 +76,7 @@ public class Q381_LetsBecomeARoyalMember extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java index 20e0560e27..994d36fd2f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q382_KailsMagicCoin/Q382_KailsMagicCoin.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q382_KailsMagicCoin extends Quest { - private static final String qn = "Q382_KailsMagicCoin"; - // Monsters private static final int FALLEN_ORC = 21017; private static final int FALLEN_ORC_ARCHER = 21019; @@ -41,7 +39,7 @@ public class Q382_KailsMagicCoin extends Quest public Q382_KailsMagicCoin() { - super(382, qn, "Kail's Magic Coin"); + super(382, "Kail's Magic Coin"); registerQuestItems(SILVER_BASILISK, GOLD_GOLEM, BLOOD_DRAGON); @@ -55,7 +53,7 @@ public class Q382_KailsMagicCoin extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q382_KailsMagicCoin extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java index 446bf3aa11..7f309b87a3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q383_SearchingForTreasure/Q383_SearchingForTreasure.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q383_SearchingForTreasure extends Quest { - private static final String qn = "Q383_SearchingForTreasure"; - // NPCs private static final int ESPEN = 30890; private static final int PIRATE_CHEST = 31148; @@ -37,7 +35,7 @@ public class Q383_SearchingForTreasure extends Quest public Q383_SearchingForTreasure() { - super(383, qn, "Searching for Treasure"); + super(383, "Searching for Treasure"); addStartNpc(ESPEN); addTalkId(ESPEN, PIRATE_CHEST); @@ -47,7 +45,7 @@ public class Q383_SearchingForTreasure extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -253,7 +251,7 @@ public class Q383_SearchingForTreasure extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java index 6d5fceefd9..c10ddb32f2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q384_WarehouseKeepersPastime/Q384_WarehouseKeepersPastime.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q384_WarehouseKeepersPastime extends Quest { - private static final String qn = "Q384_WarehouseKeepersPastime"; - // NPCs private static final int CLIFF = 30182; private static final int BAXT = 30685; @@ -39,7 +37,7 @@ public class Q384_WarehouseKeepersPastime extends Quest // Items private static final int MEDAL = 5964; - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20947, 160000); // Connabi @@ -212,7 +210,7 @@ public class Q384_WarehouseKeepersPastime extends Quest public Q384_WarehouseKeepersPastime() { - super(384, qn, "Warehouse Keeper's Pastime"); + super(384, "Warehouse Keeper's Pastime"); registerQuestItems(MEDAL); @@ -229,7 +227,7 @@ public class Q384_WarehouseKeepersPastime extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -395,7 +393,7 @@ public class Q384_WarehouseKeepersPastime extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -433,7 +431,7 @@ public class Q384_WarehouseKeepersPastime extends Quest return null; } - partyMember.getQuestState(qn).dropItems(MEDAL, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(MEDAL, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q385_YokeOfThePast/Q385_YokeOfThePast.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q385_YokeOfThePast/Q385_YokeOfThePast.java index 07afce3a41..d57b0a2000 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q385_YokeOfThePast/Q385_YokeOfThePast.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q385_YokeOfThePast/Q385_YokeOfThePast.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q385_YokeOfThePast extends Quest { - private static final String qn = "Q385_YokeOfThePast"; - // NPCs private static final int GATEKEEPER_ZIGGURAT[] = { @@ -70,7 +68,7 @@ public class Q385_YokeOfThePast extends Quest private static final int BLANK_SCROLL = 5965; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21208, 70000); @@ -118,7 +116,7 @@ public class Q385_YokeOfThePast extends Quest public Q385_YokeOfThePast() { - super(385, qn, "Yoke of the Past"); + super(385, "Yoke of the Past"); registerQuestItems(ANCIENT_SCROLL); @@ -135,7 +133,7 @@ public class Q385_YokeOfThePast extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -159,7 +157,7 @@ public class Q385_YokeOfThePast extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -199,7 +197,7 @@ public class Q385_YokeOfThePast extends Quest return null; } - partyMember.getQuestState(qn).dropItems(ANCIENT_SCROLL, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(ANCIENT_SCROLL, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java index 8803fc2ee6..ea5d342b74 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q386_StolenDignity/Q386_StolenDignity.java @@ -80,11 +80,9 @@ public class Q386_StolenDignity extends Quest }; // @formatter:on - private static final String qn = "Q386_StolenDignity"; - public Q386_StolenDignity() { - super(386, qn, "Stolen Dignity"); + super(386, "Stolen Dignity"); addStartNpc(ROMP); addTalkId(ROMP); @@ -97,7 +95,7 @@ public class Q386_StolenDignity extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return event; @@ -147,7 +145,7 @@ public class Q386_StolenDignity extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -168,7 +166,7 @@ public class Q386_StolenDignity extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java index adfd1df0e9..4c4543675f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q401_PathToAWarrior/Q401_PathToAWarrior.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q401_PathToAWarrior extends Quest { - private static final String qn = "Q401_PathToAWarrior"; - // Items private static final int AURON_LETTER = 1138; private static final int WARRIOR_GUILD_MARK = 1139; @@ -45,7 +43,7 @@ public class Q401_PathToAWarrior extends Quest public Q401_PathToAWarrior() { - super(401, qn, "Path to a Warrior"); + super(401, "Path to a Warrior"); registerQuestItems(AURON_LETTER, WARRIOR_GUILD_MARK, RUSTED_BRONZE_SWORD_1, RUSTED_BRONZE_SWORD_2, RUSTED_BRONZE_SWORD_3, SIMPLON_LETTER, POISON_SPIDER_LEG); @@ -59,7 +57,7 @@ public class Q401_PathToAWarrior extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -110,7 +108,7 @@ public class Q401_PathToAWarrior extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java index 26b9f7daf4..8586314e90 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q402_PathToAHumanKnight/Q402_PathToAHumanKnight.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q402_PathToAHumanKnight extends Quest { - private static final String qn = "Q402_PathToAHumanKnight"; - // Items private static final int SWORD_OF_RITUAL = 1161; private static final int COIN_OF_LORDS_1 = 1162; @@ -63,7 +61,7 @@ public class Q402_PathToAHumanKnight extends Quest public Q402_PathToAHumanKnight() { - super(402, qn, "Path to a Human Knight"); + super(402, "Path to a Human Knight"); registerQuestItems(MARK_OF_ESQUIRE, COIN_OF_LORDS_1, COIN_OF_LORDS_2, COIN_OF_LORDS_3, COIN_OF_LORDS_4, COIN_OF_LORDS_5, COIN_OF_LORDS_6, GLUDIO_GUARD_MARK_1, BUGBEAR_NECKLACE, EINHASAD_CHURCH_MARK_1, EINHASAD_CRUCIFIX, GLUDIO_GUARD_MARK_2, SPIDER_LEG, EINHASAD_CHURCH_MARK_2, LIZARDMAN_TOTEM, GLUDIO_GUARD_MARK_3, GIANT_SPIDER_HUSK, EINHASAD_CHURCH_MARK_3, LIZARDMAN_TOTEM, GLUDIO_GUARD_MARK_3, GIANT_SPIDER_HUSK, EINHASAD_CHURCH_MARK_3, HORRIBLE_SKULL); @@ -77,7 +75,7 @@ public class Q402_PathToAHumanKnight extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -160,7 +158,7 @@ public class Q402_PathToAHumanKnight extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java index dec3c75778..032037c1c8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q403_PathToARogue/Q403_PathToARogue.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q403_PathToARogue extends Quest { - private static final String qn = "Q403_PathToARogue"; - // Items private static final int BEZIQUE_LETTER = 1180; private static final int NETI_BOW = 1181; @@ -49,7 +47,7 @@ public class Q403_PathToARogue extends Quest public Q403_PathToARogue() { - super(403, qn, "Path to a Rogue"); + super(403, "Path to a Rogue"); registerQuestItems(BEZIQUE_LETTER, NETI_BOW, NETI_DAGGER, SPARTOI_BONES, HORSESHOE_OF_LIGHT, MOST_WANTED_LIST, STOLEN_JEWELRY, STOLEN_TOMES, STOLEN_RING, STOLEN_NECKLACE); @@ -63,7 +61,7 @@ public class Q403_PathToARogue extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -106,7 +104,7 @@ public class Q403_PathToARogue extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java index 372776ce47..493bd98ab3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q404_PathToAHumanWizard/Q404_PathToAHumanWizard.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q404_PathToAHumanWizard extends Quest { - private static final String qn = "Q404_PathToAHumanWizard"; - // Items private static final int MAP_OF_LUSTER = 1280; private static final int KEY_OF_FLAME = 1281; @@ -53,7 +51,7 @@ public class Q404_PathToAHumanWizard extends Quest public Q404_PathToAHumanWizard() { - super(404, qn, "Path to a Human Wizard"); + super(404, "Path to a Human Wizard"); registerQuestItems(MAP_OF_LUSTER, KEY_OF_FLAME, FLAME_EARING, BROKEN_BRONZE_MIRROR, WIND_FEATHER, WIND_BANGEL, RAMA_DIARY, SPARKLE_PEBBLE, WATER_NECKLACE, RUST_GOLD_COIN, RED_SOIL, EARTH_RING); @@ -67,7 +65,7 @@ public class Q404_PathToAHumanWizard extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -94,7 +92,7 @@ public class Q404_PathToAHumanWizard extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java index da70e4400e..44dcf41a8e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q405_PathToACleric/Q405_PathToACleric.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q405_PathToACleric extends Quest { - private static final String qn = "Q405_PathToACleric"; - // Items private static final int LETTER_OF_ORDER_1 = 1191; private static final int LETTER_OF_ORDER_2 = 1192; @@ -53,7 +51,7 @@ public class Q405_PathToACleric extends Quest public Q405_PathToACleric() { - super(405, qn, "Path to a Cleric"); + super(405, "Path to a Cleric"); registerQuestItems(LETTER_OF_ORDER_1, BOOK_OF_SIMPLON, BOOK_OF_PRAGA, BOOK_OF_VIVYAN, NECKLACE_OF_MOTHER, PENDANT_OF_MOTHER, LETTER_OF_ORDER_2, LIONEL_BOOK, CERTIFICATE_OF_GALLINT, LIONEL_COVENANT); @@ -67,7 +65,7 @@ public class Q405_PathToACleric extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -88,7 +86,7 @@ public class Q405_PathToACleric extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java index ea1ef39fd7..9f75581a23 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q406_PathToAnElvenKnight/Q406_PathToAnElvenKnight.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q406_PathToAnElvenKnight extends Quest { - private static final String qn = "Q406_PathToAnElvenKnight"; - // Items private static final int SORIUS_LETTER = 1202; private static final int KLUTO_BOX = 1203; @@ -42,7 +40,7 @@ public class Q406_PathToAnElvenKnight extends Quest public Q406_PathToAnElvenKnight() { - super(406, qn, "Path to an Elven Knight"); + super(406, "Path to an Elven Knight"); registerQuestItems(SORIUS_LETTER, KLUTO_BOX, TOPAZ_PIECE, EMERALD_PIECE, KLUTO_MEMO); @@ -56,7 +54,7 @@ public class Q406_PathToAnElvenKnight extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -98,7 +96,7 @@ public class Q406_PathToAnElvenKnight extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java index b57301ebbf..21353ceb79 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q407_PathToAnElvenScout/Q407_PathToAnElvenScout.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q407_PathToAnElvenScout extends Quest { - private static final String qn = "Q407_PathToAnElvenScout"; - // Items private static final int REISA_LETTER = 1207; private static final int PRIAS_TORN_LETTER_1 = 1208; @@ -49,7 +47,7 @@ public class Q407_PathToAnElvenScout extends Quest public Q407_PathToAnElvenScout() { - super(407, qn, "Path to an Elven Scout"); + super(407, "Path to an Elven Scout"); registerQuestItems(REISA_LETTER, PRIAS_TORN_LETTER_1, PRIAS_TORN_LETTER_2, PRIAS_TORN_LETTER_3, PRIAS_TORN_LETTER_4, MORETTI_HERB, MORETTI_LETTER, PRIAS_LETTER, HONORARY_GUARD, RUSTED_KEY); @@ -63,7 +61,7 @@ public class Q407_PathToAnElvenScout extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -105,7 +103,7 @@ public class Q407_PathToAnElvenScout extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java index d5131c410f..c5fa0c8f1e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q408_PathToAnElvenWizard/Q408_PathToAnElvenWizard.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q408_PathToAnElvenWizard extends Quest { - private static final String qn = "Q408_PathToAnElvenWizard"; - // Items private static final int ROSELLA_LETTER = 1218; private static final int RED_DOWN = 1219; @@ -52,7 +50,7 @@ public class Q408_PathToAnElvenWizard extends Quest public Q408_PathToAnElvenWizard() { - super(408, qn, "Path to an Elven Wizard"); + super(408, "Path to an Elven Wizard"); registerQuestItems(ROSELLA_LETTER, RED_DOWN, MAGICAL_POWERS_RUBY, PURE_AQUAMARINE, APPETIZING_APPLE, GOLD_LEAVES, IMMORTAL_LOVE, AMETHYST, NOBILITY_AMETHYST, FERTILITY_PERIDOT, CHARM_OF_GRAIN, SAP_OF_THE_MOTHER_TREE, LUCKY_POTPOURRI); @@ -66,7 +64,7 @@ public class Q408_PathToAnElvenWizard extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -150,7 +148,7 @@ public class Q408_PathToAnElvenWizard extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java index da3e899172..fb2ed11d56 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q409_PathToAnElvenOracle/Q409_PathToAnElvenOracle.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q409_PathToAnElvenOracle extends Quest { - private static final String qn = "Q409_PathToAnElvenOracle"; - // Items private static final int CRYSTAL_MEDALLION = 1231; private static final int SWINDLER_MONEY = 1232; @@ -44,7 +42,7 @@ public class Q409_PathToAnElvenOracle extends Quest public Q409_PathToAnElvenOracle() { - super(409, qn, "Path to an Elven Oracle"); + super(409, "Path to an Elven Oracle"); registerQuestItems(CRYSTAL_MEDALLION, SWINDLER_MONEY, ALLANA_DIARY, LIZARD_CAPTAIN_ORDER, HALF_OF_DIARY, TAMIL_NECKLACE); @@ -58,7 +56,7 @@ public class Q409_PathToAnElvenOracle extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -92,7 +90,7 @@ public class Q409_PathToAnElvenOracle extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java index 9ffeae059a..d905e4e71c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q410_PathToAPalusKnight/Q410_PathToAPalusKnight.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q410_PathToAPalusKnight extends Quest { - private static final String qn = "Q410_PathToAPalusKnight"; - // Items private static final int PALUS_TALISMAN = 1237; private static final int LYCANTHROPE_SKULL = 1238; @@ -49,7 +47,7 @@ public class Q410_PathToAPalusKnight extends Quest public Q410_PathToAPalusKnight() { - super(410, qn, "Path to a Palus Knight"); + super(410, "Path to a Palus Knight"); registerQuestItems(PALUS_TALISMAN, LYCANTHROPE_SKULL, VIRGIL_LETTER, MORTE_TALISMAN, PREDATOR_CARAPACE, ARACHNID_TRACKER_SILK, COFFIN_OF_ETERNAL_REST); @@ -63,7 +61,7 @@ public class Q410_PathToAPalusKnight extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -123,7 +121,7 @@ public class Q410_PathToAPalusKnight extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java index edf59107c2..77799ecf43 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q411_PathToAnAssassin/Q411_PathToAnAssassin.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q411_PathToAnAssassin extends Quest { - private static final String qn = "Q411_PathToAnAssassin"; - // Items private static final int SHILEN_CALL = 1245; private static final int ARKENIA_LETTER = 1246; @@ -44,7 +42,7 @@ public class Q411_PathToAnAssassin extends Quest public Q411_PathToAnAssassin() { - super(411, qn, "Path to an Assassin"); + super(411, "Path to an Assassin"); registerQuestItems(SHILEN_CALL, ARKENIA_LETTER, LEIKAN_NOTE, MOONSTONE_BEAST_MOLAR, SHILEN_TEARS, ARKENIA_RECOMMENDATION); @@ -58,7 +56,7 @@ public class Q411_PathToAnAssassin extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -108,7 +106,7 @@ public class Q411_PathToAnAssassin extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java index d1168e1dfd..e0cd248736 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q412_PathToADarkWizard/Q412_PathToADarkWizard.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q412_PathToADarkWizard extends Quest { - private static final String qn = "Q412_PathToADarkWizard"; - // Items private static final int SEED_OF_ANGER = 1253; private static final int SEED_OF_DESPAIR = 1254; @@ -50,7 +48,7 @@ public class Q412_PathToADarkWizard extends Quest public Q412_PathToADarkWizard() { - super(412, qn, "Path to a Dark Wizard"); + super(412, "Path to a Dark Wizard"); registerQuestItems(SEED_OF_ANGER, SEED_OF_DESPAIR, SEED_OF_HORROR, SEED_OF_LUNACY, FAMILY_REMAINS, VARIKA_LIQUOR, KNEE_BONE, HEART_OF_LUNACY, LUCKY_KEY, CANDLE, HUB_SCENT); @@ -64,7 +62,7 @@ public class Q412_PathToADarkWizard extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -143,7 +141,7 @@ public class Q412_PathToADarkWizard extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java index a428eebe73..76cdb35794 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q413_PathToAShillienOracle/Q413_PathToAShillienOracle.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q413_PathToAShillienOracle extends Quest { - private static final String qn = "Q413_PathToAShillienOracle"; - // Items private static final int SIDRA_LETTER = 1262; private static final int BLANK_SHEET = 1263; @@ -46,7 +44,7 @@ public class Q413_PathToAShillienOracle extends Quest public Q413_PathToAShillienOracle() { - super(413, qn, "Path to a Shillien Oracle"); + super(413, "Path to a Shillien Oracle"); registerQuestItems(SIDRA_LETTER, BLANK_SHEET, BLOODY_RUNE, GARMIEL_BOOK, PRAYER_OF_ADONIUS, PENITENT_MARK, ASHEN_BONES, ANDARIEL_BOOK); @@ -60,7 +58,7 @@ public class Q413_PathToAShillienOracle extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -110,7 +108,7 @@ public class Q413_PathToAShillienOracle extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java index 7dd4cfdad7..d520e28e88 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q414_PathToAnOrcRaider/Q414_PathToAnOrcRaider.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q414_PathToAnOrcRaider extends Quest { - private static final String qn = "Q414_PathToAnOrcRaider"; - // Items private static final int GREEN_BLOOD = 1578; private static final int GOBLIN_DWELLING_MAP = 1579; @@ -52,7 +50,7 @@ public class Q414_PathToAnOrcRaider extends Quest public Q414_PathToAnOrcRaider() { - super(414, qn, "Path to an Orc Raider"); + super(414, "Path to an Orc Raider"); registerQuestItems(GREEN_BLOOD, GOBLIN_DWELLING_MAP, KURUKA_RATMAN_TOOTH, BETRAYER_REPORT_1, BETRAYER_REPORT_2, HEAD_OF_BETRAYER, TIMORA_ORC_HEAD); @@ -66,7 +64,7 @@ public class Q414_PathToAnOrcRaider extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -125,7 +123,7 @@ public class Q414_PathToAnOrcRaider extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java index c2a6f782eb..0afedb7470 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q415_PathToAMonk/Q415_PathToAMonk.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.templates.item.WeaponType; public class Q415_PathToAMonk extends Quest { - private static final String qn = "Q415_PathToAMonk"; - // Items private static final int POMEGRANATE = 1593; private static final int LEATHER_POUCH_1 = 1594; @@ -67,7 +65,7 @@ public class Q415_PathToAMonk extends Quest public Q415_PathToAMonk() { - super(415, qn, "Path to a Monk"); + super(415, "Path to a Monk"); registerQuestItems(POMEGRANATE, LEATHER_POUCH_1, LEATHER_POUCH_2, LEATHER_POUCH_3, LEATHER_POUCH_FULL_1, LEATHER_POUCH_FULL_2, LEATHER_POUCH_FULL_3, KASHA_BEAR_CLAW, KASHA_BLADE_SPIDER_TALON, SCARLET_SALAMANDER_SCALE, FIERY_SPIRIT_SCROLL, ROSHEEK_LETTER, GANTAKI_LETTER_OF_RECOMMENDATION, FIG, LEATHER_POUCH_4, LEATHER_POUCH_FULL_4, VUKU_ORC_TUSK, RATMAN_FANG, LANG_KLIZARDMAN_TOOTH, FELIM_LIZARDMAN_TOOTH, IRON_WILL_SCROLL, TORUKU_LETTER, KASHA_SPIDER_TOOTH, HORN_OF_BAAR_DRE_VANUL); @@ -81,7 +79,7 @@ public class Q415_PathToAMonk extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -149,7 +147,7 @@ public class Q415_PathToAMonk extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java index e7b1b1250d..4273f3fbf9 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q416_PathToAnOrcShaman/Q416_PathToAnOrcShaman.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q416_PathToAnOrcShaman extends Quest { - private static final String qn = "Q416_PathToAnOrcShaman"; - // Items private static final int FIRE_CHARM = 1616; private static final int KASHA_BEAR_PELT = 1617; @@ -68,7 +66,7 @@ public class Q416_PathToAnOrcShaman extends Quest public Q416_PathToAnOrcShaman() { - super(416, qn, "Path to an Orc Shaman"); + super(416, "Path to an Orc Shaman"); registerQuestItems(FIRE_CHARM, KASHA_BEAR_PELT, KASHA_BLADE_SPIDER_HUSK, FIERY_EGG_1, HESTUI_MASK, FIERY_EGG_2, TOTEM_SPIRIT_CLAW, TATARU_LETTER, FLAME_CHARM, GRIZZLY_BLOOD, BLOOD_CAULDRON, SPIRIT_NET, BOUND_DURKA_SPIRIT, DURKA_PARASITE, TOTEM_SPIRIT_BLOOD); @@ -82,7 +80,7 @@ public class Q416_PathToAnOrcShaman extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -176,7 +174,7 @@ public class Q416_PathToAnOrcShaman extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java index 7e9c3a2b91..e734c0798b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q417_PathToBecomeAScavenger/Q417_PathToBecomeAScavenger.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q417_PathToBecomeAScavenger extends Quest { - private static final String qn = "Q417_PathToBecomeAScavenger"; - // Items private static final int RING_OF_RAVEN = 1642; private static final int PIPPI_LETTER = 1643; @@ -67,7 +65,7 @@ public class Q417_PathToBecomeAScavenger extends Quest public Q417_PathToBecomeAScavenger() { - super(417, qn, "Path to become a Scavenger"); + super(417, "Path to become a Scavenger"); registerQuestItems(PIPPI_LETTER, RAUT_TELEPORT_SCROLL, SUCCUBUS_UNDIES, MION_LETTER, BRONK_INGOT, SHARI_AXE, ZIMENF_POTION, BRONK_PAY, SHARI_PAY, ZIMENF_PAY, BEAR_PICTURE, TARANTULA_PICTURE, HONEY_JAR, BEAD, BEAD_PARCEL_1, BEAD_PARCEL_2); @@ -81,7 +79,7 @@ public class Q417_PathToBecomeAScavenger extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -212,7 +210,7 @@ public class Q417_PathToBecomeAScavenger extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java index eca4a72ffa..a9850537fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q418_PathToAnArtisan/Q418_PathToAnArtisan.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SocialAction; public class Q418_PathToAnArtisan extends Quest { - private static final String qn = "Q418_PathToAnArtisan"; - // Items private static final int SILVERA_RING = 1632; private static final int FIRST_PASS_CERTIFICATE = 1633; @@ -51,7 +49,7 @@ public class Q418_PathToAnArtisan extends Quest public Q418_PathToAnArtisan() { - super(418, qn, "Path to an Artisan"); + super(418, "Path to an Artisan"); registerQuestItems(SILVERA_RING, FIRST_PASS_CERTIFICATE, SECOND_PASS_CERTIFICATE, BOOGLE_RATMAN_TOOTH, BOOGLE_RATMAN_LEADER_TOOTH, KLUTO_LETTER, FOOTPRINT_OF_THIEF, STOLEN_SECRET_BOX, SECRET_BOX); @@ -65,7 +63,7 @@ public class Q418_PathToAnArtisan extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -182,7 +180,7 @@ public class Q418_PathToAnArtisan extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java index 7c1ceab60f..bbbdd197f4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q419_GetAPet/Q419_GetAPet.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q419_GetAPet extends Quest { - private static final String qn = "Q419_GetAPet"; - // Items private static final int ANIMAL_LOVER_LIST = 3417; private static final int ANIMAL_SLAYER_LIST_1 = 3418; @@ -54,7 +52,7 @@ public class Q419_GetAPet extends Quest private static final int ELLIE = 30091; // Droplist - private static final Map DROPLIST = new HashMap<>(); + private static final Map DROPLIST = new HashMap<>(); static { DROPLIST.put(20103, new int[] @@ -131,7 +129,7 @@ public class Q419_GetAPet extends Quest public Q419_GetAPet() { - super(419, qn, "Get a Pet"); + super(419, "Get a Pet"); registerQuestItems(ANIMAL_LOVER_LIST, ANIMAL_SLAYER_LIST_1, ANIMAL_SLAYER_LIST_2, ANIMAL_SLAYER_LIST_3, ANIMAL_SLAYER_LIST_4, ANIMAL_SLAYER_LIST_5, BLOODY_FANG, BLOODY_CLAW, BLOODY_NAIL, BLOODY_KASHA_FANG, BLOODY_TARANTULA_NAIL); @@ -148,7 +146,7 @@ public class Q419_GetAPet extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -227,7 +225,7 @@ public class Q419_GetAPet extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java index 1b17a96883..473f67adb0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q420_LittleWing/Q420_LittleWing.java @@ -26,8 +26,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q420_LittleWing extends Quest { - private static final String qn = "Q420_LittleWing"; - // Needed items private static final int COAL = 1870; private static final int CHARCOAL = 1871; @@ -87,7 +85,7 @@ public class Q420_LittleWing extends Quest public Q420_LittleWing() { - super(420, qn, "Little Wing"); + super(420, "Little Wing"); registerQuestItems(FAIRY_STONE, DELUXE_FAIRY_STONE, FAIRY_STONE_LIST, DELUXE_FAIRY_STONE_LIST, TOAD_LORD_BACK_SKIN, JUICE_OF_MONKSHOOD, SCALE_OF_DRAKE_EXARION, EGG_OF_DRAKE_EXARION, SCALE_OF_DRAKE_ZWOV, EGG_OF_DRAKE_ZWOV, SCALE_OF_DRAKE_KALIBRAN, EGG_OF_DRAKE_KALIBRAN, SCALE_OF_WYVERN_SUZET, EGG_OF_WYVERN_SUZET, SCALE_OF_WYVERN_SHAMHAI, EGG_OF_WYVERN_SHAMHAI); @@ -101,7 +99,7 @@ public class Q420_LittleWing extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -296,7 +294,7 @@ public class Q420_LittleWing extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index 423956cdfe..42ac7b212a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -42,8 +42,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q421_LittleWingsBigAdventure extends Quest { - private static final String qn = "Q421_LittleWingsBigAdventure"; - // NPCs private static final int CRONOS = 30610; private static final int MIMYU = 30747; @@ -53,7 +51,7 @@ public class Q421_LittleWingsBigAdventure extends Quest public Q421_LittleWingsBigAdventure() { - super(421, qn, "Little Wing's Big Adventure"); + super(421, "Little Wing's Big Adventure"); registerQuestItems(FAIRY_LEAF); @@ -68,7 +66,7 @@ public class Q421_LittleWingsBigAdventure extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -128,7 +126,7 @@ public class Q421_LittleWingsBigAdventure extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java index 3c23bd68f5..edebee4011 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q422_RepentYourSins/Q422_RepentYourSins.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.UserInfo; public class Q422_RepentYourSins extends Quest { - private static final String qn = "Q422_RepentYourSins"; - // Items private static final int RATMAN_SCAVENGER_SKULL = 4326; private static final int TUREK_WAR_HOUND_TAIL = 4327; @@ -56,7 +54,7 @@ public class Q422_RepentYourSins extends Quest public Q422_RepentYourSins() { - super(422, qn, "Repent Your Sins"); + super(422, "Repent Your Sins"); registerQuestItems(RATMAN_SCAVENGER_SKULL, TUREK_WAR_HOUND_TAIL, TYRANT_KINGPIN_HEART, TRISALIM_TARANTULA_VENOM_SAC, MANUAL_OF_MANACLES, PENITENT_MANACLES, QITEM_PENITENT_MANACLES); @@ -70,7 +68,7 @@ public class Q422_RepentYourSins extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -198,7 +196,7 @@ public class Q422_RepentYourSins extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getAlreadyCompletedMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java index 3c9726d753..d0181f02bd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q426_QuestForFishingShot/Q426_QuestForFishingShot.java @@ -28,11 +28,9 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q426_QuestForFishingShot extends Quest { - private static final String qn = "Q426_QuestForFishingShot"; - private static final int SWEET_FLUID = 7586; - private static final Map MOBS1 = new HashMap<>(); + private static final Map MOBS1 = new HashMap<>(); static { MOBS1.put(20005, 45); @@ -207,7 +205,7 @@ public class Q426_QuestForFishingShot extends Quest MOBS1.put(21644, 170); } - private static final Map MOBS2 = new HashMap<>(); + private static final Map MOBS2 = new HashMap<>(); static { MOBS2.put(20579, 420); @@ -238,7 +236,7 @@ public class Q426_QuestForFishingShot extends Quest MOBS2.put(21636, 950); } - private static final Map MOBS3 = new HashMap<>(); + private static final Map MOBS3 = new HashMap<>(); static { MOBS3.put(20655, 110); @@ -259,7 +257,7 @@ public class Q426_QuestForFishingShot extends Quest MOBS3.put(21264, 920); } - private static final Map MOBS4 = new HashMap<>(); + private static final Map MOBS4 = new HashMap<>(); static { MOBS4.put(20815, 205); @@ -283,7 +281,7 @@ public class Q426_QuestForFishingShot extends Quest MOBS4.put(21657, 935); } - private static final Map MOBS5 = new HashMap<>(); + private static final Map MOBS5 = new HashMap<>(); static { MOBS5.put(20828, 935); @@ -296,7 +294,7 @@ public class Q426_QuestForFishingShot extends Quest MOBS5.put(21656, 750); } - private static final Map MOBSspecial = new HashMap<>(); + private static final Map MOBSspecial = new HashMap<>(); static { MOBSspecial.put(20829, new int[] @@ -328,7 +326,7 @@ public class Q426_QuestForFishingShot extends Quest public Q426_QuestForFishingShot() { - super(426, qn, "Quest for Fishing Shot"); + super(426, "Quest for Fishing Shot"); registerQuestItems(SWEET_FLUID); @@ -365,7 +363,7 @@ public class Q426_QuestForFishingShot extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -389,7 +387,7 @@ public class Q426_QuestForFishingShot extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -419,7 +417,7 @@ public class Q426_QuestForFishingShot extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q431_WeddingMarch/Q431_WeddingMarch.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q431_WeddingMarch/Q431_WeddingMarch.java index a26b562ea0..6b214f0b24 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q431_WeddingMarch/Q431_WeddingMarch.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q431_WeddingMarch/Q431_WeddingMarch.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q431_WeddingMarch extends Quest { - private static final String qn = "Q431_WeddingMarch"; - // NPC private static final int KANTABILON = 31042; @@ -37,7 +35,7 @@ public class Q431_WeddingMarch extends Quest public Q431_WeddingMarch() { - super(431, qn, "Wedding March"); + super(431, "Wedding March"); registerQuestItems(SILVER_CRYSTAL); @@ -51,7 +49,7 @@ public class Q431_WeddingMarch extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -85,7 +83,7 @@ public class Q431_WeddingMarch extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,7 +120,7 @@ public class Q431_WeddingMarch extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q432_BirthdayPartySong/Q432_BirthdayPartySong.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q432_BirthdayPartySong/Q432_BirthdayPartySong.java index 7111b586d4..0613ef27fb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q432_BirthdayPartySong/Q432_BirthdayPartySong.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q432_BirthdayPartySong/Q432_BirthdayPartySong.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q432_BirthdayPartySong extends Quest { - private static final String qn = "Q432_BirthdayPartySong"; - // NPC private static final int OCTAVIA = 31043; @@ -34,7 +32,7 @@ public class Q432_BirthdayPartySong extends Quest public Q432_BirthdayPartySong() { - super(432, qn, "Birthday Party Song"); + super(432, "Birthday Party Song"); registerQuestItems(RED_CRYSTAL); @@ -48,7 +46,7 @@ public class Q432_BirthdayPartySong extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -78,7 +76,7 @@ public class Q432_BirthdayPartySong extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -108,7 +106,7 @@ public class Q432_BirthdayPartySong extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index f7d1e137d0..b6bc5db31d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -36,8 +36,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q501_ProofOfClanAlliance extends Quest { - private static final String qn = "Q501_ProofOfClanAlliance"; - // Items private static final int ADENA = 57; private static final int POTION_OF_RECOVERY = 3889; @@ -119,7 +117,7 @@ public class Q501_ProofOfClanAlliance extends Quest public Q501_ProofOfClanAlliance() { - super(501, qn, "Proof of Clan Alliance"); + super(501, "Proof of Clan Alliance"); registerQuestItems(HERB_OF_HARIT, HERB_OF_VANOR, HERB_OF_OEL_MAHUM, BLOOD_OF_EVA, ATHREAS_COIN, SYMBOL_OF_LOYALTY, VOUCHER_OF_FAITH, ANTIDOTE_RECIPE_LIST); @@ -141,7 +139,7 @@ public class Q501_ProofOfClanAlliance extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); QuestState st2 = getClanLeaderQuestState(player, npc); if (st == null) @@ -265,7 +263,7 @@ public class Q501_ProofOfClanAlliance extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); QuestState cl = getClanLeaderQuestState(player, npc); if (st == null) @@ -452,7 +450,7 @@ public class Q501_ProofOfClanAlliance extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); QuestState cl = getClanLeaderQuestState(player, npc); if ((st == null) || (cl == null)) @@ -577,6 +575,6 @@ public class Q501_ProofOfClanAlliance extends Quest { final Clan clan = player.getClan(); final PlayerInstance leader = clan.getLeader().getPlayerInstance(); - return leader.getQuestState(qn); + return leader.getQuestState(getName()); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java index dbdbdd22db..2fd88174de 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q503_PursuitOfClanAmbition/Q503_PursuitOfClanAmbition.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q503_PursuitOfClanAmbition extends Quest { - private static final String qn = "Q503_PursuitOfClanAmbition"; - // Items // First private static final int G_LET_MARTIEN = 3866; @@ -104,7 +102,7 @@ public class Q503_PursuitOfClanAmbition extends Quest public Q503_PursuitOfClanAmbition() { - super(503, qn, "Pursuit of Clan Ambition!"); + super(503, "Pursuit of Clan Ambition!"); registerQuestItems(MI_DRAKE_EGGS, BL_WYRM_EGGS, DRAKE_EGGS, TH_WYRM_EGGS, BROOCH, NEBULITE_CRYSTALS, BROKE_POWER_STONE, POWER_STONE, IMP_KEYS, G_LET_MARTIEN, G_LET_BALTHAZAR, G_LET_RODEMAI, SCEPTER_JUDGEMENT); @@ -119,7 +117,7 @@ public class Q503_PursuitOfClanAmbition extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -264,7 +262,7 @@ public class Q503_PursuitOfClanAmbition extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q504_CompetitionForTheBanditStronghold/Q504_CompetitionForTheBanditStronghold.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q504_CompetitionForTheBanditStronghold/Q504_CompetitionForTheBanditStronghold.java index 873858ada9..aa1bd282cf 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q504_CompetitionForTheBanditStronghold/Q504_CompetitionForTheBanditStronghold.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q504_CompetitionForTheBanditStronghold/Q504_CompetitionForTheBanditStronghold.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q504_CompetitionForTheBanditStronghold extends Quest { - private static final String qn = "Q504_CompetitionForTheBanditStronghold"; - // NPCs private static final int MESSENGER = 35437; private static final int TARLK_BUGBEAR = 20570; @@ -45,7 +43,7 @@ public class Q504_CompetitionForTheBanditStronghold extends Quest public Q504_CompetitionForTheBanditStronghold() { - super(504, qn, "Competition for the Bandit Stronghold"); + super(504, "Competition for the Bandit Stronghold"); addStartNpc(MESSENGER); addTalkId(MESSENGER); @@ -56,7 +54,7 @@ public class Q504_CompetitionForTheBanditStronghold extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -90,7 +88,7 @@ public class Q504_CompetitionForTheBanditStronghold extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -137,7 +135,7 @@ public class Q504_CompetitionForTheBanditStronghold extends Quest @Override public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if ((qs == null) || (qs.getState() != State.STARTED)) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q505_BloodOffering/Q505_BloodOffering.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q505_BloodOffering/Q505_BloodOffering.java index f9af3d5e66..744c81e839 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q505_BloodOffering/Q505_BloodOffering.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q505_BloodOffering/Q505_BloodOffering.java @@ -24,14 +24,14 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.util.Util; +import quests.Q635_InTheDimensionalRift.Q635_InTheDimensionalRift; + /** * @author Mobius * @note Based on python script */ public class Q505_BloodOffering extends Quest { - private static final String qn = "Q505_BloodOffering"; - // NPCs // @formatter:off private static final int[] TOWN_DAWN = {31078, 31079, 31080, 31081, 31083, 31084, 31082, 31692, 31694, 31997, 31168}; @@ -45,7 +45,7 @@ public class Q505_BloodOffering extends Quest public Q505_BloodOffering() { - super(505, qn, "Blood Offering"); + super(505, "Blood Offering"); addStartNpc(TOWN_DAWN); addTalkId(TOWN_DAWN); @@ -67,13 +67,13 @@ public class Q505_BloodOffering extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; } - final QuestState qs2 = player.getQuestState("Q635_InTheDimensionalRift"); + final QuestState qs2 = player.getQuestState(Q635_InTheDimensionalRift.class.getSimpleName()); final int npcId = npc.getNpcId(); if (Util.contains(FESTIVALGUIDE, npcId)) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java index 38fb29dfde..4a611faa9f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q508_AClansReputation/Q508_AClansReputation.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q508_AClansReputation extends Quest { - private static final String qn = "Q508_AClansReputation"; - // NPC private static final int SIR_ERIC_RODEMAI = 30868; @@ -129,7 +127,7 @@ public class Q508_AClansReputation extends Quest public Q508_AClansReputation() { - super(508, qn, "A Clan's Reputation"); + super(508, "A Clan's Reputation"); registerQuestItems(THEMIS_SCALE, NUCLEUS_OF_HEKATON_PRIME, TIPHON_SHARD, GLAKIS_NUCLEUS, RAHHAS_FANG, NUCLEUS_OF_FLAMESTONE_GIANT); @@ -143,7 +141,7 @@ public class Q508_AClansReputation extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -180,7 +178,7 @@ public class Q508_AClansReputation extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java index 05e02915e4..d7874679e4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q509_TheClansPrestige/Q509_TheClansPrestige.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q509_TheClansPrestige extends Quest { - private static final String qn = "Q509_TheClansPrestige"; - // NPCs private static final int VALDIS = 31331; @@ -116,7 +114,7 @@ public class Q509_TheClansPrestige extends Quest public Q509_TheClansPrestige() { - super(509, qn, "The Clan's Prestige"); + super(509, "The Clan's Prestige"); registerQuestItems(DAIMONS_EYES, HESTIAS_FAIRY_STONE, NUCLEUS_OF_LESSER_GOLEM, FALSTON_FANG, SHAIDS_TALON); @@ -130,7 +128,7 @@ public class Q509_TheClansPrestige extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -167,7 +165,7 @@ public class Q509_TheClansPrestige extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java index bf49e10ce0..4db4fd0d17 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q510_AClansReputation/Q510_AClansReputation.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public class Q510_AClansReputation extends Quest { - private static final String qn = "Q510_AClansReputation"; - // NPC private static final int Valdis = 31331; @@ -41,7 +39,7 @@ public class Q510_AClansReputation extends Quest public Q510_AClansReputation() { - super(510, qn, "A Clan's Reputation"); + super(510, "A Clan's Reputation"); registerQuestItems(Claw); @@ -55,7 +53,7 @@ public class Q510_AClansReputation extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -79,7 +77,7 @@ public class Q510_AClansReputation extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java index e2fcb0eb22..1bf3dbf24d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q601_WatchingEyes/Q601_WatchingEyes.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q601_WatchingEyes extends Quest { - private static final String qn = "Q601_WatchingEyes"; - // Items private static final int PROOF_OF_AVENGER = 7188; @@ -57,7 +55,7 @@ public class Q601_WatchingEyes extends Quest public Q601_WatchingEyes() { - super(601, qn, "Watching Eyes"); + super(601, "Watching Eyes"); registerQuestItems(PROOF_OF_AVENGER); @@ -71,7 +69,7 @@ public class Q601_WatchingEyes extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -120,7 +118,7 @@ public class Q601_WatchingEyes extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -157,7 +155,7 @@ public class Q601_WatchingEyes extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java index 2aa1785bbe..be3136d47f 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q602_ShadowOfLight/Q602_ShadowOfLight.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q602_ShadowOfLight extends Quest { - private static final String qn = "Q602_ShadowOfLight"; - private static final int EYE_OF_DARKNESS = 7189; private static final int[][] REWARDS = @@ -63,7 +61,7 @@ public class Q602_ShadowOfLight extends Quest public Q602_ShadowOfLight() { - super(602, qn, "Shadow of Light"); + super(602, "Shadow of Light"); registerQuestItems(EYE_OF_DARKNESS); @@ -77,7 +75,7 @@ public class Q602_ShadowOfLight extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -127,7 +125,7 @@ public class Q602_ShadowOfLight extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -164,7 +162,7 @@ public class Q602_ShadowOfLight extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q603_DaimonTheWhiteEyed_Part1/Q603_DaimonTheWhiteEyed_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q603_DaimonTheWhiteEyed_Part1/Q603_DaimonTheWhiteEyed_Part1.java index ba18f57702..fba72161c8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q603_DaimonTheWhiteEyed_Part1/Q603_DaimonTheWhiteEyed_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q603_DaimonTheWhiteEyed_Part1/Q603_DaimonTheWhiteEyed_Part1.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q603_DaimonTheWhiteEyed_Part1 extends Quest { - private static final String qn = "Q603_DaimonTheWhiteEyed_Part1"; - // Items private static final int EVIL_SPIRIT_BEADS = 7190; private static final int BROKEN_CRYSTAL = 7191; @@ -48,7 +46,7 @@ public class Q603_DaimonTheWhiteEyed_Part1 extends Quest private static final int GRENDEL_SLAVE = 21304; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(CANYON_BANDERSNATCH_SLAVE, 500000); @@ -58,7 +56,7 @@ public class Q603_DaimonTheWhiteEyed_Part1 extends Quest public Q603_DaimonTheWhiteEyed_Part1() { - super(603, qn, "Daimon the White-Eyed - Part 1"); + super(603, "Daimon the White-Eyed - Part 1"); registerQuestItems(EVIL_SPIRIT_BEADS, BROKEN_CRYSTAL); @@ -72,7 +70,7 @@ public class Q603_DaimonTheWhiteEyed_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -152,7 +150,7 @@ public class Q603_DaimonTheWhiteEyed_Part1 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -257,7 +255,7 @@ public class Q603_DaimonTheWhiteEyed_Part1 extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java index 5754490e14..e4d547a6b7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q604_DaimonTheWhiteEyed_Part2/Q604_DaimonTheWhiteEyed_Part2.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q604_DaimonTheWhiteEyed_Part2 extends Quest { - private static final String qn = "Q604_DaimonTheWhiteEyed_Part2"; - // Monster private static final int DAIMON_THE_WHITE_EYED = 25290; @@ -62,7 +60,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest public Q604_DaimonTheWhiteEyed_Part2() { - super(604, qn, "Daimon the White-Eyed - Part 2"); + super(604, "Daimon the White-Eyed - Part 2"); registerQuestItems(SUMMON_CRYSTAL, ESSENCE_OF_DAIMON); @@ -75,7 +73,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest switch (RaidBossSpawnManager.getInstance().getRaidBossStatusId(DAIMON_THE_WHITE_EYED)) { case UNDEFINED: - LOGGER.log(Level.WARNING, qn + ": can not find spawned RaidBoss id=" + DAIMON_THE_WHITE_EYED); + LOGGER.log(Level.WARNING, getName() + ": can not find spawned RaidBoss id=" + DAIMON_THE_WHITE_EYED); break; case ALIVE: @@ -107,7 +105,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest } String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -175,7 +173,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -243,7 +241,7 @@ public class Q604_DaimonTheWhiteEyed_Part2 extends Quest { for (PlayerInstance partyMember : getPartyMembers(player, npc, "cond", "2")) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java index 6a88ba4ec6..40c389ed7b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q605_AllianceWithKetraOrcs/Q605_AllianceWithKetraOrcs.java @@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q606_WarWithVarkaSilenos.Q606_WarWithVarkaSilenos; + /** * This quest supports both Q605 && Q606 onKill sections. */ public class Q605_AllianceWithKetraOrcs extends Quest { - private static final String qn = "Q605_AllianceWithKetraOrcs"; - private static final String qn2 = "Q606_WarWithVarkaSilenos"; - - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21350, 500000); @@ -60,7 +59,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest CHANCES.put(21375, 626000); } - private static final Map CHANCES_MANE = new HashMap<>(); + private static final Map CHANCES_MANE = new HashMap<>(); static { CHANCES_MANE.put(21350, 500000); @@ -98,7 +97,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest public Q605_AllianceWithKetraOrcs() { - super(605, qn, "Alliance with Ketra Orcs"); + super(605, "Alliance with Ketra Orcs"); registerQuestItems(VARKA_BADGE_SOLDIER, VARKA_BADGE_OFFICER, VARKA_BADGE_CAPTAIN); @@ -115,7 +114,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -237,7 +236,7 @@ public class Q605_AllianceWithKetraOrcs extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -346,14 +345,14 @@ public class Q605_AllianceWithKetraOrcs extends Quest final int npcId = npc.getNpcId(); // Support for Q606. - QuestState st = partyMember.getQuestState(qn2); + QuestState st = partyMember.getQuestState(Q606_WarWithVarkaSilenos.class.getSimpleName()); if ((st != null) && Rnd.nextBoolean() && CHANCES_MANE.containsKey(npcId)) { st.dropItems(VARKA_MANE, 1, 0, CHANCES_MANE.get(npcId)); return null; } - st = partyMember.getQuestState(qn); + st = partyMember.getQuestState(getName()); int cond = st.getInt("cond"); if (cond == 6) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q606_WarWithVarkaSilenos/Q606_WarWithVarkaSilenos.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q606_WarWithVarkaSilenos/Q606_WarWithVarkaSilenos.java index 5c7af52a57..1fc012b342 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q606_WarWithVarkaSilenos/Q606_WarWithVarkaSilenos.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q606_WarWithVarkaSilenos/Q606_WarWithVarkaSilenos.java @@ -27,15 +27,13 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q606_WarWithVarkaSilenos extends Quest { - private static final String qn = "Q606_WarWithVarkaSilenos"; - // Items private static final int HORN_OF_BUFFALO = 7186; private static final int VARKA_MANE = 7233; public Q606_WarWithVarkaSilenos() { - super(606, qn, "War with Varka Silenos"); + super(606, "War with Varka Silenos"); registerQuestItems(VARKA_MANE); @@ -47,7 +45,7 @@ public class Q606_WarWithVarkaSilenos extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -85,7 +83,7 @@ public class Q606_WarWithVarkaSilenos extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q607_ProveYourCourage/Q607_ProveYourCourage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q607_ProveYourCourage/Q607_ProveYourCourage.java index c29a492984..8623050909 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q607_ProveYourCourage/Q607_ProveYourCourage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q607_ProveYourCourage/Q607_ProveYourCourage.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q607_ProveYourCourage extends Quest { - private static final String qn = "Q607_ProveYourCourage"; - // Items private static final int HEAD_OF_SHADITH = 7235; private static final int TOTEM_OF_VALOR = 7219; @@ -33,7 +31,7 @@ public class Q607_ProveYourCourage extends Quest public Q607_ProveYourCourage() { - super(607, qn, "Prove your courage!"); + super(607, "Prove your courage!"); registerQuestItems(HEAD_OF_SHADITH); @@ -47,7 +45,7 @@ public class Q607_ProveYourCourage extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q607_ProveYourCourage extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,12 +120,12 @@ public class Q607_ProveYourCourage extends Quest { if (partyMember.getAllianceWithVarkaKetra() >= 3) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; } - + if (st.hasQuestItems(KETRA_ALLIANCE_3)) { st.set("cond", "2"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q608_SlayTheEnemyCommander/Q608_SlayTheEnemyCommander.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q608_SlayTheEnemyCommander/Q608_SlayTheEnemyCommander.java index a45c84ef85..16207aa5bc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q608_SlayTheEnemyCommander/Q608_SlayTheEnemyCommander.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q608_SlayTheEnemyCommander/Q608_SlayTheEnemyCommander.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q608_SlayTheEnemyCommander extends Quest { - private static final String qn = "Q608_SlayTheEnemyCommander"; - // Quest Items private static final int HEAD_OF_MOS = 7236; private static final int TOTEM_OF_WISDOM = 7220; @@ -33,7 +31,7 @@ public class Q608_SlayTheEnemyCommander extends Quest public Q608_SlayTheEnemyCommander() { - super(608, qn, "Slay the enemy commander!"); + super(608, "Slay the enemy commander!"); registerQuestItems(HEAD_OF_MOS); @@ -47,7 +45,7 @@ public class Q608_SlayTheEnemyCommander extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q608_SlayTheEnemyCommander extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -125,7 +123,7 @@ public class Q608_SlayTheEnemyCommander extends Quest { if (partyMember.getAllianceWithVarkaKetra() >= 4) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q609_MagicalPowerOfWater_Part1/Q609_MagicalPowerOfWater_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q609_MagicalPowerOfWater_Part1/Q609_MagicalPowerOfWater_Part1.java index 436bdefe3f..7aabeb19f6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q609_MagicalPowerOfWater_Part1/Q609_MagicalPowerOfWater_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q609_MagicalPowerOfWater_Part1/Q609_MagicalPowerOfWater_Part1.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q609_MagicalPowerOfWater_Part1 extends Quest { - private static final String qn = "Q609_MagicalPowerOfWater_Part1"; - // NPCs private static final int WAHKAN = 31371; private static final int ASEFA = 31372; @@ -40,7 +38,7 @@ public class Q609_MagicalPowerOfWater_Part1 extends Quest public Q609_MagicalPowerOfWater_Part1() { - super(609, qn, "Magical Power of Water - Part 1"); + super(609, "Magical Power of Water - Part 1"); registerQuestItems(STOLEN_GREEN_TOTEM); @@ -55,7 +53,7 @@ public class Q609_MagicalPowerOfWater_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -99,7 +97,7 @@ public class Q609_MagicalPowerOfWater_Part1 extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -174,7 +172,7 @@ public class Q609_MagicalPowerOfWater_Part1 extends Quest @Override public String onAggro(NpcInstance npc, PlayerInstance player, boolean isPet) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java index 1414147e61..011d68a886 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q610_MagicalPowerOfWater_Part2/Q610_MagicalPowerOfWater_Part2.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q610_MagicalPowerOfWater_Part2 extends Quest { - private static final String qn = "Q610_MagicalPowerOfWater_Part2"; - // Monster private static final int SOUL_OF_WATER_ASHUTAR = 25316; @@ -52,7 +50,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest public Q610_MagicalPowerOfWater_Part2() { - super(610, qn, "Magical Power of Water - Part 2"); + super(610, "Magical Power of Water - Part 2"); registerQuestItems(ICE_HEART_OF_ASHUTAR); @@ -65,7 +63,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest switch (RaidBossSpawnManager.getInstance().getRaidBossStatusId(SOUL_OF_WATER_ASHUTAR)) { case UNDEFINED: - LOGGER.log(Level.WARNING, qn + ": can not find spawned RaidBoss id=" + SOUL_OF_WATER_ASHUTAR); + LOGGER.log(Level.WARNING, getName() + ": can not find spawned RaidBoss id=" + SOUL_OF_WATER_ASHUTAR); break; case ALIVE: @@ -97,7 +95,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest } String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -163,7 +161,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -223,7 +221,7 @@ public class Q610_MagicalPowerOfWater_Part2 extends Quest { for (PlayerInstance partyMember : getPartyMembers(player, npc, "cond", "2")) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java index 08149e82b2..3ffe2b6a90 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q611_AllianceWithVarkaSilenos/Q611_AllianceWithVarkaSilenos.java @@ -26,15 +26,14 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q612_WarWithKetraOrcs.Q612_WarWithKetraOrcs; + /** * This quest supports both Q611 && Q612 onKill sections. */ public class Q611_AllianceWithVarkaSilenos extends Quest { - private static final String qn = "Q611_AllianceWithVarkaSilenos"; - private static final String qn2 = "Q612_WarWithKetraOrcs"; - - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21324, 500000); @@ -60,7 +59,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest CHANCES.put(21349, 626000); } - private static final Map CHANCES_MOLAR = new HashMap<>(); + private static final Map CHANCES_MOLAR = new HashMap<>(); static { CHANCES_MOLAR.put(21324, 500000); @@ -98,7 +97,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest public Q611_AllianceWithVarkaSilenos() { - super(611, qn, "Alliance with Varka Silenos"); + super(611, "Alliance with Varka Silenos"); registerQuestItems(KETRA_BADGE_SOLDIER, KETRA_BADGE_OFFICER, KETRA_BADGE_CAPTAIN); @@ -115,7 +114,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -237,7 +236,7 @@ public class Q611_AllianceWithVarkaSilenos extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -346,14 +345,14 @@ public class Q611_AllianceWithVarkaSilenos extends Quest final int npcId = npc.getNpcId(); // Support for Q612. - QuestState st = partyMember.getQuestState(qn2); + QuestState st = partyMember.getQuestState(Q612_WarWithKetraOrcs.class.getSimpleName()); if ((st != null) && Rnd.nextBoolean() && CHANCES_MOLAR.containsKey(npcId)) { st.dropItems(MOLAR_OF_KETRA_ORC, 1, 0, CHANCES_MOLAR.get(npcId)); return null; } - st = partyMember.getQuestState(qn); + st = partyMember.getQuestState(getName()); int cond = st.getInt("cond"); if (cond == 6) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q612_WarWithKetraOrcs/Q612_WarWithKetraOrcs.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q612_WarWithKetraOrcs/Q612_WarWithKetraOrcs.java index 018d81aa30..a7320adc1d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q612_WarWithKetraOrcs/Q612_WarWithKetraOrcs.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q612_WarWithKetraOrcs/Q612_WarWithKetraOrcs.java @@ -27,15 +27,13 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q612_WarWithKetraOrcs extends Quest { - private static final String qn = "Q612_WarWithKetraOrcs"; - // Items private static final int NEPENTHES_SEED = 7187; private static final int MOLAR_OF_KETRA_ORC = 7234; public Q612_WarWithKetraOrcs() { - super(612, qn, "War with Ketra Orcs"); + super(612, "War with Ketra Orcs"); registerQuestItems(MOLAR_OF_KETRA_ORC); @@ -47,7 +45,7 @@ public class Q612_WarWithKetraOrcs extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -85,7 +83,7 @@ public class Q612_WarWithKetraOrcs extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q613_ProveYourCourage/Q613_ProveYourCourage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q613_ProveYourCourage/Q613_ProveYourCourage.java index 0d8aa64dc9..3394cde9bd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q613_ProveYourCourage/Q613_ProveYourCourage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q613_ProveYourCourage/Q613_ProveYourCourage.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q613_ProveYourCourage extends Quest { - private static final String qn = "Q613_ProveYourCourage"; - // Items private static final int HEAD_OF_HEKATON = 7240; private static final int FEATHER_OF_VALOR = 7229; @@ -33,7 +31,7 @@ public class Q613_ProveYourCourage extends Quest public Q613_ProveYourCourage() { - super(613, qn, "Prove your courage!"); + super(613, "Prove your courage!"); registerQuestItems(HEAD_OF_HEKATON); @@ -47,7 +45,7 @@ public class Q613_ProveYourCourage extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q613_ProveYourCourage extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,7 +120,7 @@ public class Q613_ProveYourCourage extends Quest { if (partyMember.getAllianceWithVarkaKetra() <= -3) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q614_SlayTheEnemyCommander/Q614_SlayTheEnemyCommander.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q614_SlayTheEnemyCommander/Q614_SlayTheEnemyCommander.java index 44351e4d62..0a54f61b0e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q614_SlayTheEnemyCommander/Q614_SlayTheEnemyCommander.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q614_SlayTheEnemyCommander/Q614_SlayTheEnemyCommander.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q614_SlayTheEnemyCommander extends Quest { - private static final String qn = "Q614_SlayTheEnemyCommander"; - // Quest Items private static final int HEAD_OF_TAYR = 7241; private static final int FEATHER_OF_WISDOM = 7230; @@ -33,7 +31,7 @@ public class Q614_SlayTheEnemyCommander extends Quest public Q614_SlayTheEnemyCommander() { - super(614, qn, "Slay the enemy commander!"); + super(614, "Slay the enemy commander!"); registerQuestItems(HEAD_OF_TAYR); @@ -47,7 +45,7 @@ public class Q614_SlayTheEnemyCommander extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -84,7 +82,7 @@ public class Q614_SlayTheEnemyCommander extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -125,7 +123,7 @@ public class Q614_SlayTheEnemyCommander extends Quest { if (partyMember.getAllianceWithVarkaKetra() <= -4) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q615_MagicalPowerOfFire_Part1/Q615_MagicalPowerOfFire_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q615_MagicalPowerOfFire_Part1/Q615_MagicalPowerOfFire_Part1.java index 039f21fe56..4d927f5fd4 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q615_MagicalPowerOfFire_Part1/Q615_MagicalPowerOfFire_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q615_MagicalPowerOfFire_Part1/Q615_MagicalPowerOfFire_Part1.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q615_MagicalPowerOfFire_Part1 extends Quest { - private static final String qn = "Q615_MagicalPowerOfFire_Part1"; - // NPCs private static final int NARAN = 31378; private static final int UDAN = 31379; @@ -40,7 +38,7 @@ public class Q615_MagicalPowerOfFire_Part1 extends Quest public Q615_MagicalPowerOfFire_Part1() { - super(615, qn, "Magical Power of Fire - Part 1"); + super(615, "Magical Power of Fire - Part 1"); registerQuestItems(STOLEN_RED_TOTEM); @@ -55,7 +53,7 @@ public class Q615_MagicalPowerOfFire_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -99,7 +97,7 @@ public class Q615_MagicalPowerOfFire_Part1 extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -174,7 +172,7 @@ public class Q615_MagicalPowerOfFire_Part1 extends Quest @Override public String onAggro(NpcInstance npc, PlayerInstance player, boolean isPet) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java index 0240b1001b..e3b1dff6b2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q616_MagicalPowerOfFire_Part2/Q616_MagicalPowerOfFire_Part2.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q616_MagicalPowerOfFire_Part2 extends Quest { - private static final String qn = "Q616_MagicalPowerOfFire_Part2"; - // Monster private static final int SOUL_OF_FIRE_NASTRON = 25306; @@ -52,7 +50,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest public Q616_MagicalPowerOfFire_Part2() { - super(616, qn, "Magical Power of Fire - Part 2"); + super(616, "Magical Power of Fire - Part 2"); registerQuestItems(FIRE_HEART_OF_NASTRON); @@ -65,7 +63,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest switch (RaidBossSpawnManager.getInstance().getRaidBossStatusId(SOUL_OF_FIRE_NASTRON)) { case UNDEFINED: - LOGGER.log(Level.WARNING, qn + ": can not find spawned RaidBoss id=" + SOUL_OF_FIRE_NASTRON); + LOGGER.log(Level.WARNING, getName() + ": can not find spawned RaidBoss id=" + SOUL_OF_FIRE_NASTRON); break; case ALIVE: @@ -97,7 +95,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest } String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -163,7 +161,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -234,7 +232,7 @@ public class Q616_MagicalPowerOfFire_Part2 extends Quest { for (PlayerInstance partyMember : getPartyMembers(player, npc, "cond", "2")) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java index 1e72cd620c..be4fbd1e8e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q617_GatherTheFlames/Q617_GatherTheFlames.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q617_GatherTheFlames extends Quest { - private static final String qn = "Q617_GatherTheFlames"; - // NPCs private static final int HILDA = 31271; private static final int VULCAN = 31539; @@ -40,7 +38,7 @@ public class Q617_GatherTheFlames extends Quest private static final int TORCH = 7264; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21381, 510000); @@ -88,7 +86,7 @@ public class Q617_GatherTheFlames extends Quest public Q617_GatherTheFlames() { - super(617, qn, "Gather the Flames"); + super(617, "Gather the Flames"); registerQuestItems(TORCH); @@ -105,7 +103,7 @@ public class Q617_GatherTheFlames extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -152,7 +150,7 @@ public class Q617_GatherTheFlames extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -194,7 +192,7 @@ public class Q617_GatherTheFlames extends Quest return null; } - partyMember.getQuestState(qn).dropItems(TORCH, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(TORCH, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q618_IntoTheFlame/Q618_IntoTheFlame.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q618_IntoTheFlame/Q618_IntoTheFlame.java index f6c84bc582..bc429a0544 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q618_IntoTheFlame/Q618_IntoTheFlame.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q618_IntoTheFlame/Q618_IntoTheFlame.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q618_IntoTheFlame extends Quest { - private static final String qn = "Q618_IntoTheFlame"; - // NPCs private static final int KLEIN = 31540; private static final int HILDA = 31271; @@ -39,7 +37,7 @@ public class Q618_IntoTheFlame extends Quest public Q618_IntoTheFlame() { - super(618, qn, "Into the Flame"); + super(618, "Into the Flame"); registerQuestItems(VACUALITE_ORE, VACUALITE); @@ -54,7 +52,7 @@ public class Q618_IntoTheFlame extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -93,7 +91,7 @@ public class Q618_IntoTheFlame extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -147,7 +145,7 @@ public class Q618_IntoTheFlame extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java index eafb86cdbd..866cdd62ae 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q619_RelicsOfTheOldEmpire/Q619_RelicsOfTheOldEmpire.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q619_RelicsOfTheOldEmpire extends Quest { - private static final String qn = "Q619_RelicsOfTheOldEmpire"; - // NPC private static int GHOST_OF_ADVENTURER = 31538; @@ -51,7 +49,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest public Q619_RelicsOfTheOldEmpire() { - super(619, qn, "Relics of the Old Empire"); + super(619, "Relics of the Old Empire"); registerQuestItems(RELICS); @@ -78,7 +76,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -115,7 +113,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -155,7 +153,7 @@ public class Q619_RelicsOfTheOldEmpire extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java index 614ceaf73c..a378a05f84 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q620_FourGoblets/Q620_FourGoblets.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q620_FourGoblets extends Quest { - private static final String qn = "Q620_FourGoblets"; - // NPCs private static final int GHOST_OF_WIGOTH_1 = 31452; private static final int NAMELESS_SPIRIT = 31453; @@ -71,7 +69,7 @@ public class Q620_FourGoblets extends Quest public Q620_FourGoblets() { - super(620, qn, "Four Goblets"); + super(620, "Four Goblets"); registerQuestItems(SEALED_BOX, USED_GRAVE_PASS, GOBLET_OF_ALECTIA, GOBLET_OF_TISHAS, GOBLET_OF_MEKARA, GOBLET_OF_MORIGUL); @@ -88,7 +86,7 @@ public class Q620_FourGoblets extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -228,7 +226,7 @@ public class Q620_FourGoblets extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -315,7 +313,7 @@ public class Q620_FourGoblets extends Quest return null; } - partyMember.getQuestState(qn).dropItems(SEALED_BOX, 1, 0, 300000); + partyMember.getQuestState(getName()).dropItems(SEALED_BOX, 1, 0, 300000); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java index e19ad56aa4..aebd73577c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q621_EggDelivery/Q621_EggDelivery.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q621_EggDelivery extends Quest { - private static final String qn = "Q621_EggDelivery"; - // Items private static final int BOILED_EGGS = 7195; private static final int FEE_OF_BOILED_EGG = 7196; @@ -51,7 +49,7 @@ public class Q621_EggDelivery extends Quest public Q621_EggDelivery() { - super(621, qn, "Egg Delivery"); + super(621, "Egg Delivery"); registerQuestItems(BOILED_EGGS, FEE_OF_BOILED_EGG); @@ -63,7 +61,7 @@ public class Q621_EggDelivery extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -149,7 +147,7 @@ public class Q621_EggDelivery extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java index 6a28cc2af3..ce677b7e92 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q622_SpecialtyLiquorDelivery/Q622_SpecialtyLiquorDelivery.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q622_SpecialtyLiquorDelivery extends Quest { - private static final String qn = "Q622_SpecialtyLiquorDelivery"; - // Items private static final int SPECIAL_DRINK = 7197; private static final int FEE_OF_SPECIAL_DRINK = 7198; @@ -52,7 +50,7 @@ public class Q622_SpecialtyLiquorDelivery extends Quest public Q622_SpecialtyLiquorDelivery() { - super(622, qn, "Specialty Liquor Delivery"); + super(622, "Specialty Liquor Delivery"); registerQuestItems(SPECIAL_DRINK, FEE_OF_SPECIAL_DRINK); @@ -64,7 +62,7 @@ public class Q622_SpecialtyLiquorDelivery extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -140,7 +138,7 @@ public class Q622_SpecialtyLiquorDelivery extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java index 7e8a0007c2..a18d25444a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q623_TheFinestFood/Q623_TheFinestFood.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q623_TheFinestFood extends Quest { - private static final String qn = "Q623_TheFinestFood"; - // Items private static final int LEAF_OF_FLAVA = 7199; private static final int BUFFALO_MEAT = 7200; @@ -42,7 +40,7 @@ public class Q623_TheFinestFood extends Quest public Q623_TheFinestFood() { - super(623, qn, "The Finest Food"); + super(623, "The Finest Food"); registerQuestItems(LEAF_OF_FLAVA, BUFFALO_MEAT, ANTELOPE_HORN); @@ -56,7 +54,7 @@ public class Q623_TheFinestFood extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -114,7 +112,7 @@ public class Q623_TheFinestFood extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -158,7 +156,7 @@ public class Q623_TheFinestFood extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q624_TheFinestIngredients_Part1/Q624_TheFinestIngredients_Part1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q624_TheFinestIngredients_Part1/Q624_TheFinestIngredients_Part1.java index 4f72fbf37c..497e01a835 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q624_TheFinestIngredients_Part1/Q624_TheFinestIngredients_Part1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q624_TheFinestIngredients_Part1/Q624_TheFinestIngredients_Part1.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q624_TheFinestIngredients_Part1 extends Quest { - private static final String qn = "Q624_TheFinestIngredients_Part1"; - // Mobs private static final int NEPENTHES = 21319; private static final int ATROX = 21321; @@ -43,7 +41,7 @@ public class Q624_TheFinestIngredients_Part1 extends Quest public Q624_TheFinestIngredients_Part1() { - super(624, qn, "The Finest Ingredients - Part 1"); + super(624, "The Finest Ingredients - Part 1"); registerQuestItems(TRUNK_OF_NEPENTHES, FOOT_OF_BANDERSNATCHLING, SECRET_SPICE); @@ -57,7 +55,7 @@ public class Q624_TheFinestIngredients_Part1 extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -95,7 +93,7 @@ public class Q624_TheFinestIngredients_Part1 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -139,7 +137,7 @@ public class Q624_TheFinestIngredients_Part1 extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java index f94683f5df..589fc7628e 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q625_TheFinestIngredients_Part2/Q625_TheFinestIngredients_Part2.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q625_TheFinestIngredients_Part2 extends Quest { - private static final String qn = "Q625_TheFinestIngredients_Part2"; - // Monster private static final int ICICLE_EMPEROR_BUMBALUMP = 25296; @@ -62,7 +60,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest public Q625_TheFinestIngredients_Part2() { - super(625, qn, "The Finest Ingredients - Part 2"); + super(625, "The Finest Ingredients - Part 2"); registerQuestItems(FOOD_FOR_BUMBALUMP, SPECIAL_YETI_MEAT); @@ -75,7 +73,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest switch (RaidBossSpawnManager.getInstance().getRaidBossStatusId(ICICLE_EMPEROR_BUMBALUMP)) { case UNDEFINED: - LOGGER.log(Level.WARNING, qn + ": can not find spawned RaidBoss id=" + ICICLE_EMPEROR_BUMBALUMP); + LOGGER.log(Level.WARNING, getName() + ": can not find spawned RaidBoss id=" + ICICLE_EMPEROR_BUMBALUMP); break; case ALIVE: @@ -107,7 +105,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest } String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -175,7 +173,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -235,7 +233,7 @@ public class Q625_TheFinestIngredients_Part2 extends Quest { for (PlayerInstance partyMember : getPartyMembers(player, npc, "cond", "2")) { - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q626_ADarkTwilight/Q626_ADarkTwilight.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q626_ADarkTwilight/Q626_ADarkTwilight.java index 457269dee0..f80e15932c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q626_ADarkTwilight/Q626_ADarkTwilight.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q626_ADarkTwilight/Q626_ADarkTwilight.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q626_ADarkTwilight extends Quest { - private static final String qn = "Q626_ADarkTwilight"; - // Items private static final int BLOOD_OF_SAINT = 7169; @@ -36,7 +34,7 @@ public class Q626_ADarkTwilight extends Quest private static final int HIERARCH = 31517; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21520, 533000); @@ -57,7 +55,7 @@ public class Q626_ADarkTwilight extends Quest public Q626_ADarkTwilight() { - super(626, qn, "A Dark Twilight"); + super(626, "A Dark Twilight"); registerQuestItems(BLOOD_OF_SAINT); @@ -74,7 +72,7 @@ public class Q626_ADarkTwilight extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -123,7 +121,7 @@ public class Q626_ADarkTwilight extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java index 8b96040c22..2a160101d2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q627_HeartInSearchOfPower/Q627_HeartInSearchOfPower.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q627_HeartInSearchOfPower extends Quest { - private static final String qn = "Q627_HeartInSearchOfPower"; - // NPCs private static final int NECROMANCER = 31518; private static final int ENFEUX = 31519; @@ -39,7 +37,7 @@ public class Q627_HeartInSearchOfPower extends Quest private static final int GEM_OF_SAINTS = 7172; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21520, 550000); @@ -59,7 +57,7 @@ public class Q627_HeartInSearchOfPower extends Quest } // Rewards - private static final Map REWARDS = new HashMap<>(); + private static final Map REWARDS = new HashMap<>(); static { REWARDS.put("adena", new int[] @@ -96,7 +94,7 @@ public class Q627_HeartInSearchOfPower extends Quest public Q627_HeartInSearchOfPower() { - super(627, qn, "Heart in Search of Power"); + super(627, "Heart in Search of Power"); registerQuestItems(BEAD_OF_OBEDIENCE); @@ -113,7 +111,7 @@ public class Q627_HeartInSearchOfPower extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -180,7 +178,7 @@ public class Q627_HeartInSearchOfPower extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q628_HuntOfTheGoldenRamMercenaryForce/Q628_HuntOfTheGoldenRamMercenaryForce.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q628_HuntOfTheGoldenRamMercenaryForce/Q628_HuntOfTheGoldenRamMercenaryForce.java index 9a23347123..402587b136 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q628_HuntOfTheGoldenRamMercenaryForce/Q628_HuntOfTheGoldenRamMercenaryForce.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q628_HuntOfTheGoldenRamMercenaryForce/Q628_HuntOfTheGoldenRamMercenaryForce.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest { - private static final String qn = "Q628_HuntOfTheGoldenRamMercenaryForce"; - // NPCs private static final int KAHMAN = 31554; @@ -39,7 +37,7 @@ public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest private static final int GOLDEN_RAM_BADGE_SOLDIER = 7247; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21508, 500000); @@ -56,7 +54,7 @@ public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest public Q628_HuntOfTheGoldenRamMercenaryForce() { - super(628, qn, "Hunt of the Golden Ram Mercenary Force"); + super(628, "Hunt of the Golden Ram Mercenary Force"); registerQuestItems(SPLINTER_STAKATO_CHITIN, NEEDLE_STAKATO_CHITIN, GOLDEN_RAM_BADGE_RECRUIT, GOLDEN_RAM_BADGE_SOLDIER); @@ -73,7 +71,7 @@ public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -108,7 +106,7 @@ public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -174,7 +172,7 @@ public class Q628_HuntOfTheGoldenRamMercenaryForce extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q629_CleanUpTheSwampOfScreams/Q629_CleanUpTheSwampOfScreams.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q629_CleanUpTheSwampOfScreams/Q629_CleanUpTheSwampOfScreams.java index bf38991c48..91d16e59ee 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q629_CleanUpTheSwampOfScreams/Q629_CleanUpTheSwampOfScreams.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q629_CleanUpTheSwampOfScreams/Q629_CleanUpTheSwampOfScreams.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q629_CleanUpTheSwampOfScreams extends Quest { - private static final String qn = "Q629_CleanUpTheSwampOfScreams"; - // NPC private static final int PIERCE = 31553; @@ -37,7 +35,7 @@ public class Q629_CleanUpTheSwampOfScreams extends Quest private static final int GOLDEN_RAM_COIN = 7251; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21508, 500000); @@ -54,7 +52,7 @@ public class Q629_CleanUpTheSwampOfScreams extends Quest public Q629_CleanUpTheSwampOfScreams() { - super(629, qn, "Clean up the Swamp of Screams"); + super(629, "Clean up the Swamp of Screams"); registerQuestItems(TALON_OF_STAKATO, GOLDEN_RAM_COIN); @@ -71,7 +69,7 @@ public class Q629_CleanUpTheSwampOfScreams extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -116,7 +114,7 @@ public class Q629_CleanUpTheSwampOfScreams extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -150,7 +148,7 @@ public class Q629_CleanUpTheSwampOfScreams extends Quest return null; } - partyMember.getQuestState(qn).dropItems(TALON_OF_STAKATO, 1, 100, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(TALON_OF_STAKATO, 1, 100, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q631_DeliciousTopChoiceMeat/Q631_DeliciousTopChoiceMeat.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q631_DeliciousTopChoiceMeat/Q631_DeliciousTopChoiceMeat.java index 08ea6fb711..09aa714076 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q631_DeliciousTopChoiceMeat/Q631_DeliciousTopChoiceMeat.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q631_DeliciousTopChoiceMeat/Q631_DeliciousTopChoiceMeat.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q631_DeliciousTopChoiceMeat extends Quest { - private static final String qn = "Q631_DeliciousTopChoiceMeat"; - // NPC private static final int TUNATUN = 31537; @@ -37,7 +35,7 @@ public class Q631_DeliciousTopChoiceMeat extends Quest private static final int TOP_QUALITY_MEAT = 7546; // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(21460, 601000); @@ -97,7 +95,7 @@ public class Q631_DeliciousTopChoiceMeat extends Quest public Q631_DeliciousTopChoiceMeat() { - super(631, qn, "Delicious Top Choice Meat"); + super(631, "Delicious Top Choice Meat"); registerQuestItems(TOP_QUALITY_MEAT); @@ -114,7 +112,7 @@ public class Q631_DeliciousTopChoiceMeat extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -161,7 +159,7 @@ public class Q631_DeliciousTopChoiceMeat extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -206,7 +204,7 @@ public class Q631_DeliciousTopChoiceMeat extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q632_NecromancersRequest/Q632_NecromancersRequest.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q632_NecromancersRequest/Q632_NecromancersRequest.java index e2825ccddf..37334b6f08 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q632_NecromancersRequest/Q632_NecromancersRequest.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q632_NecromancersRequest/Q632_NecromancersRequest.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q632_NecromancersRequest extends Quest { - private static final String qn = "Q632_NecromancersRequest"; - // Monsters private static final int[] VAMPIRES = { @@ -67,7 +65,7 @@ public class Q632_NecromancersRequest extends Quest public Q632_NecromancersRequest() { - super(632, qn, "Necromancer's Request"); + super(632, "Necromancer's Request"); registerQuestItems(VAMPIRE_HEART, ZOMBIE_BRAIN); @@ -82,7 +80,7 @@ public class Q632_NecromancersRequest extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -121,7 +119,7 @@ public class Q632_NecromancersRequest extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -150,7 +148,7 @@ public class Q632_NecromancersRequest extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q633_InTheForgottenVillage/Q633_InTheForgottenVillage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q633_InTheForgottenVillage/Q633_InTheForgottenVillage.java index 5e23a53eff..4b42cea826 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q633_InTheForgottenVillage/Q633_InTheForgottenVillage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q633_InTheForgottenVillage/Q633_InTheForgottenVillage.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q633_InTheForgottenVillage extends Quest { - private static final String qn = "Q633_InTheForgottenVillage"; - // NPCS private static final int MINA = 31388; @@ -37,7 +35,7 @@ public class Q633_InTheForgottenVillage extends Quest private static final int ZOMBIE_LIVER = 7545; // MOBS / DROP chances - private static final Map MOBS = new HashMap<>(); + private static final Map MOBS = new HashMap<>(); static { MOBS.put(21557, 328000); // Bone Snatcher @@ -58,7 +56,7 @@ public class Q633_InTheForgottenVillage extends Quest MOBS.put(21584, 401000); // Bone Scavenger } - private static final Map UNDEADS = new HashMap<>(); + private static final Map UNDEADS = new HashMap<>(); static { UNDEADS.put(21553, 347000); // Trampled Man @@ -75,7 +73,7 @@ public class Q633_InTheForgottenVillage extends Quest public Q633_InTheForgottenVillage() { - super(633, qn, "In the Forgotten Village"); + super(633, "In the Forgotten Village"); registerQuestItems(RIB_BONE, ZOMBIE_LIVER); @@ -97,7 +95,7 @@ public class Q633_InTheForgottenVillage extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -134,7 +132,7 @@ public class Q633_InTheForgottenVillage extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -176,7 +174,7 @@ public class Q633_InTheForgottenVillage extends Quest return null; } - partyMember.getQuestState(qn).dropItems(ZOMBIE_LIVER, 1, 0, UNDEADS.get(npcId)); + partyMember.getQuestState(getName()).dropItems(ZOMBIE_LIVER, 1, 0, UNDEADS.get(npcId)); } else if (MOBS.containsKey(npcId)) { @@ -186,12 +184,12 @@ public class Q633_InTheForgottenVillage extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; } - + if (st.dropItems(RIB_BONE, 1, 200, MOBS.get(npcId))) { st.set("cond", "2"); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q634_InSearchOfFragmentsOfDimension/Q634_InSearchOfFragmentsOfDimension.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q634_InSearchOfFragmentsOfDimension/Q634_InSearchOfFragmentsOfDimension.java index e0990db1a4..2362dd68a0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q634_InSearchOfFragmentsOfDimension/Q634_InSearchOfFragmentsOfDimension.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q634_InSearchOfFragmentsOfDimension/Q634_InSearchOfFragmentsOfDimension.java @@ -24,14 +24,12 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q634_InSearchOfFragmentsOfDimension extends Quest { - private static final String qn = "Q634_InSearchOfFragmentsOfDimension"; - // Items private static final int DIMENSION_FRAGMENT = 7079; public Q634_InSearchOfFragmentsOfDimension() { - super(634, qn, "In Search of Fragments of Dimension"); + super(634, "In Search of Fragments of Dimension"); // Dimensional Gate Keepers. for (int i = 31494; i < 31508; i++) @@ -51,7 +49,7 @@ public class Q634_InSearchOfFragmentsOfDimension extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q634_InSearchOfFragmentsOfDimension extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -105,7 +103,7 @@ public class Q634_InSearchOfFragmentsOfDimension extends Quest return null; } - partyMember.getQuestState(qn).dropItems(DIMENSION_FRAGMENT, (int) ((npc.getLevel() * 0.15) + 2.6), -1, 80000); + partyMember.getQuestState(getName()).dropItems(DIMENSION_FRAGMENT, (int) ((npc.getLevel() * 0.15) + 2.6), -1, 80000); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q635_InTheDimensionalRift/Q635_InTheDimensionalRift.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q635_InTheDimensionalRift/Q635_InTheDimensionalRift.java index 152ff6bf05..65911f09d0 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q635_InTheDimensionalRift/Q635_InTheDimensionalRift.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q635_InTheDimensionalRift/Q635_InTheDimensionalRift.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q635_InTheDimensionalRift extends Quest { - private static final String qn = "Q635_InTheDimensionalRift"; - // Item private static final int DIMENSION_FRAGMENT = 7079; // Locations @@ -56,7 +54,7 @@ public class Q635_InTheDimensionalRift extends Quest public Q635_InTheDimensionalRift() { - super(635, qn, "In the Dimensional Rift"); + super(635, "In the Dimensional Rift"); for (int i = 31494; i <= 31508; i++) { @@ -73,7 +71,7 @@ public class Q635_InTheDimensionalRift extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -112,7 +110,7 @@ public class Q635_InTheDimensionalRift extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q636_TheTruthBeyondTheGate/Q636_TheTruthBeyondTheGate.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q636_TheTruthBeyondTheGate/Q636_TheTruthBeyondTheGate.java index 2f0cd1f195..5ba10df04c 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q636_TheTruthBeyondTheGate/Q636_TheTruthBeyondTheGate.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q636_TheTruthBeyondTheGate/Q636_TheTruthBeyondTheGate.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q636_TheTruthBeyondTheGate extends Quest { - private static final String qn = "Q636_TheTruthBeyondTheGate"; - // NPCs private static final int ELIYAH = 31329; private static final int FLAURON = 32010; @@ -38,7 +36,7 @@ public class Q636_TheTruthBeyondTheGate extends Quest public Q636_TheTruthBeyondTheGate() { - super(636, qn, "Truth Beyond the Gate"); + super(636, "Truth Beyond the Gate"); addStartNpc(ELIYAH); addTalkId(ELIYAH, FLAURON); @@ -48,7 +46,7 @@ public class Q636_TheTruthBeyondTheGate extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q636_TheTruthBeyondTheGate extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q637_ThroughTheGateOnceMore/Q637_ThroughTheGateOnceMore.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q637_ThroughTheGateOnceMore/Q637_ThroughTheGateOnceMore.java index 2e336766a7..48c77ca577 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q637_ThroughTheGateOnceMore/Q637_ThroughTheGateOnceMore.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q637_ThroughTheGateOnceMore/Q637_ThroughTheGateOnceMore.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q637_ThroughTheGateOnceMore extends Quest { - private static final String qn = "Q637_ThroughTheGateOnceMore"; - // NPC private static final int FLAURON = 32010; @@ -38,7 +36,7 @@ public class Q637_ThroughTheGateOnceMore extends Quest public Q637_ThroughTheGateOnceMore() { - super(637, qn, "Through the Gate Once More"); + super(637, "Through the Gate Once More"); registerQuestItems(NECROMANCER_HEART); @@ -52,7 +50,7 @@ public class Q637_ThroughTheGateOnceMore extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -75,7 +73,7 @@ public class Q637_ThroughTheGateOnceMore extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -136,7 +134,7 @@ public class Q637_ThroughTheGateOnceMore extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java index 70cc7a6e8b..1df18f0b40 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q638_SeekersOfTheHolyGrail/Q638_SeekersOfTheHolyGrail.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q638_SeekersOfTheHolyGrail extends Quest { - private static final String qn = "Q638_SeekersOfTheHolyGrail"; - // NPC private static final int INNOCENTIN = 31328; @@ -35,7 +33,7 @@ public class Q638_SeekersOfTheHolyGrail extends Quest public Q638_SeekersOfTheHolyGrail() { - super(638, qn, "Seekers of the Holy Grail"); + super(638, "Seekers of the Holy Grail"); registerQuestItems(PAGAN_TOTEM); @@ -52,7 +50,7 @@ public class Q638_SeekersOfTheHolyGrail extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -76,7 +74,7 @@ public class Q638_SeekersOfTheHolyGrail extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -129,7 +127,7 @@ public class Q638_SeekersOfTheHolyGrail extends Quest return null; } - partyMember.getQuestState(qn).dropItemsAlways(PAGAN_TOTEM, 1, 0); + partyMember.getQuestState(getName()).dropItemsAlways(PAGAN_TOTEM, 1, 0); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q639_GuardiansOfTheHolyGrail/Q639_GuardiansOfTheHolyGrail.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q639_GuardiansOfTheHolyGrail/Q639_GuardiansOfTheHolyGrail.java index f52ce16770..a023b426b3 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q639_GuardiansOfTheHolyGrail/Q639_GuardiansOfTheHolyGrail.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q639_GuardiansOfTheHolyGrail/Q639_GuardiansOfTheHolyGrail.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q639_GuardiansOfTheHolyGrail extends Quest { - private static final String qn = "Q639_GuardiansOfTheHolyGrail"; - // NPCs private static final int DOMINIC = 31350; private static final int GREMORY = 32008; @@ -39,7 +37,7 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest private static final int WATER_BOTTLE = 8070; private static final int HOLY_WATER_BOTTLE = 8071; - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(22122, 760000); @@ -60,7 +58,7 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest public Q639_GuardiansOfTheHolyGrail() { - super(639, qn, "Guardians of the Holy Grail"); + super(639, "Guardians of the Holy Grail"); registerQuestItems(SCRIPTURE, WATER_BOTTLE, HOLY_WATER_BOTTLE); @@ -77,7 +75,7 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -148,7 +146,7 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -214,7 +212,7 @@ public class Q639_GuardiansOfTheHolyGrail extends Quest return null; } - partyMember.getQuestState(qn).dropItems(SCRIPTURE, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(SCRIPTURE, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q640_TheZeroHour/Q640_TheZeroHour.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q640_TheZeroHour/Q640_TheZeroHour.java index ff46e9127e..334bdaa121 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q640_TheZeroHour/Q640_TheZeroHour.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q640_TheZeroHour/Q640_TheZeroHour.java @@ -23,10 +23,10 @@ import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; import org.l2jmobius.gameserver.util.Util; +import quests.Q109_InSearchOfTheNest.Q109_InSearchOfTheNest; + public class Q640_TheZeroHour extends Quest { - private static final String qn = "Q640_TheZeroHour"; - // NPC private static final int KAHMAN = 31554; @@ -84,7 +84,7 @@ public class Q640_TheZeroHour extends Quest public Q640_TheZeroHour() { - super(640, qn, "The Zero Hour"); + super(640, "The Zero Hour"); registerQuestItems(FANG_OF_STAKATO); @@ -99,7 +99,7 @@ public class Q640_TheZeroHour extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -145,7 +145,7 @@ public class Q640_TheZeroHour extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -161,7 +161,7 @@ public class Q640_TheZeroHour extends Quest } else { - QuestState st2 = player.getQuestState("Q109_InSearchOfTheNest"); + QuestState st2 = player.getQuestState(Q109_InSearchOfTheNest.class.getSimpleName()); htmltext = ((st2 != null) && st2.isCompleted()) ? "31554-01.htm" : "31554-10.htm"; } break; @@ -183,7 +183,7 @@ public class Q640_TheZeroHour extends Quest return null; } - partyMember.getQuestState(qn).dropItemsAlways(FANG_OF_STAKATO, 1, 0); + partyMember.getQuestState(getName()).dropItemsAlways(FANG_OF_STAKATO, 1, 0); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q641_AttackSailren/Q641_AttackSailren.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q641_AttackSailren/Q641_AttackSailren.java index b12179339e..c00ca00092 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q641_AttackSailren/Q641_AttackSailren.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q641_AttackSailren/Q641_AttackSailren.java @@ -27,8 +27,6 @@ import quests.Q126_TheNameOfEvil_2.Q126_TheNameOfEvil_2; public class Q641_AttackSailren extends Quest { - private static final String qn = "Q641_AttackSailren"; - // NPCs private static final int STATUE = 32109; @@ -38,7 +36,7 @@ public class Q641_AttackSailren extends Quest public Q641_AttackSailren() { - super(641, qn, "Attack Sailren!"); + super(641, "Attack Sailren!"); registerQuestItems(GAZKH_FRAGMENT); @@ -52,7 +50,7 @@ public class Q641_AttackSailren extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return null; @@ -88,7 +86,7 @@ public class Q641_AttackSailren extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -103,7 +101,7 @@ public class Q641_AttackSailren extends Quest } else { - QuestState st2 = player.getQuestState(Q126_TheNameOfEvil_2.qn); + QuestState st2 = player.getQuestState(Q126_TheNameOfEvil_2.class.getSimpleName()); htmltext = ((st2 != null) && st2.isCompleted()) ? "32109-1.htm" : "32109-2.htm"; } break; @@ -133,7 +131,7 @@ public class Q641_AttackSailren extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java index 111816e273..a31f525891 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q642_APowerfulPrimevalCreature/Q642_APowerfulPrimevalCreature.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q642_APowerfulPrimevalCreature extends Quest { - private static final String qn = "Q642_APowerfulPrimevalCreature"; - // Items private static final int DINOSAUR_TISSUE = 8774; private static final int DINOSAUR_EGG = 8775; @@ -51,7 +49,7 @@ public class Q642_APowerfulPrimevalCreature extends Quest public Q642_APowerfulPrimevalCreature() { - super(642, qn, "A Powerful Primeval Creature"); + super(642, "A Powerful Primeval Creature"); registerQuestItems(DINOSAUR_TISSUE, DINOSAUR_EGG); @@ -66,7 +64,7 @@ public class Q642_APowerfulPrimevalCreature extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -122,7 +120,7 @@ public class Q642_APowerfulPrimevalCreature extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java index e7a51391cb..2cd23567c6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q643_RiseAndFallOfTheElrokiTribe/Q643_RiseAndFallOfTheElrokiTribe.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q643_RiseAndFallOfTheElrokiTribe extends Quest { - private static final String qn = "Q643_RiseAndFallOfTheElrokiTribe"; - // NPCs private static final int SINGSING = 32106; private static final int KARAKAWEI = 32117; @@ -36,7 +34,7 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest public Q643_RiseAndFallOfTheElrokiTribe() { - super(643, qn, "Rise and Fall of the Elroki Tribe"); + super(643, "Rise and Fall of the Elroki Tribe"); registerQuestItems(BONES); @@ -50,7 +48,7 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -94,7 +92,7 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -133,7 +131,7 @@ public class Q643_RiseAndFallOfTheElrokiTribe extends Quest return null; } - partyMember.getQuestState(qn).dropItems(BONES, 1, 0, 750000); + partyMember.getQuestState(getName()).dropItems(BONES, 1, 0, 750000); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q644_GraveRobberAnnihilation/Q644_GraveRobberAnnihilation.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q644_GraveRobberAnnihilation/Q644_GraveRobberAnnihilation.java index 69784b96f6..5147f6bb86 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q644_GraveRobberAnnihilation/Q644_GraveRobberAnnihilation.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q644_GraveRobberAnnihilation/Q644_GraveRobberAnnihilation.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q644_GraveRobberAnnihilation extends Quest { - private static final String qn = "Q644_GraveRobberAnnihilation"; - // Item private static final int ORC_GRAVE_GOODS = 8088; @@ -64,7 +62,7 @@ public class Q644_GraveRobberAnnihilation extends Quest public Q644_GraveRobberAnnihilation() { - super(644, qn, "Grave Robber Annihilation"); + super(644, "Grave Robber Annihilation"); registerQuestItems(ORC_GRAVE_GOODS); @@ -78,7 +76,7 @@ public class Q644_GraveRobberAnnihilation extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -109,7 +107,7 @@ public class Q644_GraveRobberAnnihilation extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -146,7 +144,7 @@ public class Q644_GraveRobberAnnihilation extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q645_GhostsOfBatur/Q645_GhostsOfBatur.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q645_GhostsOfBatur/Q645_GhostsOfBatur.java index 41c8a83cf4..fd606f9a85 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q645_GhostsOfBatur/Q645_GhostsOfBatur.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q645_GhostsOfBatur/Q645_GhostsOfBatur.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q645_GhostsOfBatur extends Quest { - private static final String qn = "Q645_GhostsOfBatur"; - // NPC private static final int KARUDA = 32017; @@ -64,7 +62,7 @@ public class Q645_GhostsOfBatur extends Quest public Q645_GhostsOfBatur() { - super(645, qn, "Ghosts of Batur"); + super(645, "Ghosts of Batur"); addStartNpc(KARUDA); addTalkId(KARUDA); @@ -76,7 +74,7 @@ public class Q645_GhostsOfBatur extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -107,7 +105,7 @@ public class Q645_GhostsOfBatur extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -144,7 +142,7 @@ public class Q645_GhostsOfBatur extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q646_SignsOfRevolt/Q646_SignsOfRevolt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q646_SignsOfRevolt/Q646_SignsOfRevolt.java index 625b922912..effb6ce217 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q646_SignsOfRevolt/Q646_SignsOfRevolt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q646_SignsOfRevolt/Q646_SignsOfRevolt.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.util.Util; public class Q646_SignsOfRevolt extends Quest { - private static final String qn = "Q646_SignsOfRevolt"; - // NPC private static final int TORRANT = 32016; @@ -56,7 +54,7 @@ public class Q646_SignsOfRevolt extends Quest public Q646_SignsOfRevolt() { - super(646, qn, "Signs of Revolt"); + super(646, "Signs of Revolt"); registerQuestItems(CURSED_DOLL); @@ -70,7 +68,7 @@ public class Q646_SignsOfRevolt extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -101,7 +99,7 @@ public class Q646_SignsOfRevolt extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -138,7 +136,7 @@ public class Q646_SignsOfRevolt extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java index 8ee10f43a9..e4c28ca859 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q647_InfluxOfMachines/Q647_InfluxOfMachines.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q647_InfluxOfMachines extends Quest { - private static final String qn = "Q647_InfluxOfMachines"; - // Item private static final int DESTROYED_GOLEM_SHARD = 8100; @@ -35,7 +33,7 @@ public class Q647_InfluxOfMachines extends Quest public Q647_InfluxOfMachines() { - super(647, qn, "Influx of Machines"); + super(647, "Influx of Machines"); registerQuestItems(DESTROYED_GOLEM_SHARD); @@ -52,7 +50,7 @@ public class Q647_InfluxOfMachines extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -79,7 +77,7 @@ public class Q647_InfluxOfMachines extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -116,7 +114,7 @@ public class Q647_InfluxOfMachines extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java index c410527c40..578fb0a046 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q648_AnIceMerchantsDream/Q648_AnIceMerchantsDream.java @@ -23,14 +23,14 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q115_TheOtherSideOfTruth.Q115_TheOtherSideOfTruth; + /** * @author Mobius * @note Based on python script */ public class Q648_AnIceMerchantsDream extends Quest { - private static final String qn = "Q648_AnIceMerchantsDream"; - // NPCs private static final int RAFFORTY = 32020; private static final int ICE_SHELF = 32023; @@ -64,7 +64,7 @@ public class Q648_AnIceMerchantsDream extends Quest public Q648_AnIceMerchantsDream() { - super(648, qn, "An Ice Merchant's Dream"); + super(648, "An Ice Merchant's Dream"); addStartNpc(RAFFORTY); addStartNpc(ICE_SHELF); @@ -76,7 +76,7 @@ public class Q648_AnIceMerchantsDream extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -137,7 +137,7 @@ public class Q648_AnIceMerchantsDream extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -166,7 +166,7 @@ public class Q648_AnIceMerchantsDream extends Quest { if ((silver > 0) || (black > 0)) { - final QuestState st2 = player.getQuestState("Q115_TheOtherSideOfTruth"); + final QuestState st2 = player.getQuestState(Q115_TheOtherSideOfTruth.class.getSimpleName()); htmltext = "32020-05.htm"; if (st2 != null) { @@ -226,7 +226,7 @@ public class Q648_AnIceMerchantsDream extends Quest return null; } - final QuestState qs = partyMember.getQuestState(qn); + final QuestState qs = partyMember.getQuestState(getName()); if (qs != null) { int chance = (int) ((npc.getNpcId() - 22050) * Config.RATE_DROP_QUEST); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q649_ALooterAndARailroadMan/Q649_ALooterAndARailroadMan.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q649_ALooterAndARailroadMan/Q649_ALooterAndARailroadMan.java index 2682ec0279..624f295a11 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q649_ALooterAndARailroadMan/Q649_ALooterAndARailroadMan.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q649_ALooterAndARailroadMan/Q649_ALooterAndARailroadMan.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q649_ALooterAndARailroadMan extends Quest { - private static final String qn = "Q649_ALooterAndARailroadMan"; - // Item private static final int THIEF_GUILD_MARK = 8099; @@ -34,7 +32,7 @@ public class Q649_ALooterAndARailroadMan extends Quest public Q649_ALooterAndARailroadMan() { - super(649, qn, "A Looter and a Railroad Man"); + super(649, "A Looter and a Railroad Man"); registerQuestItems(THIEF_GUILD_MARK); @@ -48,7 +46,7 @@ public class Q649_ALooterAndARailroadMan extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +80,7 @@ public class Q649_ALooterAndARailroadMan extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q650_ABrokenDream/Q650_ABrokenDream.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q650_ABrokenDream/Q650_ABrokenDream.java index 43f9e9f175..ef9aeed251 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q650_ABrokenDream/Q650_ABrokenDream.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q650_ABrokenDream/Q650_ABrokenDream.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q117_TheOceanOfDistantStars.Q117_TheOceanOfDistantStars; + public class Q650_ABrokenDream extends Quest { - private static final String qn = "Q650_ABrokenDream"; - // NPC private static final int GHOST = 32054; @@ -38,7 +38,7 @@ public class Q650_ABrokenDream extends Quest public Q650_ABrokenDream() { - super(650, qn, "A Broken Dream"); + super(650, "A Broken Dream"); registerQuestItems(DREAM_FRAGMENT); @@ -51,7 +51,7 @@ public class Q650_ABrokenDream extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -82,7 +82,7 @@ public class Q650_ABrokenDream extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -92,7 +92,7 @@ public class Q650_ABrokenDream extends Quest switch (st.getState()) { case State.CREATED: - QuestState st2 = player.getQuestState("Q117_TheOceanOfDistantStars"); + QuestState st2 = player.getQuestState(Q117_TheOceanOfDistantStars.class.getSimpleName()); if ((st2 != null) && st2.isCompleted() && (player.getLevel() >= 39)) { htmltext = "32054-01.htm"; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java index 2f6145ea5c..9ee587f1b8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q651_RunawayYouth/Q651_RunawayYouth.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; public class Q651_RunawayYouth extends Quest { - private static final String qn = "Q651_RunawayYouth"; - // NPCs private static final int IVAN = 32014; private static final int BATIDAE = 31989; @@ -49,7 +47,7 @@ public class Q651_RunawayYouth extends Quest public Q651_RunawayYouth() { - super(651, qn, "Runaway Youth"); + super(651, "Runaway Youth"); addStartNpc(IVAN); addTalkId(IVAN, BATIDAE); @@ -61,7 +59,7 @@ public class Q651_RunawayYouth extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -109,7 +107,7 @@ public class Q651_RunawayYouth extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java index 451c569e0f..5ee71a3961 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q652_AnAgedExAdventurer/Q652_AnAgedExAdventurer.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q652_AnAgedExAdventurer extends Quest { - private static final String qn = "Q652_AnAgedExAdventurer"; - // NPCs private static final int TANTAN = 32012; private static final int SARA = 30180; @@ -54,7 +52,7 @@ public class Q652_AnAgedExAdventurer extends Quest public Q652_AnAgedExAdventurer() { - super(652, qn, "An Aged Ex-Adventurer"); + super(652, "An Aged Ex-Adventurer"); addStartNpc(TANTAN); addTalkId(TANTAN, SARA); @@ -66,7 +64,7 @@ public class Q652_AnAgedExAdventurer extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -114,7 +112,7 @@ public class Q652_AnAgedExAdventurer extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java index 30cbdfa889..e276673b0b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q653_WildMaiden/Q653_WildMaiden.java @@ -27,8 +27,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; public class Q653_WildMaiden extends Quest { - private static final String qn = "Q653_WildMaiden"; - // NPCs private static final int SUKI = 32013; private static final int GALIBREDO = 30181; @@ -50,7 +48,7 @@ public class Q653_WildMaiden extends Quest public Q653_WildMaiden() { - super(653, qn, "Wild Maiden"); + super(653, "Wild Maiden"); addStartNpc(SUKI); addTalkId(SUKI, GALIBREDO); @@ -62,7 +60,7 @@ public class Q653_WildMaiden extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -110,7 +108,7 @@ public class Q653_WildMaiden extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q654_JourneyToASettlement/Q654_JourneyToASettlement.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q654_JourneyToASettlement/Q654_JourneyToASettlement.java index 53e68e9276..7a07abc9df 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q654_JourneyToASettlement/Q654_JourneyToASettlement.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q654_JourneyToASettlement/Q654_JourneyToASettlement.java @@ -22,10 +22,10 @@ import org.l2jmobius.gameserver.model.quest.Quest; import org.l2jmobius.gameserver.model.quest.QuestState; import org.l2jmobius.gameserver.model.quest.State; +import quests.Q119_LastImperialPrince.Q119_LastImperialPrince; + public class Q654_JourneyToASettlement extends Quest { - private static final String qn = "Q654_JourneyToASettlement"; - // Item private static final int ANTELOPE_SKIN = 8072; @@ -34,7 +34,7 @@ public class Q654_JourneyToASettlement extends Quest public Q654_JourneyToASettlement() { - super(654, qn, "Journey to a Settlement"); + super(654, "Journey to a Settlement"); registerQuestItems(ANTELOPE_SKIN); @@ -48,7 +48,7 @@ public class Q654_JourneyToASettlement extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -80,7 +80,7 @@ public class Q654_JourneyToASettlement extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -89,7 +89,7 @@ public class Q654_JourneyToASettlement extends Quest switch (st.getState()) { case State.CREATED: - QuestState prevSt = player.getQuestState("Q119_LastImperialPrince"); + QuestState prevSt = player.getQuestState(Q119_LastImperialPrince.class.getSimpleName()); htmltext = ((prevSt == null) || !prevSt.isCompleted() || (player.getLevel() < 74)) ? "31453-00.htm" : "31453-01.htm"; break; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q655_AGrandPlanForTamingWildBeasts/Q655_AGrandPlanForTamingWildBeasts.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q655_AGrandPlanForTamingWildBeasts/Q655_AGrandPlanForTamingWildBeasts.java index e68fcb90cc..5dd3a40f14 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q655_AGrandPlanForTamingWildBeasts/Q655_AGrandPlanForTamingWildBeasts.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q655_AGrandPlanForTamingWildBeasts/Q655_AGrandPlanForTamingWildBeasts.java @@ -29,8 +29,6 @@ import org.l2jmobius.gameserver.model.quest.State; */ public class Q655_AGrandPlanForTamingWildBeasts extends Quest { - private static final String qn = "Q655_AGrandPlanForTamingWildBeasts"; - // NPCs private static final int MESSENGER = 35627; // Items @@ -39,7 +37,7 @@ public class Q655_AGrandPlanForTamingWildBeasts extends Quest public Q655_AGrandPlanForTamingWildBeasts() { - super(655, qn, "A Grand Plan for Taming Wild Beasts"); + super(655, "A Grand Plan for Taming Wild Beasts"); addStartNpc(MESSENGER); addTalkId(MESSENGER); @@ -49,7 +47,7 @@ public class Q655_AGrandPlanForTamingWildBeasts extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; @@ -81,7 +79,7 @@ public class Q655_AGrandPlanForTamingWildBeasts extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - final QuestState qs = player.getQuestState(qn); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q659_IdRatherBeCollectingFairyBreath/Q659_IdRatherBeCollectingFairyBreath.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q659_IdRatherBeCollectingFairyBreath/Q659_IdRatherBeCollectingFairyBreath.java index b51d038ad4..5f36044d1a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q659_IdRatherBeCollectingFairyBreath/Q659_IdRatherBeCollectingFairyBreath.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q659_IdRatherBeCollectingFairyBreath/Q659_IdRatherBeCollectingFairyBreath.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q659_IdRatherBeCollectingFairyBreath extends Quest { - private static final String qn = "Q659_IdRatherBeCollectingFairyBreath"; - // NPCs private static final int GALATEA = 30634; @@ -39,7 +37,7 @@ public class Q659_IdRatherBeCollectingFairyBreath extends Quest public Q659_IdRatherBeCollectingFairyBreath() { - super(659, qn, "I'd Rather Be Collecting Fairy Breath"); + super(659, "I'd Rather Be Collecting Fairy Breath"); registerQuestItems(FAIRY_BREATH); @@ -53,7 +51,7 @@ public class Q659_IdRatherBeCollectingFairyBreath extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -92,7 +90,7 @@ public class Q659_IdRatherBeCollectingFairyBreath extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java index a9f8af2bc1..575b66c179 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q660_AidingTheFloranVillage/Q660_AidingTheFloranVillage.java @@ -25,8 +25,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q660_AidingTheFloranVillage extends Quest { - private static final String qn = "Q660_AidingTheFloranVillage"; - // NPCs private static final int MARIA = 30608; private static final int ALEX = 30291; @@ -52,7 +50,7 @@ public class Q660_AidingTheFloranVillage extends Quest public Q660_AidingTheFloranVillage() { - super(660, qn, "Aiding the Floran Village"); + super(660, "Aiding the Floran Village"); registerQuestItems(WATCHING_EYES, LIZARDMEN_SCALE, GOLEM_SHARD); @@ -66,7 +64,7 @@ public class Q660_AidingTheFloranVillage extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -194,7 +192,7 @@ public class Q660_AidingTheFloranVillage extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -252,7 +250,7 @@ public class Q660_AidingTheFloranVillage extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q661_MakingTheHarvestGroundsSafe/Q661_MakingTheHarvestGroundsSafe.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q661_MakingTheHarvestGroundsSafe/Q661_MakingTheHarvestGroundsSafe.java index 204121e033..bc8d5c5aa7 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q661_MakingTheHarvestGroundsSafe/Q661_MakingTheHarvestGroundsSafe.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q661_MakingTheHarvestGroundsSafe/Q661_MakingTheHarvestGroundsSafe.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q661_MakingTheHarvestGroundsSafe extends Quest { - private static final String qn = "Q661_MakingTheHarvestGroundsSafe"; - // NPC private static final int NORMAN = 30210; @@ -44,7 +42,7 @@ public class Q661_MakingTheHarvestGroundsSafe extends Quest public Q661_MakingTheHarvestGroundsSafe() { - super(661, qn, "Making the Harvest Grounds Safe"); + super(661, "Making the Harvest Grounds Safe"); registerQuestItems(STING_OF_GIANT_POISON_BEE, CLOUDY_GEM, TALON_OF_YOUNG_ARANEID); @@ -58,7 +56,7 @@ public class Q661_MakingTheHarvestGroundsSafe extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -100,7 +98,7 @@ public class Q661_MakingTheHarvestGroundsSafe extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java index 40eb4a896b..3dff851500 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q662_AGameOfCards/Q662_AGameOfCards.java @@ -30,8 +30,6 @@ import org.l2jmobius.gameserver.templates.item.Item; public class Q662_AGameOfCards extends Quest { - private static final String qn = "Q662_AGameOfCards"; - // NPC private static final int KLUMP = 30845; @@ -48,7 +46,7 @@ public class Q662_AGameOfCards extends Quest private static final int ZIGGO_GEMSTONE = 8868; // All cards - private static final Map CARDS = new HashMap<>(); + private static final Map CARDS = new HashMap<>(); static { CARDS.put(0, "?"); @@ -69,7 +67,7 @@ public class Q662_AGameOfCards extends Quest } // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(18001, 232000); // Blood Queen @@ -116,7 +114,7 @@ public class Q662_AGameOfCards extends Quest public Q662_AGameOfCards() { - super(662, qn, "A Game of Cards"); + super(662, "A Game of Cards"); registerQuestItems(RED_GEM); @@ -133,7 +131,7 @@ public class Q662_AGameOfCards extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -569,7 +567,7 @@ public class Q662_AGameOfCards extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -630,7 +628,7 @@ public class Q662_AGameOfCards extends Quest return null; } - partyMember.getQuestState(qn).dropItems(RED_GEM, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(RED_GEM, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java index a62c795859..6932b5fcf6 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q663_SeductiveWhispers/Q663_SeductiveWhispers.java @@ -28,8 +28,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q663_SeductiveWhispers extends Quest { - private static final String qn = "Q663_SeductiveWhispers"; - // NPC private static final int WILBERT = 30846; @@ -74,7 +72,7 @@ public class Q663_SeductiveWhispers extends Quest }; // Text of cards - private static final Map CARDS = new HashMap<>(); + private static final Map CARDS = new HashMap<>(); static { CARDS.put(0, "No such card"); @@ -91,7 +89,7 @@ public class Q663_SeductiveWhispers extends Quest } // Drop chances - private static final Map CHANCES = new HashMap<>(); + private static final Map CHANCES = new HashMap<>(); static { CHANCES.put(20674, 807000); // Doom Knight @@ -125,7 +123,7 @@ public class Q663_SeductiveWhispers extends Quest public Q663_SeductiveWhispers() { - super(663, qn, "Seductive Whispers"); + super(663, "Seductive Whispers"); registerQuestItems(SPIRIT_BEAD); @@ -142,7 +140,7 @@ public class Q663_SeductiveWhispers extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -454,7 +452,7 @@ public class Q663_SeductiveWhispers extends Quest @Override public String onTalk(NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = getNoQuestMsg(); if (st == null) { @@ -534,7 +532,7 @@ public class Q663_SeductiveWhispers extends Quest return null; } - partyMember.getQuestState(qn).dropItems(SPIRIT_BEAD, 1, 0, CHANCES.get(npc.getNpcId())); + partyMember.getQuestState(getName()).dropItems(SPIRIT_BEAD, 1, 0, CHANCES.get(npc.getNpcId())); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q688_DefeatTheElrokianRaiders/Q688_DefeatTheElrokianRaiders.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q688_DefeatTheElrokianRaiders/Q688_DefeatTheElrokianRaiders.java index 9dd13b1b30..5b71740336 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q688_DefeatTheElrokianRaiders/Q688_DefeatTheElrokianRaiders.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q688_DefeatTheElrokianRaiders/Q688_DefeatTheElrokianRaiders.java @@ -24,8 +24,6 @@ import org.l2jmobius.gameserver.model.quest.State; public class Q688_DefeatTheElrokianRaiders extends Quest { - private static final String qn = "Q688_DefeatTheElrokianRaiders"; - // Item private static final int DINOSAUR_FANG_NECKLACE = 8785; @@ -37,7 +35,7 @@ public class Q688_DefeatTheElrokianRaiders extends Quest public Q688_DefeatTheElrokianRaiders() { - super(688, qn, "Defeat the Elrokian Raiders!"); + super(688, "Defeat the Elrokian Raiders!"); registerQuestItems(DINOSAUR_FANG_NECKLACE); @@ -51,7 +49,7 @@ public class Q688_DefeatTheElrokianRaiders extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -102,7 +100,7 @@ public class Q688_DefeatTheElrokianRaiders extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -131,7 +129,7 @@ public class Q688_DefeatTheElrokianRaiders extends Quest return null; } - QuestState st = partyMember.getQuestState(qn); + QuestState st = partyMember.getQuestState(getName()); if (st == null) { return null; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java index acaa5f74a2..b0b40fbf99 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/SagasSuperClass.java @@ -39,7 +39,6 @@ import org.l2jmobius.gameserver.network.serverpackets.MagicSkillUse; public class SagasSuperClass extends Quest { - public String qn = "SagasSuperClass"; public int qnu; public int[] NPC = {}; public int[] Items = {}; @@ -62,9 +61,9 @@ public class SagasSuperClass extends Quest }; // @formatter:on - public SagasSuperClass(int id, String name, String descr) + public SagasSuperClass(int id, String descr) { - super(id, name, descr); + super(id, descr); qnu = id; } @@ -147,7 +146,7 @@ public class SagasSuperClass extends Quest player = (PlayerInstance) World.getInstance().findObject(_SpawnList.get(npc)); if (player != null) { - st = player.getQuestState(qn); + st = player.getQuestState(getName()); } } return st; @@ -180,7 +179,7 @@ public class SagasSuperClass extends Quest public QuestState findQuest(PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st != null) { if (qnu != 68) @@ -229,7 +228,7 @@ public class SagasSuperClass extends Quest @Override public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); String htmltext = ""; if (st != null) { @@ -570,7 +569,7 @@ public class SagasSuperClass extends Quest public String onTalk(NpcInstance npc, PlayerInstance talker) { String htmltext = "You are either not on a quest that involves this NPC, or you don't meet this NPCs minimum quest requirements."; - QuestState st = talker.getQuestState(qn); + QuestState st = talker.getQuestState(getName()); if (st != null) { int npcId = npc.getNpcId(); @@ -819,7 +818,7 @@ public class SagasSuperClass extends Quest public String onFirstTalk(NpcInstance npc, PlayerInstance player) { String htmltext = ""; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); int npcId = npc.getNpcId(); if (st != null) { @@ -902,7 +901,7 @@ public class SagasSuperClass extends Quest return super.onAttack(npc, player, damage, isPet); } int cond = st2.getInt("cond"); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); int npcId = npc.getNpcId(); if ((npcId == Mob[2]) && (st == st2) && (cond == 17)) { @@ -966,7 +965,7 @@ public class SagasSuperClass extends Quest public String onKill(NpcInstance npc, PlayerInstance player, boolean isPet) { int npcId = npc.getNpcId(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); for (int Archon_Minion = 21646; Archon_Minion < 21652; Archon_Minion++) { if (npcId == Archon_Minion) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java index db6adb906d..0e29e1e002 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ElrokiTeleporters/ElrokiTeleporters.java @@ -24,7 +24,7 @@ public class ElrokiTeleporters extends Quest { public ElrokiTeleporters() { - super(-1, "ElrokiTeleporters", "teleports"); + super(-1, "teleports"); addStartNpc(32111, 32112); addTalkId(32111, 32112); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java index 991915ba90..1ff49727af 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/GrandBossTeleporters/GrandBossTeleporters.java @@ -34,8 +34,6 @@ import org.l2jmobius.gameserver.model.zone.type.BossZone; */ public class GrandBossTeleporters extends Quest { - private static final String qn = "GrandBossTeleporters"; - // NPCs private static final int[] NPCs = { @@ -53,7 +51,7 @@ public class GrandBossTeleporters extends Quest private GrandBossTeleporters() { - super(-1, qn, "teleports"); + super(-1, "teleports"); addStartNpc(NPCs); addTalkId(NPCs); @@ -63,7 +61,7 @@ public class GrandBossTeleporters extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { st = newQuestState(player); @@ -111,7 +109,7 @@ public class GrandBossTeleporters extends Quest } else if ((status == 0) || (status == 1)) // If entrance to see Antharas is unlocked (he is Dormant or Waiting) { - final QuestState st = player.getQuestState(qn); + final QuestState st = player.getQuestState(getName()); if (st.getQuestItemsCount(3865) > 0) { st.takeItems(3865, 1); @@ -149,7 +147,7 @@ public class GrandBossTeleporters extends Quest final int status = GrandBossManager.getInstance().getBossStatus(29028); if ((status == 0) || (status == 1)) // If entrance to see Valakas is unlocked (he is Dormant or Waiting) { - final QuestState st = player.getQuestState(qn); + final QuestState st = player.getQuestState(getName()); if (playerCount >= 200) { htmltext = "31385-03.htm"; @@ -239,12 +237,12 @@ public class GrandBossTeleporters extends Quest private Quest antharasAI() { - return QuestManager.getInstance().getQuest("antharas"); + return QuestManager.getInstance().getQuest("Antharas"); } private Quest valakasAI() { - return QuestManager.getInstance().getQuest("valakas"); + return QuestManager.getInstance().getQuest("Valakas"); } public static void main(String[] args) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java index c95e2f4170..fcb187c1a2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/HuntingGroundsTeleport/HuntingGroundsTeleport.java @@ -67,7 +67,7 @@ public class HuntingGroundsTeleport extends Quest public HuntingGroundsTeleport() { - super(-1, "HuntingGroundsTeleport", "teleports"); + super(-1, "teleports"); addStartNpc(PRIESTS); addTalkId(PRIESTS); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java index ec92e6c451..3a03dd7766 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NewbieTravelToken/NewbieTravelToken.java @@ -26,7 +26,7 @@ import org.l2jmobius.gameserver.model.quest.QuestState; public class NewbieTravelToken extends Quest { - private static final Map data = new HashMap<>(); + private static final Map data = new HashMap<>(); static { data.put("30600", new int[] @@ -65,7 +65,7 @@ public class NewbieTravelToken extends Quest public NewbieTravelToken() { - super(-1, "NewbieTravelToken", "teleports"); + super(-1, "teleports"); addStartNpc(30598, 30599, 30600, 30601, 30602); addTalkId(30598, 30599, 30600, 30601, 30602); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java index ad2379bcb7..6ad35d2d0a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/NoblesseTeleport/NoblesseTeleport.java @@ -24,7 +24,7 @@ public class NoblesseTeleport extends Quest { public NoblesseTeleport() { - super(-1, "NoblesseTeleport", "teleports"); + super(-1, "teleports"); addStartNpc(30006, 30059, 30080, 30134, 30146, 30177, 30233, 30256, 30320, 30540, 30576, 30836, 30848, 30878, 30899, 31275, 31320, 31964); addTalkId(30006, 30059, 30080, 30134, 30146, 30177, 30233, 30256, 30320, 30540, 30576, 30836, 30848, 30878, 30899, 31275, 31320, 31964); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java index 9c0042a6aa..138d8c1d28 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/OracleTeleport/OracleTeleport.java @@ -220,7 +220,7 @@ public class OracleTeleport extends Quest public OracleTeleport() { - super(-1, "OracleTeleport", "teleports"); + super(-1, "teleports"); for (int posters : RIFT_POSTERS) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java index 6cc390dd3f..312d95cfe2 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/PaganTeleporters/PaganTeleporters.java @@ -30,7 +30,7 @@ public class PaganTeleporters extends Quest public PaganTeleporters() { - super(-1, "PaganTeleporters", "teleports"); + super(-1, "teleports"); addStartNpc(32034, 32035, 32036, 32037, 32039, 32040); addTalkId(32034, 32035, 32036, 32037, 32039, 32040); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/RaceTrack/RaceTrack.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/RaceTrack/RaceTrack.java index 00e4dc073b..089ce70896 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/RaceTrack/RaceTrack.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/RaceTrack/RaceTrack.java @@ -30,7 +30,7 @@ public class RaceTrack extends Quest { private static final int RACE_MANAGER = 30995; - private static final Map RETURN_LOCATIONS = new HashMap<>(); + private static final Map RETURN_LOCATIONS = new HashMap<>(); static { RETURN_LOCATIONS.put(30320, new Location(-80826, 149775, -3043)); // RICHLIN @@ -49,7 +49,7 @@ public class RaceTrack extends Quest public RaceTrack() { - super(-1, "RaceTrack", "teleports"); + super(-1, "teleports"); addStartNpc(30320, 30256, 30059, 30080, 30899, 30177, 30848, 30233, 31320, 31275, 31964, 31210); addTalkId(RACE_MANAGER, 30320, 30256, 30059, 30080, 30899, 30177, 30848, 30233, 31320, 31275, 31964, 31210); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/TeleportWithCharm/TeleportWithCharm.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/TeleportWithCharm/TeleportWithCharm.java index 73a5bcc3f5..c4ddbc1ceb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/TeleportWithCharm/TeleportWithCharm.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/TeleportWithCharm/TeleportWithCharm.java @@ -31,7 +31,7 @@ public class TeleportWithCharm extends Quest public TeleportWithCharm() { - super(-1, "TeleportWithCharm", "teleports"); + super(-1, "teleports"); addStartNpc(WHIRPY, TAMIL); addTalkId(WHIRPY, TAMIL); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortex/ToIVortex.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortex/ToIVortex.java index 2b14962693..dcd74b0bee 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortex/ToIVortex.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortex/ToIVortex.java @@ -29,7 +29,7 @@ public class ToIVortex extends Quest public ToIVortex() { - super(-1, "ToIVortex", "teleports"); + super(-1, "teleports"); addStartNpc(30952, 30953, 30954); addTalkId(30952, 30953, 30954); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java index 55e59dde31..489bda4423 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/teleports/ToIVortexExit/ToIVortexExit.java @@ -27,14 +27,12 @@ import org.l2jmobius.gameserver.model.quest.Quest; */ public class ToIVortexExit extends Quest { - private static final String qn = "ToIVortexExit"; - // NPC private static final int TELE_CUBE = 29055; private ToIVortexExit() { - super(-1, qn, "teleports"); + super(-1, "teleports"); addStartNpc(TELE_CUBE); addTalkId(TELE_CUBE); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java index 262dab0d1b..4b2dd7a690 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/AllianceMaster/AllianceMaster.java @@ -24,7 +24,7 @@ public class AllianceMaster extends Quest { public AllianceMaster() { - super(-1, "AllianceMaster", "village_master"); + super(-1, "village_master"); addStartNpc(30026, 30031, 30037, 30066, 30070, 30109, 30115, 30120, 30154, 30174, 30175, 30176, 30187, 30191, 30195, 30288, 30289, 30290, 30297, 30358, 30373, 30462, 30474, 30498, 30499, 30500, 30503, 30504, 30505, 30508, 30511, 30512, 30513, 30520, 30525, 30565, 30594, 30595, 30676, 30677, 30681, 30685, 30687, 30689, 30694, 30699, 30704, 30845, 30847, 30849, 30854, 30857, 30862, 30865, 30894, 30897, 30900, 30905, 30910, 30913, 31269, 31272, 31276, 31279, 31285, 31288, 31314, 31317, 31321, 31324, 31326, 31328, 31331, 31334, 31336, 31755, 31958, 31961, 31965, 31968, 31974, 31977, 31996, 32092, 32093, 32094, 32095, 32096, 32097, 32098); addTalkId(30026, 30031, 30037, 30066, 30070, 30109, 30115, 30120, 30154, 30174, 30175, 30176, 30187, 30191, 30195, 30288, 30289, 30290, 30297, 30358, 30373, 30462, 30474, 30498, 30499, 30500, 30503, 30504, 30505, 30508, 30511, 30512, 30513, 30520, 30525, 30565, 30594, 30595, 30676, 30677, 30681, 30685, 30687, 30689, 30694, 30699, 30704, 30845, 30847, 30849, 30854, 30857, 30862, 30865, 30894, 30897, 30900, 30905, 30910, 30913, 31269, 31272, 31276, 31279, 31285, 31288, 31314, 31317, 31321, 31324, 31326, 31328, 31331, 31334, 31336, 31755, 31958, 31961, 31965, 31968, 31974, 31977, 31996, 32092, 32093, 32094, 32095, 32096, 32097, 32098); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java index 11d903b4b3..2d0c304d4b 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/ClanMaster/ClanMaster.java @@ -24,7 +24,7 @@ public class ClanMaster extends Quest { public ClanMaster() { - super(-1, "ClanMaster", "village_master"); + super(-1, "village_master"); addStartNpc(30026, 30031, 30037, 30066, 30070, 30109, 30115, 30120, 30154, 30174, 30175, 30176, 30187, 30191, 30195, 30288, 30289, 30290, 30297, 30358, 30373, 30462, 30474, 30498, 30499, 30500, 30503, 30504, 30505, 30508, 30511, 30512, 30513, 30520, 30525, 30565, 30594, 30595, 30676, 30677, 30681, 30685, 30687, 30689, 30694, 30699, 30704, 30845, 30847, 30849, 30854, 30857, 30862, 30865, 30894, 30897, 30900, 30905, 30910, 30913, 31269, 31272, 31276, 31279, 31285, 31288, 31314, 31317, 31321, 31324, 31326, 31328, 31331, 31334, 31336, 31755, 31958, 31961, 31965, 31968, 31974, 31977, 31996, 32092, 32093, 32094, 32095, 32096, 32097, 32098); addTalkId(30026, 30031, 30037, 30066, 30070, 30109, 30115, 30120, 30154, 30174, 30175, 30176, 30187, 30191, 30195, 30288, 30289, 30290, 30297, 30358, 30373, 30462, 30474, 30498, 30499, 30500, 30503, 30504, 30505, 30508, 30511, 30512, 30513, 30520, 30525, 30565, 30594, 30595, 30676, 30677, 30681, 30685, 30687, 30689, 30694, 30699, 30704, 30845, 30847, 30849, 30854, 30857, 30862, 30865, 30894, 30897, 30900, 30905, 30910, 30913, 31269, 31272, 31276, 31279, 31285, 31288, 31314, 31317, 31321, 31324, 31326, 31328, 31331, 31334, 31336, 31755, 31958, 31961, 31965, 31968, 31974, 31977, 31996, 32092, 32093, 32094, 32095, 32096, 32097, 32098); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java index 8cb7c4dbbe..f843dea4fd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/FirstClassChange/FirstClassChange.java @@ -107,7 +107,7 @@ public class FirstClassChange extends Quest public FirstClassChange() { - super(-1, "FirstClassChange", "village_master"); + super(-1, "village_master"); addStartNpc(FIRSTCLASSNPCS); addTalkId(FIRSTCLASSNPCS); @@ -117,7 +117,7 @@ public class FirstClassChange extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState("FirstClassChange"); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -175,7 +175,7 @@ public class FirstClassChange extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = Quest.getNoQuestMsg(); - QuestState st = player.getQuestState("FirstClassChange"); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java index 6fb468f608..e02a6d9824 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/village_master/SecondClassChange/SecondClassChange.java @@ -32,8 +32,6 @@ import org.l2jmobius.gameserver.network.serverpackets.HennaInfo; */ public class SecondClassChange extends Quest { - private static final String qn = "SecondClassChange"; - // 2nd class change items private static final int MARK_OF_CHALLENGER = 2627; private static final int MARK_OF_DUTY = 2633; @@ -121,7 +119,7 @@ public class SecondClassChange extends Quest public SecondClassChange() { - super(-1, qn, "village_master"); + super(-1, "village_master"); addStartNpc(SECONDCLASSNPCS); addTalkId(SECONDCLASSNPCS); @@ -131,7 +129,7 @@ public class SecondClassChange extends Quest public String onAdvEvent(String event, NpcInstance npc, PlayerInstance player) { String htmltext = event; - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; @@ -184,7 +182,7 @@ public class SecondClassChange extends Quest public String onTalk(NpcInstance npc, PlayerInstance player) { String htmltext = Quest.getNoQuestMsg(); - QuestState st = player.getQuestState(qn); + QuestState st = player.getQuestState(getName()); if (st == null) { return htmltext; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index a7e36bfb3c..b17b8fe485 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -1810,7 +1810,7 @@ public class NpcInstance extends Creature sb.append("["); state = ""; - final QuestState qs = player.getQuestState(q.getScriptName()); + final QuestState qs = player.getQuestState(q.getName()); if (qs != null) { if (qs.isStarted() && (qs.getInt("cond") > 0)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java index af7ccd4878..0e99834847 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/quest/Quest.java @@ -70,7 +70,6 @@ public class Quest extends ManagedScript private final Map> _allEventTimers = new HashMap<>(); private final int _questId; - private final String _name; private final String _prefixPath; // used only for admin_quest_reload private final String _descr; private final byte _initialState = State.CREATED; @@ -150,13 +149,11 @@ public class Quest extends ManagedScript /** * (Constructor)Add values to class variables and put the quest in HashMaps. * @param questId : int pointing out the ID of the quest - * @param name : String corresponding to the name of the quest * @param descr : String for the description of the quest */ - public Quest(int questId, String name, String descr) + public Quest(int questId, String descr) { _questId = questId; - _name = name; _descr = descr; // Given the quest instance, create a string representing the path and questName like a simplified version of a canonical class name. @@ -174,7 +171,7 @@ public class Quest extends ManagedScript } else { - _allEventsS.put(name, this); + _allEventsS.put(getName(), this); } init_LoadGlobalData(); @@ -279,7 +276,7 @@ public class Quest extends ManagedScript */ public String getName() { - return _name; + return getClass().getSimpleName(); } /** @@ -742,7 +739,7 @@ public class Quest extends ManagedScript // if not overriden by a subclass, then default to the returned value of the simpler (and older) onEvent override // if the player has a state, use it as parameter in the next call, else return null - final QuestState qs = player.getQuestState(_name); + final QuestState qs = player.getQuestState(getName()); if (qs != null) { @@ -1194,7 +1191,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("REPLACE INTO quest_global_data (quest_name,var,value) VALUES (?,?,?)"); - statement.setString(1, _name); + statement.setString(1, getName()); statement.setString(2, var); statement.setString(3, value); statement.executeUpdate(); @@ -1219,7 +1216,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("SELECT value FROM quest_global_data WHERE quest_name = ? AND var = ?"); - statement.setString(1, _name); + statement.setString(1, getName()); statement.setString(2, var); ResultSet rs = statement.executeQuery(); @@ -1248,7 +1245,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ? AND var = ?"); - statement.setString(1, _name); + statement.setString(1, getName()); statement.setString(2, var); statement.executeUpdate(); statement.close(); @@ -1268,7 +1265,7 @@ public class Quest extends ManagedScript { PreparedStatement statement; statement = con.prepareStatement("DELETE FROM quest_global_data WHERE quest_name = ?"); - statement.setString(1, _name); + statement.setString(1, getName()); statement.executeUpdate(); statement.close(); } @@ -1432,7 +1429,7 @@ public class Quest extends ManagedScript } // Check player's quest conditions. - final QuestState qs = player.getQuestState(_name); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return null; @@ -1469,7 +1466,7 @@ public class Quest extends ManagedScript } // Check player's quest conditions. - final QuestState qs = player.getQuestState(_name); + final QuestState qs = player.getQuestState(getName()); if (qs == null) { return null; @@ -1612,7 +1609,7 @@ public class Quest extends ManagedScript // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getPartyMembers().size() == 0)) { - temp = player.getQuestState(_name); + temp = player.getQuestState(getName()); if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value)) { return player; // match @@ -1633,7 +1630,7 @@ public class Quest extends ManagedScript for (PlayerInstance partyMember : party.getPartyMembers()) { - temp = partyMember.getQuestState(_name); + temp = partyMember.getQuestState(getName()); if ((temp != null) && (temp.get(var) != null) && ((String) temp.get(var)).equalsIgnoreCase(value) && partyMember.isInsideRadius(target, Config.ALT_PARTY_RANGE, true, false)) { candidates.add(partyMember); @@ -1717,7 +1714,7 @@ public class Quest extends ManagedScript // if this player is not in a party, just check if this player instance matches the conditions itself if ((party == null) || (party.getPartyMembers().size() == 0)) { - temp = player.getQuestState(_name); + temp = player.getQuestState(getName()); if ((temp != null) && (temp.getState() == state)) { return player; // match @@ -1738,7 +1735,7 @@ public class Quest extends ManagedScript for (PlayerInstance partyMember : party.getPartyMembers()) { - temp = partyMember.getQuestState(_name); + temp = partyMember.getQuestState(getName()); if ((temp != null) && (temp.getState() == state) && partyMember.isInsideRadius(target, Config.ALT_PARTY_RANGE, true, false)) { @@ -1764,15 +1761,12 @@ public class Quest extends ManagedScript */ public String showHtmlFile(PlayerInstance player, String fileName) { - final String questId = _name; - // Create handler to file linked to the quest final String directory = _descr.toLowerCase(); - String content = HtmCache.getInstance().getHtm("data/scripts/" + directory + "/" + questId + "/" + fileName); - + String content = HtmCache.getInstance().getHtm("data/scripts/" + directory + "/" + getName() + "/" + fileName); if (content == null) { - content = HtmCache.getInstance().getHtmForce("data/scripts/quests/" + questId + "/" + fileName); + content = HtmCache.getInstance().getHtmForce("data/scripts/quests/" + getName() + "/" + fileName); } if (player != null) @@ -1877,12 +1871,6 @@ public class Quest extends ManagedScript return super.reload(); } - @Override - public String getScriptName() - { - return _name; - } - /** * This is used to register all monsters contained in mobs for a particular script
    * Caution : This method register ID for all QuestEventTypes
    diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java index eab41e4e10..3fe6f7c54a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/scripting/ManagedScript.java @@ -94,6 +94,4 @@ public abstract class ManagedScript { return _lastLoadTime; } - - public abstract String getScriptName(); }