diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 304219a667f46a9de16d5f3543d3d52ed2685671..1f0c62bf805a702d63c198c1e5119833860fdc14 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -460,7 +460,7 @@ quests/Q00325_GrimCollector/Q00325_GrimCollector.java
quests/Q00326_VanquishRemnants/Q00326_VanquishRemnants.java
quests/327_ReclaimTheLand/__init__.py
quests/Q00328_SenseForBusiness/Q00328_SenseForBusiness.java
-quests/329_CuriosityOfDwarf/__init__.py
+quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
quests/330_AdeptOfTaste/__init__.py
quests/Q00331_ArrowOfVengeance/Q00331_ArrowOfVengeance.java
quests/333_BlackLionHunt/__init__.py
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-01.htm
deleted file mode 100644
index 430b838cab793fe2b1507df8fb2fa1ea7dd4f814..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-01.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Trader Rolento:<br>
-As Elves are infatuated with poetry and songs and Orcs rave over war, we Dwarves love to make things with our very own hands. Ever since I was young, I immensely enjoyed fooling around with toys with springs or pocket watches. My dream is to make a<font color="LEVEL"> golem</font> with my own hands some day.<br>
-However, I am not talking about the animate, monster golems that you can see frequently. The golems made by the dwarves are automatic dolls that move according to minute mechanical devices. It is totally different from stone golems or granite golems, which are magically blessed with life.<br>
-However, I always wondered what the energy source of a magically created golem would be. No matter how carefully I looked at it, I could not find the part that generated power ... . There are many golems in the wastelands here. They say it is because the devil Beleth and the magicians of the Ivory Tower used them as weapons of war in this land. If that is true, then that means that more than a thousand years have passed since the golems were abandoned in this land. Don't you find it surprising that they are still moving? What do you think? Aren't you getting curious, too? If you have time later, let's research it together.<br>
-(Quest for characters level 33 and above.)
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-02.htm
deleted file mode 100644
index 9df9a84e2e143b6f09feaee38574d82c7a0f4833..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-02.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Trader Rolento:<br>
-As Elves are infatuated with poetry and songs and Orcs rave over war, we Dwarves love to make things with our very own hands. Ever since I was young, I immensely enjoyed fooling around with toys with springs or pocket watches. My dream is to make a<font color="LEVEL"> golem</font> with my own hands someday.<br>
-However, I am not talking about the animate, monster golems that you can see frequently. The golems made by the dwarves are automatic dolls that move according to minute mechanical devices. It is totally different from stone golems or granite golems, which were magically blessed with life.<br>
-However, I always wondered what the energy source of a magically created golem would be. No matter how carefully I looked at it, I could not find the part that generated power ... There are many golems in the Wastelands here. They say it is because the devil Beleth and the magicians of the Ivory Tower used them as weapons of war in this land. If that is true, then that means that more than a thousand years have passed since the golems were abandoned in this land. What do you think? Aren't you getting curious, too? If you grant my request, it will be a great help to my studies ... will you help me?<br>
-<a action="bypass -h Quest 329_CuriosityOfDwarf 30437-03.htm">Say you will help</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-03.htm
deleted file mode 100644
index 4fdb3d4a601e88e9a78f0e8f7c8d6e61e3ab0b86..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-03.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Trader Rolento:<br>
-Good! We understand each other well. Actually, I recently had a chance to see a destroyed granite golem, and within the remains I saw a piece of stone of a different hue. I asked Sal, who has profound knowledge of magic, and he said the stone was a<font color="LEVEL"> heartstone</font>. I found out that all the golems made by the magicians had a heartstone in the center of their bodies.<br>
-What was it that he said? Something about putting a symbolic heart that resembles the living body into a still stone figure, and then gathering the magic forces before beginning the spells ... . Of course I didn't understand a word of what he was talking about, but anyway, it seems almost certain that the heartstone is the power source of the golem.<br>
-So, I would like you to go into the Wastelands and get me the<font color="LEVEL"> heartstone of a golem</font>. There are many<font color="LEVEL"> granite golems</font> in the Wastelands. There are also granite golems that are nicknamed<font color="LEVEL"> punchers,</font> because they brandish their fists about fiercely.<br>
-Most heartstones shatter or crack when the golem is killed, but very rarely you can obtain whole, perfect heartstones. I would like you to bring me all the heartstones you can find -- whether they be broken or whole. I will compensate you for as many as you bring back. Of course, I will be more generous for<font color="LEVEL"> perfect heartstones</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-04.htm
deleted file mode 100644
index 74f6e1c2c85a95c66f5791728eb4396388562c67..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-04.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Trader Rolento:<br>
-Oh dear, your hands are still empty. As I already told you, I need the<font color="LEVEL"> heartstones of granite golems and punchers</font>. Please go to the Wastelands and find heartstones for me.<br>
-<a action="bypass -h Quest 329_CuriosityOfDwarf 30437-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 329_CuriosityOfDwarf 30437-07.htm">Say you will continue</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/__init__.py
deleted file mode 100644
index 8ee8dae0f8419705677f9736308b6a7c8d83281b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/__init__.py
+++ /dev/null
@@ -1,86 +0,0 @@
-# Made by Mr. - Version 0.3 by DrLecter
-import sys
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "329_CuriosityOfDwarf"
-
-GOLEM_HEARTSTONE = 1346
-BROKEN_HEARTSTONE = 1365
-ADENA = 57
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [BROKEN_HEARTSTONE, GOLEM_HEARTSTONE]
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "30437-03.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30437-06.htm" :
- st.exitQuest(1)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if id == State.CREATED :
- st.set("cond","0")
- if st.getInt("cond")==0 :
- if player.getLevel() >= 33 :
- htmltext = "30437-02.htm"
- else:
- htmltext = "30437-01.htm"
- st.exitQuest(1)
- else :
- heart=st.getQuestItemsCount(GOLEM_HEARTSTONE)
- broken=st.getQuestItemsCount(BROKEN_HEARTSTONE)
- if broken+heart>0 :
- st.giveItems(ADENA,50*broken+1000*heart)
- st.takeItems(BROKEN_HEARTSTONE,-1)
- st.takeItems(GOLEM_HEARTSTONE,-1)
- htmltext = "30437-05.htm"
- else:
- htmltext = "30437-04.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
-
- npcId = npc.getId()
- n = self.getRandom(100)
- if npcId == 20085 :
- if n<5 :
- st.giveItems(GOLEM_HEARTSTONE,1)
- st.playSound("ItemSound.quest_itemget")
- elif n<58 :
- st.giveItems(BROKEN_HEARTSTONE,1)
- st.playSound("ItemSound.quest_itemget")
- elif npcId == 20083 :
- if n<6 :
- st.giveItems(GOLEM_HEARTSTONE,1)
- st.playSound("ItemSound.quest_itemget")
- elif n<56 :
- st.giveItems(BROKEN_HEARTSTONE,1)
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(329,qn,"Curiosity Of Dwarf")
-
-QUEST.addStartNpc(30437)
-QUEST.addTalkId(30437)
-
-QUEST.addKillId(20083)
-QUEST.addKillId(20085)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..14ccce59024d8fc0c1cbe253814f257e685026e2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-01.htm
@@ -0,0 +1,5 @@
+<html><body>Trader Rolento:<br>
+As Elves are infatuated with poetry and songs and Orcs rave over war, we Dwarves love to make things with our very own hands. Ever since I was young, I immensely enjoyed fooling around with toys with springs or pocket watches. My dream is to make a <font color="LEVEL">golem</font> with my own hands some day.<br>
+However, I am not talking about the animate, monster golems that you can see frequently. The golems made by the dwarves are automatic dolls that move according to minute mechanical devices. It is totally different from stone golems or granite golems, which are magically blessed with life.<br>However, I always wondered what the energy source of a magically created golem would be. No matter how carefully I looked at it, I could not find the part that generated power... . There are many golems in the wastelands here. They say it is because the devil Beleth and the magicians of the Ivory Tower used them as weapons of war in this land. If that is true, then that means that more than a thousand years have passed since the golems were abandoned in this land. Don't you find it surprising that they are still moving? What do you think? Aren't you getting curious, too? If you have time later, let's research it together.<br>
+(Quest for characters level 33 and above.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..95708b9ad9d9b97132ca4d8b6735beecd3dd8a3d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-02.htm
@@ -0,0 +1,6 @@
+<html><body>Trader Rolento:<br>
+As Elves are infatuated with poetry and songs and Orcs rave over war, we Dwarves love to make things with our very own hands. Ever since I was young, I immensely enjoyed fooling around with toys with springs or pocket watches. My dream is to make a <font color="LEVEL">golem</font> with my own hands someday.<br>
+However, I am not talking about the animate, monster golems that you can see frequently. The golems made by the dwarves are automatic dolls that move according to minute mechanical devices. It is totally different from stone golems or granite golems, which were magically blessed with life.<br>
+However, I always wondered what the energy source of a magically created golem would be. No matter how carefully I looked at it, I could not find the part that generated power... There are many golems in the Wastelands here. They say it is because the devil Beleth and the magicians of the Ivory Tower used them as weapons of war in this land. If that is true, then that means that more than a thousand years have passed since the golems were abandoned in this land. What do you think? Aren't you getting curious, too? If you grant my request, it will be a great help to my studies... will you help me?<br>
+<a action="bypass -h Quest Q00329_CuriosityOfADwarf 30437-03.htm">Say you will help</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..c331082c3faed86466abf1541affa3801210da05
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-03.htm
@@ -0,0 +1,6 @@
+<html><body>Trader Rolento:<br>
+Good! We understand each other well. Actually, I recently had a chance to see a destroyed granite golem, and within the remains I saw a piece of stone of a different hue. I asked Sarien, who has profound knowledge of magic, and he said the stone was a <font color="LEVEL">heartstone</font>. I found out that all the golems made by the magicians had a heartstone in the center of their bodies.<br>
+What was it that he said? Something about putting a symbolic heart that resembles the living body into a still stone figure, and then gathering the magic forces before beginning the spells... . Of course I didn't understand a word of what he was talking about, but anyway, it seems almost certain that the heartstone is the power source of the golem.<br>
+So, I would like you to go into the Wastelands and get me the <font color="LEVEL">heartstone of a golem</font>. There are many <font color="LEVEL">granite golems</font> in the Wastelands. There are also granite golems that are nicknamed <font color="LEVEL">punchers,</font> because they Brandish their fists about fiercely.<br>
+Most heartstones shatter or crack when the golem is killed, but very rarely you can obtain whole, perfect heartstones. I would like you to bring me all the heartstones you can find -- whether they be broken or whole. I will compensate you for as many as you bring back. Of course, I will be more generous for <font color="LEVEL">perfect heartstones</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..e98628095f24ad21f19cbec7fd48fd115c8d62b3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-04.html
@@ -0,0 +1,5 @@
+<html><head><body>Trader Rolento:<br>
+Oh dear, your hands are still empty. As I already told you, I need the <font color="LEVEL">heartstones of granite golems and punchers</font>. Please go to the Wastelands and find heartstones for me.<br>
+<a action="bypass -h Quest Q00329_CuriosityOfADwarf 30437-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00329_CuriosityOfADwarf 30437-07.html">Say you will continue</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-05.html
similarity index 66%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-05.html
index 9cf44120b1d75c35c382543d8fddb38fcc6d5c56..d9d90920dc784a7af15175f4d3f6d24992f68653 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-05.html
@@ -1,7 +1,6 @@
-<html><body>Trader Rolento:<br>
-Oh, you have found some! I will reveal whether or not the power to move rocks like living humans for hundreds of years lies within this small stone. I must begin my research immediately -- starting tonight. Although it is difficult because I do not have any proper tools or measuring devices, because this is not a workshop, I can measure the size with a ruler and the weight with a scale, and pound it with my hammer to fathom its solidity and density. Hmm ... so this goes like this ... and ...<br>
-Oh dear, I've been wrapped up too much in my own thoughts, forgive me! As we promised, I will reward you by the number of heartstones you have brought.<br>
-But I wish to have some more heartstones to send to my guild brothers in Giran. What do you say? Could I ask you another favor?<br>
-<a action="bypass -h Quest 329_CuriosityOfDwarf 30437-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 329_CuriosityOfDwarf 30437-07.htm">Say you will continue</a>
+<html><body>Trader Rolento:<br>
+Oh, you have found some! I will reveal whether or not the power to move rocks like living humans for hundreds of years lies within this small stone. I must begin my research immediately -- starting tonight. Although it is difficult because I do not have any proper tools or measuring devices, because this is not a workshop, I can measure the size with a ruler and the weight with a scale, and pound it with my hammer to fathom its solidity and density. Hmm ... so this goes like this ... and ...<br>
+Oh dear, I've been wrapped up too much in my own thoughts, forgive me! As we promised, I will reward you by the number of heartstones you have brought.<br>But I wish to have some more heartstones to send to my guild brothers in Giran. What do you say? Could I ask you another favor?<br>
+<a action="bypass -h Quest Q00329_CuriosityOfADwarf 30437-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00329_CuriosityOfADwarf 30437-07.html">Say you will continue</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-06.html
similarity index 99%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-06.html
index 1f8a47f791e288e5d990ae823e42f27b5d2cc5be..a0500194c25e6f3ee133c20bf4788d7e2ba71e86 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-06.html
@@ -1,3 +1,3 @@
-<html><body>Trader Rolento:<br>
-I'm sorry that you are quitting, it is too bad. I'll have to ask someone else. Thanks anyway. May the divine blessing of Maphr, our God of the Earth, be with you!
+<html><body>Trader Rolento:<br>
+I'm sorry that you are quitting, it is too bad. I'll have to ask someone else. Thanks anyway. May the divine blessing of Maphr, our God of the Earth, be with you!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-07.html
similarity index 99%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-07.html
index 60a9f8e5654e3f3078dd2ed954cb73b203181f16..18f0149023cc7ecf022fa84a903db78dcb5eb4e3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/329_CuriosityOfDwarf/30437-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/30437-07.html
@@ -1,3 +1,3 @@
-<html><body>Trader Rolento:<br>
-I want to thank you. Thank you so much for helping me satisfy my curiosity. If my studies produce results, then we Dwarves may be able to develop a new power tool that moves mechanical devices. It is all thanks to you. That granted, please help me a little more.
+<html><body>Trader Rolento:<br>
+I want to thank you. Thank you so much for helping me satisfy my curiosity. If my studies produce results, then we Dwarves may be able to develop a new power tool that moves mechanical devices. It is all thanks to you. That granted, please help me a little more.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
new file mode 100644
index 0000000000000000000000000000000000000000..e308e6a2f8ef3bdb6e670e562fda54aa475a6308
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00329_CuriosityOfADwarf/Q00329_CuriosityOfADwarf.java
@@ -0,0 +1,160 @@
+/*
+ * Copyright (C) 2004-2013 L2J DataPack
+ *
+ * This file is part of L2J DataPack.
+ *
+ * L2J DataPack is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * L2J DataPack is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package quests.Q00329_CuriosityOfADwarf;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.model.quest.State;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Curiosity Of A Dwarf (329)
+ * @author ivantotov
+ */
+public final class Q00329_CuriosityOfADwarf extends Quest
+{
+ // NPC
+ private static final int TRADER_ROLENTO = 30437;
+ // Items
+ private static final int GOLEM_HEARTSTONE = 1346;
+ private static final int BROKEN_HEARTSTONE = 1365;
+ // Misc
+ private static final int MIN_LEVEL = 33;
+ // Monsters
+ private static final Map<Integer, List<ItemHolder>> MONSTER_DROPS = new HashMap<>();
+ static
+ {
+ MONSTER_DROPS.put(20083, Arrays.asList(new ItemHolder(GOLEM_HEARTSTONE, 3), new ItemHolder(BROKEN_HEARTSTONE, 54))); // Granitic Golem
+ MONSTER_DROPS.put(20085, Arrays.asList(new ItemHolder(GOLEM_HEARTSTONE, 3), new ItemHolder(BROKEN_HEARTSTONE, 58))); // Puncher
+ }
+
+ private Q00329_CuriosityOfADwarf(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+ addStartNpc(TRADER_ROLENTO);
+ addTalkId(TRADER_ROLENTO);
+ addKillId(MONSTER_DROPS.keySet());
+ registerQuestItems(GOLEM_HEARTSTONE, BROKEN_HEARTSTONE);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ String htmltext = null;
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (event)
+ {
+ case "30437-03.htm":
+ {
+ if (st.isCreated())
+ {
+ st.startQuest();
+ htmltext = event;
+ }
+ break;
+ }
+ case "30437-06.html":
+ {
+ st.exitQuest(true, true);
+ htmltext = event;
+ break;
+ }
+ case "30437-07.html":
+ {
+ htmltext = event;
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState st = killer.getQuestState(getName());
+ if ((st != null) && Util.checkIfInRange(1500, npc, killer, true))
+ {
+ final int rnd = getRandom(100);
+ for (ItemHolder drop : MONSTER_DROPS.get(npc.getId()))
+ {
+ if (rnd < drop.getCount())
+ {
+ st.giveItemRandomly(npc, drop.getId(), 1, 0, 1.0, true);
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @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() >= MIN_LEVEL ? "30437-02.htm" : "30437-01.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (hasAtLeastOneQuestItem(player, getRegisteredItemIds()))
+ {
+ final long broken = st.getQuestItemsCount(BROKEN_HEARTSTONE);
+ final long golem = st.getQuestItemsCount(GOLEM_HEARTSTONE);
+ st.giveAdena(((broken * 50) + (golem * 1000) + ((broken + golem) >= 10 ? 1183 : 0)), true);
+ takeItems(player, -1, getRegisteredItemIds());
+ htmltext = "30437-05.html";
+ }
+ else
+ {
+ htmltext = "30437-04.html";
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00329_CuriosityOfADwarf(329, Q00329_CuriosityOfADwarf.class.getSimpleName(), "Curiosity Of A Dwarf");
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20130929update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20130929update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..02f974918171d903ff27ead5646e6d6e6a30cd3f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20130929update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00329_CuriosityOfADwarf' WHERE name='329_CuriosityOfDwarf';
\ No newline at end of file