diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 254fb70e558644337e741ec269128b7a8a5efdc8..86d757ff20144550314380348339accb95980899 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -300,9 +300,9 @@ quests/37_PleaseMakeMeFormalWear/__init__.py
 quests/38_DragonFangs/__init__.py
 quests/39_RedEyedInvaders/__init__.py
 quests/40_ASpecialOrder/__init__.py
-quests/42_HelpTheUncle/__init__.py
-quests/43_HelpTheSister/__init__.py
-quests/44_HelpTheSon/__init__.py
+quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
+quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
+quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
 quests/45_ToTalkingIsland/__init__.py
 quests/46_OnceMoreInTheArmsOfTheMotherTree/__init__.py
 quests/47_IntoTheDarkForest/__init__.py
@@ -339,8 +339,8 @@ quests/117_OceanOfDistantStar/__init__.py
 quests/118_ToLeadAndBeLed/__init__.py
 quests/119_LastImperialPrince/__init__.py
 quests/120_PavelsResearch/__init__.py
-quests/121_PavelTheGiants/__init__.py
-quests/122_OminousNews/__init__.py
+quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
+quests/Q00122_OminousNews/Q00122_OminousNews.java
 quests/123_TheLeaderAndTheFollower/__init__.py
 quests/Q00124_MeetingTheElroki/Q00124_MeetingTheElroki.java
 quests/Q00125_TheNameOfEvil1/Q00125_TheNameOfEvil1.java
@@ -436,7 +436,7 @@ quests/236_SeedsOfChaos/__init__.py
 quests/237_WindsOfChange/__init__.py
 quests/238_SuccesFailureOfBusiness/__init__.py
 quests/239_WontYouJoinUs/__init__.py
-quests/240_ImTheOnlyOneYouCanTrust/__init__.py
+quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
 quests/Q00241_PossessorOfAPreciousSoul1/Q00241_PossessorOfAPreciousSoul1.java
 quests/Q00242_PossessorOfAPreciousSoul2/Q00242_PossessorOfAPreciousSoul2.java
 quests/Q00246_PossessorOfAPreciousSoul3/Q00246_PossessorOfAPreciousSoul3.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-0.htm
