From 411782efceee2e1b0957586b043654209d96a0a8 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 14 Jan 2020 20:48:49 +0000 Subject: [PATCH] Improvements for quest Seven Signs Girl of Doubt (10292). --- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 3 +-- .../Q10292_SevenSignsGirlOfDoubt.java | 10 +++++++--- 8 files changed, 14 insertions(+), 17 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index dd0e6ed668..806385cb9b 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -61,7 +60,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index dd0e6ed668..806385cb9b 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -61,7 +60,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 6090fc1c67..2f7939bd14 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 6090fc1c67..2f7939bd14 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 6090fc1c67..2f7939bd14 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 6090fc1c67..2f7939bd14 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 6090fc1c67..2f7939bd14 100644 --- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -37,7 +37,6 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest private static final int HARDIN = 30832; private static final int WOOD = 32593; private static final int FRANZ = 32597; - private static final int JAINA = 32617; private static final int ELCADIA = 32784; // Item private static final ItemHolder ELCADIAS_MARK = new ItemHolder(17226, 10); @@ -57,7 +56,7 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest { super(10292); addStartNpc(WOOD); - addTalkId(WOOD, FRANZ, JAINA, ELCADIA, HARDIN); + addTalkId(WOOD, FRANZ, ELCADIA, HARDIN); addKillId(MOBS); addKillId(CREATURE_OF_THE_DUSK1, CREATURE_OF_THE_DUSK2); addCondMinLevel(MIN_LEVEL, "32593-03.htm"); diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java index 104bcb0401..806068e76e 100644 --- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java +++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q10292_SevenSignsGirlOfDoubt/Q10292_SevenSignsGirlOfDoubt.java @@ -42,8 +42,8 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest // Misc private static final int MIN_LEVEL = 81; // Variables - private static int killCount = 0; private static final String I_QUEST1 = "I_QUEST1"; + private static final String KILLCOUNT_VAR = "killCount"; // Monster private static final int CREATURE_OF_THE_DUSK1 = 27422; private static final int CREATURE_OF_THE_DUSK2 = 27424; @@ -208,12 +208,16 @@ public class Q10292_SevenSignsGirlOfDoubt extends Quest } else { - killCount++; - if (killCount == 2) + if (qs.getInt(KILLCOUNT_VAR) == 1) { + qs.unset(KILLCOUNT_VAR); qs.setMemoState(6); qs.setCond(6); } + else + { + qs.set(KILLCOUNT_VAR, 1); + } } } return super.onKill(npc, player, isSummon);