From 848927e24d4c12eb7d1f6d03b04de58f83b8477b Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 18 Sep 2016 11:28:45 +0000
Subject: [PATCH] Quest Resurrected Owner of Hall (10354). Contributed by
 gigilo1968.

---
 .../data/scripts/quests/MissingQuests.txt     |   1 -
 .../Q10351_OwnerOfHall.java                   |   2 +-
 .../32892-00.htm                              |   4 +
 .../32892-00a.htm                             |   4 +
 .../32892-01.htm                              |   4 +
 .../32892-02.htm                              |   4 +
 .../32892-03.htm                              |   4 +
 .../32892-04.htm                              |   3 +
 .../32892-05.html                             |   3 +
 .../32892-06.html                             |   4 +
 .../32892-07.html                             |   3 +
 .../Complete.html                             |   4 +
 .../Q10354_ResurrectedOwnerOfHall.java        | 147 +++++++++++++++++
 .../scripts/quests/QuestMasterHandler.java    |   2 +
 .../dist/game/data/stats/npcs/29100-29199.xml | 150 ++++++++++--------
 .../dist/game/data/stats/npcs/29200-29299.xml | 106 ++++++++++++-
 16 files changed, 370 insertions(+), 75 deletions(-)
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-00a.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-01.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-02.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-03.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-04.htm
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-05.html
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-06.html
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/32892-07.html
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Complete.html
 create mode 100644 L2J_Mobius_Underground/dist/game/data/scripts/quests/Q10354_ResurrectedOwnerOfHall/Q10354_ResurrectedOwnerOfHall.java

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 @@
+<html><body>Divine Messenger Lydia:<br>
+I appreciate your dedication to the truth. But you must prepare yourself thoroughly, as it will not be easy to face.<br>
+(You must be level 95 or above to accept this quest.)
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+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.<br>
+(You must complete the Owner of Hall quest to proceed.)
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+It seems I've seriously underestimated <font color="LEVEL">Octavis</font>!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10354_ResurrectedOwnerOfHall 32892-02.htm">"What do you mean?"</Button>
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+We face another test. Tribulation comes to us in the form of <font color="LEVEL">Octavis</font>, resurrected and more powerful than ever.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10354_ResurrectedOwnerOfHall 32892-03.htm">"Who would do that, resurrect him?"</Button>
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+Nothing has come out of <font color="LEVEL">Shilen</font>without the tang of rumor or lie. And there is no time to wonder. We must act. <font color="LEVEL">Octavis</font>'s fury will not wait.<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10354_ResurrectedOwnerOfHall 32892-04.htm">"Then I'll just have to defeat him again."</Button>
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+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 <font color="LEVEL">how to save Octavis.</font> Then I will send you to him.
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+I will pray for your safe return.
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+You have done it! Oh, praise be! The impossible has been achieved!<br>
+<Button ALIGN=LEFT ICON="NORMAL" action="bypass -h Quest Q10354_ResurrectedOwnerOfHall 32892-07.html">"Fair enough."</Button>
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+Praise to you, <font color="LEVEL">%name%</font>! 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!
+</body></html>
\ 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 @@
+<html><body>Divine Messenger Lydia:<br>
+Your courage and skills came unexpected and greatly appreciated. I will sing another prayer in praise of your name!<br>
+(You have already completed this quest.)
+</body></html>
\ 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 <http://www.gnu.org/licenses/>.
+ */
+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 @@
 		</collision>
 	</npc>
 	<npc id="29194" level="98" type="L2RaidBoss" name="Octavis" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="boss_skill_01" id="14030" level="1" />
 			<skill name="boss_skill_02" id="14031" level="1" />
@@ -4032,10 +4031,10 @@
 		</parameters>
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
-		<acquire exp="16629786992" sp="26607659" raidPoints="21" />
+		<acquire exp="16629786992" sp="3991787" raidPoints="21" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="15691245" hpRegen="8.5" mp="22800" mpRegen="30" />
+			<vitals hp="37360855" hpRegen="8.5" mp="45646" mpRegen="30" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -4062,75 +4061,90 @@
 			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 		</skill_list>
