diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
index b07b7ea5d1..1e2c645187 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/MissingQuests.txt
@@ -57,7 +57,6 @@
10418 The Immortal Pirate King
10457 Kefensis' Illusion
10506 Diana's Request
-10532 Uncovering the Conspiracy Eliminate the Undead and Dragons
10712 The Minstrel's Song, Part 1
10717 The Minstrel's Song, Part 2
10720 The Minstrel's Song, Part 3
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
new file mode 100644
index 0000000000..b74e2cd1f1
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
@@ -0,0 +1,4 @@
+
Namo:
+It's now time to investigate the Dimensional Cracks in Dragon Valley. There's going to be a lot of things you'll have to do.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
new file mode 100644
index 0000000000..7a4efde95a
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
@@ -0,0 +1,5 @@
+Namo:
+You're probably aware that many extraordinarious things are happening in Dragon Valley. And this might sound romantic, but it couldn't be further from the truth.
+You've already forced off with the dragons an Undead of western Dragon Valley, but it's vastly different from how Dragon Valley used to be
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
new file mode 100644
index 0000000000..df864bfa48
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
@@ -0,0 +1,6 @@
+Namo:
+The Drakes were previously nowhere near being an organitzation, but now there's organized activity on their part.
+Individually they are weaker than before, but since they're come together, they've become more particular is what I'm saying. It's to the point that the return of the undead was near undetectable.
+The biggest issue is determining if there's a connection between the Dimensional Cracks in Dragon Valley and the unusuals events going on, and since we're limited in what we can do we have to be especially fastidious.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
new file mode 100644
index 0000000000..47a1aa46a5
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
@@ -0,0 +1,4 @@
+Namo:
+I may have exaggerated a bit, but what you have to do is very simple. Dispose of the dragons and undead in the east of Dragon Valley to get an idea of what's going on.
+We can get an idea of the situation by slaying 200 Prey Drakes, Beast Drakes, Dust Drakes, Vampiric Drakes, Bloody Grave Warriors, Dark Grave Warriors, Drak Grave Wizards, and Dark Grave Humans Knights.
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
new file mode 100644
index 0000000000..1fa97e2d79
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
@@ -0,0 +1,4 @@
+Namo:
+That's good enough. Were you able to investigate the area at all?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
new file mode 100644
index 0000000000..812cbf0579
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
@@ -0,0 +1,3 @@
+Namo:
+Great. Thanks to you, the rest of our work vill be a breeze. If we detect any more changes in the Dimensional Cracks, we'll tell you right away.
+
\ No newline at end of file
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
new file mode 100644
index 0000000000..bd38f05470
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10532_UncoveringTheConspiracy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+/**
+ * Odd Happenings At Dragon Valley (10532)
+ * @URL https://youtu.be/y8OmynL8LVA https://l2wiki.com/Uncovering_the_Conspiracy
+ * @author Darkloud
+ * @date 2020-01-15 - [01:00:1009]
+ */
+public class Q10532_UncoveringTheConspiracy extends Quest
+{
+ // NPCs
+ private static final int NAMO = 33973;
+ private static final int[] MONSTERS =
+ {
+ 23430, // Prey Drake
+ 23431, // Best Drake
+ 23432, // Dust Drake
+ 23426, // Vampiric Drake
+ 23441, // Bloody Grave Warrior
+ 23442, // Dark Grave Warrior
+ 23443, // Dark Grave Wizard
+ 23444, // Dark Grave Knight
+ };
+
+ // Rewards
+ private static final int XP = 651696104;
+ private static final int SP = 30466;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+ private static final int MAX_LEVEL = 84;
+
+ public Q10532_UncoveringTheConspiracy()
+ {
+ super(10532);
+ addStartNpc(NAMO);
+ addTalkId(NAMO);
+ addKillId(MONSTERS);
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, getNoQuestMsg(null));
+ }
+
+ @Override
+ public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "33973-02.htm":
+ case "33973-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "33973-05.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-06.htm":
+ {
+ if (qs.isCond(2))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, XP, SP);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(Npc npc, PlayerInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, true);
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = "33973-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-05.htm";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ int killCount = qs.getInt("KILLED_COUNT");
+ killCount++;
+ qs.set("KILLED_COUNT", killCount);
+ if (killCount >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ final Set npcLogList = new HashSet<>(1);
+ npcLogList.add(new NpcLogListHolder(NpcStringId.SUBJUGATION_IN_THE_SOUTHERN_DRAGON_VALLEY, qs.getInt("KILLED_COUNT")));
+ return npcLogList;
+ }
+ return super.getNpcLogList(player);
+ }
+}
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
index b759609ca5..3e35f24989 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -361,6 +361,7 @@ import quests.Q10527_TheAssassinationOfTheKetraOrcCommander.Q10527_TheAssassinat
import quests.Q10528_TheAssassinationOfTheKetraOrcChief.Q10528_TheAssassinationOfTheKetraOrcChief;
import quests.Q10530_KekropusLetterTheDragonsTransition.Q10530_KekropusLetterTheDragonsTransition;
import quests.Q10531_OddHappeningsAtDragonValley.Q10531_OddHappeningsAtDragonValley;
+import quests.Q10532_UncoveringTheConspiracy.Q10532_UncoveringTheConspiracy;
import quests.Q10534_HatchlingResearch.Q10534_HatchlingResearch;
import quests.Q10537_KamaelDisarray.Q10537_KamaelDisarray;
import quests.Q10538_GiantsEvolution.Q10538_GiantsEvolution;
@@ -519,7 +520,6 @@ import quests.not_done.Q10396_WitchOfSpores;
import quests.not_done.Q10418_TheImmortalPirateKing;
import quests.not_done.Q10457_KefensisIllusion;
import quests.not_done.Q10506_DianasRequest;
-import quests.not_done.Q10532_UncoveringTheConspiracy;
import quests.not_done.Q10748_MysteriousSuggestion1;
import quests.not_done.Q10749_MysteriousSuggestion2;
import quests.not_done.Q10845_BloodyBattleRescueTheSmiths;
@@ -922,7 +922,7 @@ public class QuestMasterHandler
Q10528_TheAssassinationOfTheKetraOrcChief.class,
Q10530_KekropusLetterTheDragonsTransition.class,
Q10531_OddHappeningsAtDragonValley.class,
- Q10532_UncoveringTheConspiracy.class, // TODO: Not done.
+ Q10532_UncoveringTheConspiracy.class,
Q10534_HatchlingResearch.class,
Q10537_KamaelDisarray.class,
Q10538_GiantsEvolution.class,
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
deleted file mode 100644
index 42e5bf4eb4..0000000000
--- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10532_UncoveringTheConspiracy extends Quest
-{
- private static final int START_NPC = 33973;
-
- public Q10532_UncoveringTheConspiracy()
- {
- super(10532);
- addStartNpc(START_NPC);
- addTalkId(START_NPC);
- addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
- }
-}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
index 2ac2fefac7..16d5f22361 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/MissingQuests.txt
@@ -125,7 +125,6 @@
10454 Final Embryo Apostle
10457 Kefensis' Illusion
10506 Diana's Request
-10532 Uncovering the Conspiracy Eliminate the Undead and Dragons
10535 Blacksmith's Soul-awakening Weapon - 3
10712 The Minstrel's Song, Part 1
10717 The Minstrel's Song, Part 2
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
new file mode 100644
index 0000000000..b74e2cd1f1
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
@@ -0,0 +1,4 @@
+Namo:
+It's now time to investigate the Dimensional Cracks in Dragon Valley. There's going to be a lot of things you'll have to do.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
new file mode 100644
index 0000000000..7a4efde95a
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
@@ -0,0 +1,5 @@
+Namo:
+You're probably aware that many extraordinarious things are happening in Dragon Valley. And this might sound romantic, but it couldn't be further from the truth.
+You've already forced off with the dragons an Undead of western Dragon Valley, but it's vastly different from how Dragon Valley used to be
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
new file mode 100644
index 0000000000..df864bfa48
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
@@ -0,0 +1,6 @@
+Namo:
+The Drakes were previously nowhere near being an organitzation, but now there's organized activity on their part.
+Individually they are weaker than before, but since they're come together, they've become more particular is what I'm saying. It's to the point that the return of the undead was near undetectable.
+The biggest issue is determining if there's a connection between the Dimensional Cracks in Dragon Valley and the unusuals events going on, and since we're limited in what we can do we have to be especially fastidious.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
new file mode 100644
index 0000000000..47a1aa46a5
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
@@ -0,0 +1,4 @@
+Namo:
+I may have exaggerated a bit, but what you have to do is very simple. Dispose of the dragons and undead in the east of Dragon Valley to get an idea of what's going on.
+We can get an idea of the situation by slaying 200 Prey Drakes, Beast Drakes, Dust Drakes, Vampiric Drakes, Bloody Grave Warriors, Dark Grave Warriors, Drak Grave Wizards, and Dark Grave Humans Knights.
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
new file mode 100644
index 0000000000..1fa97e2d79
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
@@ -0,0 +1,4 @@
+Namo:
+That's good enough. Were you able to investigate the area at all?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
new file mode 100644
index 0000000000..812cbf0579
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
@@ -0,0 +1,3 @@
+Namo:
+Great. Thanks to you, the rest of our work vill be a breeze. If we detect any more changes in the Dimensional Cracks, we'll tell you right away.
+
\ No newline at end of file
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
new file mode 100644
index 0000000000..bd38f05470
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10532_UncoveringTheConspiracy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+/**
+ * Odd Happenings At Dragon Valley (10532)
+ * @URL https://youtu.be/y8OmynL8LVA https://l2wiki.com/Uncovering_the_Conspiracy
+ * @author Darkloud
+ * @date 2020-01-15 - [01:00:1009]
+ */
+public class Q10532_UncoveringTheConspiracy extends Quest
+{
+ // NPCs
+ private static final int NAMO = 33973;
+ private static final int[] MONSTERS =
+ {
+ 23430, // Prey Drake
+ 23431, // Best Drake
+ 23432, // Dust Drake
+ 23426, // Vampiric Drake
+ 23441, // Bloody Grave Warrior
+ 23442, // Dark Grave Warrior
+ 23443, // Dark Grave Wizard
+ 23444, // Dark Grave Knight
+ };
+
+ // Rewards
+ private static final int XP = 651696104;
+ private static final int SP = 30466;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+ private static final int MAX_LEVEL = 84;
+
+ public Q10532_UncoveringTheConspiracy()
+ {
+ super(10532);
+ addStartNpc(NAMO);
+ addTalkId(NAMO);
+ addKillId(MONSTERS);
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, getNoQuestMsg(null));
+ }
+
+ @Override
+ public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "33973-02.htm":
+ case "33973-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "33973-05.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-06.htm":
+ {
+ if (qs.isCond(2))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, XP, SP);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(Npc npc, PlayerInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, true);
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = "33973-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-05.htm";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ int killCount = qs.getInt("KILLED_COUNT");
+ killCount++;
+ qs.set("KILLED_COUNT", killCount);
+ if (killCount >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ final Set npcLogList = new HashSet<>(1);
+ npcLogList.add(new NpcLogListHolder(NpcStringId.SUBJUGATION_IN_THE_SOUTHERN_DRAGON_VALLEY, qs.getInt("KILLED_COUNT")));
+ return npcLogList;
+ }
+ return super.getNpcLogList(player);
+ }
+}
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
index 0706d9dd50..88068a80c4 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -359,6 +359,7 @@ import quests.Q10527_TheAssassinationOfTheKetraOrcCommander.Q10527_TheAssassinat
import quests.Q10528_TheAssassinationOfTheKetraOrcChief.Q10528_TheAssassinationOfTheKetraOrcChief;
import quests.Q10530_KekropusLetterTheDragonsTransition.Q10530_KekropusLetterTheDragonsTransition;
import quests.Q10531_OddHappeningsAtDragonValley.Q10531_OddHappeningsAtDragonValley;
+import quests.Q10532_UncoveringTheConspiracy.Q10532_UncoveringTheConspiracy;
import quests.Q10534_HatchlingResearch.Q10534_HatchlingResearch;
import quests.Q10537_KamaelDisarray.Q10537_KamaelDisarray;
import quests.Q10538_GiantsEvolution.Q10538_GiantsEvolution;
@@ -527,7 +528,6 @@ import quests.not_done.Q10423_EmbryoStrongholdAmbush;
import quests.not_done.Q10454_FinalEmbryoApostle;
import quests.not_done.Q10457_KefensisIllusion;
import quests.not_done.Q10506_DianasRequest;
-import quests.not_done.Q10532_UncoveringTheConspiracy;
import quests.not_done.Q10535_BlacksmithsSoulAwakeningWeapon3;
import quests.not_done.Q10748_MysteriousSuggestion1;
import quests.not_done.Q10749_MysteriousSuggestion2;
@@ -949,7 +949,7 @@ public class QuestMasterHandler
Q10528_TheAssassinationOfTheKetraOrcChief.class,
Q10530_KekropusLetterTheDragonsTransition.class,
Q10531_OddHappeningsAtDragonValley.class,
- Q10532_UncoveringTheConspiracy.class, // TODO: Not done.
+ Q10532_UncoveringTheConspiracy.class,
Q10534_HatchlingResearch.class,
Q10535_BlacksmithsSoulAwakeningWeapon3.class, // TODO: Not done.
Q10537_KamaelDisarray.class,
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
deleted file mode 100644
index 42e5bf4eb4..0000000000
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10532_UncoveringTheConspiracy extends Quest
-{
- private static final int START_NPC = 33973;
-
- public Q10532_UncoveringTheConspiracy()
- {
- super(10532);
- addStartNpc(START_NPC);
- addTalkId(START_NPC);
- addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
- }
-}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/MissingQuests.txt
index 5c629ae1f8..24ee929815 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/MissingQuests.txt
@@ -142,7 +142,6 @@
10454 Final Embryo Apostle
10457 Kefensis' Illusion
10506 Diana's Request
-10532 Uncovering the Conspiracy Eliminate the Undead and Dragons
10535 Blacksmith's Soul-awakening Weapon - 3
10552 Challenge! Balthus Knight!
10553 What Matters More Than Ability
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
new file mode 100644
index 0000000000..b74e2cd1f1
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
@@ -0,0 +1,4 @@
+Namo:
+It's now time to investigate the Dimensional Cracks in Dragon Valley. There's going to be a lot of things you'll have to do.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
new file mode 100644
index 0000000000..7a4efde95a
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
@@ -0,0 +1,5 @@
+Namo:
+You're probably aware that many extraordinarious things are happening in Dragon Valley. And this might sound romantic, but it couldn't be further from the truth.
+You've already forced off with the dragons an Undead of western Dragon Valley, but it's vastly different from how Dragon Valley used to be
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
new file mode 100644
index 0000000000..df864bfa48
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
@@ -0,0 +1,6 @@
+Namo:
+The Drakes were previously nowhere near being an organitzation, but now there's organized activity on their part.
+Individually they are weaker than before, but since they're come together, they've become more particular is what I'm saying. It's to the point that the return of the undead was near undetectable.
+The biggest issue is determining if there's a connection between the Dimensional Cracks in Dragon Valley and the unusuals events going on, and since we're limited in what we can do we have to be especially fastidious.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
new file mode 100644
index 0000000000..47a1aa46a5
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
@@ -0,0 +1,4 @@
+Namo:
+I may have exaggerated a bit, but what you have to do is very simple. Dispose of the dragons and undead in the east of Dragon Valley to get an idea of what's going on.
+We can get an idea of the situation by slaying 200 Prey Drakes, Beast Drakes, Dust Drakes, Vampiric Drakes, Bloody Grave Warriors, Dark Grave Warriors, Drak Grave Wizards, and Dark Grave Humans Knights.
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
new file mode 100644
index 0000000000..1fa97e2d79
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
@@ -0,0 +1,4 @@
+Namo:
+That's good enough. Were you able to investigate the area at all?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
new file mode 100644
index 0000000000..812cbf0579
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
@@ -0,0 +1,3 @@
+Namo:
+Great. Thanks to you, the rest of our work vill be a breeze. If we detect any more changes in the Dimensional Cracks, we'll tell you right away.
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
new file mode 100644
index 0000000000..bd38f05470
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10532_UncoveringTheConspiracy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+/**
+ * Odd Happenings At Dragon Valley (10532)
+ * @URL https://youtu.be/y8OmynL8LVA https://l2wiki.com/Uncovering_the_Conspiracy
+ * @author Darkloud
+ * @date 2020-01-15 - [01:00:1009]
+ */
+public class Q10532_UncoveringTheConspiracy extends Quest
+{
+ // NPCs
+ private static final int NAMO = 33973;
+ private static final int[] MONSTERS =
+ {
+ 23430, // Prey Drake
+ 23431, // Best Drake
+ 23432, // Dust Drake
+ 23426, // Vampiric Drake
+ 23441, // Bloody Grave Warrior
+ 23442, // Dark Grave Warrior
+ 23443, // Dark Grave Wizard
+ 23444, // Dark Grave Knight
+ };
+
+ // Rewards
+ private static final int XP = 651696104;
+ private static final int SP = 30466;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+ private static final int MAX_LEVEL = 84;
+
+ public Q10532_UncoveringTheConspiracy()
+ {
+ super(10532);
+ addStartNpc(NAMO);
+ addTalkId(NAMO);
+ addKillId(MONSTERS);
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, getNoQuestMsg(null));
+ }
+
+ @Override
+ public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "33973-02.htm":
+ case "33973-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "33973-05.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-06.htm":
+ {
+ if (qs.isCond(2))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, XP, SP);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(Npc npc, PlayerInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, true);
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = "33973-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-05.htm";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ int killCount = qs.getInt("KILLED_COUNT");
+ killCount++;
+ qs.set("KILLED_COUNT", killCount);
+ if (killCount >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ final Set npcLogList = new HashSet<>(1);
+ npcLogList.add(new NpcLogListHolder(NpcStringId.SUBJUGATION_IN_THE_SOUTHERN_DRAGON_VALLEY, qs.getInt("KILLED_COUNT")));
+ return npcLogList;
+ }
+ return super.getNpcLogList(player);
+ }
+}
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/QuestMasterHandler.java
index 964f92451a..f1e26cec6d 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -364,6 +364,7 @@ import quests.Q10527_TheAssassinationOfTheKetraOrcCommander.Q10527_TheAssassinat
import quests.Q10528_TheAssassinationOfTheKetraOrcChief.Q10528_TheAssassinationOfTheKetraOrcChief;
import quests.Q10530_KekropusLetterTheDragonsTransition.Q10530_KekropusLetterTheDragonsTransition;
import quests.Q10531_OddHappeningsAtDragonValley.Q10531_OddHappeningsAtDragonValley;
+import quests.Q10532_UncoveringTheConspiracy.Q10532_UncoveringTheConspiracy;
import quests.Q10534_HatchlingResearch.Q10534_HatchlingResearch;
import quests.Q10537_KamaelDisarray.Q10537_KamaelDisarray;
import quests.Q10538_GiantsEvolution.Q10538_GiantsEvolution;
@@ -916,7 +917,7 @@ public class QuestMasterHandler
Q10528_TheAssassinationOfTheKetraOrcChief.class,
Q10530_KekropusLetterTheDragonsTransition.class,
Q10531_OddHappeningsAtDragonValley.class,
- Q10532_UncoveringTheConspiracy.class, // TODO: Not done.
+ Q10532_UncoveringTheConspiracy.class,
Q10534_HatchlingResearch.class,
Q10535_BlacksmithsSoul3.class, // TODO: Not done.
Q10537_KamaelDisarray.class,
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
deleted file mode 100644
index 42e5bf4eb4..0000000000
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10532_UncoveringTheConspiracy extends Quest
-{
- private static final int START_NPC = 33973;
-
- public Q10532_UncoveringTheConspiracy()
- {
- super(10532);
- addStartNpc(START_NPC);
- addTalkId(START_NPC);
- addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
- }
-}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/MissingQuests.txt
index a19a8a80fc..1701566eef 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/MissingQuests.txt
@@ -152,7 +152,6 @@
10457 Kefensis' Illusion
10506 Diana's Request
10529 Ivory Tower's Research - Sea of Spores Journal
-10532 Uncovering the Conspiracy Eliminate the Undead and Dragons
10533 Orfen's Ambition
10535 Blacksmith's Soul-awakening Weapon - 3
10552 Challenge! Balthus Knight!
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
new file mode 100644
index 0000000000..b74e2cd1f1
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
@@ -0,0 +1,4 @@
+Namo:
+It's now time to investigate the Dimensional Cracks in Dragon Valley. There's going to be a lot of things you'll have to do.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
new file mode 100644
index 0000000000..7a4efde95a
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
@@ -0,0 +1,5 @@
+Namo:
+You're probably aware that many extraordinarious things are happening in Dragon Valley. And this might sound romantic, but it couldn't be further from the truth.
+You've already forced off with the dragons an Undead of western Dragon Valley, but it's vastly different from how Dragon Valley used to be
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
new file mode 100644
index 0000000000..df864bfa48
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
@@ -0,0 +1,6 @@
+Namo:
+The Drakes were previously nowhere near being an organitzation, but now there's organized activity on their part.
+Individually they are weaker than before, but since they're come together, they've become more particular is what I'm saying. It's to the point that the return of the undead was near undetectable.
+The biggest issue is determining if there's a connection between the Dimensional Cracks in Dragon Valley and the unusuals events going on, and since we're limited in what we can do we have to be especially fastidious.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
new file mode 100644
index 0000000000..47a1aa46a5
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
@@ -0,0 +1,4 @@
+Namo:
+I may have exaggerated a bit, but what you have to do is very simple. Dispose of the dragons and undead in the east of Dragon Valley to get an idea of what's going on.
+We can get an idea of the situation by slaying 200 Prey Drakes, Beast Drakes, Dust Drakes, Vampiric Drakes, Bloody Grave Warriors, Dark Grave Warriors, Drak Grave Wizards, and Dark Grave Humans Knights.
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
new file mode 100644
index 0000000000..1fa97e2d79
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
@@ -0,0 +1,4 @@
+Namo:
+That's good enough. Were you able to investigate the area at all?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
new file mode 100644
index 0000000000..812cbf0579
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
@@ -0,0 +1,3 @@
+Namo:
+Great. Thanks to you, the rest of our work vill be a breeze. If we detect any more changes in the Dimensional Cracks, we'll tell you right away.
+
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
new file mode 100644
index 0000000000..bd38f05470
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10532_UncoveringTheConspiracy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+/**
+ * Odd Happenings At Dragon Valley (10532)
+ * @URL https://youtu.be/y8OmynL8LVA https://l2wiki.com/Uncovering_the_Conspiracy
+ * @author Darkloud
+ * @date 2020-01-15 - [01:00:1009]
+ */
+public class Q10532_UncoveringTheConspiracy extends Quest
+{
+ // NPCs
+ private static final int NAMO = 33973;
+ private static final int[] MONSTERS =
+ {
+ 23430, // Prey Drake
+ 23431, // Best Drake
+ 23432, // Dust Drake
+ 23426, // Vampiric Drake
+ 23441, // Bloody Grave Warrior
+ 23442, // Dark Grave Warrior
+ 23443, // Dark Grave Wizard
+ 23444, // Dark Grave Knight
+ };
+
+ // Rewards
+ private static final int XP = 651696104;
+ private static final int SP = 30466;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+ private static final int MAX_LEVEL = 84;
+
+ public Q10532_UncoveringTheConspiracy()
+ {
+ super(10532);
+ addStartNpc(NAMO);
+ addTalkId(NAMO);
+ addKillId(MONSTERS);
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, getNoQuestMsg(null));
+ }
+
+ @Override
+ public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "33973-02.htm":
+ case "33973-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "33973-05.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-06.htm":
+ {
+ if (qs.isCond(2))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, XP, SP);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(Npc npc, PlayerInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, true);
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = "33973-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-05.htm";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ int killCount = qs.getInt("KILLED_COUNT");
+ killCount++;
+ qs.set("KILLED_COUNT", killCount);
+ if (killCount >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ final Set npcLogList = new HashSet<>(1);
+ npcLogList.add(new NpcLogListHolder(NpcStringId.SUBJUGATION_IN_THE_SOUTHERN_DRAGON_VALLEY, qs.getInt("KILLED_COUNT")));
+ return npcLogList;
+ }
+ return super.getNpcLogList(player);
+ }
+}
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/QuestMasterHandler.java
index 54a3a6dbae..2099301f89 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -319,6 +319,7 @@ import quests.Q10527_TheAssassinationOfTheKetraOrcCommander.Q10527_TheAssassinat
import quests.Q10528_TheAssassinationOfTheKetraOrcChief.Q10528_TheAssassinationOfTheKetraOrcChief;
import quests.Q10530_KekropusLetterTheDragonsTransition.Q10530_KekropusLetterTheDragonsTransition;
import quests.Q10531_OddHappeningsAtDragonValley.Q10531_OddHappeningsAtDragonValley;
+import quests.Q10532_UncoveringTheConspiracy.Q10532_UncoveringTheConspiracy;
import quests.Q10534_HatchlingResearch.Q10534_HatchlingResearch;
import quests.Q10537_KamaelDisarray.Q10537_KamaelDisarray;
import quests.Q10538_GiantsEvolution.Q10538_GiantsEvolution;
@@ -831,7 +832,7 @@ public class QuestMasterHandler
Q10529_IvoryTowersResearchSeaOfSporesJournal.class, // TODO: Not done.
Q10530_KekropusLetterTheDragonsTransition.class,
Q10531_OddHappeningsAtDragonValley.class,
- Q10532_UncoveringTheConspiracy.class, // TODO: Not done.
+ Q10532_UncoveringTheConspiracy.class,
Q10533_OrfensAmbition.class, // TODO: Not done.
Q10534_HatchlingResearch.class,
Q10535_BlacksmithsSoul3.class, // TODO: Not done.
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
deleted file mode 100644
index 42e5bf4eb4..0000000000
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10532_UncoveringTheConspiracy extends Quest
-{
- private static final int START_NPC = 33973;
-
- public Q10532_UncoveringTheConspiracy()
- {
- super(10532);
- addStartNpc(START_NPC);
- addTalkId(START_NPC);
- addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
- }
-}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/MissingQuests.txt
index e78f8eb49f..1928ce189b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/MissingQuests.txt
@@ -159,7 +159,6 @@
10423 Embryo Stronghold Ambush
10454 Final Embryo Apostle
10457 Kefensis' Illusion
-10532 Uncovering the Conspiracy Eliminate the Undead and Dragons
10535 Blacksmith's Soul-awakening Weapon - 3
10552 Challenge! Balthus Knight!
10553 What Matters More Than Ability
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
new file mode 100644
index 0000000000..b74e2cd1f1
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-01.htm
@@ -0,0 +1,4 @@
+Namo:
+It's now time to investigate the Dimensional Cracks in Dragon Valley. There's going to be a lot of things you'll have to do.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
new file mode 100644
index 0000000000..7a4efde95a
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-02.htm
@@ -0,0 +1,5 @@
+Namo:
+You're probably aware that many extraordinarious things are happening in Dragon Valley. And this might sound romantic, but it couldn't be further from the truth.
+You've already forced off with the dragons an Undead of western Dragon Valley, but it's vastly different from how Dragon Valley used to be
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
new file mode 100644
index 0000000000..df864bfa48
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-03.htm
@@ -0,0 +1,6 @@
+Namo:
+The Drakes were previously nowhere near being an organitzation, but now there's organized activity on their part.
+Individually they are weaker than before, but since they're come together, they've become more particular is what I'm saying. It's to the point that the return of the undead was near undetectable.
+The biggest issue is determining if there's a connection between the Dimensional Cracks in Dragon Valley and the unusuals events going on, and since we're limited in what we can do we have to be especially fastidious.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
new file mode 100644
index 0000000000..47a1aa46a5
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-04.htm
@@ -0,0 +1,4 @@
+Namo:
+I may have exaggerated a bit, but what you have to do is very simple. Dispose of the dragons and undead in the east of Dragon Valley to get an idea of what's going on.
+We can get an idea of the situation by slaying 200 Prey Drakes, Beast Drakes, Dust Drakes, Vampiric Drakes, Bloody Grave Warriors, Dark Grave Warriors, Drak Grave Wizards, and Dark Grave Humans Knights.
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
new file mode 100644
index 0000000000..1fa97e2d79
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-05.htm
@@ -0,0 +1,4 @@
+Namo:
+That's good enough. Were you able to investigate the area at all?
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
new file mode 100644
index 0000000000..812cbf0579
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/33973-06.htm
@@ -0,0 +1,3 @@
+Namo:
+Great. Thanks to you, the rest of our work vill be a breeze. If we detect any more changes in the Dimensional Cracks, we'll tell you right away.
+
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
new file mode 100644
index 0000000000..bd38f05470
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/Q10532_UncoveringTheConspiracy/Q10532_UncoveringTheConspiracy.java
@@ -0,0 +1,183 @@
+/*
+ * This file is part of the L2J Mobius project.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+package quests.Q10532_UncoveringTheConspiracy;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import org.l2jmobius.gameserver.enums.QuestSound;
+import org.l2jmobius.gameserver.enums.QuestType;
+import org.l2jmobius.gameserver.model.actor.Npc;
+import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
+import org.l2jmobius.gameserver.model.holders.NpcLogListHolder;
+import org.l2jmobius.gameserver.model.quest.Quest;
+import org.l2jmobius.gameserver.model.quest.QuestState;
+import org.l2jmobius.gameserver.model.quest.State;
+import org.l2jmobius.gameserver.network.NpcStringId;
+
+/**
+ * Odd Happenings At Dragon Valley (10532)
+ * @URL https://youtu.be/y8OmynL8LVA https://l2wiki.com/Uncovering_the_Conspiracy
+ * @author Darkloud
+ * @date 2020-01-15 - [01:00:1009]
+ */
+public class Q10532_UncoveringTheConspiracy extends Quest
+{
+ // NPCs
+ private static final int NAMO = 33973;
+ private static final int[] MONSTERS =
+ {
+ 23430, // Prey Drake
+ 23431, // Best Drake
+ 23432, // Dust Drake
+ 23426, // Vampiric Drake
+ 23441, // Bloody Grave Warrior
+ 23442, // Dark Grave Warrior
+ 23443, // Dark Grave Wizard
+ 23444, // Dark Grave Knight
+ };
+
+ // Rewards
+ private static final int XP = 651696104;
+ private static final int SP = 30466;
+ // Misc
+ private static final int MIN_LEVEL = 81;
+ private static final int MAX_LEVEL = 84;
+
+ public Q10532_UncoveringTheConspiracy()
+ {
+ super(10532);
+ addStartNpc(NAMO);
+ addTalkId(NAMO);
+ addKillId(MONSTERS);
+ addCondLevel(MIN_LEVEL, MAX_LEVEL, getNoQuestMsg(null));
+ }
+
+ @Override
+ public String onAdvEvent(String event, Npc npc, PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+ String htmltext = null;
+ switch (event)
+ {
+ case "33973-02.htm":
+ case "33973-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "33973-05.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "33973-06.htm":
+ {
+ if (qs.isCond(2))
+ {
+ if (player.getLevel() >= MIN_LEVEL)
+ {
+ addExpAndSp(player, XP, SP);
+ qs.exitQuest(QuestType.ONE_TIME, true);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = getNoQuestLevelRewardMsg(player);
+ }
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(Npc npc, PlayerInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, true);
+
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = "33973-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(2))
+ {
+ htmltext = "33973-05.htm";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(Npc npc, PlayerInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ int killCount = qs.getInt("KILLED_COUNT");
+ killCount++;
+ qs.set("KILLED_COUNT", killCount);
+ if (killCount >= 200)
+ {
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public Set getNpcLogList(PlayerInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isStarted() && qs.isCond(1))
+ {
+ final Set npcLogList = new HashSet<>(1);
+ npcLogList.add(new NpcLogListHolder(NpcStringId.SUBJUGATION_IN_THE_SOUTHERN_DRAGON_VALLEY, qs.getInt("KILLED_COUNT")));
+ return npcLogList;
+ }
+ return super.getNpcLogList(player);
+ }
+}
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/QuestMasterHandler.java
index 805657430b..a3be54dffb 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -318,6 +318,7 @@ import quests.Q10527_TheAssassinationOfTheKetraOrcCommander.Q10527_TheAssassinat
import quests.Q10528_TheAssassinationOfTheKetraOrcChief.Q10528_TheAssassinationOfTheKetraOrcChief;
import quests.Q10530_KekropusLetterTheDragonsTransition.Q10530_KekropusLetterTheDragonsTransition;
import quests.Q10531_OddHappeningsAtDragonValley.Q10531_OddHappeningsAtDragonValley;
+import quests.Q10532_UncoveringTheConspiracy.Q10532_UncoveringTheConspiracy;
import quests.Q10534_HatchlingResearch.Q10534_HatchlingResearch;
import quests.Q10537_KamaelDisarray.Q10537_KamaelDisarray;
import quests.Q10538_GiantsEvolution.Q10538_GiantsEvolution;
@@ -853,7 +854,7 @@ public class QuestMasterHandler
Q10529_IvoryTowersResearchFloatingSeaJournal.class, // FIXME: Custom.
Q10530_KekropusLetterTheDragonsTransition.class,
Q10531_OddHappeningsAtDragonValley.class,
- Q10532_UncoveringTheConspiracy.class, // TODO: Not done.
+ Q10532_UncoveringTheConspiracy.class,
Q10533_OrfensAmbition.class, // FIXME: Custom.
Q10534_HatchlingResearch.class,
Q10535_BlacksmithsSoul3.class, // TODO: Not done.
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java b/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
deleted file mode 100644
index 42e5bf4eb4..0000000000
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/quests/not_done/Q10532_UncoveringTheConspiracy.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the L2J Mobius project.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-package quests.not_done;
-
-import org.l2jmobius.Config;
-import org.l2jmobius.gameserver.model.quest.Quest;
-
-/**
- * @author Mobius
- */
-public class Q10532_UncoveringTheConspiracy extends Quest
-{
- private static final int START_NPC = 33973;
-
- public Q10532_UncoveringTheConspiracy()
- {
- super(10532);
- addStartNpc(START_NPC);
- addTalkId(START_NPC);
- addCondMinLevel(Config.PLAYER_MAXIMUM_LEVEL, getNoQuestMsg(null));
- }
-}