From d59f75b7fa16c17816e9d1b9ddc9b08cf5c06862 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 23 Aug 2019 07:43:08 +0000 Subject: [PATCH] Fixed quest The Name of Evil - 1 (125). Author: Avanael92 Source: https://bitbucket.org/l2jserver --- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- .../Q00125_TheNameOfEvil1.java | 47 ++++++++++--------- 6 files changed, 150 insertions(+), 132 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5d036b330..59864615b4 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break; diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5d036b330..59864615b4 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break; diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5d036b330..59864615b4 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break; diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5d036b330..59864615b4 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break; diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index f5d036b330..59864615b4 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break; diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java index c0b94c9932..3a277c8670 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java @@ -47,6 +47,8 @@ public class Q00125_TheNameOfEvil1 extends Quest private static final int DEINONYCHUS_BONE = 8780; private static final int EPITAPH_OF_WISDOM = 8781; private static final int GAZKH_FRAGMENT = 8782; + // Skills + private static final int REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID = 5089; private static final Map ORNITHOMIMUS = new HashMap<>(); private static final Map DEINONYCHUS = new HashMap<>(); @@ -460,12 +462,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32119-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("E"); qs.unset("P"); qs.unset("U"); + htmltext = "32119-02.html"; } else { @@ -506,12 +508,12 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32120-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("T"); qs.unset("O"); qs.unset("O2"); qs.unset("N"); + htmltext = "32120-02.html"; } else { @@ -553,31 +555,32 @@ public class Q00125_TheNameOfEvil1 extends Quest { if (qs.get("Memo") == null) { - htmltext = "32121-02.html"; - npc.broadcastPacket(new MagicSkillUse(npc, player, 5089, 1, 1000, 0)); + npc.broadcastPacket(new MagicSkillUse(npc, player, REPRESENTATION_ENTER_THE_SAILREN_NEST_QUEST_ID, 1, 1000, 0)); qs.unset("W"); qs.unset("A"); qs.unset("G"); qs.unset("U"); - break; + htmltext = "32121-02.html"; } - - switch (qs.getInt("Memo")) + else { - case 1: + switch (qs.getInt("Memo")) { - htmltext = "32121-09.html"; - break; - } - case 2: - { - htmltext = "32121-19.html"; - break; - } - case 3: - { - htmltext = "32121-20.html"; - break; + case 1: + { + htmltext = "32121-09.html"; + break; + } + case 2: + { + htmltext = "32121-19.html"; + break; + } + case 3: + { + htmltext = "32121-20.html"; + break; + } } } break;