deleted file mode 100644
index 2b1b31e4b6a5ecbd0e35cfff260ffb1fa115bad5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-0.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Head Blacksmith Newyear:<br>
-Have you ever thought about working for us dwarves?<br>
-Near this area lies the <font color="LEVEL">Pavel Ruins</font>.  I sent an investigator there a while ago, but got nowhere with their reportings.<br>
-If you are experienced enough, I'd like to send you there.<br>
-<a action="bypass -h Quest 121_PavelTheGiants 31961-1.htm">Say you're experienced enough</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-1.htm
deleted file mode 100644
index 6d07a5a278b548b509ae0387a795fcf89a8321d1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-1.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Collector Yumi:<br>
-What brings you here?<br>
-Ah, Newyear sent you, did he? I'm glad you came. I've been waiting for you.<br>
-How is the old boy? Surely he could have sent some food with you. Would that have been too much to expect of him? Honestly.<br>
-Well, no matter. Let's discuss business.<br>
-<a action="bypass -h Quest 121_PavelTheGiants 32041-2.htm">"Ask what needs to be done."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-2.htm
deleted file mode 100644
index 93676f7f335406da297b084b78c343a7010a8b94..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/32041-2.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Collector Yumi:<br>
-We have two problems. The first and most urgent is that we are beset by a mad scientist whose work is causing us great harm. I am not sure if you can prevail against him, and in good conscience I cannot send you against him until I am sure. Please go see<font color="LEVEL"> Collector Gutenhagen.</font> He has been in need of assistance, and he can evaluate your fitness for this task. If he passes you, come see me, and I will tell you a tale of the<font color="LEVEL"> old manager</font> of the Pavel Ruins.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/__init__.py
deleted file mode 100644
index 0de26b45626659181d028e1720a76bfafa980b00..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/__init__.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#Made by Ethernaly ethernaly@email.it
-import sys
-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
-
-qn = "121_PavelTheGiants"
-
-#NPCs
-NEWYEAR   = 31961
-YUMI      = 32041
-
-class Quest (JQuest) :
-
-  def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-  
-  def onAdvEvent (self,event,npc, player) :
-    htmltext = event
-    st = player.getQuestState(qn)
-    if not st : return
-    if event == "32041-2.htm" :
-       st.playSound("ItemSound.quest_finish")
-       st.addExpAndSp(346320,26069)
-       st.unset("cond")
-       st.exitQuest(False)
-    elif event == "31961-1.htm" :
-       st.set("cond","1")
-       st.setState(State.STARTED)
-       st.playSound("ItemSound.quest_accept")
-    return htmltext
-
-  def onTalk(self, npc, player):
-    htmltext = Quest.getNoQuestMsg(player)
-    st = player.getQuestState(qn)
-    if not st : return htmltext    
-    npcId=npc.getNpcId()
-    id = st.getState()
-    cond = st.getInt("cond")
-    if id == State.COMPLETED:
-       htmltext = Quest.getAlreadyCompletedMsg(player)
-    elif id == State.CREATED and npcId == NEWYEAR :
-       if player.getLevel() >= 70 :
-          htmltext = "31961-0.htm"
-       else:
-          htmltext = "31961-1a.htm"
-          st.exitQuest(1)
-    elif id == State.STARTED:
-       if npcId == YUMI :
-         if cond == 1 :
-            htmltext = "32041-1.htm"
-       else :
-         htmltext = "31961-2.htm"
-    return htmltext    
-
-QUEST=Quest(121,qn,"Pavel The Giants")
-
-QUEST.addStartNpc(NEWYEAR)
-QUEST.addTalkId (NEWYEAR)
-QUEST.addTalkId(YUMI)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-01.htm
deleted file mode 100644
index 3612f64dc5990204f72ba7c26b40a0c76c2ae35a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Moira:<br>
-Are you qualified to receive the blessings of Pa'agrio? (Characters must have reached level 20 to undertake this quest. )
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-02.htm
deleted file mode 100644
index 4b1fd1716730d4642c3f568539c33e0c1f907fd1..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-02.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Moira:<br>
-Oh, sighing rock! I'd like to end your wandering for good. Do you wish to help me do that?<br>
-<a action="bypass -h Quest 122_OminousNews 31979-03.htm">"Do you know the path I have to follow?"</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-03.htm
deleted file mode 100644
index 5e1cb719a68b03f1e7ecfeab6cf9047b577121db..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/31979-03.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Seer Moira:<br>
-If you follow the path from the western part of the village, you'll meet someone who'll stop your wandering. His name is<font color="LEVEL"> Karuda</font><br>
-When you meet him, tell him to wait.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-01.htm
deleted file mode 100644
index fafc5c5761544e7c92812d6ee487b3178f6900a4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Karuda:<br>
-What misfortune brought you here? You don't want any part of what's happening here. This place is in chaos. Trust me, it's best if you just pass on by.<br>
-<a action="bypass -h Quest 122_OminousNews 32017-02.htm">"The Seer Moira sent me."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/__init__.py
deleted file mode 100644
index e67c4a98a10508f62792a49e9f53fe94ccf7d3fc..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/__init__.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Made by Polo
-import sys
-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
-
-qn = "122_OminousNews"
-
-#Npc
-MOIRA = 31979
-KARUDA = 32017
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr): JQuest.__init__(self,id,name,descr)
-
- def onAdvEvent (self,event,npc,player) :
-   st = player.getQuestState(qn)
-   if not st : return
-   htmltext = Quest.getNoQuestMsg(player)
-   id = st.getState()
-   cond = st.getInt("cond")
-   if id != State.COMPLETED :
-     htmltext = event
-     if htmltext == "31979-03.htm" and cond == 0 :
-       st.set("cond","1")
-       st.setState(State.STARTED)
-       st.playSound("ItemSound.quest_accept")
-     elif htmltext == "32017-02.htm" :
-       if cond == 1 and st.getInt("ok") :
-         st.giveItems(57,8923)
-         st.addExpAndSp(45151,2310)
-         st.unset("cond")
-         st.unset("ok")
-         st.exitQuest(False)
-         st.playSound("ItemSound.quest_finish")
-       else :
-         htmltext = Quest.getNoQuestMsg(player)
-   return htmltext
-
- def onTalk (self,npc,player):
-   npcId = npc.getNpcId()
-   htmltext = Quest.getNoQuestMsg(player)
-   st = player.getQuestState(qn)
-   if not st : return htmltext
-
-   id = st.getState()
-   cond = st.getInt("cond")
-   if id == State.COMPLETED :
-      htmltext="<html><body>This quest have already been State.COMPLETED</body></html>"
-   elif npcId == MOIRA :
-      if cond == 0 :
-         if player.getLevel()>=20 :
-            htmltext = "31979-02.htm"
-         else :
-            htmltext = "31979-01.htm"
-            st.exitQuest(1)
-      else:
-         htmltext = "31979-03.htm"
-   elif npcId == KARUDA and cond==1 and id == State.STARTED:
-      htmltext = "32017-01.htm"
-      st.set("ok","1")
-   return htmltext
-
-QUEST       = Quest(122,qn,"Ominous News")
-
-
-QUEST.addStartNpc(MOIRA)
-
-QUEST.addTalkId(MOIRA)
-
-QUEST.addTalkId(KARUDA)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-1.htm
deleted file mode 100644
index e20ef4bfcfe446c6bfd74d13697f1b14ba51e676..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-1.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Bounty Hunter Kintaijin:<br>
-You adventurers are all alike ... just in it for the fortune and fame. I'll bet you could care less about who I am and what my story is.<br>
-The only things you're probably interested in are <font color="LEVEL">what you have to do</font> and <font color="LEVEL">what you will receive</font>.<br>
-Am I wrong?<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-2.htm">"Nope. Just tell me what I need to know."</a><br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-4.htm">"I'm not like the others. Tell me your tale."</a><br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-6.htm">"Forget all that. Who is this scammer you're talking about?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-3.htm
deleted file mode 100644
index 2e1cd111180ba8f117b1469538901512dab04e9a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-3.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Bounty Hunter Kintaijin:<br>
-Alright, then let's get to the point. I want you to hunt down and destroy the <font color="LEVEL">Spiked Stakatos and Cannibalistic Stakatos</font><br>
-found in the Stakato Nest. If you can manage to bring back <font color="LEVEL">25 Stakato Fangs</font> as evidence, I will provide you with a reward.<br>
-A word of advice - don't try to do this on your own. This mission won't be nearly as rough if you find some fellow adventurers to assist you.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-4.htm
deleted file mode 100644
index 6a81c81f7041907cbcd050f96a41b8d58b2ea3bd..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-4.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Bounty Hunter Kintaijin:<br>
-No need to feign interest in my background. Whether you are interested in me or not, I am still going to give you the quest.<br>
-Should I go on?<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-2.htm">"Well then, to hell with this. Just tell me about the quest."</a><br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-5.htm">"Yes! Tell me what makes Kintaijin tick."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-5.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-5.htm
deleted file mode 100644
index 7b138cf0e2ad7ff189641c7775f99d8081952518..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-5.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Bounty Hunter Kintaijin:<br>
-As you can see, I'm a bounty hunter. And generally, I do what I do for the money. But this one is personal to me.<br>
-I'm here to bring in Billy Haari for this crimes.<br>
-And I almost had him ... until he ran into the Stakato's NEst. I'm good at what I do. But this place is a bit too much for even me.<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-6.htm">"What kind of crime did Billy Haari commit?"</a><br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-7.htm">"Well, good luck with that. Now what about that mission?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/__init__.py
deleted file mode 100644
index a1ee596d987f1b7aac38e1b3d60469fdcbc25c74..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/__init__.py
+++ /dev/null
@@ -1,82 +0,0 @@
-import sys
-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
-
-qn = "240_ImTheOnlyOneYouCanTrust"
-
-# NPC
-KINTAIJIN = 32640
-
-# Mobs
-MOBS = range(22617,22634)
-
-# QUEST ITEM
-STAKATOFANGS = 14879
-
-class Quest (JQuest) :
-	def __init__(self,id,name,descr):
-		JQuest.__init__(self,id,name,descr)
-		self.questItemIds = [STAKATOFANGS]
-
-	def onAdvEvent (self,event,npc, player) :
-		htmltext = event
-		st = player.getQuestState(qn)
-		if not st : return
-
-		if event == "32640-3.htm" :
-			st.set("cond","1")
-			st.setState(State.STARTED)
-			st.playSound("ItemSound.quest_accept")
-		return htmltext
-
-	def onTalk (self,npc,player):
-		htmltext = Quest.getNoQuestMsg(player)
-		st = player.getQuestState(qn)
-		if not st : return htmltext
-
-		npcId = npc.getNpcId()
-		id = st.getState()
-		cond = st.getInt("cond")
-
-		if id == State.COMPLETED :
-			htmltext = "32640-10.htm"
-		elif id == State.CREATED :
-			if player.getLevel() >= 81 :
-				htmltext = "32640-1.htm"
-			else :
-				htmltext = "32640-0.htm"
-				st.exitQuest(1)
-		else :
-			if cond == 1 :
-				htmltext = "32640-8.htm"
-			elif cond == 2 :
-				st.takeItems(STAKATOFANGS,-1)
-				st.addExpAndSp(589542,36800)
-				st.exitQuest(False)
-				st.playSound("ItemSound.quest_finish")
-				htmltext = "32640-9.htm"
-		return htmltext
-
-	def onKill(self,npc,player,isPet):
-		partyMember = self.getRandomPartyMember(player,"1")
-		if not partyMember : return
-		st = partyMember.getQuestState(qn)
-		if not st : return
-
-		if st.getInt("cond") == 1 :
-			if st.getQuestItemsCount(STAKATOFANGS) >= 25 :
-				st.set("cond","2")
-				st.playSound("ItemSound.quest_middle")
-			else :
-				st.giveItems(STAKATOFANGS,1)
-				st.playSound("ItemSound.quest_itemget")
-		return
-
-QUEST = Quest(240,qn,"I'm the Only One You Can Trust")
-
-QUEST.addStartNpc(KINTAIJIN)
-QUEST.addTalkId(KINTAIJIN)
-
-for mobId in MOBS:
-	QUEST.addKillId(mobId)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-05.htm
deleted file mode 100644
index e633d87c6d3d76aba67c994cf9a45c33a5322a1d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-05.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Chief Mercenary Sophya:<br>
-The map! This is good information. Where did you get it?<br>
-<a action="bypass -h Quest 42_HelpTheUncle 5">"From Pet Manager Waters."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-06a.htm
deleted file mode 100644
index 6d11987f5eae81240d767f77872d68624edb770d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-06a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Chief Mercenary Sophya:<br>
-Did you give my thanks to Waters?</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-00.htm
deleted file mode 100644
index aa27cc08a738b873aa049b7ca860c93a699bd8ac..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-00.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-Hey, could you do me a favor?<br>
-<a action="bypass -h Quest 42_HelpTheUncle 1">"What do you need?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01.htm
deleted file mode 100644
index 21ec2aa7d7740fcc638ffa0354da692bad32c3c4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-Awesome! Please, bring me a<font color="LEVEL"> trident</font>! I simply must have one! They probably sell them in the stores around here, but I don't have enough adena...
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-02.htm
deleted file mode 100644
index fc67caf92abf6606f2c8d623cd8c4add8ae835a6..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-02.htm
+++ /dev/null
@@ -1,7 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-Oh, you got it. Thank you.<br>
-My uncle suddenly is saying he wants to build a pastureland in the north. He wishes to become an adventurer to make money for the pastureland.<br>
-He says he is not a beginner anymore. But he still worries me... so I hope this might help him a little bit.<br>
-And.. It is really hard to ask<font color="LEVEL"> since you gave me a Trident</font>, but I have one request.<br>
-<a action="bypass -h Quest 42_HelpTheUncle 3">Ask what it is</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03.htm
deleted file mode 100644
index ee93948bf770fe597af04d1b642037c56e727258..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-I need to send the trident, but outlwas have been rampant in this area lately! Please kill at least 30<font color="LEVEL"> monster eye gazers and destroyers</font>!<br>
-Destroy them so I can send the trident safely. Please, you must help me!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03a.htm
deleted file mode 100644
index 971a388162caeebaa0d7b6b6af480330cd01ef62..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-03a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-Please destroy the monsterous eye so I can ship the trident safely.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-05a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-05a.htm
deleted file mode 100644
index 33a23ad6f70455a931792a2d9852e3a7fe580f8b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-05a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Pet Manager Waters:<br>
-Please take the map to Sophya of the Black Lions.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/__init__.py
deleted file mode 100644
index 88afebb58f1cfe86de6a503027fc9108d52c9012..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/__init__.py
+++ /dev/null
@@ -1,125 +0,0 @@
-#quest by zerghase
-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.jython import QuestJython as JQuest
-
-qn = "42_HelpTheUncle"
-
-WATERS=30828
-SOPHYA=30735
-
-TRIDENT=291
-MAP_PIECE=7548
-MAP=7549
-PET_TICKET=7583
-
-MONSTER_EYE_DESTROYER=20068
-MONSTER_EYE_GAZER=20266
-
-MAX_COUNT=30
-MIN_LEVEL=25
-
-class Quest (JQuest) :
-  def onEvent(self, event, st):
-    htmltext=event
-    if event=="1":
-      htmltext="30828-01.htm"
-      st.set("cond","1")
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    elif event=="3" and st.getQuestItemsCount(TRIDENT):
-      htmltext="30828-03.htm"
-      st.takeItems(TRIDENT,1)
-      st.set("cond","2")
-    elif event=="4" and st.getQuestItemsCount(MAP_PIECE)>=MAX_COUNT:
-      htmltext="30828-05.htm"
-      st.takeItems(MAP_PIECE,MAX_COUNT)
-      st.giveItems(MAP,1)
-      st.set("cond", "4")
-    elif event=="5" and st.getQuestItemsCount(MAP):
-      htmltext="30735-06.htm"
-      st.takeItems(MAP,1)
-      st.set("cond","5")
-    elif event=="7":
-      htmltext="30828-07.htm"
-      st.giveItems(PET_TICKET,1)
-      st.unset("cond")
-      st.exitQuest(False)
-      st.exitQuest(0)
-    return htmltext
-
-  def onTalk(self, npc, player):
-    htmltext = Quest.getNoQuestMsg(player)
-    st = player.getQuestState(qn)
-    if not st : return htmltext
-    npcId=npc.getNpcId()
-    id=st.getState()
-    if id==State.CREATED:
-      if player.getLevel()>=MIN_LEVEL:
-        htmltext="30828-00.htm"
-      else:
-        htmltext="<html><body>This quest can only be taken by characters that have a minimum level of %s. Return when you are more experienced.</body></html>" % MIN_LEVEL
-        st.exitQuest(1)
-    elif id==State.STARTED:
-      cond=st.getInt("cond")
-      if npcId==WATERS:
-        if cond==1:
-          if not st.getQuestItemsCount(TRIDENT):
-            htmltext="30828-01a.htm"
-          else:
-            htmltext="30828-02.htm"
-        elif cond==2:
-          htmltext="30828-03a.htm"
-        elif cond==3:
-            htmltext="30828-04.htm"
-        elif cond==4:
-          htmltext="30828-05a.htm"
-        elif cond==5:
-          htmltext="30828-06.htm"
-      elif npcId==SOPHYA and id == State.STARTED:
-        cond=st.getInt("cond")
-        if cond==4 and st.getQuestItemsCount(MAP):
-          htmltext="30735-05.htm"
-        elif cond==5:
-          htmltext="30735-06a.htm"
-    elif id==State.COMPLETED:
-      st.exitQuest(0)
-      htmltext=Quest.getAlreadyCompletedMsg(player)
-
-    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()
-    cond=st.getInt("cond")
-    if cond==2:
-      numItems,chance = divmod(100*Config.RATE_QUEST_DROP,100)
-      if self.getRandom(100) < chance :
-        numItems = numItems +1  
-      pieces=st.getQuestItemsCount(MAP_PIECE)
-      if pieces + numItems >= MAX_COUNT :
-        numItems = MAX_COUNT - pieces
-        if numItems != 0:
-          st.playSound("ItemSound.quest_middle")
-          st.set("cond", "3")
-      else :  
-        st.playSound("ItemSound.quest_itemget")
-      st.giveItems(MAP_PIECE,int(numItems))
-    return        
-
-QUEST=Quest(42,qn,"Help The Uncle!")
-
-
-QUEST.addStartNpc(WATERS)
-
-QUEST.addTalkId(WATERS)
-
-QUEST.addTalkId(SOPHYA)
-
-QUEST.addKillId(MONSTER_EYE_DESTROYER)
-QUEST.addKillId(MONSTER_EYE_GAZER)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01a.htm
deleted file mode 100644
index af652bfa3642322ec4ecc5ab95f84ef62be96369..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Pet Manager Cooper:<br>
-Please bring me a crafted dagger. I really need one.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-02.htm
deleted file mode 100644
index f61398dbfc4f9d14d87677440ceb9d4082a5fc01..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-02.htm
+++ /dev/null
@@ -1,9 +0,0 @@
-<html><body>Pet Manager Cooper:<br>
-Oh, wonderful! You survivied!<br>
-Frankly, even though I often say that I want to move away, it's hard to leave the big city! I must have adena to live in the territory right now!<br>
-I was saving up a little every day, but when I returned home one day, I found that my sister had disappeared! She left a note saying that she was going out in the world to help me!<br>
-I couldn't do much as her older brother, but I've heard that her name is on a list of graduates from Talking Island.<br>
-I must see her, if only to give her a sword! I hate to ask you this so suddenly, but...<br>
-Can you help me?<br>
-<a action="bypass -h Quest 43_HelpTheSister 3">"What do you want me to do?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05.htm
deleted file mode 100644
index 44300c41afd95141a6bd659ac3dcaef381df1910..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Pet Manager Cooper:<br>
-The two pieces create a strange map. I remeber that the<font color="LEVEL"> famous Galladucci</font> said that he was waiting for an important map to be delivered, and it was running late. Is this it?</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05a.htm
deleted file mode 100644
index 0839a6d6d50dc341287abb721c51ac2b59a6f62b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-05a.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Pet Manager Cooper:<br>
-Please take the map to Galladucci at the Boutique Shop.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/__init__.py
deleted file mode 100644
index 39f63303d784d48056bd2b5c4c1b5c491497f8b0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/__init__.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#quest by zerghase
-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.jython import QuestJython as JQuest
-
-qn = "43_HelpTheSister"
-
-COOPER=30829
-GALLADUCCI=30097
-
-CRAFTED_DAGGER=220
-MAP_PIECE=7550
-MAP=7551
-PET_TICKET=7584
-
-SPECTER=20171
-SORROW_MAIDEN=20197
-
-MAX_COUNT=30
-MIN_LEVEL=26
-
-class Quest (JQuest) :
-  def onEvent(self, event, st):
-    htmltext=event
-    if event=="1":
-      htmltext="30829-01.htm"
-      st.set("cond","1")
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    elif event=="3" and st.getQuestItemsCount(CRAFTED_DAGGER):
-      htmltext="30829-03.htm"
-      st.takeItems(CRAFTED_DAGGER,1)
-      st.set("cond","2")
-    elif event=="4" and st.getQuestItemsCount(MAP_PIECE)>=MAX_COUNT:
-      htmltext="30829-05.htm"
-      st.takeItems(MAP_PIECE,MAX_COUNT)
-      st.giveItems(MAP,1)
-      st.set("cond", "4")
-    elif event=="5" and st.getQuestItemsCount(MAP):
-      htmltext="30097-06.htm"
-      st.takeItems(MAP,1)
-      st.set("cond","5")
-    elif event=="7":
-      htmltext="30829-07.htm"
-      st.giveItems(PET_TICKET,1)
-      st.exitQuest(False)
-      st.exitQuest(0)
-    return htmltext
-
-  def onTalk(self, npc, player):
-    htmltext = Quest.getNoQuestMsg(player)
-    st = player.getQuestState(qn)
-    if not st : return htmltext
-
-    npcId=npc.getNpcId()
-    id=st.getState()
-    if id==State.CREATED:
-      if player.getLevel()>=MIN_LEVEL:
-        htmltext="30829-00.htm"
-      else:
-        st.exitQuest(1)
-        htmltext="<html><body>This quest can only be taken by characters that have a minimum level of %s. Return when you are more experienced.</body></html>" % MIN_LEVEL
-    elif id==State.STARTED:
-      cond=st.getInt("cond")
-      if npcId==COOPER:
-        if cond==1:
-          if not st.getQuestItemsCount(CRAFTED_DAGGER):
-            htmltext="30829-01a.htm"
-          else:
-            htmltext="30829-02.htm"
-        elif cond==2:
-          htmltext="30829-03a.htm"
-        elif cond==3:
-            htmltext="30829-04.htm"
-        elif cond==4:
-          htmltext="30829-05a.htm"
-        elif cond==5:
-          htmltext="30829-06.htm"
-      elif npcId==GALLADUCCI:
-        if cond==4 and st.getQuestItemsCount(MAP):
-          htmltext="30097-05.htm"
-    elif id==State.COMPLETED:
-      st.exitQuest(0)
-      htmltext=Quest.getAlreadyCompletedMsg(player)
-
-    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()
-    cond=st.getInt("cond")
-    if cond==2:
-      numItems,chance = divmod(100*Config.RATE_QUEST_DROP,100)
-      if self.getRandom(100) < chance :
-        numItems = numItems +1  
-      pieces=st.getQuestItemsCount(MAP_PIECE)
-      if pieces + numItems >= MAX_COUNT :
-        numItems = MAX_COUNT - pieces
-        if numItems != 0:
-          st.playSound("ItemSound.quest_middle")
-          st.set("cond", "3")
-      else :  
-        st.playSound("ItemSound.quest_itemget")
-      st.giveItems(MAP_PIECE,int(numItems))
-    return     
-
-QUEST=Quest(43,qn,"Help The Sister!")
-
-
-QUEST.addStartNpc(COOPER)
-
-QUEST.addTalkId(COOPER)
-
-QUEST.addTalkId(GALLADUCCI)
-
-QUEST.addKillId(SPECTER)
-QUEST.addKillId(SORROW_MAIDEN)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06.htm
deleted file mode 100644
index 5c37c18b0cfad9e6cb199219f5e5632ef7dc2e2a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>High Prefect Drikus:<br>
-Hmm... you sound doubtful! Obviously, this is the property of the Orcs! Ony we are qualified to possess it!<br>
-Tell this to whoever is cometing with you for it! Once its ownership is decided, come back and talk to me.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06a.htm
deleted file mode 100644
index 6b03a84c78f7a516aa208f90cd65ae54298b2d5f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-06a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>High Prefect Drikus:<br>
-Determine the owner. He must come to me alone.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01.htm
deleted file mode 100644
index 857daf33848ef2a2be102ccedde5b0a71650a9d0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Pet Manager Lundy:<br>
-Great! Will you do me a favor? I need a<font color="LEVEL"> work hammer</font> immediately! I could buy one in any store around here, but I don't have the money!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01a.htm
deleted file mode 100644
index 4acd289ed3992034b27c7778f7c38edad3be79a4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-01a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Pet Manager Lundy:<br>
-Please bring me a work hammer. I really need one.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-02.htm
deleted file mode 100644
index 67e4822e874646e8abb3e966a62d31162d2da630..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-02.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Pet Manager Lundy:<br>
-Is this work hammer for me? Thank you! You will be blessed!<br>
-What? Money? I don't have any, silly!<br>
-By the way, I need another favor! My son went to Talking Island seeking adventure! He'll be graduating soon, and I want to send him this work hammer as a graduation present.<br>
-But there are fearsome bandits laying in wait around here. You must kill them!<font color="LEVEL"> Of course, I'll still need the work hammer.</font><br>
-<a action="bypass -h Quest 44_HelpTheSon 3">"I'll do it."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03a.htm
deleted file mode 100644
index c74c963b90505354c3133270804e4251af05e055..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03a.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Pet Manager Lundy:<br>
-You haven't destroyed 30 Maille Lizardmen yet, have you?</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/__init__.py
deleted file mode 100644
index 853518ecc3cf16d0f7392d2714b130bd617c7048..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/__init__.py
+++ /dev/null
@@ -1,122 +0,0 @@
-#quest by zerghase
-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.jython import QuestJython as JQuest
-
-qn = "44_HelpTheSon"
-
-LUNDY=30827
-DRIKUS=30505
-
-WORK_HAMMER=168
-GEMSTONE_FRAGMENT=7552
-GEMSTONE=7553
-PET_TICKET=7585
-
-MAILLE_GUARD=20921
-MAILLE_SCOUT=20920
-MAILLE_LIZARDMAN=20919
-
-MAX_COUNT=30
-MIN_LEVEL=24
-
-class Quest (JQuest) :
-  def onEvent(self, event, st):
-    htmltext=event
-    if event=="1":
-      htmltext="30827-01.htm"
-      st.set("cond","1")
-      st.setState(State.STARTED)
-      st.playSound("ItemSound.quest_accept")
-    if event=="3" and st.getQuestItemsCount(WORK_HAMMER):
-      htmltext="30827-03.htm"
-      st.takeItems(WORK_HAMMER,1)
-      st.set("cond","2")
-    if event=="4" and st.getQuestItemsCount(GEMSTONE_FRAGMENT)>=MAX_COUNT:
-      htmltext="30827-05.htm"
-      st.takeItems(GEMSTONE_FRAGMENT,MAX_COUNT)
-      st.giveItems(GEMSTONE,1)
-      st.set("cond", "4")
-    if event=="5" and st.getQuestItemsCount(GEMSTONE):
-      htmltext="30505-06.htm"
-      st.takeItems(GEMSTONE,1)
-      st.set("cond","5")
-    if event=="7":
-      htmltext="30827-07.htm"
-      st.giveItems(PET_TICKET,1)
-      st.unset("cond")
-      st.exitQuest(False)
-    return htmltext
-
-  def onTalk(self, npc, player):
-    htmltext = Quest.getNoQuestMsg(player)
-    st = player.getQuestState(qn)
-    if not st : return htmltext
-    npcId=npc.getNpcId()
-    id=st.getState()
-    if id==State.CREATED:
-      if player.getLevel()>=MIN_LEVEL:
-        htmltext="30827-00.htm"
-      else:
-        st.exitQuest(1)
-        htmltext="<html><body>This quest can only be taken by characters that have a minimum level of 24. Return when you are more experienced.</body></html>"
-    elif id==State.STARTED:
-      cond=st.getInt("cond")
-      if npcId==LUNDY:
-        if cond==1:
-          if not st.getQuestItemsCount(WORK_HAMMER):
-            htmltext="30827-01a.htm"
-          else:
-            htmltext="30827-02.htm"
-        elif cond==2:
-          htmltext="30827-03a.htm"
-        elif cond==3:
-            htmltext="30827-04.htm"
-        elif cond==4:
-          htmltext="30827-05a.htm"
-        elif cond==5:
-          htmltext="30827-06.htm"
-      elif npcId==DRIKUS:
-        if cond==4 and st.getQuestItemsCount(GEMSTONE):
-          htmltext="30505-05.htm"
-        elif cond==5:
-          htmltext="30505-06a.htm"
-    elif id==State.COMPLETED:
-      htmltext=Quest.getAlreadyCompletedMsg(player)
-    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()
-    cond=st.getInt("cond")
-    if cond==2:
-      numItems,chance = divmod(100*Config.RATE_QUEST_DROP,100)
-      if self.getRandom(100) < chance :
-        numItems = numItems +1  
-      pieces=st.getQuestItemsCount(GEMSTONE_FRAGMENT)
-      if pieces + numItems >= MAX_COUNT :
-        numItems = MAX_COUNT - pieces
-        if numItems != 0 :
-          st.playSound("ItemSound.quest_middle")
-          st.set("cond", "3")
-      else :  
-        st.playSound("ItemSound.quest_itemget")
-      st.giveItems(GEMSTONE_FRAGMENT,int(numItems))
-    return     
-
-QUEST=Quest(44,qn,"Help The Son!")
-
-
-QUEST.addStartNpc(LUNDY)
-
-QUEST.addTalkId(LUNDY)
-
-QUEST.addTalkId(DRIKUS)
-
-QUEST.addKillId(MAILLE_GUARD)
-QUEST.addKillId(MAILLE_SCOUT)
-QUEST.addKillId(MAILLE_LIZARDMAN)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..02a8e2be0d82dae7958aee3c66bebdb1f6cd3317
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-01.html
@@ -0,0 +1,4 @@
+<html><body>Chief Mercenary Sophya:<br>
+The Map! This is good information. Where did you get it?<br>
+<a action="bypass -h Quest Q00042_HelpTheUncle 30735-02.html">"From Pet Manager Waters."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30735-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-02a.html
new file mode 100644
index 0000000000000000000000000000000000000000..aeccb1542ff851abd9df7829adb02583375e9f39
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-02a.html
@@ -0,0 +1,3 @@
+<html><body>Chief Mercenary Sophya:<br>
+Did you give my thanks to Waters?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..aeccb1542ff851abd9df7829adb02583375e9f39
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30735-03.html
@@ -0,0 +1,3 @@
+<html><body>Chief Mercenary Sophya:<br>
+Did you give my thanks to Waters?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ee4bacad48758a6804f220758e90878c2b5101e8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00.htm
@@ -0,0 +1,4 @@
+<html><body>Pet Manager Waters:<br>
+Hey, could you do me a favor?<br>
+<a action="bypass -h Quest Q00042_HelpTheUncle 30828-01.htm">"What do you need?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00a.html
new file mode 100644
index 0000000000000000000000000000000000000000..3e427620f3cc98cdb715d734d88e089c8f8f47b3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-00a.html
@@ -0,0 +1,4 @@
+<html><body>
+Hmm... Now that I see you in the light... You're not what I'm looking for at all! You look too scruffy and poor!<br>
+(This quest can be performed only by the characters at the 25th level or above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..302046c97aa422e8b9ca2ff104ff988551e076a7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-01.htm
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Waters:<br>
+Awesome! Please, bring me a <font color="LEVEL">Trident</font>! I simply must have one! They probably sell them in stores around here, but I don't have enough Adena...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..5bf344bfafa66649a16c4b4d09e065ddd147c343
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02.html
@@ -0,0 +1,7 @@
+<html><body>Pet Manager Waters:<br>
+Wonderful, you've brought it. Much thanks!<br>
+So I have this uncle... one day my uncle just up and moves out north. He said he would earn cash as an adventurer.<br>
+I hear he's actually pretty good, he takes on quests other adventurers couldn't. But he's family, so I'm worried. I wanted to help.<br>
+And... <font color="LEVEL">You even gave me Trident</font>, but I need to ask another favor.<br>
+<a action="bypass -h Quest Q00042_HelpTheUncle 30828-03.html">Ask what it is</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02a.html
similarity index 51%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02a.html
index 8feb6a16066c9f266139dd6bddb1c3a2307fd99f..a23257cbb8a344905fe9535d9a5b27edc109252b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-01a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-02a.html
@@ -1,3 +1,3 @@
 <html><body>Pet Manager Waters:<br>
-Please bring me a trident. I really need one.
+Please bring me a Trident. I really need one.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..ea5fd0bdbbe144c070f0c9de65fcd1bca48caa3a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03.html
@@ -0,0 +1,4 @@
+<html><body>Pet Manager Waters:<br>
+I need to send the Trident, but outlaws have been rampant in this area lately! Please kill 30 <font color="LEVEL">Monster Eye Gazers and Destroyers</font>!<br>
+Destroy them so I can send the Trident safely. Please, you must help me!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03a.html
new file mode 100644
index 0000000000000000000000000000000000000000..157bfcb27e17582278551be6c67eea848ce2cde8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-03a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Waters:<br>
+Well, you should have suddenly felt that it is too valuable. Then, that's OK. Please bring me one when you have enough. 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..90042c71b3ec5e03bf66a285e5dd0d7381e8c2b6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-04.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Waters:<br>
+Please destroy the monsterous eye so I can ship the Trident safely.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-05.html
similarity index 57%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-05.html
index ecaa8c7f11114d3c125a4d7c5779d47169a48f07..a2b88b8a7a5e2fc065b53bdc03533b54cd3bf445 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-05.html
@@ -1,5 +1,5 @@
 <html><body>Pet Manager Waters:<br>
 Thank you! I've heard marvelous stories about a great adventurer who defeated the monsters in this area.<br>
-Well, where is the map piece?<br>
-<a action="bypass -h Quest 42_HelpTheUncle 4">"Here it is."</a>
+Well, where is the Map Pieces?<br>
+<a action="bypass -h Quest Q00042_HelpTheUncle 30828-06.html">"Here it is."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-06.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-06.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-06a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-06a.html
new file mode 100644
index 0000000000000000000000000000000000000000..4a921511175e8329d9920e782b3bc3334c5050c7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-06a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Waters:<br>
+Where is the Map fragment?
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..ed7a628c8902a2ae26dcfc71171792514af3ff8d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-07.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Waters:<br>
+Take the Map to Sophya, captain of the Black Lion Mercenaries.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-08.html
similarity index 70%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-08.html
index 40b1f6e9cb9e68d4b13a18e744d1a690c49651f8..d2226650c4c047708e575cc8f80d910b8b44cab3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-08.html
@@ -1,5 +1,5 @@
 <html><body>Pet Manager Waters:<br>
 The Black Lion Mercenaries have always been trustworthy, but this time you've outdone yourselves!<br>
 Thank you so much! I should really do something for you...<br>
-<a action="bypass -h Quest 42_HelpTheUncle 7">"It was nothing!"</a>
+<a action="bypass -h Quest Q00042_HelpTheUncle 30828-09.html">"It was nothing!"</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-09.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/42_HelpTheUncle/30828-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/30828-09.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
new file mode 100644
index 0000000000000000000000000000000000000000..fbcb50a979dfd55eaeb82d5d79a0f9f359e871e8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00042_HelpTheUncle/Q00042_HelpTheUncle.java
@@ -0,0 +1,201 @@
+/*
+ * 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.Q00042_HelpTheUncle;
+
+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;
+
+/**
+ * Help The Uncle! (42)<br>
+ * Original Jython script by zerghase
+ * @author malyelfik
+ */
+public class Q00042_HelpTheUncle extends Quest
+{
+	// NPCs
+	private static final int WATERS = 30828;
+	private static final int SOPHYA = 30735;
+	
+	// Monster
+	private static final int MONSTER_EYE_DESTROYER = 20068;
+	private static final int MONSTER_EYE_GAZER = 20266;
+	
+	// Items
+	private static final int TRIDENT = 291;
+	private static final int MAP_PIECE = 7548;
+	private static final int MAP = 7549;
+	private static final int PET_TICKET = 7583;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		String htmltext = event;
+		switch (event)
+		{
+			case "30828-01.htm":
+				st.startQuest();
+				break;
+			case "30828-03.html":
+				if (st.hasQuestItems(TRIDENT))
+				{
+					st.takeItems(TRIDENT, 1);
+					st.setCond(2, true);
+				}
+				else
+				{
+					htmltext = "30828-03a.html";
+				}
+				break;
+			case "30828-06.html":
+				if (st.getQuestItemsCount(MAP_PIECE) == 30)
+				{
+					st.takeItems(MAP_PIECE, -1);
+					st.giveItems(MAP, 1);
+					st.setCond(4, true);
+				}
+				else
+				{
+					htmltext = "30828-06a.html";
+				}
+				break;
+			case "30735-02.html":
+				if (st.hasQuestItems(MAP))
+				{
+					st.takeItems(MAP, -1);
+					st.setCond(5, true);
+				}
+				else
+				{
+					htmltext = "30735-02a.html";
+				}
+				break;
+			case "30828-09.html":
+				st.giveItems(PET_TICKET, 1);
+				st.exitQuest(false, true);
+				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 WATERS:
+				switch (st.getState())
+				{
+					case State.CREATED:
+						htmltext = (player.getLevel() >= 25) ? "30828-00.htm" : "30828-00a.html";
+						break;
+					case State.STARTED:
+						switch (st.getCond())
+						{
+							case 1:
+								htmltext = (st.hasQuestItems(TRIDENT)) ? "30828-02.html" : "30828-02a.html";
+								break;
+							case 2:
+								htmltext = "30828-04.html";
+								break;
+							case 3:
+								htmltext = "30828-05.html";
+								break;
+							case 4:
+								htmltext = "30828-07.html";
+								break;
+							case 5:
+								htmltext = "30828-08.html";
+								break;
+						}
+						break;
+					case State.COMPLETED:
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+				}
+				break;
+			case SOPHYA:
+				if (st.isStarted())
+				{
+					switch (st.getCond())
+					{
+						case 4:
+							htmltext = "30735-01.html";
+							break;
+						case 5:
+							htmltext = "30735-03.html";
+							break;
+					}
+				}
+				break;
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+	{
+		QuestState st = player.getQuestState(getName());
+		
+		if ((st != null) && st.isCond(2))
+		{
+			st.giveItems(MAP_PIECE, 1);
+			if (st.getQuestItemsCount(MAP_PIECE) == 30)
+			{
+				st.setCond(3, true);
+			}
+			else
+			{
+				st.playSound("ItemSound.quest_itemget");
+			}
+		}
+		return super.onKill(npc, player, isPet);
+	}
+	
+	public Q00042_HelpTheUncle(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(WATERS);
+		addTalkId(WATERS, SOPHYA);
+		addKillId(MONSTER_EYE_DESTROYER, MONSTER_EYE_GAZER);
+		
+		questItemIds = new int[]
+		{
+			MAP,
+			MAP_PIECE
+		};
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00042_HelpTheUncle(42, Q00042_HelpTheUncle.class.getSimpleName(), "Help The Uncle!");
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30097-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-01.html
similarity index 72%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30097-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-01.html
index 6909f268eb6df297c67d671be9bdfd981af197a8..fdcee73c44a89a85550fe34df1f2b3b986c365aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30097-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-01.html
@@ -1,5 +1,5 @@
 <html><body>Trader Galladucci:<br>
 The map traces some very important merchandise! To think it would end up there! Thank you! Did you find it?<br>
 What? Pet Manager Cooper? Well, OK... Can you take him a message for me?<br>
-<a action="bypass -h Quest 43_HelpTheSister 5">"Sure, no problem!"</a>
+<a action="bypass -h Quest Q00043_HelpTheSister 30097-02.html">"Sure, no problem!"</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30097-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-02.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30097-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-02.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-02a.html
new file mode 100644
index 0000000000000000000000000000000000000000..28ed4007e876c5fa23c7d8b37122f86f4252b948
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-02a.html
@@ -0,0 +1,5 @@
+<html><body>Trader Galladucci:<br>
+Aren't you going to  deliver my message to Cooper? Didn't you see the fragment of a Map here?<br>
+Now I have no reason to call out Cooper, do I?  If you find the Map around here, please bring it to me.<br>
+Hmm, my memory isn't fading, is it?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..69d1ab09d8cd849c52aa4d67837405169187136b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30097-03.html
@@ -0,0 +1,3 @@
+<html><body>Trader Galladucci:<br>
+Did you deliver my message to Cooper?  It is the cycle of Tera!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00.htm
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00.htm
index 7a27704a5f6aa66bc6913a0c08cebc60ec323358..d871f69a321e02336dc56746897c6b659e8afd4a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00.htm
@@ -1,5 +1,5 @@
 <html><body>Pet Manager Cooper:<br>
 This stuff makes me crazy!<br>
-What? Oh, sorry! I was thinking of something else... Do you have any extra adena?<br>
-<a action="bypass -h Quest 43_HelpTheSister 1">"Straight to the point, eh?"</a>
+What? Oh, sorry! I was thinking of something else... Do you have any extra Adena?<br>
+<a action="bypass -h Quest Q00043_HelpTheSister 30829-01.htm">"Straight to the point, eh?"</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00a.html
new file mode 100644
index 0000000000000000000000000000000000000000..5b72d9c410252a5af9d76b66a6addddb93dab400
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-00a.html
@@ -0,0 +1,4 @@
+<html><body>Pet Manager Cooper:<br>
+You don't seem like the type that would have much extra Adena... Come back when you've gotten some!<br>
+(This quest may only be undertaken by characters of level 26 or above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-01.htm
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-01.htm
index 5fe9f1971edd908c7e0c33fd74b580889e855ec5..8460545205b4a945441b079b0deecf56d0f193d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-01.htm
@@ -1,3 +1,3 @@
 <html><body>Pet Manager Cooper:<br>
-If you can, please bring me a<font color="LEVEL"> crafted dagger</font>. I need one badly! They sell them at the store nearby, but I don't have enough adena!
+If you can, please bring me a <font color="LEVEL">Crafted Dagger</font>. I need one badly! They sell them at the store nearby, but I don't have enough Adena!
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..7e459cb42853b00a8a01f683e92848bc229abf7b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02.html
@@ -0,0 +1,9 @@
+<html><body>Pet Manager Cooper:<br>
+Oh, wonderful! You've arrived!<br>
+Frankly, even though I often say that I want to move away, it's hard to leave the big city. However, one must have a lot of Adena to live in this territory right now!<br>
+I was saving up a little every day, but when I returned home one day, I found that my sister had disappeared! She left a note saying that she was going out into the world to find fame and fortune for both of us.<br>  
+As her older brother, I could never provide her with all the things she has wanted. Recently, I've heard that her name is on a list of graduates from Talking Island.<br>
+I must see her, and give her a sword as a gift.  It's the least I can do. I hate to ask you this so suddenly, but...<br>
+Can you help me?<br>
+<a action="bypass -h Quest Q00043_HelpTheSister 30829-03.html">"What do you want me to do?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02a.html
new file mode 100644
index 0000000000000000000000000000000000000000..55287e760f6f96388a33042013287117f8b21cc7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-02a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Cooper:<br>
+Please bring me a Crafted Dagger. I really need one.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-03.html
similarity index 57%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-03.html
index 6d6caf6d312d617b5e5bbb7f4401018071582765..5b63dc78e22f1af8a34895abf684c5a615dcc475 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-03.html
@@ -1,4 +1,4 @@
 <html><body>Pet Manager Cooper:<br>
-I could just send a sword to my sister, but I'm worried about her. I'm afraid she's in great danger on the road to Giran! Hunt<font color="LEVEL"> specters and sorrow maidens on the Execution Ground</font>. Please kill at least 30.<br>
+I could just send a sword to my sister, but I'm worried about her. I'm afraid she's in great danger on the road to Giran! Hunt <font color="LEVEL">Specters and Sorrow Maidens on the Execution Grounds</font>. Please kill at least 30.<br>
 Last night I dreamed that specters and sorrow maidens were chasing my sister. The more you kill, the better her chances are!
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-03a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-04.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-03a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-04.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-05.html
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-05.html
index 585914e508468b01c26220ed593fd5ed31e37dbc..b42ebaff066129079947fcf157bdf0012c7f3f49 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-05.html
@@ -1,5 +1,5 @@
 <html><body>Pet Manager Cooper:<br>
 Good job with those monsters in the Execution Ground! You got at least 30 of them, right?<br>
 What's that? A piece of a map? Hmm... Let me try something...?<br>
-<a action="bypass -h Quest 43_HelpTheSister 4">"Here it is."</a>
+<a action="bypass -h Quest Q00043_HelpTheSister 30829-06.html">"Here it is."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..9a3321c2a45d67ad0aabbb8763f5f0b2e79a8ddf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Cooper:<br>
+The two pieces create a Strange Map. I remember that the <font color="LEVEL">famous Galladucci</font> said that he was waiting for an important Map to be delivered, and it was running late. Is this it?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06a.html
new file mode 100644
index 0000000000000000000000000000000000000000..9e7778afc78b4d65337eb31c6d1483a78ecb1f3e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-06a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Cooper:<br>
+Where is the piece of Map?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..02842ba29cba6697e6dc4b23fbd4f5cd2a738aa5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-07.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Cooper:<br>
+Please take the Map to Galladucci at the Boutique Shop.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-08.html
similarity index 56%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-08.html
index f473912833b2a4013798d6d995807196beb07a39..d228124c0234e998a2d88ef76625183fb5163eb6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-08.html
@@ -1,5 +1,5 @@
 <html><body>Pet Manager Cooper:<br>
 Is it the one he was looking for? Good.<br>
 Thank you so much!<br>
-<a action="bypass -h Quest 43_HelpTheSister 7">"Don't mention it!"</a>
+<a action="bypass -h Quest Q00043_HelpTheSister 30829-09.html">"Don't mention it!"</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-09.html
similarity index 65%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-09.html
index 7bdb5307a7b7186cd03c15333e44d6cd0af878e7..19405bb2ae3ccdff9d680ea9e0f8db3304ccae0d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/43_HelpTheSister/30829-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/30829-09.html
@@ -1,6 +1,6 @@
 <html><body>Pet Manager Cooper:<br>
-All I asked was for you to make the path safer for my sister... And you've actually brought the map!<br>
+All I asked was for you to make the path safer for my sister... And you've actually brought the Map!<br>
 Mr. Galladucci was very pleased! You shall be well-rewarded for this, my friend.<br>
 This is the most valuable thing I own. It was originally reserved for those of the upper class... But this one is yours!<br>
-<font color="LEVEL">It's a coupon you can exchange for a pet.</font> It won't be easy to raise. You must be very careful!
+<font color="LEVEL">It's a coupon you can exchange for a pet. </font>It won't be easy to raise. You must be very careful!
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ac47e2210c36ad4fb56e5fc94a959e1dd73f84f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00043_HelpTheSister/Q00043_HelpTheSister.java
@@ -0,0 +1,201 @@
+/*
+ * 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.Q00043_HelpTheSister;
+
+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;
+
+/**
+ * Help The Sister! (43)<br>
+ * Original Jython script by zerghase
+ * @author malyelfik
+ */
+public class Q00043_HelpTheSister extends Quest
+{
+	// NPCs
+	private static final int COOPER = 30829;
+	private static final int GALLADUCCI = 30097;
+	
+	// Monster
+	private static final int SPECTER = 20171;
+	private static final int SORROW_MAIDEN = 20197;
+	
+	// Items
+	private static final int CRAFTED_DAGGER = 220;
+	private static final int MAP_PIECE = 7550;
+	private static final int MAP = 7551;
+	private static final int PET_TICKET = 7584;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		String htmltext = event;
+		switch (event)
+		{
+			case "30829-01.htm":
+				st.startQuest();
+				break;
+			case "30829-03.html":
+				if (st.hasQuestItems(CRAFTED_DAGGER))
+				{
+					st.takeItems(CRAFTED_DAGGER, 1);
+					st.setCond(2, true);
+				}
+				else
+				{
+					htmltext = getNoQuestMsg(player);
+				}
+				break;
+			case "30829-06.html":
+				if (st.getQuestItemsCount(MAP_PIECE) == 30)
+				{
+					st.takeItems(MAP_PIECE, -1);
+					st.giveItems(MAP, 1);
+					st.setCond(4, true);
+				}
+				else
+				{
+					htmltext = "30829-06a.html";
+				}
+				break;
+			case "30097-02.html":
+				if (st.hasQuestItems(MAP))
+				{
+					st.takeItems(MAP, -1);
+					st.setCond(5, true);
+				}
+				else
+				{
+					htmltext = "30097-02a.html";
+				}
+				break;
+			case "30829-09.html":
+				st.giveItems(PET_TICKET, 1);
+				st.exitQuest(false, true);
+				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 COOPER:
+				switch (st.getState())
+				{
+					case State.CREATED:
+						htmltext = (player.getLevel() >= 26) ? "30829-00.htm" : "30829-00a.html";
+						break;
+					case State.STARTED:
+						switch (st.getCond())
+						{
+							case 1:
+								htmltext = (st.hasQuestItems(CRAFTED_DAGGER)) ? "30829-02.html" : "30829-02a.html";
+								break;
+							case 2:
+								htmltext = "30829-04.html";
+								break;
+							case 3:
+								htmltext = "30829-05.html";
+								break;
+							case 4:
+								htmltext = "30829-07.html";
+								break;
+							case 5:
+								htmltext = "30829-08.html";
+								break;
+						}
+						break;
+					case State.COMPLETED:
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+				}
+				break;
+			case GALLADUCCI:
+				if (st.isStarted())
+				{
+					switch (st.getCond())
+					{
+						case 4:
+							htmltext = "30097-01.html";
+							break;
+						case 5:
+							htmltext = "30097-03.html";
+							break;
+					}
+				}
+				break;
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+	{
+		QuestState st = player.getQuestState(getName());
+		
+		if ((st != null) && st.isCond(2))
+		{
+			st.giveItems(MAP_PIECE, 1);
+			if (st.getQuestItemsCount(MAP_PIECE) == 30)
+			{
+				st.setCond(3, true);
+			}
+			else
+			{
+				st.playSound("ItemSound.quest_itemget");
+			}
+		}
+		return super.onKill(npc, player, isPet);
+	}
+	
+	public Q00043_HelpTheSister(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(COOPER);
+		addTalkId(COOPER, GALLADUCCI);
+		addKillId(SORROW_MAIDEN, SPECTER);
+		
+		questItemIds = new int[]
+		{
+			MAP,
+			MAP_PIECE
+		};
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00043_HelpTheSister(43, Q00043_HelpTheSister.class.getSimpleName(), "Help The Sister!");
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-01.html
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-01.html
index d6912716aa5a5814b8693e7e8397e3047f4de98e..ec48b3d26522c140258ebb9cb7c489114302f77f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30505-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-01.html
@@ -2,4 +2,5 @@
 Oh no! The orb! It's broken!<br>
 This is the orb of ancestors that Dudamara's totem told me about! It was stolen by lesser Orcs a very long time ago.<br>
 Does it belong to you?<br>
-<a action="bypass -h Quest 44_HelpTheSon 5">"I'm not sure."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00044_HelpTheSon 30505-02.html">"I'm not sure."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..2a3ef8d2ac8c3555d402730d07084836d5e900e8
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02.html
@@ -0,0 +1,4 @@
+<html><body>High Prefect Drikus:<br>
+Hmm... You sound doubtful! Obviously, this is the property of the Orcs! Only we are qualified to possess it!<br>
+Tell this to whoever is competing with you for it! Once its ownership is decided, come back and talk to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02a.html
new file mode 100644
index 0000000000000000000000000000000000000000..e47a7c00571c15bb61eda1ffb0843762825c7cb6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-02a.html
@@ -0,0 +1,3 @@
+<html><body>High Prefect Drikus:<br>
+When you decide who the owner is, send him to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..d8d2158908d4c6d3db6796a14d9dda1923a1c837
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30505-03.html
@@ -0,0 +1,3 @@
+<html><body>High Prefect Drikus:<br>
+Determine the owner. He must come to me alone.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00.htm
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00.htm
index e79aa57a97d5e5a6040248c3096fc884a0779d4f..9af13248f1bb13e5981bfe463cb2a93b3710ac8e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00.htm
@@ -1,4 +1,5 @@
 <html><body>Pet Manager Lundy:<br>
 This stuff drives me crazy! What was he thinking?<br>
 Hey, buddy, can I talk to you for a minute?<br>
-<a action="bypass -h Quest 44_HelpTheSon 1">"Sure."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00044_HelpTheSon 30827-01.htm">"Sure."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00a.html
new file mode 100644
index 0000000000000000000000000000000000000000..63bef2bc39e596618a3211a5fa0323e01fcae2ac
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-00a.html
@@ -0,0 +1,4 @@
+<html><body>Pet Manager Lundy:<br>
+Hmm, well, never mind. I was going to ask you for a favor, but on second thought, you're too young. Come back when you're older.<br>
+(This quest may only be undertaken by characters of level 24 or above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..f208c45eb77df6d56f31777df7bca69154e6cf85
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-01.htm
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Lundy:<br>
+Great! Will you do me a favor? I need a <font color="LEVEL">Work Hammer</font> immediately! I could buy one in any store around here, but I don't have the money!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..c758c2294a5cbef5fba808ad08abaf740cc97323
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02.html
@@ -0,0 +1,7 @@
+<html><body>Pet Manager Lundy:<br>
+Is this Work Hammer for me? Thank you! You will be blessed!<br>
+What? Money? I don't have any, silly!<br>
+By the way, I need another favor! My son went to Talking Island seeking adventure! He'll be graduating soon, and I want to send him this Work Hammer as a graduation present.<br>
+But there are some fearsome bandits laying in wait around here. You must kill them! <font color="LEVEL">Of course, I'll still need the Work Hammer.</font><br>
+<a action="bypass -h Quest Q00044_HelpTheSon 30827-03.html">"I'll do it."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02a.html
new file mode 100644
index 0000000000000000000000000000000000000000..c6b676ad3483a63e730ce8ccd15ee182cd13a144
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-02a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Lundy:<br>
+Please be a sport and bring me a Work Hammer! Think of it as charity!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03.html
similarity index 69%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03.html
index 16b80e93771779cc513d693a5a5b675b2d55476e..92f0cdcf3ebb919ccfbfa5e7e0145ecbecca6d7e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03.html
@@ -2,4 +2,5 @@
 Thank you! You are so generous!<br>
 There are Maille Lizardmen around here. They always try to steal the things going out from this town.<br>
 Wouldn't you be upset if your generosity, the Work Hammer, could not reach Talking Island because it was stolen by thieves?<br>
-So, please take the Maille Lizardmen down. I would be grateful if you could take out the<font color="LEVEL"> Maille Lizardman Guards, Maille Lizardman Scouts, and Maille Lizardmen.</font> Defeat 30 of them.</body></html>
\ No newline at end of file
+So, please take the Maille Lizardmen down. I would be grateful if you could take out the <font color="LEVEL">Maille Lizardman Guards, Maille Lizardman Scouts, and Maille Lizardmen</font>. Defeat 30 of them.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03a.html
new file mode 100644
index 0000000000000000000000000000000000000000..270de14009b71b39a078548e8de73744d786959b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-03a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Lundy:<br>
+Do you think the hammer is too valuable? Then, that's OK. Let's talk about it next time.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..78e8edc68de6cc39da7ddc2ffa8038df18cf0982
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-04.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Lundy:<br>
+You haven't destroyed 30 Maille Lizardmen yet, have you?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-05.html
similarity index 69%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-05.html
index c416b0a2f9fe6a4df413f917448200ce086b4a9f..bd67f4087942abc459bfd91884c8a90831ec05ba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-05.html
@@ -3,4 +3,5 @@ You defeated them! Good job!<br>
 By the way, what are those shiny things? Wow, can I see one?<br>
 Hmm... It looks like a head. What if we put it together?<br>
 Like so...<br>
-<a action="bypass -h Quest 44_HelpTheSon 4">"Hm..."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00044_HelpTheSon 30827-06.html">"Hm..."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06.html
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06.html
index 5deaa5bc8db11d9d97f2aeec0ab565a87c6c6257..0a4e67a215437f86a6d2e47962477e1b6536a7f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06.html
@@ -1,3 +1,4 @@
 <html><body>Pet Manager Lundy:<br>
 Hmm... What misterious beads! I heard that Drikus is collecting things like this.<br>
-I shined them up a bit. Would you take them and investigate?</body></html>
\ No newline at end of file
+I shined them up a bit. Would you take them and investigate?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06a.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06a.html
new file mode 100644
index 0000000000000000000000000000000000000000..de99cf63426cc6bc143c89aa69033d13dae6e1c2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-06a.html
@@ -0,0 +1,3 @@
+<html><body>Pet Manager Lundy:<br>
+Hmmm...? Where is the bead? Did you see it?
+<body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-07.html
similarity index 58%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-07.html
index 8d6d54c1f9ea9272cd2e6bc8d331365ee24355cf..2fdc6bd00efcb64d183d305b2f5cbe3fdbed0de1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-05a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-07.html
@@ -1,3 +1,4 @@
 <html><body>Pet Manager Lundy:<br>
 What did High Prefect Drikus say?<br>
-Why haven't you seen him yet! Go!</body></html>
\ No newline at end of file
+Why haven't you seen him yet! Go!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-08.html
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-08.html
index cf90c35e83d8fd1ec588b2986f3cef41cea81625..47e20e8c740e2b31a1aae048e747d9e9f58e12b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-08.html
@@ -1,4 +1,5 @@
 <html><body>Pet Manager Lundy:<br>
 Oh really? The owner? Honestly, you can take the credit! Why are you so interested in that bead?<br>
 I think you should choose something else! Drikus may not get around to fixing it for a long time...<br>
-<a action="bypass -h Quest 44_HelpTheSon 7">"Whatever."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00044_HelpTheSon 30827-09.html">"Whatever."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-09.html
similarity index 86%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-09.html
index aa13615831b8dccce660509ee748dcc5b44a6140..fd48bad96ed4c2e065de1e7a621aa309a2e89f66 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/44_HelpTheSon/30827-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/30827-09.html
@@ -1,4 +1,5 @@
 <html><body>Pet Manager Lundy:<br>
 Excellent! I'll give you one of my most valuable possessions.<br>
 There are very few of these, even among the very rich, and today you become one of the chosen few owners!<br>
-Please accept this<font color="LEVEL"> pet exchange ticket</font>. Your new pet is a very popular breed from the north. Raise it carefully! It is very, very rare!</body></html>
\ No newline at end of file
+Please accept this<font color="LEVEL"> pet exchange ticket</font>. Your new pet is a very popular breed from the north. Raise it carefully! It is very, very rare!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
new file mode 100644
index 0000000000000000000000000000000000000000..b7056e35fc7cdad5e57a04d4fbeb71ea54d1bf3a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00044_HelpTheSon/Q00044_HelpTheSon.java
@@ -0,0 +1,203 @@
+/*
+ * 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.Q00044_HelpTheSon;
+
+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;
+
+/**
+ * Help The Son! (44)<br>
+ * Original Jython script by zerghase
+ * @author malyelfik
+ */
+public class Q00044_HelpTheSon extends Quest
+{
+	// NPCs
+	private static final int LUNDY = 30827;
+	private static final int DRIKUS = 30505;
+	
+	// Monster
+	private static final int MAILLE_GUARD = 20921;
+	private static final int MAILLE_SCOUT = 20920;
+	private static final int MAILLE_LIZARDMAN = 20919;
+	
+	// Items
+	private static final int WORK_HAMMER = 168;
+	private static final int GEMSTONE_FRAGMENT = 7552;
+	private static final int GEMSTONE = 7553;
+	private static final int PET_TICKET = 7585;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		String htmltext = event;
+		switch (event)
+		{
+			case "30827-01.htm":
+				st.startQuest();
+				break;
+			case "30827-03.html":
+				if (st.hasQuestItems(WORK_HAMMER))
+				{
+					st.takeItems(WORK_HAMMER, 1);
+					st.setCond(2, true);
+				}
+				else
+				{
+					htmltext = "30827-03a.html";
+				}
+				break;
+			case "30827-06.html":
+				if (st.getQuestItemsCount(GEMSTONE_FRAGMENT) == 30)
+				{
+					st.takeItems(GEMSTONE_FRAGMENT, -1);
+					st.giveItems(GEMSTONE, 1);
+					st.setCond(4, true);
+				}
+				else
+				{
+					htmltext = "30827-06a.html";
+				}
+				break;
+			case "30505-02.html":
+				if (st.hasQuestItems(GEMSTONE))
+				{
+					st.takeItems(GEMSTONE, -1);
+					st.setCond(5, true);
+				}
+				else
+				{
+					htmltext = "30505-02a.html";
+				}
+				break;
+			case "30827-09.html":
+				st.giveItems(PET_TICKET, 1);
+				st.exitQuest(false, true);
+				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 LUNDY:
+				switch (st.getState())
+				{
+					case State.CREATED:
+						htmltext = (player.getLevel() >= 24) ? "30827-00.htm" : "30827-00a.html";
+						break;
+					case State.STARTED:
+						switch (st.getCond())
+						{
+							case 1:
+								htmltext = (st.hasQuestItems(WORK_HAMMER)) ? "30827-02.html" : "30827-02a.html";
+								break;
+							case 2:
+								htmltext = "30827-04.html";
+								break;
+							case 3:
+								htmltext = "30827-05.html";
+								break;
+							case 4:
+								htmltext = "30827-07.html";
+								break;
+							case 5:
+								htmltext = "30827-08.html";
+								break;
+						}
+						break;
+					case State.COMPLETED:
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+				}
+				break;
+			case DRIKUS:
+				if (st.isStarted())
+				{
+					switch (st.getCond())
+					{
+						case 4:
+							htmltext = "30505-01.html";
+							break;
+						case 5:
+							htmltext = "30505-03.html";
+							break;
+					}
+				}
+				break;
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+	{
+		QuestState st = player.getQuestState(getName());
+		
+		if ((st != null) && st.isCond(2))
+		{
+			st.giveItems(GEMSTONE_FRAGMENT, 1);
+			if (st.getQuestItemsCount(GEMSTONE_FRAGMENT) == 30)
+			{
+				st.setCond(3, true);
+			}
+			else
+			{
+				st.playSound("ItemSound.quest_itemget");
+			}
+		}
+		return super.onKill(npc, player, isPet);
+	}
+	
+	public Q00044_HelpTheSon(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(LUNDY);
+		addTalkId(LUNDY, DRIKUS);
+		addKillId(MAILLE_GUARD, MAILLE_LIZARDMAN, MAILLE_SCOUT);
+		
+		questItemIds = new int[]
+		{
+			GEMSTONE,
+			GEMSTONE_FRAGMENT
+		};
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00044_HelpTheSon(44, Q00044_HelpTheSon.class.getSimpleName(), "Help The Son!");
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-00.htm
similarity index 71%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-00.htm
index bfcf0028013dd436396dd0a3acc0a7bcbeee4c3a..18ba31772854e9da692d5173fb986201dff7de2b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-00.htm
@@ -1,8 +1,8 @@
-<html><body>Head Blacksmith Newyear:<br>
+<html><body> Head Blacksmith Newyear:<br>
 You have the right look, I won't argue that.<br>
-Now let's find out if you have the skills. Show me how you hold a weapon... <br>
-Hmm... I've been a blacksmith here for almost 100 years. I've seen every manner of warrior.<br>
+Now let's find out if you have the skills. Show me how you hold a weapon...<br>
+Hmm... I've been a blacksmith here for almost 100 years. I've seen every manner of warrior.<br> 
 Your hands are too far apart, your grip is loose, and your stance is all wrong. Basically, you aren't ready.<br>
 Return here when you've learned your craft better, adventurer. I think you have the potential.<br>
-(Only characters of level 70 or above can take on this quest.)
+(Only characters of level 70 or above can take on this quest.) 
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ca37ebb56ce1f473e92c497545f6f609cd8f40d7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-01.htm
@@ -0,0 +1,6 @@
+<html><body>Head Blacksmith Newyear: <br> 
+Have you ever thought about working for us dwarves?<br> 
+Near this area lies the <font color="LEVEL">Pavel Ruins</font>. I sent an investigator there a while ago, but got nowhere with their reportings.<br>
+If you are experienced enough, I'd like to send you there.<br>
+<a action="bypass -h Quest Q00121_PavelTheGiant 31961-02.htm">Say you're experienced enough</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-02.htm
similarity index 68%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-02.htm
index c390cad90deef3b255e3c5764eb0fc0ffdba0152..c910e194aa7b937372e234f386984e348101e978 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-1.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-02.htm
@@ -1,5 +1,5 @@
-<html><body> Head Blacksmith Newyear:<br>
-You're full of confidence, I see. Well, that's right and proper; you have the skill to back it up. Just the sort of adventurer I need!<br>
-In the heart of the Ruins of Pavel there is a Dwarven barracks. There you will find my associate, <font color="LEVEL">Collector Yumi</font>. She will give you a job if you tell her I sent you. She's, um,  a little eccentric. I'm not sure what she'll make of you, but I think you'll pass muster with her.<br>
+<html><body>Head Blacksmith Newyear: <br> 
+You're full of confidence, I see. Well, that's right and proper; you have the skill to back it up. Just the sort of adventurer I need!<br> 
+In the heart of the Ruins of Pavel there is a Dwarven barracks. There you will find my associate, <font color="LEVEL">Collector Yumi</font>. She will give you a job if you tell her I sent you. She's, um, a little eccentric. I'm not sure what she'll make of you, but I think you'll pass muster with her.<br>
 So, get going! Quests don't keep forever, you know!
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-03.html
similarity index 82%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-03.html
index c53019a3bb64046abc2c160bca973a6d3ff8595d..78aa86ce2156b3d1649da0dc1b945148fd43513c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/121_PavelTheGiants/31961-2.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/31961-03.html
@@ -1,3 +1,3 @@
-<html><body>Head Blacksmith Newyear:<br>
+<html><body>Head Blacksmith Newyear: <br> 
 In the heart of the Ruins of Pavel there is a Dwarven barracks. There you will find my associate, <font color="LEVEL">Collector Yumi</font>. She'll give you a job if you tell her I sent you.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..ccbf3d9eb03fb84d03f18c6d87a06c7c58e9534b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-01.html
@@ -0,0 +1,7 @@
+<html><body>Collector Yumi: <br> 
+What brings you here?<br> 
+Ah, Newyear sent you, did he? I'm glad you came. I've been waiting for you.<br> 
+How is the old boy? Surely he could have sent some food with you. Would that have been too much to expect of him? Honestly.<br> 
+Well, no matter. Let's discuss business.<br> 
+<a action="bypass -h Quest Q00121_PavelTheGiant 32041-02.html">Ask what needs to be done.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..4162d6ecf984ad8152afa641a2e86b11c30b8b78
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/32041-02.html
@@ -0,0 +1,3 @@
+<html><body>Collector Yumi: <br> 
+We have two problems. The first and most urgent is that we are beset by a mad scientist whose work is causing us great harm.  I am not sure if you can prevail against him, and in good conscience I cannot send you against him until I am sure.  Please go see <font color="LEVEL">Collector Gutenhagen.</font> He has been in need of assistance, and he can evaluate your fitness for this task. If he passes you, come see me, and I will tell you a tale of the <font color="LEVEL">old manager</font> of the Pavel Ruins.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
new file mode 100644
index 0000000000000000000000000000000000000000..690e65eefa74f26fbec367e696b60571baec84af
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00121_PavelTheGiant/Q00121_PavelTheGiant.java
@@ -0,0 +1,103 @@
+/*
+ * 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.Q00121_PavelTheGiant;
+
+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;
+
+/**
+ * Pavel the Giants (121)<br>
+ * Original Jython script by Ethernaly
+ * @author malyelfik
+ */
+public class Q00121_PavelTheGiant extends Quest
+{
+	// NPCs
+	private static final int NEWYEAR = 31961;
+	private static final int YUMI = 32041;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		switch (event)
+		{
+			case "31961-02.htm":
+				st.startQuest();
+				break;
+			case "32041-02.html":
+				st.addExpAndSp(346320, 26069);
+				st.exitQuest(false, true);
+				break;
+		}
+		return event;
+	}
+	
+	@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 NEWYEAR:
+				switch (st.getState())
+				{
+					case State.CREATED:
+						htmltext = (player.getLevel() >= 70) ? "31961-01.htm" : "31961-00.htm";
+						break;
+					case State.STARTED:
+						htmltext = "31961-03.html";
+						break;
+					case State.COMPLETED:
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+				}
+				break;
+			case YUMI:
+				if (st.isStarted())
+				{
+					htmltext = "32041-01.html";
+				}
+				break;
+		}
+		return htmltext;
+	}
+	
+	public Q00121_PavelTheGiant(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(NEWYEAR);
+		addTalkId(NEWYEAR, YUMI);
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00121_PavelTheGiant(121, Q00121_PavelTheGiant.class.getSimpleName(), "Pavel the Giant");
+	}
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-00.htm
new file mode 100644
index 0000000000000000000000000000000000000000..35ac15f4101c440ac70cf11fb1354ff6de82eef2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-00.htm
@@ -0,0 +1,4 @@
+<html><body>Seer Moira: <br>
+Are you qualified to receive the blessings of Pa'agrio?<br>
+(Characters must have reached level 20 to undertake this quest.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..27dfc0b677d4757f9687ae13f575bb896cb1a6a1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-01.htm
@@ -0,0 +1,4 @@
+<html><body>Seer Moira:<br>
+Oh, sighing rock! I'd like to end your wandering for good. Do you wish to help me do that? <br>
+<a action="bypass -h Quest Q00122_OminousNews 31979-02.htm">"Do you know the path I have to follow?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..29882221ebd6fe7b4825ba74838c981788501220
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-02.htm
@@ -0,0 +1,4 @@
+<html><body>Seer Moira:<br>
+If you follow the path from the western part of the village, you'll meet someone who'll stop your wandering. His name is <font color="LEVEL">Karuda</font>.<br> 
+When you meet him, tell him to wait.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..7d31e2a9e4f2052749cca2fc72f4916bb11e0fd3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/31979-03.html
@@ -0,0 +1,3 @@
+<html><body>Seer Moira: <br>
+Why are you still wandering around here? Follow the path in the western part of the village until you meet someone who'll stop your wandering. His name is <font color="LEVEL">Karuda.</font> Don't forget.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..aefc3d30f4865f8a69a6489d98643c7f33b78d66
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-01.html
@@ -0,0 +1,4 @@
+<html><body>Karuda: <br> 
+What misfortune brought you here? You don't want any part of what's happening here. This place is in chaos. Trust me, it's best if you just pass on by.<br> 
+<a action="bypass -h Quest Q00122_OminousNews 32017-02.html">"The Seer Moira sent me."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-02.html
similarity index 76%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-02.html
index 106ff82d6c0dc18ce07dffea4bab018e1c3ac5a5..2dfa862361aa1a79be422ef58cc420dff780aaae 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/122_OminousNews/32017-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/32017-02.html
@@ -1,2 +1,3 @@
-<html><body>Karuda:<br>
-Seer Moira sent you? Well, I'm sort of busy at the moment. Do you think you could come back again later? I do have a job for you. In fact, here's some money - a deposit to retain your services for the future.</body></html>
\ No newline at end of file
+<html><body>Karuda:<br> 
+Seer Moira sent you? Well, I'm sort of busy at the moment. Do you think you could come back again later? I do have a job for you. In fact, here's some money - a deposit to retain your services for the future.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
new file mode 100644
index 0000000000000000000000000000000000000000..4557d1f890d147cf04158e247f5f923cfafff0e1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00122_OminousNews/Q00122_OminousNews.java
@@ -0,0 +1,104 @@
+/*
+ * 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.Q00122_OminousNews;
+
+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;
+
+/**
+ * Ominous News (122)<br>
+ * Original Jython script by Polo
+ * @author malyelfik
+ */
+public class Q00122_OminousNews extends Quest
+{
+	// NPCs
+	private static final int MOIRA = 31979;
+	private static final int KARUDA = 32017;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		switch (event)
+		{
+			case "31979-02.htm":
+				st.startQuest();
+				break;
+			case "32017-02.html":
+				st.giveAdena(8923, true);
+				st.addExpAndSp(45151, 2310);
+				st.exitQuest(false, true);
+				break;
+		}
+		return event;
+	}
+	
+	@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 MOIRA:
+				switch (st.getState())
+				{
+					case State.CREATED:
+						htmltext = (player.getLevel() >= 20) ? "31979-01.htm" : "31979-00.htm";
+						break;
+					case State.STARTED:
+						htmltext = "31979-03.html";
+						break;
+					case State.COMPLETED:
+						htmltext = getAlreadyCompletedMsg(player);
+						break;
+				}
+				break;
+			case KARUDA:
+				if (st.isStarted())
+				{
+					htmltext = "32017-01.html";
+				}
+				break;
+		}
+		return htmltext;
+	}
+	
+	public Q00122_OminousNews(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(MOIRA);
+		addTalkId(MOIRA, KARUDA);
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00122_OminousNews(122, Q00122_OminousNews.class.getSimpleName(), "Ominous News");
+	}
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-0.htm
similarity index 78%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-0.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-0.htm
index 8fface89b26262cd3ffc1c09c1f085fc899569e7..fd0f16d053dd46d3b679748428add8c095625d83 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-0.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-0.htm
@@ -1,4 +1,4 @@
 <html><body>Bounty Hunter Kintaijin:<br>
-You can't just take harder missions without having proven yourself to me. Don't look around like that. I;m talking to you.<br>
+You can't just take harder missions without having proven yourself to me. Don't look around like that. I'm talking to you.<br>
 (Only characters level 81 and above who haved completed the I'm the Only One You Can Trust quest can take this mission)
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-1.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ae738a5c96d2729e00fc27ddced875182cde5904
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-1.htm
@@ -0,0 +1,8 @@
+<html><body>Bounty Hunter Kintaijin:<br>
+You adventurers are all alike ... just in it for the fortune and fame.  I'll bet you could care less about who I am and what my story is.<br>
+The only things you're probably interested in are <font color="LEVEL">what you have to do</font> and <font color="LEVEL">what you will receive</font>.<br>
+Am I wrong?<br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-4.htm">"Nope. Just tell me what I need to know."</a><br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-5.html">"I'm not like the others. Tell me your tale."</a><br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-6.html">"Forget all that. Who is this scammer you're talking about?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-9.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-10.html
similarity index 67%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-9.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-10.html
index 3dbdb697467e2fd7faf1c961e0dd03f7091012a7..fd357a337e38ea0342a548d59746bdec6ce65ec3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-9.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-10.html
@@ -1,5 +1,5 @@
 <html><body>Bounty Hunter Kintaijin:<br>
 Ah, you've returned!<br>
-Did you bring me the fangs? Hmm, let's see... one, two, three... twenty-four, twenty-five! Excellent!<br>
+Did you bring me the fangs?  Hmm, let's see... one, two, three... twenty-four, twenty-five! Excellent!<br>
 You did better than I thought you would. You have earned my admiration and trust. And now you may use my teleport options to you heart's content.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-11.html
similarity index 100%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-10.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-11.html
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-7.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-2.htm
similarity index 82%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-7.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-2.htm
index 2d083fbc6aab15ba81843d456d4dd4002237db12..c640ad7ac03b3f03ae00f3c77721ebb32d385645 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-7.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-2.htm
@@ -2,5 +2,5 @@
 There are some things to do to clean up Billy Haari's mess. But this is quite dangerous, that's why I need to ask a person who is reliable. So, prove yourself if you want to get with the mission.<br>
 I'll even give you the authority to teleport to Stakato Nest along with profitable missions if you can prove your skill. With the authority, you can teleport to major area of Stakato Nest anytime.<br>
 Will it be enough for you to take the mission?<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-3.htm">"I will accept the mission."</a>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-3.htm">"I will accept the mission."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-3.htm
new file mode 100644
index 0000000000000000000000000000000000000000..827249d3c3582e3395b67ddbf02e13bdac42922e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-3.htm
@@ -0,0 +1,4 @@
+<html><body>Bounty Hunter Kintaijin:<br>
+Alright, then let's get to the point. I want you to hunt down and destroy the <font color="LEVEL">Spiked Stakatos and Cannibalistic Stakatos</font> in the Stakato's Nest. If you manage to bring back <font color="LEVEL">25 Stakato Fangs</font>, I'll reward you well.<br>
+A quick word of advice: don't try to do this on your own. This mission won't be nearly as rough if you find some fellow adventurers to assist you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-4.htm
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-4.htm
index f0e3929f74bfcb48fbe87c97533359052bda336e..1f0c0e1199c905475012da828390d317d4a8e259 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-2.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-4.htm
@@ -2,5 +2,5 @@
 Your answer does not shock me in the least.<br>
 Let me just tell you from the start that if you complete this quest to my satisfaction, you will then gain access to my teleport options. Do not scoff at this gesture! It could come in very handy for you later.<br>
 Should I go on?<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-3.htm">"Please continue."</a>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-3.htm">"Please continue."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-5.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-5.html
new file mode 100644
index 0000000000000000000000000000000000000000..24dbbf42304243e4de11713812c994f73b08af99
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-5.html
@@ -0,0 +1,6 @@
+<html><body>Bounty Hunter Kintaijin:<br>
+No need to feign interest in my background. Whether you are interested in me or not, I am still going to give you the quest.<br>
+Should I go on?<br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-4.htm">"Well then, to hell with this. Just tell me about the quest."</a><br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-7.html">"Yes! Tell me what makes Kintaijin tick."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-6.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-6.html
similarity index 64%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-6.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-6.html
index 69a2b3423314d63055f112194e71a6953b95c0cd..e47cc433e33c9c783fa6d65e8734be75802808ce 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-6.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-6.html
@@ -1,6 +1,6 @@
 <html><body>Bounty Hunter Kintaijin:<br>
 Billy Haari. He is the most despicable and loathsome being in existance.<br>
-Extortion, treason, fraud. You name it and he is guilty of it. The village I came from was just a stepping for Haari. By the time he disappeared, there wasn't one life in the town he hadn't damaged.<br>
+Extortion, treason, fraud. You name it and he is guilty of it. The village I came from was just a stepping stone for Haari. By the time he disappeared, there wasn't one life in the town he hadn't damaged.<br>
 It was said that he sought refuge here in the Stakato's Nest. And although I've done much searching, I still don't know whether he is dead or alive. What I do know is that, the more monsters you kill, the easier it will be for me to get back in their and search for that criminal.<br>
-<a action="bypass -h Quest 240_ImTheOnlyOneYouCanTrust 32640-7.htm">"Now, let's talk about the mission."</a>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-2.htm">"Now, let's talk about the mission."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-7.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-7.html
new file mode 100644
index 0000000000000000000000000000000000000000..4a69598addd6fceb76040b72bb8e4b81d71f07b3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-7.html
@@ -0,0 +1,6 @@
+<html><body>Bounty Hunter Kintaijin:<br>
+As you can see, I'm a bounty hunter. And generally, I do what I do for the money. But this one is personal to me.<br>
+I'm here to bring in Billy Haari for his crimes.<br>And I almost had him... until he ran into the Stakato's Nest. I'm good at what I do. But this place is a bit too much for even me.<br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-6.html">"What kind of crime did Billy Haari commit?"</a><br>
+<a action="bypass -h Quest Q00240_ImTheOnlyOneYouCanTrust 32640-2.htm">"Well, good luck with that. Now what about that mission?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-8.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-8.html
similarity index 83%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-8.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-8.html
index 2fe3a6699acc9b28f6628dcb6d7ff2ee4be14fea..3c8a24810aa2941854b2398ec597a020e09ab9cb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/240_ImTheOnlyOneYouCanTrust/32640-8.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-8.html
@@ -1,5 +1,5 @@
 <html><body>Bounty Hunter Kintaijin:<br>
 Didn't you leave yet?<br>
-Didn't I already tell you that I would trust your skill when you hunt down Stakatos such as <font color="LEVEL">Spiked Stakato series, Cannibalistic Stakato series</font> in Stakato Nest and bring back <font color="LEVEL"> 25 Stakato's Fangs</font> as an avidence?<br>
+Didn't I already tell you that I would trust your skill when you hunt down Stakatos such as <font color="LEVEL">Spiked Stakato series, Cannibalistic Stakato series</font> in Stakato Nest and bring back <font color="LEVEL">25 Stakato's Fangs</font> as an evidence?<br>
 The mission shouldn't be too tough. The problem is that the hunting will be overwhelming for yourself alone. Make sure to go with your fellows.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-9.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-9.html
new file mode 100644
index 0000000000000000000000000000000000000000..941bd8e6535d118231ee979f043e74173b76e9bf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/32640-9.html
@@ -0,0 +1,3 @@
+<html><body>Bounty Hunter Kintaijin:<br>
+You don't have enought Stakato's Fangs. No more or no less than <font color="LEVEL">25 Stakato's Fangs</font>needs to be brought back or else I won't believe you.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
new file mode 100644
index 0000000000000000000000000000000000000000..13717c6284f4b720f86b515c5c9b6d3c8159d0db
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00240_ImTheOnlyOneYouCanTrust/Q00240_ImTheOnlyOneYouCanTrust.java
@@ -0,0 +1,152 @@
+/*
+ * 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.Q00240_ImTheOnlyOneYouCanTrust;
+
+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;
+
+/**
+ * I'm the Only One You Can Trust (240)
+ * @author malyelfik
+ */
+public class Q00240_ImTheOnlyOneYouCanTrust extends Quest
+{
+	// NPC
+	private static final int KINTAIJIN = 32640;
+	
+	// Monster
+	private static final int[] MOBS =
+	{
+		22617,
+		22618,
+		22619,
+		22620,
+		22621,
+		22622,
+		22623,
+		22624,
+		22625,
+		22626,
+		22627,
+		22628,
+		22629,
+		22630,
+		22631,
+		22632,
+		22633
+	};
+	
+	// Item
+	private static final int STAKATOFANGS = 14879;
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return getNoQuestMsg(player);
+		}
+		
+		if (event.equalsIgnoreCase("32640-3.htm"))
+		{
+			st.startQuest();
+		}
+		return event;
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		String htmltext = getNoQuestMsg(player);
+		final QuestState st = player.getQuestState(getName());
+		if (st == null)
+		{
+			return htmltext;
+		}
+		
+		switch (st.getState())
+		{
+			case State.CREATED:
+				htmltext = (player.getLevel() >= 81) ? "32640-1.htm" : "32640-0.htm";
+				break;
+			case State.STARTED:
+				switch (st.getCond())
+				{
+					case 1:
+						htmltext = (!st.hasQuestItems(STAKATOFANGS)) ? "32640-8.html" : "32640-9.html";
+						break;
+					case 2:
+						if (st.getQuestItemsCount(STAKATOFANGS) >= 25)
+						{
+							st.giveAdena(147200, true);
+							st.takeItems(STAKATOFANGS, -1);
+							st.addExpAndSp(589542, 36800);
+							st.exitQuest(false, true);
+							htmltext = "32640-10.html";
+						}
+						break;
+				}
+				break;
+			case State.COMPLETED:
+				htmltext = "32640-11.html";
+				break;
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+	{
+		final L2PcInstance partyMember = getRandomPartyMember(player, "1");
+		if (partyMember == null)
+		{
+			return super.onKill(npc, player, isPet);
+		}
+		
+		final QuestState st = partyMember.getQuestState(getName());
+		st.giveItems(STAKATOFANGS, 1);
+		if (st.getQuestItemsCount(STAKATOFANGS) >= 25)
+		{
+			st.setCond(2, true);
+		}
+		else
+		{
+			st.playSound("ItemSound.quest_itemget");
+		}
+		return super.onKill(npc, player, isPet);
+	}
+	
+	public Q00240_ImTheOnlyOneYouCanTrust(int questId, String name, String descr)
+	{
+		super(questId, name, descr);
+		addStartNpc(KINTAIJIN);
+		addTalkId(KINTAIJIN);
+		addKillId(MOBS);
+		
+		questItemIds = new int[]
+		{
+			STAKATOFANGS
+		};
+	}
+	
+	public static void main(String[] args)
+	{
+		new Q00240_ImTheOnlyOneYouCanTrust(240, Q00240_ImTheOnlyOneYouCanTrust.class.getSimpleName(), "I'm the Only One You Can Trust");
+	}
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html
index fae6e5bed26c839633bac3a8f2899e8dfa529ffe..ed83de7d7076b56fe6be00ab5290c527a80a9bb5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-3.html
@@ -1,4 +1,5 @@
 <html><body>Ossian:<br>
-You got them! Your soul is truly holy.<br>Unfortunately, they still have the Soultrap spell on them, and she's too weak to break it.<br>
+You got them! Your soul is truly holy.<br>
+Unfortunately, they still have the Soultrap spell on them, and she's too weak to break it.<br>
 <a action="bypass -h Quest Q00246_PossessorOfAPreciousSoul3 31741-5.html">"What should I do?"</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html
index 123d8c783df9e5438fe6951ec68f76b106b6ff98..a0dde41c2f285bad75f6977a59880a5126fd7e6f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00246_PossessorOfAPreciousSoul3/31741-5.html
@@ -1,4 +1,6 @@
 <html><body>Ossian:<br>
 The Rain Song staff, the most powerful of her three items, must be retrieved. If the staff is found, the restraining magics can be broken, and the three items will regain their full strength.<br>
-However, since it is the most powerful item, it is guarded by the most powerful foe. The <font color="LEVEL">Flame of Splendor, the Archangel Barakiel</font>, guards the staff himself. You must prepare thoroughly in order to fight him.<br> Your mission is to defeat the Flame of Splendor, and retrieve the Rain Song staff. <br>If you are not yet ready to go against Barakiel, there is another way to get your hands on the staff. Go to the <font color="LEVEL">Valley of Saints</font>, defeat the <font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Signet of Splendor</font>, and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses.
+However, since it is the most powerful item, it is guarded by the most powerful foe. The <font color="LEVEL">Flame of Splendor, the Archangel Barakiel</font>, guards the staff himself. You must prepare thoroughly in order to fight him.<br>
+Your mission is to defeat the Flame of Splendor, and retrieve the Rain Song staff.<br>
+If you are not yet ready to go against Barakiel, there is another way to get your hands on the staff. Go to the <font color="LEVEL">Valley of Saints</font>, defeat the <font color="LEVEL">Wailing of Splendor, Fang of Splendor, Crown of Splendor, and Signet of Splendor</font>, and bring <font color="LEVEL">100 Staff Fragments</font> from their corpses.
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html
index 8d608d10ff87efd94e1fb6fe13672fc0e1ce1925..a01fe202ec620b7f88c0730e1856c7dea673971c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31740-3.html
@@ -1,5 +1,6 @@
 <html><body>Caradine:<br>
-You must meet her alone. My only role is to open the way for you.<br>Don't be frightened!<br>
+You must meet her alone. My only role is to open the way for you.<br>
+Don't be frightened!<br>
 She just wants to talk to you. What she'll say, I don't know, but you need to listen!<br>
 Now, close your eyes and relax.<br>
 <a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31740-4.html">"I'm ready."</a>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html
index 1a684dd68091395e96e05df3223043526e428564..818f161c766834e49a3a55ba0860cb28d7e8db8b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00247_PossessorOfAPreciousSoul4/31745-1.html
@@ -1,4 +1,5 @@
 <html><body>Lady of the Lake:<br>
-Finally I meet the one who bears a holy soul.<br>I've been waiting.<br>
+Finally I meet the one who bears a holy soul.<br>
+I've been waiting.<br>
 <a action="bypass -h Quest Q00247_PossessorOfAPreciousSoul4 31745-2.html">"I've been waiting to meet you, to."</a>
 </body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20120812update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20120812update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..ec051047c627734ceacd99382136ad4955fa5871
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20120812update.sql
@@ -0,0 +1,6 @@
+UPDATE character_quests SET name = 'Q00042_HelpTheUncle' WHERE name = '42_HelpTheUncle';
+UPDATE character_quests SET name = 'Q00043_HelpTheSister' WHERE name = '43_HelpTheSister';
+UPDATE character_quests SET name = 'Q00044_HelpTheSon' WHERE name = '44_HelpTheSon';
+UPDATE character_quests SET name = 'Q00240_ImTheOnlyOneYouCanTrust' WHERE name = '240_ImTheOnlyOneYouCanTrust';
+UPDATE character_quests SET name = 'Q00121_PavelTheGiant' WHERE name = '121_PavelTheGiants';
+UPDATE character_quests SET name = 'Q00122_OminousNews' WHERE name = '122_OminousNews';
\ No newline at end of file