diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 3e3737fcc700b831c887332c75c75aed3b04d666..8da065c95831d87a7ec279338bbb8243f5e62eab 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -11,6 +11,7 @@ handlers/MasterHandler.java
# AI Section
# Npc
+ai/npc/Dorian/Dorian.java
ai/npc/DragonVortex/DragonVortex.java
ai/npc/ForgeOfTheGods/ForgeOfTheGods.java
ai/npc/ForgeOfTheGods/Rooney.java
@@ -306,7 +307,7 @@ quests/Q00020_BringUpWithLove/Q00020_BringUpWithLove.java
quests/21_HiddenTruth/__init__.py
quests/22_TragedyInVonHellmannForest/__init__.py
quests/23_LidiasHeart/__init__.py
-quests/24_InhabitantsOfTheForrestOfTheDead/__init__.py
+quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
quests/25_HidingBehindTheTruth/__init__.py
quests/Q00026_TiredOfWaiting/Q00026_TiredOfWaiting.java
quests/Q00027_ChestCaughtWithABaitOfWind/Q00027_ChestCaughtWithABaitOfWind.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Dorian/Dorian.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
new file mode 100644
index 0000000000000000000000000000000000000000..c775ef393f2573eac686e26d9a4c1a1a804c05d7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/Dorian/Dorian.java
@@ -0,0 +1,89 @@
+/*
+ * 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 ai.npc.Dorian;
+
+import quests.Q00024_InhabitantsOfTheForestOfTheDead.Q00024_InhabitantsOfTheForestOfTheDead;
+
+import ai.npc.AbstractNpcAI;
+
+import com.l2jserver.gameserver.datatables.SpawnTable;
+import com.l2jserver.gameserver.model.L2Spawn;
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.network.NpcStringId;
+import com.l2jserver.gameserver.network.clientpackets.Say2;
+
+/**
+ * Dorian (Raid Fighter) - Quest AI
+ * @author malyelfik
+ */
+public class Dorian extends AbstractNpcAI
+{
+ private static final int ID = 25332;
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ if (event.equals("checkArea"))
+ {
+ if (npc.isDecayed())
+ {
+ cancelQuestTimers("checkArea");
+ }
+ else
+ {
+ for (L2PcInstance pl : npc.getKnownList().getKnownPlayersInRadius(300))
+ {
+ final QuestState qs = pl.getQuestState(Q00024_InhabitantsOfTheForestOfTheDead.class.getSimpleName());
+ if ((qs != null) && qs.isCond(3))
+ {
+ qs.takeItems(7153, -1);
+ qs.giveItems(7154, 1);
+ qs.setCond(4, true);
+ broadcastNpcSay(npc, Say2.NPC_ALL, NpcStringId.THAT_SIGN);
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public String onSpawn(L2Npc npc)
+ {
+ startQuestTimer("checkArea", 3000, npc, null, true);
+ return null;
+ }
+
+ public Dorian(String name, String descr)
+ {
+ super(name, descr);
+ addSpawnId(ID);
+
+ for (L2Spawn spawn : SpawnTable.getInstance().getSpawnTable())
+ {
+ if ((spawn != null) && (spawn.getNpcid() == ID))
+ {
+ startQuestTimer("checkArea", 3000, spawn.getLastSpawn(), null, true);
+ }
+ }
+ }
+
+ public static void main(String[] args)
+ {
+ new Dorian(Dorian.class.getSimpleName(), "ai/npc");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortuneTelling/FortuneTelling.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortuneTelling/FortuneTelling.java
index b88eeafa6aa20d8f9f8f59524dbb731621956a18..3638e9ad0da25de52285247bc523afcc12333b8c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortuneTelling/FortuneTelling.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/ai/npc/FortuneTelling/FortuneTelling.java
@@ -41,7 +41,7 @@ public class FortuneTelling extends AbstractNpcAI
public String onTalk(L2Npc npc, L2PcInstance player)
{
String htmltext = getNoQuestMsg(player);
- if (player.getAdena() < 1000)
+ if (player.getAdena() < COST)
{
htmltext = "lowadena.htm";
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-04.htm
deleted file mode 100644
index bee3f537e40314896aa564ff4b47fc55b758ab41..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-04.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Dorian:<br>
-Did you place the flower at the tombstone? Did you notice who was buried in that grave?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-05.htm">Nidrah</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-06.htm">Lidia</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-07.htm">Rose</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-13.htm
deleted file mode 100644
index 156b14784bc0333548a01dc7f800aede46bf3ab8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-13.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dorian:<br>
-I can't remember last night at all, and I'm exhausted! Have you discovered anything?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-14.htm">"There's a vampire!"</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-14.htm">"The villagers are changing into monsters!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-15.htm
deleted file mode 100644
index 298228773741f41b34748cdc93278660de2fc9af..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-15.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dorian:<br>
-Nooo!<br>
-It can't be! Me? A vampire? It's true that the lord of the manor I serve is an undead... But that doesn't mean I'm a vampire! <br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-16.htm"> "Check out this crucifix!" </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-16.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-16.htm
deleted file mode 100644
index 9584666105c9ebf4a9498499fd0e5a1add52b88e..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-16.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Dorian:<br>
-I gave you that! ...I see. Now I remember...<br>
-Young master Einhart and... and... you! You were standing there... holding the holy symbol! <br>
-Now I know... why the lord gave me such an order! <br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-17.htm">"What order?" </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-01.htm
deleted file mode 100644
index 93aa6670b99793201a38e347cbc3350fee55560f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-01.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-Long time no see. Things sure are quiet these days!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-02.htm">"What do you know about an odd doll?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-02.htm
deleted file mode 100644
index 51b3f41088dcc433988b154793a6091f0c3d38a0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-What are you talking about?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-03.htm">"Look at this!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-04.htm
deleted file mode 100644
index a7c824800fab1cae9c01f82e79a4d138fd0f0efe..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-What did you hear?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-05.htm">"That it's related to Wizard Nidrah."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-05.htm
deleted file mode 100644
index f21f9d7170e267cebea49b252e93d6005550c996..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-05.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-Where did you hear the name Nidrah?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-06.htm">"From the person who told me to see you about the doll."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-08.htm
deleted file mode 100644
index 00f3c724c49545bec2e337e42ee2eaf3713a76f1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-08.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-You trust me now? Tell me about Nidrah!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-09.htm">"Allright, I'll tell you."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-09.htm
deleted file mode 100644
index 5cebed96431c54b699eaa116803334e3dd39971d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-09.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Mysterous Wizard:<br>
-So tell me!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-10.htm">"You're gathering materials for the dark arts."</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-12.htm">"You signed a contract."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-10.htm
deleted file mode 100644
index 87220e4c8959df79afe061806f102be2051ccb80..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-10.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-Where is your proof?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-11.htm">"Lady Lidia controls all the dead of this earth, a power nearly equal to a god's! One must be granted authority by her to have power over the dead in any capacity."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-11.htm
deleted file mode 100644
index ac84fa3ee53c62fdb6f1cf5d18adeeb9ea22f336..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-11.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-So?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-15.htm">"Nobody is allowed here without permission. That you're here means you have power at least equal to the Lord of the Forest of the Dead."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-12.htm
deleted file mode 100644
index 3a5ea8b1801aa46bd2443e5bab051266415238a4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-12.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-So I made a mistake. What's wrong with that?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-13.htm">"It's impossible to have a real nonaggression contract in this situation!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-13.htm
deleted file mode 100644
index 2035c3516bb7eeb25a4a22d8d62cd5aec867ddfd..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-13.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-History is filled with such contracts. Do you know why?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-14.htm">"Nonaggression contracts are signed between two equal powers. It stays in effect only as long as it benefits them. If one party becomes weaker, the contract is nullified."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-14.htm
deleted file mode 100644
index 1fccf1849c75f2b7e44f0424a63efbec3112f794..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-14.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Mysterious Wizard:<br>
-Go on.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-15.htm">"The Lord of the Dead has absolute power here, why would she sign a contract with you? You must have power equal to hers, or else she reaps some benefit from not fighting you."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-05.htm
deleted file mode 100644
index 2b15f10116dcb28a44de51fb46a4c14d408f41f8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-05.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Maid of Lidia:<br>
-I don't know what it says, I wouldn't dream of reading the letter meant for my lord!<br>I was told you had something for me?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-06.htm">"Here's the hairpin."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-07.htm
deleted file mode 100644
index ef89c13bec4290d3dc0b3a5a4ca85ea30b06fa6e..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-07.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Maid of Lidia:<br>
-What is it?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-08.htm">"What do you know about Neidrahu?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-08.htm
deleted file mode 100644
index 59fbbf9233617a8ffd0a8645910d98abfcb3c7c1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-08.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Maid of Lidia:<br>
-Did I say Neidrahu?<br>
-What do you know of the name?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-09.htm">"It's a tree."</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-10.htm">"It's a corpse."</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-11.htm">"It's a Mystic."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-11.htm
deleted file mode 100644
index 93629b3ce346794213c2eff77b84ace6f91ceef1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-11.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Maid of Lidia:<br>
-What kind of Mystic was he?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-12.htm">"A Mystic of Dark Arts!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-12.htm
deleted file mode 100644
index 77ba325dab1b00b0f3d00d449b870bb3db7c2fbe..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-12.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Maid of Lidia:<br>
-Oh! Only Lord Alfred and Lady Lidia know. Even Einhalder thinks he's an ordinary Mystic! How do you know of this?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-13.htm">"I read the diary."</a><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-14.htm">"How do you know?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-13.htm
deleted file mode 100644
index ebc02a4c4ebbab757fbb57a68b6928143a8a4e1c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-13.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Maid of Lidia:<br>
-Did you read of the contract between Neidrahu and my lady in the diary?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-15.htm">"Now you must tell me what you know!"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-14.htm
deleted file mode 100644
index 65409038372981820ba5937eb9ea5a56fb472de0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-14.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Maid of Lidia:<br>
-How do you know about Neidrahu? Are you the last survivor? If so, you'll never get out of this forest alive...or dead!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-13.htm">"I read the diary."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/__init__.py
deleted file mode 100644
index 59247354d05973434a2d2fc3cef7315c938a34d3..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/__init__.py
+++ /dev/null
@@ -1,183 +0,0 @@
-# Created by Kerberos
-import sys
-from com.l2jserver.gameserver import GameTimeController
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest.jython import QuestJython as JQuest
-from com.l2jserver.gameserver.network.serverpackets import NpcSay
-
-qn = "24_InhabitantsOfTheForrestOfTheDead"
-
-# Npcs
-Dorian = 31389
-Wizard = 31522
-Tombstone = 31531
-MaidOfLidia = 31532
-
-#Items
-Letter = 7065
-Hairpin = 7148
-Totem = 7151
-Flower = 7152
-SilverCross = 7153
-BrokenSilverCross = 7154
-SuspiciousTotem = 7156
-
-def FindTemplate (npcId) :
- npcinstance = 0
- for spawn in SpawnTable.getInstance().getSpawnTable().values():
- if spawn :
- if spawn.getNpcid() == npcId:
- npcinstance=spawn.getLastSpawn()
- break
- return npcinstance
-
-def AutoChat(npc,text) :
- chars = npc.getKnownList().getKnownPlayers().values().toArray()
- if chars != None:
- for pc in chars :
- sm = NpcSay(npc.getObjectId(), 0, npc.getNpcId(), text)
- pc.sendPacket(sm)
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [Flower,SilverCross,BrokenSilverCross,Letter,Hairpin,Totem]
-
- def onAdvEvent (self,event,npc,player) :
- st = player.getQuestState(qn)
- if not st: return
- htmltext = event
- if event == "31389-02.htm":
- st.giveItems(Flower,1)
- st.set("cond","1")
- st.playSound("ItemSound.quest_accept")
- st.setState(State.STARTED)
- elif event == "31389-11.htm":
- st.set("cond","3")
- st.playSound("ItemSound.quest_middle")
- st.giveItems(SilverCross,1)
- elif event == "31389-16.htm":
- st.playSound("InterfaceSound.charstat_open_01")
- elif event == "31389-17.htm":
- st.takeItems(BrokenSilverCross,-1)
- st.giveItems(Hairpin,1)
- st.set("cond","5")
- elif event == "31522-03.htm":
- st.takeItems(Totem,-1)
- elif event == "31522-07.htm":
- st.set("cond","11")
- elif event == "31522-19.htm":
- st.giveItems(SuspiciousTotem,1)
- st.addExpAndSp(242105,22529)
- st.exitQuest(False)
- st.playSound("ItemSound.quest_finish")
- elif event == "31531-02.htm":
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- st.takeItems(Flower,-1)
- elif event == "31532-04.htm":
- st.playSound("ItemSound.quest_middle")
- st.giveItems(Letter,1)
- st.set("cond","6")
- elif event == "31532-06.htm":
- st.takeItems(Hairpin,-1)
- st.takeItems(Letter,-1)
- elif event == "31532-16.htm":
- st.playSound("ItemSound.quest_middle")
- st.set("cond","9")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
- npcId = npc.getNpcId()
- state = st.getState()
- if state == State.COMPLETED :
- if npcId == Wizard :
- htmltext = "31522-20.htm"
- else:
- htmltext = Quest.getAlreadyCompletedMsg(player)
- cond = st.getInt("cond")
- if npcId == Dorian :
- if state == State.CREATED :
- st2 = st.getPlayer().getQuestState("23_LidiasHeart")
- if st2 :
- if st2.getState() == State.COMPLETED and player.getLevel() >= 65 :
- htmltext = "31389-01.htm"
- else:
- htmltext = "31389-00.htm"
- else:
- htmltext = "31389-00.htm"
- elif cond == 1 :
- htmltext = "31389-03.htm"
- elif cond == 2 :
- htmltext = "31389-04.htm"
- elif cond == 3 :
- htmltext = "31389-12.htm"
- elif cond == 4 :
- htmltext = "31389-13.htm"
- elif cond == 5 :
- htmltext = "31389-18.htm"
- elif npcId == Tombstone :
- if cond == 1 :
- st.playSound("AmdSound.d_wind_loot_02")
- htmltext = "31531-01.htm"
- elif cond == 2 :
- htmltext = "31531-03.htm"
- elif npcId == MaidOfLidia :
- if cond == 5 :
- htmltext = "31532-01.htm"
- elif cond == 6 :
- if st.getQuestItemsCount(Letter) and st.getQuestItemsCount(Hairpin) :
- htmltext = "31532-05.htm"
- else:
- htmltext = "31532-07.htm"
- elif cond == 9 :
- htmltext = "31532-16.htm"
- elif npcId == Wizard :
- if cond == 10 :
- htmltext = "31522-01.htm"
- elif cond == 11 :
- htmltext = "31522-08.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
- npcId = npc.getNpcId()
- if not st.getQuestItemsCount(Totem) and st.getInt("cond") == 9:
- if npcId in [21557,21558,21560,21563,21564,21565,21566,21567] and self.getRandom(100) <=30:
- st.giveItems(Totem,1)
- st.set("cond","10")
- st.playSound("ItemSound.quest_middle")
- return
-
- def onAggroRangeEnter(self, npc, player, isPet) :
- if npc.getNpcId() == 25332:
- if isPet: npc.getAggroList().remove(player.getPet())
- else :
- npc.getAggroList().remove(player)
- st = player.getQuestState(qn)
- if st and st.getQuestItemsCount(SilverCross):
- st.takeItems(SilverCross,-1)
- st.giveItems(BrokenSilverCross,1)
- st.set("cond","4")
- AutoChat(npc,"That sign!")
- return
-
-QUEST = Quest(24,qn,"Inhabitants Of The Forrest Of The Dead")
-
-QUEST.addStartNpc(Dorian)
-
-QUEST.addTalkId(Dorian)
-QUEST.addTalkId(Tombstone)
-QUEST.addTalkId(MaidOfLidia)
-QUEST.addTalkId(Wizard)
-QUEST.addAggroRangeEnterId(25332)
-
-for mob in [21557,21558,21560,21563,21564,21565,21566,21567]:
- QUEST.addKillId(mob)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
index c5fa0bb2dabe658f5806c37b60a68b417a2f4f4e..a4a4f8cc533c463868cc8386a775dee9d83c6007 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/25_HidingBehindTheTruth/__init__.py
@@ -135,7 +135,7 @@ class Quest (JQuest) :
htmltext = Quest.getAlreadyCompletedMsg(player)
elif id == State.CREATED:
if npcId == Benedict:
- st2 = st.getPlayer().getQuestState("24_InhabitantsOfTheForrestOfTheDead")
+ st2 = st.getPlayer().getQuestState("Q00024_InhabitantsOfTheForestOfTheDead")
if st2 and st2.getState() == State.COMPLETED and player.getLevel() >= 66 :
htmltext = "31349-01.htm"
else :
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-01.htm
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-01.htm
index c1f7b90f5299fe9048dc2fd4f493afb36519ca26..0399f6a96efe69fba92e79f33a41613c14b60fa3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-01.htm
@@ -1,5 +1,5 @@
<html><body>Dorian:<br>
Are you the one who recovered the Silver Spear? Your reputation precedes you! Actually, I have a problem you may be able to help me with!<br>
Would you be willing to help me?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-02.htm">"I'll do it!"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-02.htm">"I'll do it!"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-02.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-02.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-03.htm
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-03.htm
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..f819896bcddc5522e49a0d58fe5579a44bc0a8d0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-05.html
@@ -0,0 +1,6 @@
+<html><body>Dorian:<br>
+Did you place the flower at the tombstone? Did you notice who was buried in that grave?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-06.html">Nidrah</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-07.html">Lidia</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-08.html">Rose</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-06.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-06.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-07.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-07.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..05a317f8870e805bcca431d9c4bdcd2140aa6992
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-08.html
@@ -0,0 +1,4 @@
+<html><body>Dorian:<br>
+Yes! Rose rests there... She was the maid Mr. Alfred, my former master, assigned to his daughter. They were about the same age.<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-10.html">"Who is Alfred's daughter?" </a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-09.html
similarity index 59%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-09.html
index b132bb84feed1a1bc28e7dc7f778b9e864b08840..32731213d618abda9a783393d1b25252eadb01db 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-09.html
@@ -1,4 +1,4 @@
<html><body>Dorian:<br>
Yes! Rose rests there... She was the maid Mr. Alfred, my former master, assigned to his daughter. They were about the same age.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-08.htm">"Who is Alfred's daughter?"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-10.html">"Who is Alfred's daughter?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-10.html
similarity index 58%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-08.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-10.html
index aca669ad827b793a7161f9345fa6e51ded537a08..cd42c51067462c17ed214b4b6fbcb0845dcb8698 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-10.html
@@ -1,4 +1,4 @@
<html><body>Dorian:<br>
-Why, she's Lady Lidia, current lord of this manor! She thought highly of Rose, and didn't want her coming back as an undead! Lady Lidia graciously allowed Rose to rest in peace. That's better than most others get around here! <br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-09.htm">"How did Rose earn such a privilege?"</a>
+Why, she's Lady Lidia, current lord of this manor! She thought highly of Rose, and didn't want her coming back as an undead! Lady Lidia graciously allowed Rose to rest in peace. That's better than most others get around here!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-11.html">"How did Rose earn such a privilege?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-11.html
similarity index 62%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-09.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-11.html
index 711a625e5b593c3c4286032ffd6f91cc17c510e4..f69c3603d5b57d9d16e60d6b0c02c4283b011883 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-11.html
@@ -1,5 +1,5 @@
<html><body>Dorian:<br>
I don't know, exactly. All I know is, my fiance was with Lady Lidia, and died protecting her!<br>
Anyway, thank you for taking the flower to Rose's grave.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-10.htm">"It's the least I could do."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-12.html">"It's the least I could do."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-12.html
similarity index 73%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-10.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-12.html
index 34340cb4d91555f0cf592430175621ed787dea55..7f8170f17fd0534c3f57c4423aa5a998cdd669cf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-10.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-12.html
@@ -1,6 +1,6 @@
<html><body>Dorian:<br>
Oh, don't be so modest! You remembered Rose's name! And you asked such respectful questions!<br>
-You're obviously a wonderful person!<br>Do you suppose you could do something else for me? <br>
+You're obviously a wonderful person!<br>Do you suppose you could do something else for me?<br>
Recently my nights have been dreamless, and I've woken up with wounds that I don't remember getting! Something strange is going on in this village! Will you investigate?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-11.htm">"Yes, I will."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-13.html">"Yes, I will."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-13.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-11.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-13.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-14.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-12.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-14.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..78bad85d3ae5a75383e939d1910f8eceea51ceac
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-15.html
@@ -0,0 +1,5 @@
+<html><body>Dorian:<br>
+I can't remember last night at all, and I'm exhausted! Have you discovered anything?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-16.html">"There's a vampire!"</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-16.html">"The villagers are changing into monsters!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-14.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-16.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-14.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-16.html
index 89f309dd8b6257939550f2778a93afc386112073..44df21b87aa8a65993418abcce476dadde1953d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-14.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-16.html
@@ -1,4 +1,4 @@
<html><body>Dorian:<br>
A vampire, eh?! Hmm... I see. Is the lord of the manor coming down here making the rounds? Hmm...Why am I so tired then?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31389-15.htm">"I'll tell you why! Because you're the vampire!"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-17.html">"I'll tell you why! Because you're the vampire!"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-17.html
new file mode 100644
index 0000000000000000000000000000000000000000..bf189dcf5f95352017b6350b6b129365ffb8435a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-17.html
@@ -0,0 +1,5 @@
+<html><body>Dorian:<br>
+Nooo!<br>
+It can't be! Me? A vampire? It's true that the lord of the manor I serve is an undead... But that doesn't mean I'm a vampire!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-18.html">"Check out this crucifix!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-18.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-18.html
new file mode 100644
index 0000000000000000000000000000000000000000..973f9403dfeb85b90f97975adafdd5154e6cc53f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-18.html
@@ -0,0 +1,6 @@
+<html><body>Dorian:<br>
+I gave you that! ...I see. Now I remember...<br>
+Young master Einhart and... and... you! You were standing there... holding the holy symbol!<br>
+Now I know... why the lord gave me such an order!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31389-19.html">"What order?" </a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-17.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-19.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-17.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-19.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-18.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-20.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31389-18.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-20.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-21.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-21.html
new file mode 100644
index 0000000000000000000000000000000000000000..8d0035f07089e0da426ad1ff803485877e41a55d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-21.html
@@ -0,0 +1,3 @@
+<html><body>Dorian:<br>
+Oh, come in! Say, you must've dropped this the last time you were here! It looks very valuable! You should keep it in a safe place.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-22.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-22.html
new file mode 100644
index 0000000000000000000000000000000000000000..a3785ddebfd486e7aeb987adefea99d125ac3565
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31389-22.html
@@ -0,0 +1,5 @@
+<html><body>Dorian:<br>
+Did you see the maid of the lord? I have no memories after dark, so I have no idea what she's like!<br>
+I've heard that she's quite beautiful! I was even told that she resembles my fiance!<br>
+At least she's... alive! What a privilege, even if it's only during the day! Oh, well, I shouldn't be talking about this...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..50d893c228a2ef63f0da9bcdc7ecedd85b42e4b9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-01.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+Long time no see. Things sure are quiet these days!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-02.html">"What do you know about an odd doll?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..4775944f177e27c107375fe5ea0496e8006e38ea
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-02.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+What are you talking about?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-03.html">"Look at this!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-03.html
similarity index 57%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-03.html
index fdfeb420eaace20ec10a1f163db81a914c67d025..f6b4558e8dcc71714d792b90fc67fa4daafbc664 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-03.html
@@ -1,4 +1,4 @@
<html><body>Mysterious Wizard:<br>
Oh, that. It's an amulet to help my puppets collect bone pieces in the forest without getting hurt.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-04.htm">"That's not what I heard."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-05.html">"That's not what I heard."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..41d77c4ad844a6468bdd1fcd5a5d893b4ae029c3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-04.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+It may look a little odd, but it's just an amulet.<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-05.html">"That's not what I heard."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..41efbbf8e82e6749bd9ea1ceb50f0be753e21645
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-05.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+What did you hear?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-06.html">"That it's related to Wizard Nidrah."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..c9df53037d78fe188a657feaa2066adfe918e6ff
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-06.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+Where did you hear the name Nidrah?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-07.html">"From the person who told me to see you about the doll."<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-07.html
similarity index 70%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-07.html
index 147445a82868230d377b26e8a1902bbedf4dd6fd..fe858b876d813d9ff46e50d748be72bbca7e525f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-07.html
@@ -2,5 +2,5 @@
So, you're under the protection of Lady Lidia.<br>
We've signed a mutual contract not to harm each other.<br>
This doll was made by Nidrah, and tells the Lord of the Forest of the Dead not to attack its bearer.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-07.htm">"How did you get it?"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-08.html">"How did you get it?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-08.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-08.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..69f8ff013da9e52af2ea8b9c84df57b181fa75c3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-09.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+You trust me now? Tell me about Nidrah!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-10.html">"Allright, I'll tell you."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..aad446f6fc01fbeb2e21f09d26524c16c20b7632
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-10.html
@@ -0,0 +1,5 @@
+<html><body>Mysterous Wizard:<br>
+So tell me!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-11.html">"You're gathering materials for the dark arts."<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-13.html">"You signed a contract."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-11.html
new file mode 100644
index 0000000000000000000000000000000000000000..cf00e9f27d105d498a54627e2f3294dd239b2c15
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-11.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+Where is your proof?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-12.html">"Lady Lidia controls all the dead of this earth, a power nearly equal to a god's! One must be granted authority by her to have power over the dead in any capacity."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..c62c1edd262b42e484fb78dbc65decf8044bcc7d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-12.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+So?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-16.html">"Nobody is allowed here without permission. That you're here means you have power at least equal to the Lord of the Forest of the Dead."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-13.html
new file mode 100644
index 0000000000000000000000000000000000000000..55c8220c06553a3ea1964a1f4b5f4f148de3dcab
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-13.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+So I made a mistake. What's wrong with that?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-14.html">"It's impossible to have a real nonaggression contract in this situation!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..eb2cfc91c444b10cdefd1ceb17b0309f8f1f272d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-14.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+History is filled with such contracts. Do you know why?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-15.html">"Nonaggression contracts are signed between two equal powers. It stays in effect only as long as it benefits them. If one party becomes weaker, the contract is nullified."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..9c4d29d6885ea434003a66cacc6a31de798a48c0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-15.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+Go on.<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-16.html">"The Lord of the Dead has absolute power here, why would she sign a contract with you? You must have power equal to hers, or else she reaps some benefit from not fighting you."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-16.html
similarity index 51%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-15.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-16.html
index c9fe46a03099322e162f43ec36ca8fde3959a8da..8633a862a93738124a0789599659347e33c522bf 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-15.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-16.html
@@ -1,4 +1,4 @@
<html><body>Mysterious Wizard:<br>
You think I have something to do with Nidrah?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-16.htm">"Yes."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-17.html">"Yes."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-16.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-17.html
similarity index 50%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-16.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-17.html
index 0c00ae6992043c0d8c6fb3bc569618172f9e4b7a..03b2d6c400c3d43ba81802e418de643814823742 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-16.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-17.html
@@ -1,4 +1,4 @@
<html><body>Mysterious Wizard:<br>
Let's say for arguments sake that I'm Nidrah. What difference would that make?<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-17.htm">"Here's the missing page from the diary."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-19.html">"Here's the missing page from the diary."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-18.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-18.html
new file mode 100644
index 0000000000000000000000000000000000000000..03b2d6c400c3d43ba81802e418de643814823742
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-18.html
@@ -0,0 +1,4 @@
+<html><body>Mysterious Wizard:<br>
+Let's say for arguments sake that I'm Nidrah. What difference would that make?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-19.html">"Here's the missing page from the diary."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-17.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-19.html
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-17.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-19.html
index 336465b56b256bb34d816990f15474642d8f0b33..d46b171c01967427bf9783ca6a209753d17808f4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-17.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-19.html
@@ -1,5 +1,5 @@
<html><body>Mysterious Wizard:<br>
You found the diary! You're tracking Nidrah.<br>
Going further may be difficult, you're following a dangerous man. If you insist, you'll need the key.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-18.htm">"Key?"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-20.html">"Key?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-18.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-20.html
similarity index 70%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-18.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-20.html
index 07dbf5e1f5deeac32b1b15ee7c5562a129e8c1ff..d43cb53210dc49c560c85c4c3f67918aa82752e1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-18.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-20.html
@@ -1,4 +1,4 @@
<html><body>Mysterious Wizard:<br>
The Priest of the Rune Township has the key. I'll give you the doll, it represents the person who carried the real authority in the Hellmann Forest and Rune Territory, even over Lidia.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31522-19.htm">"Who is it?"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31522-21.html">"Who is it?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-19.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-21.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-19.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-21.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-20.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-22.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31522-20.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31522-22.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-01.html
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-01.html
index ac3af170710adb5c9cce2c2aed5c33dc6bdacbdb..cb187d0e6a47e7c7dce57cc12835f745699d59ae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-01.html
@@ -1,4 +1,4 @@
<html><body>Tombstone:<br>
<font color="LEVEL">Here lies Rose, a faithful, loving servant. May she rest in peace.</font><br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31531-02.htm">Place flowers on the grave.</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31531-02.html">Place flowers on the grave.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-03.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31531-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31531-03.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-01.html
similarity index 52%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-01.html
index 4d732ea182286264e11ab513b08932989368c108..370d12e38492b5d528fd025309e0c13022934fec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-01.html
@@ -1,4 +1,4 @@
<html><body>Maid of Lidia:<br>
My lady thanks you for recovering the Silver Spear. It's a family treasure.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-02.htm">"I was doing my duty."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-02.html">"I was doing my duty."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-02.html
similarity index 59%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-02.html
index a32dc808a723fcfcb52cc88c18adb8bb7faac03b..ade644ceb9898f1c053fbf406cf8e7d1102eee60 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-02.html
@@ -1,4 +1,4 @@
<html><body>Maid of Lidia:<br>
She knows how you helped her ancestors rest in peace. My lady knows all that happens in her forest!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-03.htm">"Everything?"</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-03.html">"Everything?"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-03.html
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-03.html
index 8aab430b6c221d0cf68f13a7f118935756832879..36a19c492c0c567125f750e59da547f22c79ea5a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-03.html
@@ -1,4 +1,4 @@
<html><body>Maid of Lidia:<br>
My lady knows everything about your journeys here. She hopes you'll uncover all the details of what has transpired.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-04.htm">"Please continue."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-04.html">"Please continue."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..b88e4644bfb69912a812de91ed9fa59f4e176628
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-05.html
@@ -0,0 +1,5 @@
+<html><body>Maid of Lidia:<br>
+I don't know what it says, I wouldn't dream of reading the letter meant for my lord!<br>
+I was told you had something for me?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-07.html">"Here's the hairpin."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-06.html
similarity index 50%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-06.html
index a9fca875765b2978ffe2de7420c49fa2e3a3975e..73963b9424aabb948c43145845261dbfd27d8276 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-06.html
@@ -1,4 +1,5 @@
<html><body>Maid of Lidia:<br>
This is Neidrahu's work, a hairpin of Moon Face Flower. How beautiful!<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-07.htm">"Wait!"</a>
+I must go now.<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-09.html">"Wait!"</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..7b7810ae9cae385e31e4565bde8be7c79ff8adef
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07.html
@@ -0,0 +1,3 @@
+<html><body>Maid of Lidia:<br>
+Oh no! Could you have dropped it in the village? Take the letter with you and ask around for it. Meet me again tomorrow night.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07a.html
new file mode 100644
index 0000000000000000000000000000000000000000..deb47967a4452f4e50e69407024089304843ce22
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-07a.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+Do you have something for me?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-07.html">"Here's the hairpin."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..19e12065c9ddd5fa3328f358bb17ab78c5b37a89
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-08.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+What is it?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-10.html">"What do you know about Neidrahu?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..875cdcceef05cd5d6390bde49b21b08a39fc33d7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-09.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+What is it?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-10.html">"Tell me everything you know about Neidrahu!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..dee7dc443e303b56c99d0291703456e5480aac90
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-10.html
@@ -0,0 +1,7 @@
+<html><body>Maid of Lidia:<br>
+Did I say Neidrahu?<br>
+What do you know of the name?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-12.html">"It's a tree."</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-13.html">"It's a corpse."</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-14.html">"It's a Mystic."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-11.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-11.html
new file mode 100644
index 0000000000000000000000000000000000000000..dee7dc443e303b56c99d0291703456e5480aac90
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-11.html
@@ -0,0 +1,7 @@
+<html><body>Maid of Lidia:<br>
+Did I say Neidrahu?<br>
+What do you know of the name?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-12.html">"It's a tree."</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-13.html">"It's a corpse."</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-14.html">"It's a Mystic."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-12.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-09.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-12.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-13.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-10.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-13.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a83a597fe6191177eb1ee1e429ee44009ce9298
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-14.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+What kind of Mystic was he?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-15.html">"A Mystic of Dark Arts!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-15.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-15.html
new file mode 100644
index 0000000000000000000000000000000000000000..d80990216c6715b5d5e3e55ef2f48c5cc27b23f5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-15.html
@@ -0,0 +1,5 @@
+<html><body>Maid of Lidia:<br>
+Oh! Only Lord Alfred and Lady Lidia know. Even Einhalder thinks he's an ordinary Mystic! How do you know of this?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-16.html">"I read the diary."</a><br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-17.html">"How do you know?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-16.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-16.html
new file mode 100644
index 0000000000000000000000000000000000000000..16ede6e91a41c557ddf4d047b99d6e2b5e779eff
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-16.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+Did you read of the contract between Neidrahu and my lady in the diary?<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-18.html">"Now you must tell me what you know!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-17.html
new file mode 100644
index 0000000000000000000000000000000000000000..479d22277ff930df25b77ec6c855d8fc149cffac
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-17.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+How do you know about Neidrahu? Are you the last survivor? If so, you'll never get out of this forest alive...or dead!<br>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-16.html">"I read the diary."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-15.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-18.html
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-15.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-18.html
index 3066360c674530b7725b1d21a26e2674aa6b0dfa..629020aa5e86e30b52ee8ed34cd3442dfe7bb35a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-15.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-18.html
@@ -1,5 +1,5 @@
<html><body>Maid of Lidia:<br>
I was there when the contract was signed, but the memory of the undead is not very clear.<br>
If you find out what's on the missing page, when the contract was signed, I'll tell you more.<br>
-<a action="bypass -h Quest 24_InhabitantsOfTheForrestOfTheDead 31532-16.htm">"I've already come this far."</a>
+<a action="bypass -h Quest Q00024_InhabitantsOfTheForestOfTheDead 31532-19.html">"I've already come this far."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-16.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-19.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/24_InhabitantsOfTheForrestOfTheDead/31532-16.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-19.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-20.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-20.html
new file mode 100644
index 0000000000000000000000000000000000000000..4c314a7983fd1e3a32d74e4ee14a302d74332047
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/31532-20.html
@@ -0,0 +1,4 @@
+<html><body>Maid of Lidia:<br>
+This I can tell you.<br>
+The black magi roam freely during the day, but are fewer at night. Some carry odd looking dolls. Take one to their master, I'm sure he can tell you more!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
new file mode 100644
index 0000000000000000000000000000000000000000..2a2540566fa543e2ffd3326b5ec47e7f78d9b770
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00024_InhabitantsOfTheForestOfTheDead/Q00024_InhabitantsOfTheForestOfTheDead.java
@@ -0,0 +1,351 @@
+/*
+ * 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.Q00024_InhabitantsOfTheForestOfTheDead;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+
+/**
+ * Inhabitants of the Forest of the Dead (24)
+ * @author malyelfik
+ */
+public class Q00024_InhabitantsOfTheForestOfTheDead extends Quest
+{
+ // NPCs
+ private static final int DORIAN = 31389;
+ private static final int MYSTERIOUS_WIZARD = 31522;
+ private static final int TOMBSTONE = 31531;
+ private static final int LIDIA_MAID = 31532;
+
+ // Items
+ private static final int LIDIA_LETTER = 7065;
+ private static final int LIDIA_HAIRPIN = 7148;
+ private static final int SUSPICIOUS_TOTEM_DOLL = 7151;
+ private static final int FLOWER_BOUQUET = 7152;
+ private static final int SILVER_CROSS_OF_EINHASAD = 7153;
+ private static final int BROKEN_SILVER_CROSS_OF_EINHASAD = 7154;
+ private static final int TOTEM = 7156;
+
+ // Monsters @formatter:off
+ private static final int[] MOBS = {21557, 21558, 21560, 21563, 21564, 21565, 21566, 21567};
+ // @formatter:on
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = event;
+ switch (event)
+ {
+ // Dorian
+ case "31389-02.htm":
+ final QuestState qs = player.getQuestState("23_LidiasHeart");
+ if ((player.getLevel() > 65) && (qs != null) && qs.isCompleted())
+ {
+ st.startQuest();
+ st.giveItems(FLOWER_BOUQUET, 1);
+ return "31389-03.htm";
+ }
+ break;
+ case "31389-08.html":
+ st.set("var", "1");
+ break;
+ case "31389-13.html":
+ st.giveItems(SILVER_CROSS_OF_EINHASAD, 1);
+ st.setCond(3, true);
+ st.unset("var");
+ break;
+ case "31389-18.html":
+ st.playSound(QuestSound.INTERFACESOUND_CHARSTAT_OPEN_01);
+ break;
+ case "31389-19.html":
+ if (!st.hasQuestItems(BROKEN_SILVER_CROSS_OF_EINHASAD))
+ {
+ return getNoQuestMsg(player);
+ }
+ st.takeItems(BROKEN_SILVER_CROSS_OF_EINHASAD, -1);
+ st.setCond(5, true);
+ break;
+ case "31389-06.html":
+ case "31389-07.html":
+ case "31389-10.html":
+ case "31389-11.html":
+ case "31389-12.html":
+ case "31389-16.html":
+ case "31389-17.html":
+ break;
+ // Lidia Maid
+ case "31532-04.html":
+ st.giveItems(LIDIA_LETTER, 1);
+ st.setCond(6, true);
+ break;
+ case "31532-07.html":
+ if (st.isCond(8))
+ {
+ if (!hasQuestItems(player, LIDIA_HAIRPIN, LIDIA_LETTER))
+ {
+ return getNoQuestMsg(player);
+ }
+ st.takeItems(LIDIA_HAIRPIN, -1);
+ st.takeItems(LIDIA_LETTER, -1);
+ st.set("var", "1");
+ htmltext = "31532-06.html";
+ }
+ else
+ {
+ if (st.isCond(6))
+ {
+ st.setCond(7, true);
+ }
+ }
+ break;
+ case "31532-10.html":
+ st.set("var", "2");
+ break;
+ case "31532-14.html":
+ st.set("var", "3");
+ break;
+ case "31532-19.html":
+ st.unset("var");
+ st.setCond(9, true);
+ break;
+ case "31532-02.html":
+ case "31532-03.html":
+ case "31532-09.html":
+ case "31532-12.html":
+ case "31532-13.html":
+ case "31532-15.html":
+ case "31532-16.html":
+ case "31532-17.html":
+ case "31532-18.html":
+ break;
+ // Mysterious Wizard
+ case "31522-03.html":
+ if (!st.hasQuestItems(SUSPICIOUS_TOTEM_DOLL))
+ {
+ return getNoQuestMsg(player);
+ }
+ st.takeItems(SUSPICIOUS_TOTEM_DOLL, 1);
+ st.set("var", "1");
+ break;
+ case "31522-08.html":
+ st.unset("var");
+ st.setCond(11, true);
+ break;
+ case "31522-17.html":
+ st.set("var", "1");
+ break;
+ case "31522-21.html":
+ st.giveItems(TOTEM, 1);
+ st.addExpAndSp(242105, 22529); // GoD: Harmony: 6191140 exp and 6118650 sp
+ st.exitQuest(false, true);
+ break;
+ case "31522-02.html":
+ case "31522-05.html":
+ case "31522-06.html":
+ case "31522-07.html":
+ case "31522-10.html":
+ case "31522-11.html":
+ case "31522-12.html":
+ case "31522-13.html":
+ case "31522-14.html":
+ case "31522-15.html":
+ case "31522-16.html":
+ case "31522-19.html":
+ case "31522-20.html":
+ break;
+ // Tombstone
+ case "31531-02.html":
+ if (!st.hasQuestItems(FLOWER_BOUQUET))
+ {
+ return getNoQuestMsg(player);
+ }
+ st.takeItems(FLOWER_BOUQUET, -1);
+ st.setCond(2, true);
+ break;
+ default:
+ htmltext = null;
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ String htmltext = getNoQuestMsg(player);
+ final QuestState st = player.getQuestState(getName());
+
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (npc.getNpcId())
+ {
+ case DORIAN:
+ switch (st.getState())
+ {
+ case State.CREATED:
+ htmltext = "31389-01.htm";
+ break;
+ case State.STARTED:
+ switch (st.getCond())
+ {
+ case 1:
+ htmltext = "31389-04.html";
+ break;
+ case 2:
+ htmltext = (st.getInt("var") == 0) ? "31389-05.html" : "31389-09.html";
+ break;
+ case 3:
+ htmltext = "31389-14.html";
+ break;
+ case 4:
+ htmltext = "31389-15.html";
+ break;
+ case 5:
+ htmltext = "31389-20.html";
+ break;
+ case 6:
+ case 8:
+ htmltext = "31389-22.html";
+ break;
+ case 7:
+ st.giveItems(LIDIA_HAIRPIN, 1);
+ st.setCond(8, true);
+ htmltext = "31389-21.html";
+ break;
+ }
+ break;
+ case State.COMPLETED:
+ htmltext = getAlreadyCompletedMsg(player);
+ break;
+ }
+ break;
+ case MYSTERIOUS_WIZARD:
+ if (st.isStarted())
+ {
+ if (st.isCond(10))
+ {
+ htmltext = (st.getInt("var") == 0) ? "31522-01.html" : "31522-04.html";
+ }
+ else if (st.isCond(11))
+ {
+ htmltext = (st.getInt("var") == 0) ? "31522-09.html" : "31522-18.html";
+ }
+ }
+ else if (st.isCompleted())
+ {
+ final QuestState qs = player.getQuestState("25_HidingBehindTheTruth");
+ if (!((qs != null) && (qs.isStarted() || qs.isStarted())))
+ {
+ htmltext = "31522-22.html";
+ }
+ }
+ break;
+ case TOMBSTONE:
+ if (st.isStarted())
+ {
+ if (st.isCond(1))
+ {
+ st.playSound(QuestSound.AMDSOUND_D_WIND_LOOT_02);
+ htmltext = "31531-01.html";
+ }
+ else if (st.isCond(2))
+ {
+ htmltext = "31531-03.html";
+ }
+ }
+ break;
+ case LIDIA_MAID:
+ if (st.isStarted())
+ {
+ switch (st.getCond())
+ {
+ case 5:
+ htmltext = "31532-01.html";
+ break;
+ case 6:
+ htmltext = "31532-05.html";
+ break;
+ case 7:
+ htmltext = "31532-07a.html";
+ break;
+ case 8:
+ switch (st.getInt("var"))
+ {
+ case 0:
+ htmltext = "31532-07a.html";
+ break;
+ case 1:
+ htmltext = "31532-08.html";
+ break;
+ case 2:
+ htmltext = "31532-11.html";
+ break;
+ case 3:
+ htmltext = "31532-15.html";
+ break;
+ }
+ break;
+ case 9:
+ case 10:
+ htmltext = "31532-20.html";
+ break;
+ }
+ }
+ break;
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+ {
+ final QuestState st = player.getQuestState(getName());
+
+ if ((st != null) && st.isCond(9) && (getRandom(100) < 10))
+ {
+ st.giveItems(SUSPICIOUS_TOTEM_DOLL, 1);
+ st.setCond(10, true);
+ }
+ return super.onKill(npc, player, isPet);
+ }
+
+ public Q00024_InhabitantsOfTheForestOfTheDead(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(DORIAN);
+ addTalkId(DORIAN, MYSTERIOUS_WIZARD, TOMBSTONE, LIDIA_MAID);
+ addKillId(MOBS);
+
+ registerQuestItems(LIDIA_LETTER, LIDIA_HAIRPIN, SUSPICIOUS_TOTEM_DOLL, FLOWER_BOUQUET, SILVER_CROSS_OF_EINHASAD, BROKEN_SILVER_CROSS_OF_EINHASAD);
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00024_InhabitantsOfTheForestOfTheDead(24, Q00024_InhabitantsOfTheForestOfTheDead.class.getSimpleName(), "Inhabitants of the Forest of the Dead");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20121013update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20121013update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..3a2b196b009ab12a847fc552e35b84e3808c19e1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20121013update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name = 'Q00024_InhabitantsOfTheForestOfTheDead' WHERE name = '24_InhabitantsOfTheForrestOfTheDead';
\ No newline at end of file