-		<ai aggroRange="300" isAggressive="true" clanHelpRange="300" />
-		<drop_lists>
-			<death>
-				<group chance="1.125">
-					<item id="17401" min="1" max="1" chance="26.666666666667" /> <!-- Seraph Shield Heavy Armor -->
-					<item id="38013" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Cutter Crafting Pack -->
-					<item id="38014" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Slasher Crafting Pack -->
-					<item id="38015" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Avenger Crafting Pack -->
-					<item id="38016" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Fighter Crafting Pack -->
-					<item id="38017" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Stormer Crafting Pack -->
-					<item id="38018" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Thrower Crafting Pack -->
-					<item id="38019" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Shooter Crafting Pack -->
-					<item id="38020" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Buster Crafting Pack -->
-					<item id="38021" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Caster Crafting Pack -->
-					<item id="38022" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Retributer Crafting Pack -->
-					<item id="38012" min="1" max="1" chance="6.6666666666667" /> <!-- Specter Shaper Crafting Pack -->
-				</group>
-				<group chance="9.125">
-					<item id="19462" min="1" max="1" chance="23.506849315068" /> <!-- Octavis' Shirt -->
-					<item id="38024" min="1" max="1" chance="13.446575342466" /> <!-- Seraph Breastplate Crafting Pack Heavy Armor -->
-					<item id="38031" min="1" max="1" chance="13.07397260274" /> <!-- Seraph Leather Leggings Crafting Pack Light Armor -->
-					<item id="38025" min="1" max="1" chance="12.865753424658" /> <!-- Seraph Gaiters Crafting Pack Heavy Armor -->
-					<item id="38036" min="1" max="1" chance="12.78904109589" /> <!-- Seraph Stockings Crafting Pack Robe -->
-					<item id="38030" min="1" max="1" chance="12.164383561644" /> <!-- Seraph Leather Armor Crafting Pack Light Armor -->
-					<item id="38035" min="1" max="1" chance="12.153424657534" /> <!-- Seraph Tunic Crafting Pack Robe -->
-				</group>
-				<group chance="15.934">
-					<item id="17412" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Sigil Robe -->
-					<item id="17411" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Shoes Robe -->
-					<item id="17410" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Gloves Robe -->
-					<item id="17407" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Circlet Robe -->
-					<item id="17406" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Leather Boots Light Armor -->
-					<item id="17405" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Leather Gloves Light Armor -->
-					<item id="17402" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Leather Helmet Light Armor -->
-					<item id="17400" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Boots Heavy Armor -->
-					<item id="17399" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Gauntlets Heavy Armor -->
-					<item id="17396" min="1" max="1" chance="1.8827664114472" /> <!-- Seraph Helmet Heavy Armor -->
-					<item id="38032" min="1" max="1" chance="7.7695493912389" /> <!-- Seraph Leather Gloves Crafting Pack Light Armor -->
-					<item id="38039" min="1" max="1" chance="7.6754110706665" /> <!-- Seraph Sigil Crafting Pack Robe -->
-					<item id="38038" min="1" max="1" chance="7.656583406552" /> <!-- Seraph Shoes Crafting Pack Robe -->
-					<item id="38033" min="1" max="1" chance="7.6377557424376" /> <!-- Seraph Leather Boots Crafting Pack Light Armor -->
-					<item id="38027" min="1" max="1" chance="7.5122379816744" /> <!-- Seraph Boots Crafting Pack Heavy Armor -->
-					<item id="38029" min="1" max="1" chance="7.418099661102" /> <!-- Seraph Leather Helmet Crafting Pack Light Armor -->
-					<item id="38034" min="1" max="1" chance="7.2486506840718" /> <!-- Seraph Circlet Crafting Pack Robe -->
-					<item id="38026" min="1" max="1" chance="7.1231329233086" /> <!-- Seraph Gauntlets Crafting Pack Heavy Armor -->
-					<item id="38023" min="1" max="1" chance="7.1105811472323" /> <!-- Seraph Helmet Crafting Pack Heavy Armor -->
-					<item id="38028" min="1" max="1" chance="7.0540981548889" /> <!-- Seraph Shield Crafting Pack Heavy Armor -->
-					<item id="38037" min="1" max="1" chance="6.9662357223547" /> <!-- Seraph Gloves Crafting Pack Robe -->
-				</group>
-				<group chance="0.9">
-					<item id="19459" min="1" max="1" chance="33.333333333333" /> <!-- Octavis' Necklace -->
-					<item id="19458" min="1" max="1" chance="33.333333333333" /> <!-- Octavis' Earring -->
-					<item id="19457" min="1" max="1" chance="33.333333333333" /> <!-- Octavis' Ring -->
-				</group>
-				<group chance="100">
-					<item id="39738" min="1" max="1" chance="71.3617971755" /> <!-- Rune Stone -->
-					<item id="19448" min="1" max="1" chance="17.176784580143" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
-					<item id="17747" min="1" max="1" chance="7.1847057396293" /> <!-- Trace of Decaying Darkness -->
-					<item id="19447" min="1" max="1" chance="4.2767125047277" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
-				</group>
-			</death>
-			<lucky_corpse>
-				<item id="39629" min="2" max="2" chance="100" /> <!-- Fortune Pocket - Stage 1 -->
-			</lucky_corpse>
-		</drop_lists>
+		<ai aggroRange="300" isAggressive="true" clanHelpRange="500" />
 		<collision>
 			<radius normal="30" />
 			<height normal="81" />
 		</collision>
