diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 7706154e0ba1195cea77489a972976f4d5ff413f..83c1ae0b66a76b827f1aa6f8194946d4c7903692 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -496,8 +496,8 @@ quests/Q00354_ConquestOfAlligatorIsland/Q00354_ConquestOfAlligatorIsland.java
 quests/355_FamilyHonor/__init__.py
 quests/356_DigUpTheSeaOfSpores/__init__.py
 quests/357_WarehouseKeepersAmbition/__init__.py
-quests/358_IllegitimateChildOfAGoddess/__init__.py
-quests/359_ForSleeplessDeadmen/__init__.py
+quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
+quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
 quests/Q00360_PlunderTheirSupplies/Q00360_PlunderTheirSupplies.java
 quests/Q00362_BardsMandolin/Q00362_BardsMandolin.java
 quests/Q00363_SorrowfulSoundOfFlute/Q00363_SorrowfulSoundOfFlute.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-1.htm
deleted file mode 100644
index 848f72ef69677f5130884808f9aba8df1421e051..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-1.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-I think it is too early for you to help me. Come back after you have gained some more experience.<br>
-<font color="LEVEL">(Quest for characters level 63 and above.)</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-2.htm
deleted file mode 100644
index 759035b9059cd7626b268a0236968419ffe85721..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-2.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-To protect Shilen's reputation, we need to destroy the evil creatures that are evidence of her descent into madness.<br><br>
-<a action="bypass -h Quest 358_IllegitimateChildOfAGoddess 30862-5.htm">"I'll protect her reputation as if i were his son"</a><br><br>
-<a action="bypass -h Quest 358_IllegitimateChildOfAGoddess 30862-6.htm">"Honestly i don't care about your goddess' problems"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-3.htm
deleted file mode 100644
index 5a73266fd6806a12dc1b00bce28e296e946ae888..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-3.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-It seems you're really commited with your task, did you slayed enough monsters to protect our goddess image?<br><br>
-<a action="bypass -h Quest 358_IllegitimateChildOfAGoddess 30862-7.htm">"The lunacy of our mother is hidden now"</a><br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-4.htm
deleted file mode 100644
index f46d569d2cb44ca76e479c7e6ed2980e52dd4f91..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-4.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-Shilen's reputation can't be safe with so many monsters out there! We need to slay them to keep her doctrine strong. How do you think that killing just a few of them will suffice to honor our mother?<br><br>
-<a action="bypass -h Quest 358_IllegitimateChildOfAGoddess 30862-5.htm">"You're right, i'll double my efforts"</a><br><br>
-<a action="bypass -h Quest 358_IllegitimateChildOfAGoddess 30862-6.htm">"I will quit, Shillen's doctrine is not my businness"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-5.htm
deleted file mode 100644
index d1a863e2a13626672d808aa643f16cdfaa1f20f7..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-5.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-Then in the name of our mother, collect<font color="LEVEL"> 108 Snake Scales</font> from the evil creatures that look like her and take them back to me. Those creatures are known as<font color="LEVEL"> Falibati and Trives</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-6.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-6.htm
deleted file mode 100644
index f9999737f11cca6ab4bd02e0a64aaba48999348f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-6.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-Get off my sight then, and never come back again into our guild.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-7.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-7.htm
deleted file mode 100644
index ba874ae0dad372697e195a7feb536928005f7068..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/30862-7.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Grand Master Oltlin:<br><br>
-Well done! You've proved yourself as a brother in the Shillen's Light. Come back here whenever you feel willing to serve our mother again. Take this reward as a token of empathy.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/__init__.py
deleted file mode 100644
index 7f1291dfe492f02c440bf0cfdf5f4489002b4ce8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/358_IllegitimateChildOfAGoddess/__init__.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# Illegitimate Child Of A Goddess version 0.1 
-# by DrLecter
-import sys
-from com.l2jserver import Config
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-#Quest info
-QUEST_NUMBER,QUEST_NAME,QUEST_DESCRIPTION = 358,"IllegitimateChildOfAGoddess","Illegitimate Child Of A Goddess"
-qn = "358_IllegitimateChildOfAGoddess"
-
-#Variables
-DROP_RATE=12*Config.RATE_QUEST_DROP  #in %
-REQUIRED=108 #how many items will be paid for a reward (affects onkill sounds too)
-
-#Quest items
-SN_SCALE = 5868
-
-#Rewards
-REWARDS=range(6329,6340,2)+range(5364,5367,2)
-
-#Changing this value to non-zero, will turn recipes to 100% instead of 70/60%
-ALT_RP_100 = 0
-
-#NPCs
-OLTLIN = 30862
-
-#Mobs
-MOBS = [ 20672,20673 ]
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [SN_SCALE]
-
- def onEvent (self,event,st) :
-    htmltext = event
-    if event == "30862-5.htm" :
-       st.setState(State.STARTED)
-       st.set("cond","1")
-       st.playSound("ItemSound.quest_accept")
-    elif event == "30862-6.htm" :
-       st.exitQuest(1)
-    elif event == "30862-7.htm" :
-       if st.getQuestItemsCount(SN_SCALE) >= REQUIRED :
-          st.takeItems(SN_SCALE,REQUIRED)
-          item=REWARDS[self.getRandom(len(REWARDS))]
-          if ALT_RP_100: item +=1
-          st.rewardItems(item ,1)
-          st.exitQuest(1)
-          st.playSound("ItemSound.quest_finish")
-       else :
-          htmltext = "30862-4.htm"
-    return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getId()
-   id = st.getState()
-   if id == State.CREATED :
-      st.set("cond","0")
-      if player.getLevel() < 63 :
-         st.exitQuest(1)
-         htmltext = "30862-1.htm"
-      else :
-         htmltext = "30862-2.htm"
-   elif id == State.STARTED :
-      if st.getQuestItemsCount(SN_SCALE) >= REQUIRED :
-         htmltext = "30862-3.htm"
-      else :
-         htmltext = "30862-4.htm"
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
-     if not st : return 
-     if st.getState() != State.STARTED : return 
-   
-     count = st.getQuestItemsCount(SN_SCALE)
-     numItems, chance = divmod(DROP_RATE,100)
-     if self.getRandom(100) < chance :
-        numItems += 1
-     if numItems != 0 :
-        if count + numItems >= REQUIRED :
-           numItems = REQUIRED - count
-           if numItems != 0 :
-              st.playSound("ItemSound.quest_middle")
-              st.set("cond","2")
-        else :
-           st.playSound("ItemSound.quest_itemget")
-        st.giveItems(SN_SCALE,int(numItems))   
-     return
-
-# Quest class and state definition
-QUEST       = Quest(QUEST_NUMBER, str(QUEST_NUMBER)+"_"+QUEST_NAME, QUEST_DESCRIPTION)
-
-# Quest NPC starter initialization
-QUEST.addStartNpc(OLTLIN)
-# Quest initialization
-QUEST.addTalkId(OLTLIN)
-
-for i in MOBS :
-  QUEST.addKillId(i)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-1.htm
deleted file mode 100644
index 8e96f054cdb50feb83d6c57d77ceab6b40d91e16..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-1.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-I think it is too early for you to help me. Come back after you have gained some more experience.<br>
-<font color="LEVEL">(Quest for characters level 60 and above.)</font></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-2.htm
deleted file mode 100644
index 281289a17b27f6771d32c4a4285525bbd97ffdd9..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-2.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Knight Gustav of Elmore has resurrected the dead heroes of Aden to serve his evil purposes. If i could just recover their corpses i would be able to put them to rest again.<br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-6.htm">"I will help you"</a><br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-7.htm">"I'm not interested"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-3.htm
deleted file mode 100644
index 9e9947f395be8bb6ff16527113fc7b3041340449..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-3.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-I'm almost finished with my prayers....<br><br>.<br><br>.<br><br>.<br><br>.<br><br>.<br><br>.<br><br>It's done, these sixty dead men can be laid back to rest...
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-8.htm">"But, don't you think i deserve some reward as well?"</a><br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-4.htm
deleted file mode 100644
index 92bed7727dc3a7f2f7739f7a4943f53742144c93..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-4.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Fine. Just what i asked.. sixty corpses. Thank you very much! Now i'll be able to prepare a ceremony and purify these remains. I need to do this as quick as possible, so if you don't mind...<br><br>
-Ah... sure we can talk but not now... I really need to focus all my attention into this purification...<br><br>Give me some minutes and we will discuss whatever you like to.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-5.htm
deleted file mode 100644
index b70226b8ecc04a07b4d3a4f9abaf9504213b6e93..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-5.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-You came back that fast? It seems that this errand wasn't what you expected huh?<br>
-Remember that i need<font color="LEVEL"> 60</font> corpses in order to proceed with my ritual...Am i clear?<br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-9.htm">"Sure, i'll continue searching"</a><br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-7.htm">"Sorry, I would like to quit now"</a><br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-6.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-6.htm
deleted file mode 100644
index 8ac62b865d874fed5ab0b914c177033e6bc8b7ed..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-6.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Wonderful! I can perform a ceremony of purification in order to put our heroes' souls back to rest. I'll need you to bring me <font color="LEVEL"> Aden Residents Remains</font> from the undead around<font color="LEVEL"> Devastated Castle.</font> Our dead brothers came back from death in the form of<font color="LEVEL"> doom archers, doom guards and doom servants.</font> Given the power i can concentrate in a single ceremony you should take exactly<font color="LEVEL"> 60 corpses</font> before you come back. Now please hurry, our brave soldiers deserve a proper rest!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-7.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-7.htm
deleted file mode 100644
index a59d68b8e28995c8364476cb23c510c9ec449542..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-7.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Well, if i have no other choice i guess i'll have to let you go. Thanks for your time anyhow, of course you can come back whenever you like.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-8.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-8.htm
deleted file mode 100644
index 1310d43794ae2fb6155aa7257a77419e629052f8..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-8.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Of course you do... Here, take some materials that will hopefully make your pass for this world more grateful.<br>
-Unfortunately, there are so many heroes that won't find it's rest yet until we help them as we just did now! Can i ask you to keep your efforts so we can save more Aden residents' souls?<br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-9.htm">"OK i will continue"</a><br><br>
-<a action="bypass -h Quest 359_ForSleeplessDeadmen 30857-7.htm">"No thanks, i've seen enough dead people"</a><br>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-9.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-9.htm
deleted file mode 100644
index 391886a85b7775723a6f826734cbe324e6ed9969..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/30857-9.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>High Priest Orven:<br><br>
-Great! You already know what to do. I'll need you to bring me <font color="LEVEL"> Aden Residents Remains</font> from the undead around<font color="LEVEL"> Devastated Castle.</font> Our dead brothers came back from death in the form of<font color="LEVEL"> doom archers, doom guards and doom servants.</font> Given the power i can concentrate in a single ceremony you should take exactly<font color="LEVEL"> 60 corpses</font> before you come back. Now please hurry, our brave soldiers deserve a proper rest!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/__init__.py
deleted file mode 100644
index 2efef6ba877adfb92913d5b9d7d292ad155cbc4c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/359_ForSleeplessDeadmen/__init__.py
+++ /dev/null
@@ -1,107 +0,0 @@
-# For Sleepless Deadmen version 0.1 
-# by DrLecter
-import sys
-from com.l2jserver import Config
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-#Quest info
-QUEST_NUMBER,QUEST_NAME,QUEST_DESCRIPTION = 359,"ForSleeplessDeadmen","For Sleepless Deadmen"
-qn = "359_ForSleeplessDeadmen"
-
-#Variables
-DROP_RATE = 10  #in %
-DROP_MAX = 100 #unless you change this
-
-REQUIRED=60  #how many items will be paid for a reward
-
-#Quest items
-REMAINS = 5869
-
-#Rewards
-REWARDS=range(6341,6347)+range(5494,5496)
-
-#NPCs
-ORVEN = 30857
-
-#Mobs
-MOBS = range(21006,21009)
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [REMAINS]
-
- def onEvent (self,event,st) :
-    htmltext = event
-    if event == "30857-6.htm" :
-       st.setState(State.STARTED)
-       st.set("cond","1")
-       st.playSound("ItemSound.quest_accept")
-    elif event == "30857-7.htm" :
-       st.exitQuest(1)
-       st.playSound("ItemSound.quest_finish")
-    elif event == "30857-8.htm" :
-       st.set("cond","1")
-       st.giveItems(REWARDS[self.getRandom(len(REWARDS))] ,4)
-    return htmltext
-
- def onTalk (self,npc,player):
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   npcId = npc.getId()
-   id = st.getState()
-   if id == State.CREATED :
-      st.set("cond","0")
-      if player.getLevel() < 60 :
-         st.exitQuest(1)
-         htmltext = "30857-1.htm"
-      else :
-         htmltext = "30857-2.htm"
-   elif id == State.STARTED :
-      cond=st.getInt("cond")
-      if cond == 3 :
-         htmltext = "30857-3.htm"
-      elif cond == 2 and st.getQuestItemsCount(REMAINS) >= REQUIRED :
-         st.takeItems(REMAINS,REQUIRED)
-         st.set("cond","3")
-         htmltext = "30857-4.htm"
-      else :
-         htmltext = "30857-5.htm"
-   return htmltext
-
- def onKill(self,npc,player,isPet):
-     st = player.getQuestState(qn)
-     if not st : return 
-     if st.getState() != State.STARTED : return 
-   
-     count = st.getQuestItemsCount(REMAINS)
-     if count < REQUIRED :
-        chance = DROP_RATE * Config.RATE_QUEST_DROP
-        numItems, chance = divmod(chance,100)
-        if self.getRandom(DROP_MAX) < chance :
-           numItems += 1
-        if numItems :
-           if count + numItems >= REQUIRED :
-              numItems = REQUIRED - count
-              st.playSound("ItemSound.quest_middle")
-              st.set("cond","2")
-           else:
-              st.playSound("ItemSound.quest_itemget")   
-           st.giveItems(REMAINS,int(numItems))
-     return
-
-# Quest class and state definition
-QUEST       = Quest(QUEST_NUMBER, str(QUEST_NUMBER)+"_"+QUEST_NAME, QUEST_DESCRIPTION)
-
-# Quest NPC starter initialization
-QUEST.addStartNpc(ORVEN)
-# Quest initialization
-QUEST.addTalkId(ORVEN)
-
-for i in MOBS :
-  QUEST.addKillId(i)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3bc6de194e9910ae3512c4133ed114616faeaaed
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-01.htm
@@ -0,0 +1,5 @@
+<html><body>Grand Master Oltlin:<br>
+Have you seen the sights of the city? The wonderful castles built by humans, in spite of countless errors and obstacles. Do you have any idea what is beneath them? Often, long shadows are cast under the glow of glory.<br>
+You always find the darkest shadows under strong light. Those who pursue glory are wary of shadows. Where there is pure achievement, there is always absence.<br>
+<a action="bypass -h Quest Q00358_IllegitimateChildOfTheGoddess 30862-02.htm">"Gee, I didn't expect to hear this sort of thing from someone like you!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..6b4e9c97fb791535e6208168693ba1e0df1ac6bc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-02.htm
@@ -0,0 +1,6 @@
+<html><body>Grand Master Oltlin:<br>
+Ah, yes, the bitter ramblings of an old man. As you approach true enlightenment, the shadows grow darker. Among those who pursue glory, some work diligently against the shadow at every opportunity.<br>
+At the same time, they must know that their efforts are as futile as covering up the sky with your hand. Of course, I don't need to explain this to you. The gods created us in their own imperfect image.<br>
+Perfect beings' only creations are contrivances. As the perfect circle has no edge... perfect hatred only produces monsters.<br>
+<a action="bypass -h Quest Q00358_IllegitimateChildOfTheGoddess 30862-03.htm">"Is this a story about... Shilen?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..bec07b919562f398e727dc794663ac132d41e59a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-03.htm
@@ -0,0 +1,7 @@
+<html><body>Grand Master Oltlin:<br>
+Her anger towards Gran Kain and Einhasad for a time turned Shilen into a pure and perfect being. That is, she became the literal incarnation of destruction.<br>
+As she achieved the purest form of fury, her benevolence and austerity left her completely. Her perfect wrath is the source of those evil creatures.<br>
+They are sealed away now, and I don't know what their current condition is, but their very existence proves that she has become a goddess of destruction!<br>
+We worshippers of Shilen teach our children that she is our mother, therefore we must calm her wrath.<br>
+<a action="bypass -h Quest Q00358_IllegitimateChildOfTheGoddess 30862-04.htm">"Why can't we kill those creatures?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..42c81d97be5eb95c63d1ea9a16cb54f32e9d4dc8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-04.htm
@@ -0,0 +1,4 @@
+<html><body>Grand Master Oltlin:<br>
+There are evil creatures close to her. These are the illegitimate children she bore while her fury was at its fiercest... Go slay <font color="LEVEL">Falibati</font> and <font color="LEVEL">Trives</font> who bear a striking resemblence to her. Bring back their <font color="LEVEL">Snake Scales</font>.<br>
+<font color="LEVEL">If you bring me 108 Snake Scales, I will teach you a secret, ancient method of creation.</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..b00d937a3be32f55f69493050933832412ae7660
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-05.html
@@ -0,0 +1,5 @@
+<html><body>Grand Master Oltlin:<br>
+Have you seen the sights of the city? The wonderful castles built by humans, in spite of countless errors and obstacles. Do you have any idea what is beneath them? Often, long shadows are cast under the glow of glory.<br>
+You always find the darkest shadows under strong light. Does this make sense to you? I thought not. It seems you will need more training. Why don't you explore the world some more and come back later.<br>
+(This quest can only be undertaken by a character of level 63 or higher.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..c2c6d719dc58fc53ee00ba3ffc74de9637e8fe8d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-06.html
@@ -0,0 +1,3 @@
+<html><body>Grand Master Oltlin:<br>
+To restore the dignity and glory of the goddess you must kill <font color="LEVEL">Falibati</font> and <font color="LEVEL">Trives</font>, the illegitimate children born of her wrath, and bring back 108 <font color="LEVEL">Snake Scales</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..82c3c11480320123cff4272806d0a1dd3675c690
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/30862-07.html
@@ -0,0 +1,5 @@
+<html><body>Grand Master Oltlin:<br>
+Thank you for your efforts. I know it was not easy... Needless to say, please don't tell other people that you have done this for me. Above all my children must never learn of it...<br>
+In exchange for your efforts, I will give you this Secret Book in which ancient secret creation methods are recorded. I hope it will be helpful to you.<br>
+Too many people think they can cover the sky with the palm of their hand. There is such a thing as too much truth... My work will likely never end... If you are ever interested in helping me again, come back to see me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
new file mode 100644
index 0000000000000000000000000000000000000000..f3d05fa6b674723ba9252428941a099beec14fb9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00358_IllegitimateChildOfTheGoddess/Q00358_IllegitimateChildOfTheGoddess.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack 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.
+ * 
+ * L2J DataPack 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.Q00358_IllegitimateChildOfTheGoddess;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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;
+
+/**
+ * Illegitimate Child of the Goddess (358)
+ * @author Adry_85
+ */
+public final class Q00358_IllegitimateChildOfTheGoddess extends Quest
+{
+	// NPC
+	private static final int OLTRAN = 30862;
+	// Item
+	private static final int SNAKE_SCALE = 5868;
+	// Misc
+	private static final int MIN_LEVEL = 63;
+	private static final int SNAKE_SCALE_COUNT = 108;
+	// Rewards
+	private static final int[] REWARDS = new int[]
+	{
+		5364, // Recipe: Sealed Dark Crystal Shield(60%)
+		5366, // Recipe: Sealed Shield of Nightmare(60%)
+		6329, // Recipe: Sealed Phoenix Necklace(70%)
+		6331, // Recipe: Sealed Phoenix Earring(70%)
+		6333, // Recipe: Sealed Phoenix Ring(70%)
+		6335, // Recipe: Sealed Majestic Necklace(70%)
+		6337, // Recipe: Sealed Majestic Earring(70%)
+		6339, // Recipe: Sealed Majestic Ring(70%)
+	};
+	// Mobs
+	private static final Map<Integer, Double> MOBS = new HashMap<>();
+	static
+	{
+		MOBS.put(20672, 0.71); // trives
+		MOBS.put(20673, 0.74); // falibati
+	}
+	
+	private Q00358_IllegitimateChildOfTheGoddess()
+	{
+		super(358, Q00358_IllegitimateChildOfTheGoddess.class.getSimpleName(), "Illegitimate Child of the Goddess");
+		addStartNpc(OLTRAN);
+		addTalkId(OLTRAN);
+		addKillId(MOBS.keySet());
+		registerQuestItems(SNAKE_SCALE);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = getQuestState(player, false);
+		if (st == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "30862-02.htm":
+			case "30862-03.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "30862-04.htm":
+			{
+				st.startQuest();
+				htmltext = event;
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+	{
+		final QuestState st = getRandomPartyMemberState(player, 1, 3, npc);
+		if ((st != null) && st.giveItemRandomly(npc, SNAKE_SCALE, 1, SNAKE_SCALE_COUNT, MOBS.get(npc.getId()), true))
+		{
+			st.setCond(2, true);
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		if (st.isCreated())
+		{
+			htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30862-01.htm" : "30862-05.html");
+		}
+		else if (st.isStarted())
+		{
+			if (getQuestItemsCount(player, SNAKE_SCALE) < SNAKE_SCALE_COUNT)
+			{
+				htmltext = "30862-06.html";
+			}
+			else
+			{
+				rewardItems(player, REWARDS[getRandom(REWARDS.length)], 1);
+				st.exitQuest(true, true);
+				htmltext = "30862-07.html";
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String args[])
+	{
+		new Q00358_IllegitimateChildOfTheGoddess();
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a025a65d29a31aa9cb2507b5468efd73978366e9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-01.htm
@@ -0,0 +1,5 @@
+<html><body>High Priest Orven:<br>
+Do you know about the Devastated Castle? It was built centuries ago to protect against the hordes of barbarians that were rampant even then. We were saved from the most recent invasion of the forces of Elmore by its mighty walls, except of course for the thousands of innocents killed when they poisoned our wells...<br>
+Centuries of violent conflict have left the castle in ruins and haunted by the ghosts of the multitudes of warriors who met their bloody end there.<br>
+<a action="bypass -h Quest Q00359_ForASleeplessDeadman 30857-02.htm">Listen quietly.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..3349c4b8bc2075e0103c2c98882d521c08cff2e4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-02.htm
@@ -0,0 +1,4 @@
+<html><body>High Priest Orven:<br>
+These noble warriors made the ultimate sacrifice and successfully defended the castle from the enemy! There is no more honorable way to die, but their poor souls have not received any proper recognition... No Glory of Einhasad... Not even a Rest of Shilen, which is given to all! This is a long story... Are you sure you want to hear it?<br>
+<a action="bypass -h Quest Q00359_ForASleeplessDeadman 30857-03.htm">"Yes, please."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..9fee629e7e696d757256c8c602961af4ec8b89bf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-03.htm
@@ -0,0 +1,5 @@
+<html><body>High Priest Orven:<br>
+In the time of Raul the Unification King, Gustav Ken Vennerheim fought a bloody battle for the castle. After 130 days of pitched combat, he was slain without ever fulfilling his goal.<br>
+But now it seems that even death cannot stop his spirit! He has formed an alliance with the forces of darkness and returned as an undead. He has raised an army of the dead, among them our own warriors who died defending the castle against him! He is attempting to take the Devastated Castle again!<br>
+<a action="bypass -h Quest Q00359_ForASleeplessDeadman 30857-04.htm">......!</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2926071d30591a406186b16eea1c3ae0428d5dfc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-04.htm
@@ -0,0 +1,5 @@
+<html><body>High Priest Orven:<br>
+I feel the agony of their souls, being forced to fight their brothers... Such noble warriors deserve a peaceful rest... <br>
+The immortal heroes of Aden must be freed from this evil enslavement! Would you recover their remains and bring them here, to the Temple of Einhasad? You will find them among the <font color="LEVEL">doom archers, doom guards and doom servants</font> in the Fields of Massacre near the <font color="LEVEL">Devastated Castle</font>.<br>
+<a action="bypass -h Quest Q00359_ForASleeplessDeadman 30857-05.htm">"I will bring you the remains of the heroes."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..12d5e21b36903db1e3e617f256fb23f641a88745
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-05.htm
@@ -0,0 +1,4 @@
+<html><body>High Priest Orven:<br>
+When you break the bonds holding their souls, their bodies will turn to ashes. Collect these ashes and bring them to me, I will purify them.<br>
+I must have the <font color="LEVEL">remains of 60 heroes</font> to perform the ritual. May Einhasad watch over you...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..f565d25ee938213df29a888e232bbbc179f59659
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-06.html
@@ -0,0 +1,5 @@
+<html><body>High Priest Orven:<br>
+Do you know about the Devastated Castle? It was built centuries ago to protect against the hordes of barbarians that were rampant even then. We were saved from the most recent invasion of the forces of Elmore by its mighty walls. Centuries of violent conflict have left it in ruins and haunted by the ghosts of the multitudes of warriors who met their bloody end there.<br>
+These noble warriors deserve to rest in peace! If you meet anyone capable of taking on the powers of darkness, send them to me!<br>
+(This quest may only be undertaken by a character of level 60 or higher.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..dbb2ee7e257d7100ab63a3a16ced28287fcfc9eb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-07.html
@@ -0,0 +1,3 @@
+<html><body>High Priest Orven:<br>
+The Devastated Castle is northeast of here. There are many restless souls haunting that area. You'll find <font color="LEVEL">doom archers</font>, <font color="LEVEL">doom guards</font>, and <font color="LEVEL">doom servants</font>. Bring back <font color="LEVEL">60 of their remains</font>. Beware the doom knights, doom warriors and doom troopers who patrol there. They are former soldiers of Elmore. They won't let you free their minions easily...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..7ddfe2f1b3f5bb0337cf800f1ff37d374dd159ba
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-08.html
@@ -0,0 +1,5 @@
+<html><body>High Priest Orven:<br>
+Good work! Now they shall rest in peace!<br>
+I give you blessings in the name of Einhasad. May we never have to deal with such a desecration again!<br>
+<font color="LEVEL">Now I must pray. Come back later.</font>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..66af14346a5133bbe1932c68d00013d777b99369
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-09.html
@@ -0,0 +1,8 @@
+<html><body>High Priest Orven:<br>
+Oh, Einhasad! Here are your children. Their last battle has been won.<br>
+Take them into your arms, into the world of the dead.<br>
+Release them from their bonds and receive them into the bosom of Shilen.<br>
+Give them eternal rest and happiness in your light.<br>
+For those who grieve these brave warriors still, dry your tears, for now your loved ones are at peace...<br>
+<a action="bypass -h Quest Q00359_ForASleeplessDeadman 30857-10.html">Wait until he finishes praying.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..2190f6e519b7d9a654924a5439696558dc2e6832
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/30857-10.html
@@ -0,0 +1,6 @@
+<html><body>High Priest Orven:<br>
+The purification ritual is over.<br>
+I found a gemstone that was sparkling with a holy light. I think it must have been used by one of the fallen heroes of the castle.<br>
+Perhaps they left it for you! Yes, I think they did! Why don't you take it?<br>
+There are still many of our fallen comrades out there who have not been put to rest. If you want to help, come back and see me again.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
new file mode 100644
index 0000000000000000000000000000000000000000..08588b520eb5ae9a51fe54ff067ba277034bf3dc
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00359_ForASleeplessDeadman/Q00359_ForASleeplessDeadman.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ * 
+ * This file is part of L2J DataPack.
+ * 
+ * L2J DataPack 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.
+ * 
+ * L2J DataPack 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.Q00359_ForASleeplessDeadman;
+
+import java.util.HashMap;
+import java.util.Map;
+
+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;
+
+/**
+ * For a Sleepless Deadman (359)
+ * @author Adry_85
+ */
+public final class Q00359_ForASleeplessDeadman extends Quest
+{
+	// NPC
+	private static final int ORVEN = 30857;
+	// Item
+	private static final int REMAINS_OF_ADEN_RESIDENTS = 5869;
+	// Misc
+	private static final int MIN_LEVEL = 60;
+	private static final int REMAINS_COUNT = 60;
+	// Rewards
+	private static final int[] REWARDS = new int[]
+	{
+		5494, // Sealed Dark Crystal Shield Fragment
+		5495, // Sealed Shield of Nightmare Fragment
+		6341, // Sealed Phoenix Earring Gemstone
+		6342, // Sealed Majestic Earring Gemstone
+		6343, // Sealed Phoenix Necklace Beads
+		6344, // Sealed Majestic Necklace Beads
+		6345, // Sealed Phoenix Ring Gemstone
+		6346, // Sealed Majestic Ring Gemstone
+	};
+	// Mobs
+	private static final Map<Integer, Double> MOBS = new HashMap<>();
+	static
+	{
+		MOBS.put(21006, 0.365); // doom_servant
+		MOBS.put(21007, 0.392); // doom_guard
+		MOBS.put(21008, 0.503); // doom_archer
+	}
+	
+	private Q00359_ForASleeplessDeadman()
+	{
+		super(359, Q00359_ForASleeplessDeadman.class.getSimpleName(), "For a Sleepless Deadman");
+		addStartNpc(ORVEN);
+		addTalkId(ORVEN);
+		addKillId(MOBS.keySet());
+		registerQuestItems(REMAINS_OF_ADEN_RESIDENTS);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = getQuestState(player, false);
+		if (st == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "30857-02.htm":
+			case "30857-03.htm":
+			case "30857-04.htm":
+			{
+				htmltext = event;
+				break;
+			}
+			case "30857-05.htm":
+			{
+				st.setMemoState(1);
+				st.startQuest();
+				htmltext = event;
+				break;
+			}
+			case "30857-10.html":
+			{
+				rewardItems(player, REWARDS[getRandom(REWARDS.length)], 4);
+				st.exitQuest(true, true);
+				htmltext = event;
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isSummon)
+	{
+		final QuestState st = getRandomPartyMemberState(player, 1, 3, npc);
+		if ((st != null) && st.giveItemRandomly(npc, REMAINS_OF_ADEN_RESIDENTS, 1, REMAINS_COUNT, MOBS.get(npc.getId()), true))
+		{
+			st.setCond(2, true);
+		}
+		return super.onKill(npc, player, isSummon);
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = getQuestState(player, true);
+		String htmltext = getNoQuestMsg(player);
+		if (st.isCreated())
+		{
+			htmltext = ((player.getLevel() >= MIN_LEVEL) ? "30857-01.htm" : "30857-06.html");
+		}
+		else if (st.isStarted())
+		{
+			if (st.isMemoState(1))
+			{
+				if (getQuestItemsCount(player, REMAINS_OF_ADEN_RESIDENTS) < REMAINS_COUNT)
+				{
+					htmltext = "30857-07.html";
+				}
+				else
+				{
+					takeItems(player, REMAINS_OF_ADEN_RESIDENTS, -1);
+					st.setMemoState(2);
+					st.setCond(3, true);
+					htmltext = "30857-08.html";
+				}
+			}
+			else if (st.isMemoState(2))
+			{
+				htmltext = "30857-09.html";
+			}
+		}
+		return htmltext;
+	}
+	
+	public static void main(String args[])
+	{
+		new Q00359_ForASleeplessDeadman();
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140105update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140105update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..18edc9bc331f42f47c95f08a2bcb07bd3a63d67d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140105update.sql
@@ -0,0 +1,2 @@
+UPDATE character_quests SET name='Q00358_IllegitimateChildOfTheGoddess' WHERE name='358_IllegitimateChildOfAGoddess';
+UPDATE character_quests SET name='Q00359_ForASleeplessDeadman' WHERE name='359_ForSleeplessDeadmen';
\ No newline at end of file