diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 13611826afee0783496e3ad9ce3fd9dcc03dff32..027178314bf947ee6481c9e3674847a36058bfd2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -686,7 +686,7 @@ quests/660_AidingtheFloranVillage/__init__.py
quests/661_TheHarvestGroundsSafe/__init__.py
quests/662_AGameOfCards/__init__.py
quests/663_SeductiveWhispers/__init__.py
-quests/688_DefeatTheElrokianRaiders/__init__.py
+quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
quests/Q00690_JudesRequest/Q00690_JudesRequest.java
quests/Q00691_MatrasSuspiciousRequest/Q00691_MatrasSuspiciousRequest.java
quests/Q00692_HowtoOpposeEvil/Q00692_HowtoOpposeEvil.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-00.htm
deleted file mode 100644
index 45f08c264ff2ecbb71865a6000d1a7305b8bc41f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-00.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Dinn:<br>
-You're not someone who is skilled enough and brave enough to handle my tasks.<br>
-(This quest can be undertaken by characters level 75 and above)</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-01.htm
deleted file mode 100644
index 1b8972864099e31cd7690459a3e873ffb793a1e2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dinn:<br>
-Hey, you there -- Sir Adventurer! May I speak to you for a moment?<br>
-Have you heard of the Elrokian brigands hiding in the Primeval Plains? The wharf merchants and I are beset by them.<br>
-Sales haven't been good, and since those thieves don't look like they'll go away any time soon on their own, it's been as bad a time around here as I can remember.<br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-02.htm">"Find out more details."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-02.htm
deleted file mode 100644
index 5ba09718f195dea7a03b6c7f4ba65113b9884806..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-02.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dinn:<br>
-At first, they stole only small items. But success has made them bold, and lately they have organized themselves into armed groups that raid even in broad daylight.<br>
-The merchants on the wharf are understandably on edge. Despite standing constant watch over their wares, they have not the skill or weaponry to defend themselves against such formidable adversaries.<br>
-But you, my fine young adventurer, you look like you might have a chance. Please, please help us. Eliminate these Elrokian brigands and we will reward you as richly as we can!<br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-03.htm">"Pledge your services to catch the thieves."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-03.htm
deleted file mode 100644
index 8264faaf76b826b637da9b4c890c16bd1a937a27..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-03.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dinn:<br>
-Gods be praised! Now that I know that you are willing to help us, I finally feel like I'll be able to sleep soundly tonight.<br>
-According to a trustworthy source, the Elrokian thieves who raid our wharf all wear necklaces that contain a<font color="LEVEL"> dinosaur fang pendant</font>. Bring me those necklaces as proof that you have captured them; I'll reward you based on the number of necklaces you bring. If you bring back more than 100 necklaces, I can also give you the donations collected from the merchants here.<br>
-Please, whatever it takes, rid us of these troublesome thieves! As long as you bring me their necklaces, I'll make sure that you are well compensated for your time.<br>
-The Elrokian raiders have set up camp in the<font color="LEVEL"> Primeval Plains</FONT>. Travel south along this road, and I'm certain that you'll find them.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-04.htm
deleted file mode 100644
index e2c75a285511cc9323c5ad3ecf65ef868e8f230f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-04.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Dinn:<br>
-You don't have enough items yet.<br>
-Please, whatever it takes, rid us of these troublesome thieves! As long as you bring me their necklaces, I'll make sure that you are well compensated for your time.<br>
-The Elrokian raiders have set up camp in the<font color="LEVEL"> Primeval Plains</FONT>. Travel south along this road, and I'm certain that you'll find them.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-05.htm
deleted file mode 100644
index 8f0de0c640bb19db2d42f56fdfbec029279c65d4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-05.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Dinn:<br>
-Eh? You caught them? Ah, it finally feels like a weight has been lifted! First of all let me offer you a reward equal to the number of necklaces you've brought. If you have more than 100 necklaces, I can also give you a bounty collected by our local merchants.<br>
-Truth be told, I was prepared to offer the reward money myself, but when our merchants caught wind of your efforts, they insisted on contributing funds to the cause themselves. A noble act on their part, I dare say!<br>
-It is entirely your choice whether to collect the per necklace bounty or accept the merchant's donation.<br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-06.htm">"Take the per necklace bounty."</a><br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-07.htm">"Take the merchants' donation."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-06.htm
deleted file mode 100644
index 65a6b968ec4d77bd4ffd764331a37330c49faeb6..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-06.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Dinn:<br>
-Here, please take this reward. It's miniscule compared to all you've done for us, but this is the best we can do, and please know it comes from the bottom of our hearts.<br>
-Word has reached me that there are still many Elrokian raiders in the Primeval Plains, and their numbers are increasing. What do you think? Now that you've gained some experience, would you like to keep catching the thieves?<br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders None">"Continue to capture the Elrokian raiders."</a><br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-08.htm">"Quit."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-07.htm
deleted file mode 100644
index d96cf7306c680f081a3df1f74264974f108c39f7..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-07.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Dinn:<br>
-You have done a fantastic job! I know how difficult it must have been to collect 100 necklaces, and here you are donating them with no strings attached. I can't tell you how grateful we are!<br>
-Here, please tkae this reward. It's miniscule compared to all you've done for us, but this is the best we can do, and please know it comes from the bottom of our hearts.<br>
-Word has reached me that there are still many Elrokian raiders in the Primeval Plains, and their numbers are increasing. What do you think? Now that you've gained some experience, would you like to keep catching the thieves?<br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders None">"Continue to capture the Elrokian raiders."</a><br>
-<a action="bypass -h Quest 688_DefeatTheElrokianRaiders 32105-08.htm">"Collect the balance of your reward and quit."</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/__init__.py
deleted file mode 100644
index ceeb8de2527200c83523bdaecce26a0ef38c7edd..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/__init__.py
+++ /dev/null
@@ -1,92 +0,0 @@
-# Created by Gigiikun
-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 = "688_DefeatTheElrokianRaiders"
-
-#Settings: drop chance in %
-DROP_CHANCE = 50
-DINOSAUR_FANG_NECKLACE = 8785
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [DINOSAUR_FANG_NECKLACE]
-
- def onEvent (self,event,st) :
- htmltext = event
- count = st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE)
- if event == "None" :
- return
- elif event == "32105-03.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "32105-08.htm" :
- if count > 0 :
- st.takeItems(DINOSAUR_FANG_NECKLACE,-1)
- st.giveItems(57,count*3000)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- elif event == "32105-06.htm" :
- st.takeItems(DINOSAUR_FANG_NECKLACE,-1)
- st.giveItems(57,count*3000)
- elif event == "32105-07.htm" :
- if count >= 100 :
- st.takeItems(DINOSAUR_FANG_NECKLACE,100)
- st.giveItems(57,450000)
- else :
- htmltext = "32105-04.htm"
- return htmltext
-
- def onTalk (self, npc, player):
- st = player.getQuestState(qn)
- htmltext = Quest.getNoQuestMsg(player)
- if st :
- cond = st.getInt("cond")
- count = st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE)
- if cond == 0 :
- if player.getLevel() >= 75 :
- htmltext = "32105-01.htm"
- else :
- htmltext = "32105-00.htm"
- st.exitQuest(1)
- elif st.getState() == State.STARTED :
- if count == 0 :
- htmltext = "32105-04.htm"
- else :
- htmltext = "32105-05.htm"
- return htmltext
-
- def onKill (self, npc, player,isPet):
- partyMember = self.getRandomPartyMember(player,"1")
- if not partyMember: return
- st = partyMember.getQuestState(qn)
- if st :
- if st.getState() == State.STARTED :
- npcId = npc.getNpcId()
- cond = st.getInt("cond")
- count = st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE)
- if cond == 1 :
- chance = DROP_CHANCE*Config.RATE_QUEST_DROP
- numItems, chance = divmod(chance,100)
- if self.getRandom(100) < chance :
- numItems += 1
- if numItems :
- if int(count + numItems)/100 > int(count)/100 :
- st.playSound("ItemSound.quest_middle")
- else :
- st.playSound("ItemSound.quest_itemget")
- st.giveItems(DINOSAUR_FANG_NECKLACE,int(numItems))
- return
-
-QUEST = Quest(688,qn,"Defeat the Elrokian Raiders")
-
-QUEST.addStartNpc(32105)
-
-QUEST.addTalkId(32105)
-QUEST.addKillId(22214)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..a9c5a85ac328f0708c63e1ba9c45b4f853bbd9f0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-01.htm
@@ -0,0 +1,4 @@
+<html><body>Trader Dinn:<br>
+Hey, you there -- Sir Adventurer! May I speak to you for a moment?<br>Have you heard of the Elrokian brigands hiding in the Primeval Plains? The wharf merchants and I are beset by them.<br>Sales haven't been good, and since those thieves don't look like they'll go away any time soon on their own, it's been as bad a time around here as I can remember.<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-02.htm">Find out more details.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..64f9762478990106b5fd9f4447ed0bd843c32913
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-02.htm
@@ -0,0 +1,4 @@
+<html><body>Dinn:<br>
+At first, they stole only small items. But success has made them bold, and lately they have organized themselves into armed groups that raid even in broad daylight.<br>The merchants on the wharf are understandably on edge. Despite standing constant watch over their wares, they have not the skill or weaponry to defend themselves against such formidable adversaries.<br>But you, my fine young adventurer, you look like you might have a chance. Please, please help us. Eliminate these Elrokian brigands and we will reward you as richly as we can!<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-03.html">Pledge your services to catch the thieves.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..291b52c9bb15cbaaca6034d373badad41ca5b228
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-03.html
@@ -0,0 +1,3 @@
+<html><body>Dinn:<br>
+Gods be praised! Now that I know that you are willing to help us, I finally feel like I'll be able to sleep soundly tonight.<br>According to a trustworthy source, the Elrokian thieves who raid our wharf all wear necklaces that contain a <font color="LEVEL">dinosaur fang pendant</font>. Bring me those necklaces as proof that you have captured them; I'll reward you based on the number of necklaces you bring. If you bring back more than 100 necklaces, I can also give you the donations collected from the merchants here.<br>Please, whatever it takes, rid us of these troublesome thieves! As long as you bring me their necklaces, I'll make sure that you are well compensated for your time.<br>The Elrokian raiders have set up camp in the <font color="LEVEL">Primeval Plains</font>. Travel south along this road, and I'm certain that you'll find them.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..755ae9eedb74a5bd2a8262d29f716c5be12d9dde
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-04.html
@@ -0,0 +1,3 @@
+<html><body>Dinn:<br>
+The weather is hot, and evil abounds... These are troubled days, I can assure you! Ah, I wish you could help us, my friend, but to my eye you are still too inexperienced for this kind of fight. Oh, that you were but a few seasons older! Well, we will simply have to persevere as best we know how...<br>(Only characters level 75 and above may take on this quest.)
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..639abc3cc7d2d5a7fe90f7b68ea812894a8305bb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-05.html
@@ -0,0 +1,5 @@
+<html><body>Dinn:<br>
+Eh? You caught them? Ah, it finally feels like a weight has been lifted! First of all, let me offer you a reward equal to the number of necklaces you've brought. If you have more than 100 necklaces, I can also give you a bounty collected by our local merchants.<br>Truth be told, I was prepared to offer the reward money myself, but when our merchants caught wind of your efforts, they insisted on contributing funds to the cause themselves. A noble act on their part, I dare say!<br>It is entirely your choice whether to collect the per necklace bounty or accept the merchant's donation.<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-06.html">Take the per necklace bounty.</a><br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders donation">Take the merchants' donation.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..57e8fea519763b0f87a1e098b722c2089a8a475d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-06.html
@@ -0,0 +1,5 @@
+<html><body>Dinn:<br>
+My utmost thanks! Since you've already made a good start of it, how about trying your hand at catching even more thieves? I assure you, we'll never forget such a great service!<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-10.html">Agree to catch more thieves.</a><br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-11.html">Quit.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..92057972d05c87d67ad78e09b946db978c57b913
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-07.html
@@ -0,0 +1,3 @@
+<html><body>Dinn:<br>
+Hmm... By my count, these necklaces are short of the 100 mark. Thanks for your efforts, but I have sworn that I would not accept any donation less than that total.<br>Even good intentions should be governed by some rules to prevent potential problems in the future. If you could acquire some more necklaces to bring the total to 100, we would truly be in your debt.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..a2079e6a7df83c8c8d586bd9087a35f43d0c02e5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-08.html
@@ -0,0 +1,5 @@
+<html><body>Dinn:<br>
+You have done a fantastic job! I know how difficult it must have been to collect 100 necklaces, and here you are donating them with no strings attached. I can't tell you how grateful we are!<br>Here, please take this reward. It's miniscule compared to all you've done for us, but this is the best we can do, and please know it comes from the bottom of our hearts. <br>Word has reached me that there are still many Elrokian raiders in the Primeval Plains, and their numbers are increasing. What do you think? Now that you've gained some experience, would you like to keep catching the thieves?<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-10.html">Continue to capture the Elrokian raiders.</a><br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-11.html">Collect the balance of your reward and quit.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..5bdaefdfdffeb333e392dc85d336d6895331847f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-09.html
@@ -0,0 +1,5 @@
+<html><body>Dinn:<br>
+Please accept my apologies -- the amount of money we've managed to scrape together is far too small compared to what you've done for us. But we have few merchants, and many of them have been robbed by thieves. I blush to say it, but this is really the best we can do...<br>I know you have no expectation of payment, but we wanted to do something to show our gratitude. Since the amount is miniscule, I added some to it myself. Please accept this.<br>Were a hardy adventurer like yourself to keep capturing the raiders, I'm sure that our merchants' situation would dramatically improve... What do you say? Will you continue your efforts on our behalf?<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-10.html">Continue to capture the Elrokian raiders.</a><br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-11.html">Collect the balance of your reward and quit.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-10.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-10.html
new file mode 100644
index 0000000000000000000000000000000000000000..58d5c9d0d85fd4a467b107e5f0a0823109793441
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-10.html
@@ -0,0 +1,3 @@
+<html><body>Dinn:<br>
+Then travel to the <font color="LEVEL">Primeval Plains</font> and defeat the <font color="LEVEL">Elrokian</font> assault force. Collect their necklaces as proof of your victory. Remember: the more necklaces you bring back to me, the better for all of us.
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-11.html
similarity index 51%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-08.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-11.html
index 78369f1128f45b30490949374636101af6fecc7b..e218ab3b14fb0cc0568fed634982ddca6f3d80e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/688_DefeatTheElrokianRaiders/32105-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-11.html
@@ -1,2 +1,3 @@
<html><body>Dinn:<br>
-Very well, then. I am saddened that you have chosen not to continue. If you change your mind, please don't hesitate to return!</body></html>
\ No newline at end of file
+Very well, then. I am saddened that you have chosen not to continue. If you change your mind, please don't hesitate to return!
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..3c59a3ec80c4bf08a4ffe3c6ac5ebed0c4cf5f1e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/32105-12.html
@@ -0,0 +1,5 @@
+<html><body>Dinn:<br>
+Did you happen to lose the necklaces on the way back here? Or did you fail to actually catch any thieves? No matter what happened, if you don't have a <font color="LEVEL">dinosaur fang pendant</font>, I cannot justify rewarding you. Let me make a suggestion: travel south along this road to the Primeval Plains. I'm confident that you'll have no trouble encountering thieves that way!<br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-10.html">Continue to catch thieves.</a><br>
+<a action="bypass -h Quest Q00688_DefeatTheElrokianRaiders 32105-11.html">Quit.</a>
+</body></html>
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
new file mode 100644
index 0000000000000000000000000000000000000000..ba766744a3c95ef253c4e8a549c1c3b275e317a0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00688_DefeatTheElrokianRaiders/Q00688_DefeatTheElrokianRaiders.java
@@ -0,0 +1,170 @@
+/*
+ * 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.Q00688_DefeatTheElrokianRaiders;
+
+import com.l2jserver.Config;
+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;
+
+/**
+ * Defeat the Elrokian Raiders! (688)
+ * @author Adry_85
+ */
+public class Q00688_DefeatTheElrokianRaiders extends Quest
+{
+ // NPCs
+ private static final int ELROKI = 22214;
+ private static final int DINN = 32105;
+ // Item
+ private static final int DINOSAUR_FANG_NECKLACE = 8785;
+ // Misc
+ private static final int MIN_LEVEL = 75;
+ private static final int DROP_RATE = 448;
+
+ public Q00688_DefeatTheElrokianRaiders(int questId, String name, String descr)
+ {
+ super(questId, name, descr);
+
+ addStartNpc(DINN);
+ addTalkId(DINN);
+ addKillId(ELROKI);
+ registerQuestItems(DINOSAUR_FANG_NECKLACE);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = player.getQuestState(getName());
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "32105-02.htm":
+ case "32105-10.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "32105-03.html":
+ {
+ st.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "32105-06.html":
+ {
+ if (st.hasQuestItems(DINOSAUR_FANG_NECKLACE))
+ {
+ st.giveAdena(3000 * st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE), true);
+ st.takeItems(DINOSAUR_FANG_NECKLACE, -1);
+ htmltext = event;
+ }
+ break;
+ }
+ case "donation":
+ {
+ if (st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE) < 100)
+ {
+ htmltext = "32105-07.html";
+ }
+ else
+ {
+ if (getRandom(1000) < 500)
+ {
+ st.giveAdena(450000, true);
+ htmltext = "32105-08.html";
+ }
+ else
+ {
+ st.giveAdena(150000, true);
+ htmltext = "32105-09.html";
+ }
+ st.takeItems(DINOSAUR_FANG_NECKLACE, 100);
+ }
+ break;
+ }
+ case "32105-11.html":
+ {
+ if (st.hasQuestItems(DINOSAUR_FANG_NECKLACE))
+ {
+ st.giveAdena(3000 * st.getQuestItemsCount(DINOSAUR_FANG_NECKLACE), true);
+ }
+ st.exitQuest(true, true);
+ htmltext = event;
+ break;
+ }
+
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ QuestState st = player.getQuestState(getName());
+ String htmltext = getNoQuestMsg(player);
+ if (st == null)
+ {
+ return htmltext;
+ }
+
+ switch (st.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "32105-01.htm" : "32105-04.html";
+ break;
+ }
+ case State.STARTED:
+ {
+ htmltext = (st.hasQuestItems(DINOSAUR_FANG_NECKLACE)) ? "32105-05.html" : "32105-12.html";
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance player, boolean isPet)
+ {
+ final L2PcInstance partyMember = getRandomPartyMember(player, "1");
+ if (partyMember == null)
+ {
+ return null;
+ }
+
+ final QuestState st = partyMember.getQuestState(getName());
+
+ int chance = (int) ((DROP_RATE * Config.RATE_QUEST_DROP) % 1000);
+ if (getRandom(1000) < chance)
+ {
+ st.rewardItems(DINOSAUR_FANG_NECKLACE, 1);
+ st.playSound(QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ return super.onKill(npc, player, isPet);
+ }
+
+ public static void main(String args[])
+ {
+ new Q00688_DefeatTheElrokianRaiders(688, Q00688_DefeatTheElrokianRaiders.class.getSimpleName(), "Defeat the Elrokian Raiders!");
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20121216update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20121216update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f2f7f3d9fc82d41bd34c44324e3aa031ff0f76c5
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20121216update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00688_DefeatTheElrokianRaiders' WHERE name='688_DefeatTheElrokianRaiders';
\ No newline at end of file