+		<drop_lists>
+			<death>
+				<item id="19462" min="1" max="1" chance="1.370" /> <!-- Octavis' Shirt -->
+				<item id="19459" min="1" max="1" chance="0.3" /> <!-- Octavis' Necklace -->
+				<item id="19458" min="1" max="1" chance="0.3" /> <!-- Octavis' Earring -->
+				<item id="19457" min="1" max="1" chance="0.3" /> <!-- Octavis' Ring -->
+				<item id="17412" min="1" max="1" chance="0.3" /> <!-- Seraph Sigil -->
+				<item id="17411" min="1" max="1" chance="0.3" /> <!-- Seraph Shoes -->
+				<item id="17410" min="1" max="1" chance="0.3" /> <!-- Seraph Gloves -->
+				<item id="17407" min="1" max="1" chance="0.3" /> <!-- Seraph Circlet -->
+				<item id="17406" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Boots -->
+				<item id="17405" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Gloves -->
+				<item id="17402" min="1" max="1" chance="0.3" /> <!-- Seraph Leather Helmet -->
+				<item id="17401" min="1" max="1" chance="0.3" /> <!-- Seraph Shield -->
+				<item id="17400" min="1" max="1" chance="0.3" /> <!-- Seraph Boots -->
+				<item id="17399" min="1" max="1" chance="0.3" /> <!-- Seraph Gauntlets -->
+				<item id="17396" min="1" max="1" chance="0.3" /> <!-- Seraph Helmet -->
+				<item id="39738" min="1" max="1" chance="99" /> <!-- Rune Stone -->
+				<item id="19448" min="1" max="1" chance="24.02" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="17747" min="1" max="1" chance="9.977" /> <!-- Trace of Decaying Darkness -->
+				<item id="19447" min="1" max="1" chance="6.260" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="46489" min="1" max="1" chance="1.531" /> <!-- Pantheon's Soul Crystal - Stage 1 -->
+				<item id="46474" min="1" max="1" chance="1.525" /> <!-- Leona's Soul Crystal - Stage 1 -->
+				<item id="46504" min="1" max="1" chance="1.519" /> <!-- Lionel's Soul Crystal - Stage 1 -->
+				<item id="46490" min="1" max="1" chance="1.345" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46475" min="1" max="1" chance="1.317" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46505" min="1" max="1" chance="1.364" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="38026" min="1" max="1" chance="1.316" /> <!-- Seraph Gauntlets Crafting Pack -->
+				<item id="38038" min="1" max="1" chance="1.255" /> <!-- Seraph Shoes Crafting Pack -->
+				<item id="38037" min="1" max="1" chance="1.253" /> <!-- Seraph Gloves Crafting Pack -->
+				<item id="38039" min="1" max="1" chance="1.230" /> <!-- Seraph Sigil Crafting Pack -->
+				<item id="38032" min="1" max="1" chance="1.224" /> <!-- Seraph Leather Gloves Crafting Pack -->
+				<item id="38034" min="1" max="1" chance="1.220" /> <!-- Seraph Circlet Crafting Pack -->
+				<item id="38023" min="1" max="1" chance="1.219" /> <!-- Seraph Helmet Crafting Pack -->
+				<item id="38024" min="1" max="1" chance="1.216" /> <!-- Seraph Breastplate Crafting Pack -->
+				<item id="38027" min="1" max="1" chance="1.207" /> <!-- Seraph Boots Crafting Pack -->
+				<item id="38025" min="1" max="1" chance="1.197" /> <!-- Seraph Gaiters Crafting Pack -->
+				<item id="38036" min="1" max="1" chance="1.189" /> <!-- Seraph Stockings Crafting Pack -->
+				<item id="38028" min="1" max="1" chance="1.187" /> <!-- Seraph Shield Crafting Pack -->
+				<item id="38035" min="1" max="1" chance="1.186" /> <!-- Seraph Tunic Crafting Pack -->
+				<item id="38030" min="1" max="1" chance="1.183" /> <!-- Seraph Leather Armor Crafting Pack -->
+				<item id="38033" min="1" max="1" chance="1.163" /> <!-- Seraph Leather Boots Crafting Pack -->
+				<item id="38029" min="1" max="1" chance="1.160" /> <!-- Seraph Leather Helmet Crafting Pack -->
+				<item id="46476" min="1" max="1" chance="1.132" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46491" min="1" max="1" chance="1.125" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="38031" min="1" max="1" chance="1.137" /> <!-- Seraph Leather Leggings Crafting Pack -->
+				<item id="46459" min="1" max="1" chance="1.101" /> <!-- Mermoden's Soul Crystal - Stage 1 -->
+				<item id="46444" min="1" max="1" chance="1.116" /> <!-- Kain's Soul Crystal - Stage 1 -->
+				<item id="46506" min="1" max="1" chance="1.114" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46461" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46460" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46446" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46445" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46493" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="46463" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46508" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46448" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="38016" min="1" max="1" chance="0.075" /> <!-- Specter Fighter Crafting Pack -->
+				<item id="38022" min="1" max="1" chance="0.075" /> <!-- Specter Retributer Crafting Pack -->
+				<item id="38012" min="1" max="1" chance="0.075" /> <!-- Specter Shaper Crafting Pack -->
+				<item id="38013" min="1" max="1" chance="0.075" /> <!-- Specter Cutter Crafting Pack -->
+				<item id="38021" min="1" max="1" chance="0.075" /> <!-- Specter Caster Crafting Pack -->
+				<item id="38020" min="1" max="1" chance="0.075" /> <!-- Specter Buster Crafting Pack -->
+				<item id="38019" min="1" max="1" chance="0.075" /> <!-- Specter Shooter Crafting Pack -->
+				<item id="38014" min="1" max="1" chance="0.075" /> <!-- Specter Slasher Crafting Pack -->
+				<item id="38015" min="1" max="1" chance="0.075" /> <!-- Specter Avenger Crafting Pack -->
+				<item id="38017" min="1" max="1" chance="0.075" /> <!-- Specter Stormer Crafting Pack -->
+				<item id="38018" min="1" max="1" chance="0.075" /> <!-- Specter Thrower Crafting Pack -->
+			</death>
+			<lucky_corpse>
+				<item id="39629" min="2" max="2" chance="99" /> <!-- Fortune Bag - Stage 1 -->
+			</lucky_corpse>	
+		</drop_lists>
 	</npc>
 	<npc id="29195" level="94" type="L2RaidBoss" name="Istina" title="Queen of Annihilation">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
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 @@
 			<height normal="81" />
 		</collision>
 	</npc>
