diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/MissingQuests.txt b/L2J_Mobius_Underground/dist/game/data/scripts/quests/MissingQuests.txt
index 332ab893df..0ccafb2159 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/MissingQuests.txt
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/MissingQuests.txt
@@ -72,7 +72,6 @@
10316 Undecaying Memory of the Past
10352 Legacy of Cruma Tower
10353 Certification of Value
-10354 Resurrected Owner of Hall
10357 Altar of Blood that Awakens Destruction
10370 Menacing Times
10371 Grasp Thy Power
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
index 0d2c6067e8..4d43b98dcf 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10351_OwnerOfHall/Q10351_OwnerOfHall.java
@@ -34,7 +34,7 @@ public final class Q10351_OwnerOfHall extends Quest
{
// NPCs
private static final int LYDIA = 32892;
- private static final int OCTAVIS = 29209;
+ private static final int OCTAVIS = 29194; // Octavis common mode
// Item
private static final int OCTAVIS_BRACELET = 19461;
// Misc
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00.htm
new file mode 100644
index 0000000000..b8901336bd
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00.htm
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+I appreciate your dedication to the truth. But you must prepare yourself thoroughly, as it will not be easy to face.
+(You must be level 95 or above to accept this quest.)
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00a.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00a.htm
new file mode 100644
index 0000000000..86f7b293ba
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00a.htm
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+No--there are things you still do not understand. In order to face the truth, knowledge must baptize your spirit. You will know when the time is right.
+(You must complete the Owner of Hall quest to proceed.)
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-01.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-01.htm
new file mode 100644
index 0000000000..32540bcdb0
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-01.htm
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+It seems I've seriously underestimated Octavis!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-02.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-02.htm
new file mode 100644
index 0000000000..f28d6d2530
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-02.htm
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+We face another test. Tribulation comes to us in the form of Octavis, resurrected and more powerful than ever.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-03.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-03.htm
new file mode 100644
index 0000000000..b15bac97bd
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-03.htm
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+Nothing has come out of Shilenwithout the tang of rumor or lie. And there is no time to wonder. We must act. Octavis's fury will not wait.
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-04.htm b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-04.htm
new file mode 100644
index 0000000000..6493d48df3
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-04.htm
@@ -0,0 +1,3 @@
+Divine Messenger Lydia:
+I wish it was as straightforward as simply defeating him again. This is a battle to save his soul, and though my faith is strong... I admit, I am uncertain we will prevail. Let me know when you are prepared and I will explain how to save Octavis. Then I will send you to him.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-05.html b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-05.html
new file mode 100644
index 0000000000..e5ade4ed6f
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-05.html
@@ -0,0 +1,3 @@
+Divine Messenger Lydia:
+I will pray for your safe return.
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-06.html b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-06.html
new file mode 100644
index 0000000000..477c401ddc
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-06.html
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+You have done it! Oh, praise be! The impossible has been achieved!
+
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-07.html b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-07.html
new file mode 100644
index 0000000000..995ecdcab7
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-07.html
@@ -0,0 +1,3 @@
+Divine Messenger Lydia:
+Praise to you, %name%! I feared this Temple would come to ruin, but my faith should have been stronger! Your endeavors are truly blessed. I will sing prayers in praise of your name!
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Complete.html b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Complete.html
new file mode 100644
index 0000000000..f07db8a9e5
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Complete.html
@@ -0,0 +1,4 @@
+Divine Messenger Lydia:
+Your courage and skills came unexpected and greatly appreciated. I will sing another prayer in praise of your name!
+(You have already completed this quest.)
+
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
new file mode 100644
index 0000000000..c489bff9f0
--- /dev/null
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java
@@ -0,0 +1,147 @@
+/*
+ * 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.Q10354_ResurrectedOwnerOfHall;
+
+import com.l2jmobius.Config;
+import com.l2jmobius.gameserver.model.actor.L2Npc;
+import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jmobius.gameserver.model.quest.Quest;
+import com.l2jmobius.gameserver.model.quest.QuestState;
+import com.l2jmobius.gameserver.model.quest.State;
+
+import quests.Q10351_OwnerOfHall.Q10351_OwnerOfHall;
+
+/**
+ * Resurrected Owner of Hall (10354)
+ * @URL https://l2wiki.com/index.php?title=Resurrected_Owner_of_Hall&mobileaction=toggle_view_desktop
+ * @author Gigi
+ */
+public final class Q10354_ResurrectedOwnerOfHall extends Quest
+{
+ // NPCs
+ private static final int LYDIA = 32892;
+ private static final int OCTAVIS = 29212; // Octavis extreme mode
+ // Item
+ private static final int OCTAVIS_SOUL_BOTTLE = 34884;
+ // Misc
+ private static final int MIN_LEVEL = 95;
+
+ public Q10354_ResurrectedOwnerOfHall()
+ {
+ super(10354);
+ addStartNpc(LYDIA);
+ addTalkId(LYDIA);
+ addKillId(OCTAVIS);
+ addCondMinLevel(MIN_LEVEL, "32892-00.htm");
+ addCondCompletedQuest(Q10351_OwnerOfHall.class.getSimpleName(), "32892-00a.htm");
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = null;
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "32892-02.htm":
+ case "32892-03.htm":
+ {
+ htmltext = event;
+ break;
+ }
+ case "32892-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "32892-07.html":
+ {
+ giveAdena(player, 23655000, false);
+ addExpAndSp(player, 897850000, 215484);
+ giveItems(player, OCTAVIS_SOUL_BOTTLE, 1);
+ qs.exitQuest(false, true);
+ htmltext = getHtm(player.getHtmlPrefix(), "32892-07.html").replace("%name%", player.getName());
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ if (qs == null)
+ {
+ return htmltext;
+ }
+ final int npcId = npc.getId();
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ if (npcId == LYDIA)
+ {
+ htmltext = "32892-01.htm";
+ }
+ break;
+ }
+ case State.STARTED:
+ {
+ if (qs.isCond(1))
+ {
+ htmltext = "32892-05.html";
+ }
+ else if (qs.isCond(2))
+ {
+ htmltext = "32892-06.html";
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = "Complete.html";
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+ {
+ executeForEachPlayer(player, npc, isSummon, true, false);
+ return super.onKill(npc, player, isSummon);
+ }
+
+ @Override
+ public void actionForEachPlayer(L2PcInstance player, L2Npc npc, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && player.isInsideRadius(npc, Config.ALT_PARTY_RANGE, true, true))
+ {
+ qs.setCond(2, true);
+ }
+ }
+}
\ No newline at end of file
diff --git a/L2J_Mobius_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_Mobius_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java
index 9371de4c00..f8320e5f6a 100644
--- a/L2J_Mobius_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_Mobius_Underground/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -243,6 +243,7 @@ import quests.Q10344_DayOfDestinyOrcsFate.Q10344_DayOfDestinyOrcsFate;
import quests.Q10345_DayOfDestinyDwarfsFate.Q10345_DayOfDestinyDwarfsFate;
import quests.Q10346_DayOfDestinyKamaelsFate.Q10346_DayOfDestinyKamaelsFate;
import quests.Q10351_OwnerOfHall.Q10351_OwnerOfHall;
+import quests.Q10354_ResurrectedOwnerOfHall.Q10354_ResurrectedOwnerOfHall;
import quests.Q10358_DividedSakumPoslof.Q10358_DividedSakumPoslof;
import quests.Q10359_TracesOfEvil.Q10359_TracesOfEvil;
import quests.Q10360_CertificationOfFate.Q10360_CertificationOfFate;
@@ -632,6 +633,7 @@ public class QuestMasterHandler
Q10345_DayOfDestinyDwarfsFate.class,
Q10346_DayOfDestinyKamaelsFate.class,
Q10351_OwnerOfHall.class,
+ Q10354_ResurrectedOwnerOfHall.class,
Q10358_DividedSakumPoslof.class,
Q10359_TracesOfEvil.class,
Q10360_CertificationOfFate.class,
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/29100-29199.xml
index 6b89d76cd7..9b40cb056a 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/29100-29199.xml
@@ -4021,7 +4021,6 @@
-
@@ -4032,10 +4031,10 @@
HUMANOIDMALE
-
+
-
+
@@ -4062,75 +4061,90 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/L2J_Mobius_Underground/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_Underground/dist/game/data/stats/npcs/29200-29299.xml
index 0739485a89..51bcafda99 100644
--- a/L2J_Mobius_Underground/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_Underground/dist/game/data/stats/npcs/29200-29299.xml
@@ -512,8 +512,7 @@
-
-
+
@@ -527,7 +526,7 @@
-
+
@@ -540,7 +539,7 @@
-
+
@@ -555,11 +554,108 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+