-	<npc id="29212" level="99" type="L2Monster" name="Octavis" title="">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+	<npc id="29212" level="99" type="L2RaidBoss" name="Octavis" title="">
 		<parameters>
 			<skill name="boss_skill_01" id="14030" level="1" />
 			<skill name="boss_skill_02" id="14031" level="1" />
@@ -527,7 +526,7 @@
 		<acquire exp="29747926593" sp="47596682" />
 		<mpReward value="53" type="DIFF" ticks="10" affects="PARTY" />
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="19324155" hpRegen="22380.1" mp="22800" mpRegen="30" />
+			<vitals hp="46010814" hpRegen="10.8" mp="45646" mpRegen="30" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -540,7 +539,7 @@
 			</attribute>
 			<abnormalResist physical="230" magical="230" />
 		</stats>
-		<status attackable="false" undying="false" />
+		<status attackable="true" undying="false" />
 		<skill_list>
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 			<skill id="14726" level="1" /> <!-- Octavis -->
@@ -555,11 +554,108 @@
 			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
 			<skill id="4045" level="1" /> <!-- Resist Full Magic Attack -->
 		</skill_list>
-		<ai clanHelpRange="300" aggroRange="300" />
+		<ai clanHelpRange="600" aggroRange="300" />	
 		<collision>
 			<radius normal="30" />
 			<height normal="81" />
 		</collision>
+		<drop_lists>
+			<death>
+				<item id="19462" min="1" max="1" chance="12.75" /> <!-- Octavis' Shirt -->
+				<item id="19458" min="1" max="1" chance="2.059" /> <!-- Octavis' Earring -->
+				<item id="19459" min="1" max="1" chance="2.029" /> <!-- Octavis' Necklace -->
+				<item id="19457" min="1" max="1" chance="2.098" /> <!-- Octavis' Ring -->
+				<item id="17408" min="1" max="1" chance="1.391" /> <!-- Seraph Tunic -->
+				<item id="17398" min="1" max="1" chance="1.362" /> <!-- Seraph Gaiters -->
+				<item id="17397" min="1" max="1" chance="1.357" /> <!-- Seraph Breastplate -->
+				<item id="17409" min="1" max="1" chance="1.520" /> <!-- Seraph Stockings -->
+				<item id="17403" min="1" max="1" chance="1.509" /> <!-- Seraph Leather Armor -->
+				<item id="17404" min="1" max="1" chance="1.489" /> <!-- Seraph Leather Leggings -->
+				<item id="19447" min="1" max="1" chance="50.26" /> <!-- Blessed Scroll: Enchant Weapon (R-grade) -->
+				<item id="19448" min="1" max="1" chance="48.71" /> <!-- Blessed Scroll: Enchant Armor (R-grade) -->
+				<item id="17747" min="1" max="1" chance="9.968" /> <!-- Trace of Decaying Darkness -->
+				<item id="37076" min="1" max="1" chance="5.170" /> <!-- Monster Weapon Appearance Stone: Drakos' Dual Dagger -->
+				<item id="37082" min="1" max="1" chance="5.493" /> <!-- Monster Weapon Appearance Stone: Kanadis' Bow -->
+				<item id="37079" min="1" max="1" chance="5.162" /> <!-- Monster Weapon Appearance Stone: Mimilead's Staff -->
+				<item id="37073" min="1" max="1" chance="5.158" /> <!-- Monster Weapon Appearance Stone: Glakias' Hammer -->
+				<item id="37081" min="1" max="1" chance="5.139" /> <!-- Monster Weapon Appearance Stone: Kanadis' Hand -->
+				<item id="37067" min="1" max="1" chance="5.136" /> <!-- Monster Weapon Appearance Stone: Theor's Sword -->
+				<item id="37078" min="1" max="1" chance="5.133" /> <!-- Monster Weapon Appearance Stone: Thesakar's Spear -->
+				<item id="37070" min="1" max="1" chance="5.132" /> <!-- Monster Weapon Appearance Stone: Tegaffe's Dualsword -->
+				<item id="37069" min="1" max="1" chance="5.119" /> <!-- Monster Weapon Appearance Stone: Octavis' Sword -->
+				<item id="37085" min="1" max="1" chance="5.118" /> <!-- Monster Weapon Appearance Stone: Theor's Shield -->
+				<item id="37068" min="1" max="1" chance="5.116" /> <!-- Monster Weapon Appearance Stone: Sword of Corruption -->
+				<item id="37084" min="1" max="1" chance="5.112" /> <!-- Monster Weapon Appearance Stone: Spicula's Crossbow -->
+				<item id="37075" min="1" max="1" chance="5.110" /> <!-- Monster Weapon Appearance Stone: Drakos' Dagger -->
+				<item id="37072" min="1" max="1" chance="5.450" /> <!-- Monster Weapon Appearance Stone: Tebot's Axe -->
+				<item id="37083" min="1" max="1" chance="5.199" /> <!-- Monster Weapon Appearance Stone: Centaur's Bow -->
+				<item id="37077" min="1" max="1" chance="5.199" /> <!-- Monster Weapon Appearance Stone: Guillotine's Greatsword -->
+				<item id="37074" min="1" max="1" chance="5.184" /> <!-- Monster Weapon Appearance Stone: Tebot's Dual Blunt Weapon -->
+				<item id="37086" min="1" max="1" chance="5.183" /> <!-- Monster Weapon Appearance Stone: Shield of Corruption -->
+				<item id="37071" min="1" max="1" chance="5.177" /> <!-- Monster Weapon Appearance Stone: Seknus' One-handed Magic Sword -->
+				<item id="37080" min="1" max="1" chance="5.155" /> <!-- Monster Weapon Appearance Stone: Satyr's Staff -->
+				<item id="39484" min="1" max="1" chance="1.560" /> <!-- Alchemic Tome: Life Stone -->
+				<item id="39485" min="1" max="1" chance="1.653" /> <!-- Alchemic Tome: Dye -->
+				<item id="39483" min="1" max="1" chance="1.569" /> <!-- Alchemic Tome: Enchant Scroll -->
+				<item id="46491" min="1" max="1" chance="1.105" /> <!-- Pantheon's Soul Crystal - Stage 3 -->
+				<item id="46506" min="1" max="1" chance="1.096" /> <!-- Lionel's Soul Crystal - Stage 3 -->
+				<item id="46490" min="1" max="1" chance="1.189" /> <!-- Pantheon's Soul Crystal - Stage 2 -->
+				<item id="46505" min="1" max="1" chance="1.108" /> <!-- Lionel's Soul Crystal - Stage 2 -->
+				<item id="46476" min="1" max="1" chance="1.104" /> <!-- Leona's Soul Crystal - Stage 3 -->
+				<item id="46475" min="1" max="1" chance="1.102" /> <!-- Leona's Soul Crystal - Stage 2 -->
+				<item id="46508" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 5 -->
+				<item id="46492" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 4 -->
+				<item id="38070" min="1" max="1" chance="0.75" /> <!-- Eternal Sigil Crafting Pack -->
+				<item id="38069" min="1" max="1" chance="0.75" /> <!-- Eternal Shoes Crafting Pack -->
+				<item id="38067" min="1" max="1" chance="0.75" /> <!-- Eternal Stockings Crafting Pack -->
+				<item id="46507" min="1" max="1" chance="0.75" /> <!-- Lionel's Soul Crystal - Stage 4 -->
+				<item id="46445" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 2 -->
+				<item id="46446" min="1" max="1" chance="0.75" /> <!-- Kain's Soul Crystal - Stage 3 -->
+				<item id="46460" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 2 -->
+				<item id="46477" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 4 -->
+				<item id="46478" min="1" max="1" chance="0.75" /> <!-- Leona's Soul Crystal - Stage 5 -->
+				<item id="46461" min="1" max="1" chance="0.75" /> <!-- Mermoden's Soul Crystal - Stage 3 -->
+				<item id="46493" min="1" max="1" chance="0.75" /> <!-- Pantheon's Soul Crystal - Stage 5 -->
+				<item id="38066" min="1" max="1" chance="0.75" /> <!-- Eternal Tunic Crafting Pack -->
+				<item id="38065" min="1" max="1" chance="0.75" /> <!-- Eternal Circlet Crafting Pack -->
+				<item id="38055" min="1" max="1" chance="0.75" /> <!-- Eternal Breastplate Crafting Pack -->
+				<item id="38056" min="1" max="1" chance="0.75" /> <!-- Eternal Gaiters Crafting Pack -->
+				<item id="38054" min="1" max="1" chance="0.75" /> <!-- Eternal Helmet Crafting Pack -->
+				<item id="38068" min="1" max="1" chance="0.75" /> <!-- Eternal Gloves Crafting Pack -->
+				<item id="38057" min="1" max="1" chance="0.75" /> <!-- Eternal Gauntlets Crafting Pack -->
+				<item id="38058" min="1" max="1" chance="0.75" /> <!-- Eternal Boots Crafting Pack -->
+				<item id="38059" min="1" max="1" chance="0.75" /> <!-- Eternal Shield Crafting Pack -->
+				<item id="38060" min="1" max="1" chance="0.75" /> <!-- Eternal Leather Helmet Crafting Pack -->
+				<item id="38061" min="1" max="1" chance="0.75" /> <!-- Eternal Leather Armor Crafting Pack -->
+				<item id="38062" min="1" max="1" chance="0.75" /> <!-- Eternal Leather Leggings Crafting Pack -->
+				<item id="38063" min="1" max="1" chance="0.75" /> <!-- Eternal Leather Gloves Crafting Pack -->
+				<item id="38064" min="1" max="1" chance="0.75" /> <!-- Eternal Leather Boots Crafting Pack -->
+				<item id="46479" min="1" max="1" chance="0.3" /> <!-- Leona's Soul Crystal - Stage 6 -->
+				<item id="46494" min="1" max="1" chance="0.3" /> <!-- Pantheon's Soul Crystal - Stage 6 -->
+				<item id="46463" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 5 -->
+				<item id="46462" min="1" max="1" chance="0.3" /> <!-- Mermoden's Soul Crystal - Stage 4 -->
+				<item id="46509" min="1" max="1" chance="0.3" /> <!-- Lionel's Soul Crystal - Stage 6 -->
+				<item id="46447" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 4 -->
+				<item id="46448" min="1" max="1" chance="0.3" /> <!-- Kain's Soul Crystal - Stage 5 -->
+				<item id="38052" min="1" max="1" chance="0.075" /> <!-- Amaranthine Caster Crafting Pack -->
+				<item id="38043" min="1" max="1" chance="0.075" /> <!-- Amaranthine Shaper Crafting Pack -->
+				<item id="38044" min="1" max="1" chance="0.075" /> <!-- Amaranthine Cutter Crafting Pack -->
+				<item id="38045" min="1" max="1" chance="0.075" /> <!-- Amaranthine Slasher Crafting Pack -->
+				<item id="38046" min="1" max="1" chance="0.075" /> <!-- Amaranthine Avenger Crafting Pack -->
+				<item id="38050" min="1" max="1" chance="0.075" /> <!-- Amaranthine Shooter Crafting Pack -->
+				<item id="38047" min="1" max="1" chance="0.075" /> <!-- Amaranthine Fighter Crafting Pack -->
+				<item id="38048" min="1" max="1" chance="0.075" /> <!-- Amaranthine Stormer Crafting Pack -->
+				<item id="46464" min="1" max="1" chance="0.075" /> <!-- Mermoden's Soul Crystal - Stage 6 -->
+				<item id="46449" min="1" max="1" chance="0.075" /> <!-- Kain's Soul Crystal - Stage 6 -->
+				<item id="38053" min="1" max="1" chance="0.075" /> <!-- Amaranthine Retributer Crafting Pack -->
+				<item id="38051" min="1" max="1" chance="0.075" /> <!-- Amaranthine Buster Crafting Pack -->
+				<item id="38049" min="1" max="1" chance="0.075" /> <!-- Amaranthine Thrower Crafting Pack -->
+			</death>
+			<lucky_corpse>
+				<item id="39629" min="3" max="3" chance="99" /> <!-- Fortune Bag - Stage 1 -->
+				<item id="40198" min="1" max="1" chance="0.03" /> <!-- Disassembly Recipe Pouch: Armor -->
+			</lucky_corpse>
+		</drop_lists>
 	</npc>
 	<npc id="29213" level="98" type="L2RaidBoss" name="Baylor" title="Warden">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->