From 69d45bca8827422c80190c0acd16a1dfb87c7e54 Mon Sep 17 00:00:00 2001
From: ivantotov <gmtotov@gmail.com>
Date: Thu, 1 Jan 2015 19:36:55 +0200
Subject: [PATCH] Retail-like quest Subjugation Of Lizardmen (340). Reviewed
 by: @Zoey76

---
 L2J_DataPack/dist/game/data/scripts.cfg       |   1 -
 .../340_SubjugationOfLizardmen/30385-02.htm   |   4 -
 .../340_SubjugationOfLizardmen/30385-04.htm   |   2 -
 .../340_SubjugationOfLizardmen/30385-05.htm   |   2 -
 .../340_SubjugationOfLizardmen/30385-08.htm   |   4 -
 .../340_SubjugationOfLizardmen/30385-09.htm   |   3 -
 .../340_SubjugationOfLizardmen/30385-13.htm   |   4 -
 .../340_SubjugationOfLizardmen/30989-01.htm   |   3 -
 .../340_SubjugationOfLizardmen/30989-02.htm   |   2 -
 .../340_SubjugationOfLizardmen/30989-03.htm   |   2 -
 .../340_SubjugationOfLizardmen/__init__.py    | 166 ---------
 .../30037-01.html}                            |   5 +-
 .../30037-02.html}                            |   3 +-
 .../30037-03.html}                            |   3 +-
 .../30037-04.html}                            |   3 +-
 .../30037-05.html}                            |   0
 .../30375-01.html}                            |   6 +-
 .../30375-02.html}                            |   5 +-
 .../30375-03.html}                            |   7 +-
 .../30375-04.html}                            |   3 +-
 .../30375-05.html}                            |   3 +-
 .../30375-06.html}                            |   3 +-
 .../30385-01.htm                              |   5 +-
 .../30385-02.htm                              |   6 +
 .../30385-03.htm                              |   3 +-
 .../30385-04.html                             |   3 +
 .../30385-05.html                             |   3 +
 .../30385-06.html}                            |   5 +-
 .../30385-07.html}                            |   3 +-
 .../30385-08.html                             |   6 +
 .../30385-09.html                             |   4 +
 .../30385-10.html}                            |   3 +-
 .../30385-11.html}                            |   3 +-
 .../30385-12.html}                            |   3 +-
 .../30385-13.html                             |   3 +
 .../30989-01.html                             |   4 +
 .../30989-02.html                             |   3 +
 .../30989-03.html                             |   3 +
 .../Q00340_SubjugationOfLizardmen.java        | 345 ++++++++++++++++++
 .../scripts/quests/QuestMasterHandler.java    |   2 +
 .../dist/sql/game/updates/20150101update.sql  |   1 +
 41 files changed, 423 insertions(+), 219 deletions(-)
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-02.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-04.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-05.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-08.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-09.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-13.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-01.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-02.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-03.htm
 delete mode 100644 L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30037-01.htm => Q00340_SubjugationOfLizardmen/30037-01.html} (65%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30037-02.htm => Q00340_SubjugationOfLizardmen/30037-02.html} (88%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30037-03.htm => Q00340_SubjugationOfLizardmen/30037-03.html} (92%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30037-04.htm => Q00340_SubjugationOfLizardmen/30037-04.html} (93%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30037-05.htm => Q00340_SubjugationOfLizardmen/30037-05.html} (100%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-01.htm => Q00340_SubjugationOfLizardmen/30375-01.html} (60%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-02.htm => Q00340_SubjugationOfLizardmen/30375-02.html} (73%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-03.htm => Q00340_SubjugationOfLizardmen/30375-03.html} (89%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-04.htm => Q00340_SubjugationOfLizardmen/30375-04.html} (85%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-05.htm => Q00340_SubjugationOfLizardmen/30375-05.html} (62%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30375-06.htm => Q00340_SubjugationOfLizardmen/30375-06.html} (65%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen => Q00340_SubjugationOfLizardmen}/30385-01.htm (86%)
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-02.htm
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen => Q00340_SubjugationOfLizardmen}/30385-03.htm (72%)
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-04.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-05.html
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30385-06.htm => Q00340_SubjugationOfLizardmen/30385-06.html} (71%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30385-07.htm => Q00340_SubjugationOfLizardmen/30385-07.html} (59%)
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-08.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-09.html
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30385-10.htm => Q00340_SubjugationOfLizardmen/30385-10.html} (62%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30385-11.htm => Q00340_SubjugationOfLizardmen/30385-11.html} (65%)
 rename L2J_DataPack/dist/game/data/scripts/quests/{340_SubjugationOfLizardmen/30385-12.htm => Q00340_SubjugationOfLizardmen/30385-12.html} (87%)
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-13.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-01.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-02.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-03.html
 create mode 100644 L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
 create mode 100644 L2J_DataPack/dist/sql/game/updates/20150101update.sql

diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 206896492b..77be8715f3 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -226,7 +226,6 @@ quests/334_TheWishingPotion/__init__.py
 quests/335_TheSongOfTheHunter/__init__.py
 quests/336_CoinOfMagic/__init__.py
 quests/337_AudienceWithTheLandDragon/__init__.py
-quests/340_SubjugationOfLizardmen/__init__.py
 quests/343_UnderTheShadowOfTheIvoryTower/__init__.py
 quests/348_ArrogantSearch/__init__.py
 quests/372_LegacyOfInsolence/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-02.htm
deleted file mode 100644
index cd629cdd65..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Guard Weisz:<br>
-Do you plan to follow the northern road on your voyage to Oren? If so, you must beware of the lizardmen. They are becoming more brazen with their atrocities.<br>Those filthy reptiles! It wasn't enough to burn farms and slaughter livestock. Now they are looting in broad daylight! Something must be done about this outrage!<br>
-Unfortunately, our guards have their hands full with the Turek orcs and the ol mahums... We are going to have to rely on mercenaries to save us from these lizardmen. If you know any skilled ones, please send them to me!<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-03.htm">"I will destroy the lizardmen!"</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-04.htm
deleted file mode 100644
index c51696ae4d..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-04.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Weisz:<br>
-You must recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font> from the <font color="LEVEL">felim lizardmen</font>. They can be found at the Fellmere Harvest Grounds between the Ruins of Agony and Windy Hill. Go and destroy those filthy reptiles and restore peace to the village!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-05.htm
deleted file mode 100644
index 34488ded41..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-05.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Guard Weisz:<br>
-Please hurry! The trade guild is getting impatient. Their cargo wagons are still coming under attack from <font color="LEVEL">felim lizardmen</font> at the Fellmere Harvest Grounds. Go and recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font>.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-08.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-08.htm
deleted file mode 100644
index 324a285a77..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-08.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Guard Weisz:<br>
-Oh well, too bad. I'll have to find someone else to help the temple.<br>Anyway, the guild is still suffering attacks from the felim lizardmen. Once again we must send a mercenary to recover stolen cargo from them. Are you interested?<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-09.htm">"I'll do it."</a><br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-10.htm">Quit</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-09.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-09.htm
deleted file mode 100644
index 4a4a7a2a5b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-09.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Guard Weisz:<br>
-First, please accept this token of our appreciation for the work you've done so far...<br>
-The task is the same as before. You must kill <font color="LEVEL">felim lizardmen</font> at the Fellmere Harvest Grounds between the Ruins of Agony and Windy Hill and recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font>. Thank you for once again helping our cause.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-13.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-13.htm
deleted file mode 100644
index 6c10df980b..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-13.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Guard Weisz:<br>
-High Priestess Levian has spoken about you. She says that you stabbed to death the ringleader of the rampaging lizardmen, is that true?<br>
-Very impressive! Please accept this gift on behalf of the people of Gludio!<br> 
-Perhaps one day, with the help of noble warriors like you, lizardmen will be wiped from the face of the earth!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-01.htm
deleted file mode 100644
index b045b1f0c9..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-01.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Chest of Bifrons:<br>
-The chest emits a sinister aura.<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30989-02.htm">Open the chest.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-02.htm
deleted file mode 100644
index 18c513877c..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-02.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Chest of Bifrons:<br>
-Inside the chest is a crudely-cut statue made of black rock.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-03.htm
deleted file mode 100644
index d2fccb80a7..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30989-03.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Chest of Bifrons:<br>
-The chest is empty.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
deleted file mode 100644
index 1c20dc6da3..0000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/__init__.py
+++ /dev/null
@@ -1,166 +0,0 @@
-# Contributed by t0rm3nt0r to the Official L2J Datapack Project.
-
-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 = "340_SubjugationOfLizardmen"
-
-#NPC
-WEIZ = 30385
-ADONIUS = 30375
-LEVIAN = 30037
-CHEST = 30989
-#Quest item
-CARGO = 4255
-HOLY = 4256
-ROSARY = 4257
-TOTEM = 4258
-#Mobs
-MOBS_1 = [ 20008, 20010, 20014 ]
-MOBS_2 = [ 20357,21100,20356,21101 ]
-BIFRON = 25146
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
-     JQuest.__init__(self,id,name,descr)
-     self.questItemIds = [TOTEM]
- 
- def onAdvEvent (self, event, npc, player) :
-     st = self.getQuestState(player, False)
-     if not st: return
-     htmltext = event
-     if event == "30385-03.htm" :
-       st.set("cond","1")
-       st.setState(State.STARTED)
-       st.playSound("ItemSound.quest_accept")
-     elif event == "30385-07.htm" :
-       st.takeItems(CARGO,-1)
-       st.giveItems(57,4090)       
-       st.set("cond","2")
-       st.playSound("ItemSound.quest_middle")
-     elif event == "30385-09.htm" :
-       st.takeItems(CARGO,-1)
-       st.giveItems(57,4090)
-     elif event == "30385-10.htm" :
-       st.takeItems(CARGO,-1)
-       st.giveItems(57,4090)
-       st.exitQuest(1)
-     elif event == "30375-02.htm" :
-       st.set("cond","3")
-       st.playSound("ItemSound.quest_middle")
-     elif event == "30037-02.htm" :
-       st.set("cond","5")
-       st.playSound("ItemSound.quest_middle")
-     elif event == "30989-02.htm" :
-       st.giveItems(TOTEM,1)
-       st.set("cond","6")
-       st.playSound("ItemSound.quest_middle")
-       npc.reduceCurrentHp(9999999,npc,None)
-     return htmltext
-
- def onTalk (self,npc,player):
-     npcId = npc.getId()
-     htmltext = Quest.getNoQuestMsg(player)
-     st = self.getQuestState(player, True)
-     if not st : return htmltext
-     id = st.getState()
-     cond = st.getInt("cond")
-     kargo = st.getQuestItemsCount(CARGO)
-     rosary = st.getQuestItemsCount(ROSARY)
-     holy = st.getQuestItemsCount(HOLY)
-     totem = st.getQuestItemsCount(TOTEM)
-     if id == State.COMPLETED :
-       htmltext = Quest.getAlreadyCompletedMsg(player)
-
-     elif id == State.CREATED and npcId == WEIZ :
-       if player.getLevel() < 17 :
-         htmltext = "30385-01.htm"
-         st.exitQuest(1)
-       else :
-         htmltext = "30385-02.htm"
-     elif id == State.STARTED :
-       if npcId == WEIZ :
-         if cond == 1 :
-           if kargo < 30 :
-             htmltext = "30385-05.htm"
-           else :
-             htmltext = "30385-06.htm"
-         elif cond == 2 :
-           htmltext = "30385-11.htm"
-         elif cond == 7 :
-           st.giveItems(57,14700)
-           htmltext = "30385-13.htm"
-           st.set("cond","0")
-           st.exitQuest(False)
-           st.playSound("ItemSound.quest_finish")
-       elif npcId == ADONIUS :
-         if cond == 2 :
-           htmltext = "30375-01.htm"
-         elif cond == 3 :
-           if rosary == 1 and holy == 1 :
-             st.takeItems(HOLY,-1)
-             st.takeItems(ROSARY,-1)             
-             htmltext = "30375-04.htm"
-             st.set("cond","4")
-             st.playSound("ItemSound.quest_middle")
-           else :
-             htmltext = "30375-03.htm"
-         elif cond == 4 :
-           htmltext = "30375-05.htm"
-       elif npcId == LEVIAN :
-         if cond == 4 :
-           htmltext = "30037-01.htm"
-         elif cond == 5 :
-           htmltext = "30037-03.htm"
-         elif cond == 6 :
-           st.takeItems(TOTEM,-1)
-           st.set("cond","7")
-           st.playSound("ItemSound.quest_middle")
-           htmltext = "30037-04.htm"
-         elif cond == 7 :
-           htmltext = "30037-05.htm"
-       elif npcId == CHEST :
-         if cond == 5 :
-           htmltext = "30989-01.htm"
-         elif cond == 6 :
-           htmltext = "30989-03.htm"
-     return htmltext
-    
- def onKill(self,npc,player,isPet):
-     st = self.getQuestState(player, False)
-     if not st : return 
-     npcId = npc.getId()
-     chanse = self.getRandom(100)
-     kargo = st.getQuestItemsCount(CARGO)
-     holy = st.getQuestItemsCount(HOLY)
-     rosary = st.getQuestItemsCount(ROSARY)
-     if st:
-       if npcId in MOBS_1 :
-         if (chanse < 40) and (kargo < 30) :
-           st.giveItems(CARGO,1)
-           st.playSound("ItemSound.quest_itemget")
-       elif npcId in MOBS_2 :
-         if (chanse < 15) and (not holy) :
-           st.giveItems(HOLY,1)
-           st.playSound("ItemSound.quest_middle")
-         elif (chanse < 15) and (not rosary) :
-           st.giveItems(ROSARY,1)
-           st.playSound("ItemSound.quest_middle")
-       elif npcId == BIFRON :
-         st.addSpawn(CHEST,npc,30000)
-     return
-
-QUEST       = Quest(340, qn, "Subjugation of Lizardmen")
-
-QUEST.addStartNpc(WEIZ)
-
-QUEST.addTalkId(WEIZ)
-QUEST.addTalkId(ADONIUS)
-QUEST.addTalkId(LEVIAN)
-QUEST.addTalkId(CHEST)
-
-for i in MOBS_1 + MOBS_2 + [25146] :
-    QUEST.addKillId(i)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-01.html
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-01.html
index 6f369d340f..b4818544eb 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-01.html
@@ -1,4 +1,5 @@
 <html><body>High Priestess Levian:<br>
-The followers of Einhasad will always be subject to trials. Now is no different, as the people of Gludio are being confronted by evil itself.<br>
+The followers of Einhasad will always be subject to trials. Now is no different, as  the people of Gludio are being confronted by evil itself.<br>
 Lizardmen are reptiles. They look somewhat like dragons. They are just the lackeys of Shilen. The true evil we must confront is <font color="LEVEL">evil spirit Bifrons</font>, who is secretly controlling the actions of the lizardmen. Please help us deal with him.<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30037-02.htm">"I will help."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30037-02.html">"I will help."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-02.html
similarity index 88%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-02.html
index 528ff83a21..f6bfc8152b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-02.html
@@ -1,4 +1,5 @@
 <html><body>High Priestess Levian:<br>
 From all accounts it seems that the lizardmen worship Bifrons as a god. I would not be surprised to discover that he was being controlled by an even higher being.<br>
 I sense a great evil on the <font color="LEVEL">south shore of Gludio</font>. You will not be able to deal with this menace alone, you must bring your trusted comrades with you.<br>
-You must kill the evil spirit and find a weird looking chest. Inside this chest you will find the <font color="LEVEL">mark of darkness</font>. Bring it to me. Then, together, with the power of the goddess, we will destroy that blasphemous object.</body></html>
\ No newline at end of file
+You must kill the evil spirit and find a weird looking chest. Inside this chest you will find the <font color="LEVEL">mark of darkness</font>. Bring it to me. Then, together, with the power of the goddess, we will destroy that blasphemous object.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-03.html
similarity index 92%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-03.html
index fbe1d5dac5..8d36a88662 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-03.html
@@ -1,3 +1,4 @@
 <html><body>High Priestess Levian:<br>
 The evil spirit can be found on the <font color="LEVEL">south shore of Gludio</font>. You must not confront <font color="LEVEL">Bifrons</font> alone. Take comrades with you.<br>
-After slaying the evil spirit, find the weird looking chest and bring me the <font color="LEVEL">mark of darkness</font> that is contained within. Then we will destroy that blasphemous object once and for all.</body></html>
\ No newline at end of file
+After slaying the evil spirit, find the weird looking chest and bring me the <font color="LEVEL">mark of darkness</font> that is contained within. Then we will destroy that blasphemous object once and for all.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-04.html
similarity index 93%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-04.html
index e6617cfd3f..b0dca68932 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-04.html
@@ -1,3 +1,4 @@
 <html><body>High Priestess Levian:<br>
 Ah, it is a pleasure to see you once again in bosom of the goddess. Now I must prepare for the ritual to destroy this evil object. I have let the guards know of your noble deeds in service to the temple. <font color="LEVEL">Guard Weisz</font> wishes to meet with you. You should go and see him right away.<br>
-And remember, never let your guard down, even for a moment. May the divine protection of the goddess be with you as you fight for justice...</body></html>
\ No newline at end of file
+And remember, never let your guard down, even for a moment. May the divine protection of the goddess be with you as you fight for justice...<br>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-05.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30037-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30037-05.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-01.html
similarity index 60%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-01.html
index 01975d5441..2d6336a3ea 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-01.html
@@ -1,4 +1,6 @@
 <html><body>Priest Adonius:<br>
 Were you sent by the guards? Oh, thank heaven you've arrived! We are desperately in need of your help!<br>
-First, I suppose I should tell you of the horrible event of three days ago. Priestess Agnes was leading a group of  the faithful of our congregation back home from a pilgrimage to the Grand Temple in Giran when they were attacked by the dreaded Langk lizardmen. They were all slaughtered mercilessly, in the most gruesome fashion!<br>Now I can think of nothing but recovering the remains of our faithful and giving them a proper burial. We must at least recover the relics left by Agnes.<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30375-02.htm">"I will recover the relics."</a></body></html>
\ No newline at end of file
+First, I suppose I should tell you of the horrible event of three days ago. Priestess Agnes was leading a group of  the faithful of our congregation back home from a pilgrimage to the Grand Temple in Giran when they were attacked by the dreaded Langk lizardmen. They were all slaughtered mercilessly, in the most gruesome fashion!<br>
+Now I can think of nothing but recovering the remains of our faithful and giving them a proper burial. We must at least recover the relics left by Agnes.<br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30375-02.html">"I will recover the relics."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-02.html
similarity index 73%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-02.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-02.html
index cdb3679dbe..a9b7698231 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-02.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-02.html
@@ -1,4 +1,5 @@
 <html><body>Priest Adonius:<br>
 Oh, thank you! The site of the massacre is on the south shore of Gludio. Please find and return the remains of Priestess Agnes so that we can give her a proper burial.<br>
-Please, bring us her <font color="LEVEL">crucifix</font> and <font color="LEVEL">rosary.</font><br>
-Now please be off, time is of the essence...</body></html>
\ No newline at end of file
+Please, bring us her <font color="LEVEL">crucifix</font> and <font color="LEVEL">rosary</font>.<br>
+Now please be off, time is of the essence...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-03.html
similarity index 89%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-03.html
index 20ad59b81b..7a8e490215 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-03.html
@@ -1,7 +1,4 @@
 <html><body>Priest Adonius:<br>
 Please recover the <font color="LEVEL">crucifix</font> and <font color="LEVEL">rosary</font> that belonged to Priestess Agnes. This is essential if we are to give her a proper funeral.<br>
-You will find her remains on the south shore of Gludio. You should leave for there immediately! May the light of Einhasad guide your path...</body></html> 
-
-
-
-
+You will find her remains on the south shore of Gludio. You should leave for there immediately! May the light of Einhasad guide your path...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-04.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-04.html
similarity index 85%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-04.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-04.html
index 219d82d7e5..af54835ba8 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-04.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-04.html
@@ -2,4 +2,5 @@
 You have performed a noble deed for our temple. Now Agnes can have a funeral befitting a person of her stature.<br>
 It is all so very tragic! I know that all that happens is the will of Einhasad, still, when something so senseless happens it makes a person wonder...<br>
 Well, we must meditate upon the light and seek the truth of the Goddess.<br>
-Our struggle is bound to continue. Our temple could definitely use the services of a powerful defender such as yourself. Please go and meet with <font color="LEVEL">High Priestess Levian.</font></body></html>
\ No newline at end of file
+Our struggle is bound to continue. Our temple could definitely use the services of a powerful defender such as yourself. Please go and meet with <font color="LEVEL">High Priestess Levian</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-05.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-05.html
similarity index 62%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-05.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-05.html
index 489163a41b..420c4a54fd 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-05.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-05.html
@@ -1,2 +1,3 @@
 <html><body>Priest Adonius:<br>
-<font color="LEVEL">High Priestess Levian</font> is expecting you. She will tell you what you need to do.</body></html>
\ No newline at end of file
+<font color="LEVEL">High Priestess Levian</font> is expecting you. She will tell you what you need to do.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-06.html
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-06.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-06.html
index 4b2f3e30c7..501841b79d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30375-06.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30375-06.html
@@ -1,2 +1,3 @@
 <html><body>Priest Adonius:<br>
-Oh Divine One, please give this fine warrior the strength and courage to conquer the evil ones...</body></html>
\ No newline at end of file
+Oh Divine One, please give this fine warrior the strength and courage to conquer the evil ones...
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-01.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-01.htm
similarity index 86%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-01.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-01.htm
index a179002cb1..ce48331235 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-01.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-01.htm
@@ -1,5 +1,6 @@
 <html><body>Guard Weisz:<br>
 Do you plan to follow the northern road on your voyage to Oren? If so, you must beware of the lizardmen. They are becoming more brazen in their atrocities.<br>
 Those filthy reptiles! It wasn't enough to burn farms and slaughter livestock, now they are looting in broad daylight! Something must be done about this outrage!<br>
-Unfortunately, our guards have their hands full with the Turek orcs and ol mahums... We have come to the conclusion that we have no choice but to rely on mercenaries to save us from these lizardmen. If you know any skilled ones, send them to me.<br>
-(This quest can only be undertaken by a character of level 17 or higher.)</body></html>
\ No newline at end of file
+Unfortunately, our guards have their hands full with the Turek orcs and Ol Mahums... We have come to the conclusion that we have no choice but to rely on mercenaries to save us from these lizardmen. If you know any skilled ones, send them to me.<br>
+(This quest can only be undertaken by a character of level 17 or higher.)
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-02.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-02.htm
new file mode 100644
index 0000000000..6ca4ec8480
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-02.htm
@@ -0,0 +1,6 @@
+<html><body>Guard Weisz:<br>
+Do you plan to follow the northern road on your voyage to Oren? If so, you must beware of the lizardmen. They are becoming more brazen with their atrocities.<br>
+Those filthy reptiles! It wasn't enough to burn farms and slaughter livestock. Now they are looting in broad daylight! Something must be done about this outrage!<br>
+Unfortunately, our guards have their hands full with the Turek orcs and the Ol Mahums... We are going to have to rely on mercenaries to save us from these lizardmen. If you know any skilled ones, please send them to me!<br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-03.htm">"I will destroy the lizardmen!"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-03.htm
similarity index 72%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-03.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-03.htm
index 47e275d1ed..cfb2c48f53 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-03.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-03.htm
@@ -1,4 +1,5 @@
 <html><body>Guard Weisz:<br>
 Yes, I suppose you could be helpful.<br>
 Recently, lizardmen have been attacking the cargo wagons of the Aden Trade Guild. They slaughter the traders and guards and plunder the cargo. The guild has filed a formal request for assistance in dealing with the lizardmen. This task falls to you.<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-04.htm">"Tell me more about this task."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-04.html">"Tell me more about this task."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-04.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-04.html
new file mode 100644
index 0000000000..1def8e85b4
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-04.html
@@ -0,0 +1,3 @@
+<html><body>Guard Weisz:<br>
+You must recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font> from the <font color="LEVEL">felim lizardmen</font>. They can be found at the Fellmere Harvesting Grounds between the Ruins of Agony and Windy Hill. Go and destroy those filthy reptiles and restore peace to the village!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-05.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-05.html
new file mode 100644
index 0000000000..bb22e9c5a0
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-05.html
@@ -0,0 +1,3 @@
+<html><body>Guard Weisz:<br>
+Please hurry! The trade guild is getting impatient. Their cargo wagons are still coming under attack from <font color="LEVEL">felim lizardmen</font> at the Fellmere Harvesting Grounds. Go and recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-06.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-06.html
similarity index 71%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-06.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-06.html
index a38d4d7210..d2e50a4c74 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-06.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-06.html
@@ -1,5 +1,6 @@
 <html><body>Guard Weisz:<br>
 Ah, you've recovered all of the guild's Cargo Boxes! Good job! I will return them to the Aden Trade Guild immediately. We really appreciate your hard work.<br>
 However, despite the efforts of noble mercenaries like yourself, the lizardmen continue their despicable actions. The day before yesterday Langk lizardmen attacked and killed pilgrims from the temple of Einhasad! The temple has asked the Guards to recover the remains of the pilgrims. Would you care to join us on this mission?<br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-07.htm">"I will join the mission."</a><br>
-<a action="bypass -h Quest 340_SubjugationOfLizardmen 30385-08.htm">"No."</a></body></html>
\ No newline at end of file
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-07.html">"I will join the mission."</a><br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-08.html">"No."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-07.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-07.html
similarity index 59%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-07.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-07.html
index 2869d45b86..8a66828e2b 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-07.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-07.html
@@ -1,2 +1,3 @@
 <html><body>Guard Weisz:<br>
-You must speak with <font color="LEVEL">Priest Adonius</font> of the Einhasad Temple. He knows the whole story.</body></html>
\ No newline at end of file
+You must speak with <font color="LEVEL">Priest Adonius</font> of the Einhasad Temple. He knows the whole story.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-08.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-08.html
new file mode 100644
index 0000000000..fb7d505e33
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-08.html
@@ -0,0 +1,6 @@
+<html><body>Guard Weisz:<br>
+Oh well, too bad. I'll have to find someone else to help the temple.<br>
+Anyway, the guild is still suffering attacks from the felim lizardmen. Once again we must send a mercenary to recover stolen cargo from them. Are you interested?<br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-09.html">"I'll do it."</a><br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30385-10.html">Quit</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-09.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-09.html
new file mode 100644
index 0000000000..8bc2fe95ca
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-09.html
@@ -0,0 +1,4 @@
+<html><body>Guard Weisz:<br>
+First, please accept this token of our appreciation for the work you've done so far...<br>
+The task is the same as before. You must kill <font color="LEVEL">felim lizardmen</font> at the Fellmere Harvesting Grounds between the Ruins of Agony and Windy Hill and recover <font color="LEVEL">30 Cargo Boxes belonging to the trade guild</font>. Thank you for once again helping our cause.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-10.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-10.html
similarity index 62%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-10.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-10.html
index a4ea428266..3f7529e691 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-10.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-10.html
@@ -1,2 +1,3 @@
 <html><body>Guard Weisz:<br>
-Very well. Please accept this token of appreciation for all of your hard work from the people of Gludio.</body></html>
\ No newline at end of file
+Very well. Please accept this token of appreciation for all of your hard work from the people of Gludio.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-11.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-11.html
similarity index 65%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-11.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-11.html
index e79e530012..55ab91ec8d 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-11.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-11.html
@@ -1,2 +1,3 @@
 <html><body>Guard Weisz:<br>
-<font color="LEVEL">Priest Adonius</font> awaits! Leave for the temple of Einhasad immediately!</body></html> 
+<font color="LEVEL">Priest Adonius</font> awaits! Leave for the temple of Einhasad immediately!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-12.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-12.html
similarity index 87%
rename from L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-12.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-12.html
index 6d2519232e..ed963cf7d0 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/340_SubjugationOfLizardmen/30385-12.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-12.html
@@ -1,2 +1,3 @@
 <html><body>Guard Weisz:<br>
-The people of Gludio put their faith in the priests of Einhasad. The murder of the pilgrims by Langk lizardmen will not be forgotten!</body></html>
\ No newline at end of file
+The people of Gludio put their faith in the priests of Einhasad. The murder of the pilgrims by Langk lizardmen will not be forgotten! 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-13.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-13.html
new file mode 100644
index 0000000000..90c7f969bf
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30385-13.html
@@ -0,0 +1,3 @@
+<html><body>Guard Weisz:<br>
+High Priestess Levian has spoken about you. She says that you stabbed to death the ringleader of the rampaging lizardmen, is that true? Very impressive! Please accept this gift on behalf of the people of Gludio! Perhaps one day, with the help of noble warriors like you, lizardmen will be wiped from the face of the earth!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-01.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-01.html
new file mode 100644
index 0000000000..33915011c3
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-01.html
@@ -0,0 +1,4 @@
+<html><body>Chest of Bifrons:<br>
+The chest emits a sinister aura.<br>
+<a action="bypass -h Quest Q00340_SubjugationOfLizardmen 30989-02.html">Open the chest.</a> 
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-02.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-02.html
new file mode 100644
index 0000000000..6f9877d584
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-02.html
@@ -0,0 +1,3 @@
+<html><body>Chest of Bifrons:<br>
+Inside the chest is a crudely-cut statue made of black rock.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-03.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-03.html
new file mode 100644
index 0000000000..3dac1046ac
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/30989-03.html
@@ -0,0 +1,3 @@
+<html><body>Chest of Bifrons:<br>
+The chest is empty.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
new file mode 100644
index 0000000000..9b580c88bf
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00340_SubjugationOfLizardmen/Q00340_SubjugationOfLizardmen.java
@@ -0,0 +1,345 @@
+/*
+ * Copyright (C) 2004-2015 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.Q00340_SubjugationOfLizardmen;
+
+import com.l2jserver.gameserver.enums.QuestSound;
+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.util.Util;
+
+/**
+ * Subjugation Of Lizardmen (340)
+ * @author ivantotov
+ */
+public final class Q00340_SubjugationOfLizardmen extends Quest
+{
+	// NPCs
+	private static final int HIGH_PRIESTESS_LEVIAN = 30037;
+	private static final int PRIEST_ADONIUS = 30375;
+	private static final int GUARD_WEISZ = 30385;
+	private static final int CHEST_OF_BIFRONS = 30989;
+	// Items
+	private static final int TRADE_CARGO = 4255;
+	private static final int AGNESS_HOLY_SYMBOL = 4256;
+	private static final int AGNESS_ROSARY = 4257;
+	private static final int SINISTER_TOTEM = 4258;
+	// Monster
+	private static final int FELIM_LIZARDMAN = 20008;
+	private static final int FELIM_LIZARDMAN_SCOUT = 20010;
+	private static final int FELIM_LIZARDMAN_WARRIOR = 20014;
+	private static final int LANGK_LIZARDMAN_WARRIOR = 20024;
+	private static final int LANGK_LIZARDMAN_SCOUT = 20027;
+	private static final int LANGK_LIZARDMAN = 20030;
+	// Raid Boss
+	private static final int SERPENT_DEMON_BIFRONS = 25146;
+	// Misc
+	private static final int MIN_LEVEL = 17;
+	
+	public Q00340_SubjugationOfLizardmen()
+	{
+		super(340, Q00340_SubjugationOfLizardmen.class.getSimpleName(), "Subjugation Of Lizardmen");
+		addStartNpc(GUARD_WEISZ);
+		addTalkId(GUARD_WEISZ, HIGH_PRIESTESS_LEVIAN, PRIEST_ADONIUS, CHEST_OF_BIFRONS);
+		addKillId(FELIM_LIZARDMAN, FELIM_LIZARDMAN_SCOUT, FELIM_LIZARDMAN_WARRIOR, LANGK_LIZARDMAN_WARRIOR, LANGK_LIZARDMAN_SCOUT, LANGK_LIZARDMAN, SERPENT_DEMON_BIFRONS);
+		registerQuestItems(TRADE_CARGO, AGNESS_HOLY_SYMBOL, AGNESS_ROSARY, SINISTER_TOTEM);
+	}
+	
+	@Override
+	public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+	{
+		final QuestState qs = getQuestState(player, false);
+		if (qs == null)
+		{
+			return null;
+		}
+		
+		String htmltext = null;
+		switch (event)
+		{
+			case "30385-03.htm":
+			{
+				if (qs.isCreated())
+				{
+					qs.startQuest();
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30385-04.html":
+			case "30385-08.html":
+			{
+				htmltext = event;
+				break;
+			}
+			case "30385-07.html":
+			{
+				takeItems(player, TRADE_CARGO, -1);
+				qs.setMemoState(2);
+				qs.setCond(2, true);
+				htmltext = event;
+				break;
+			}
+			case "30385-09.html":
+			{
+				if (getQuestItemsCount(player, TRADE_CARGO) >= 30)
+				{
+					giveAdena(player, 4090, true);
+					takeItems(player, TRADE_CARGO, -1);
+					qs.setMemoState(1);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30385-10.html":
+			{
+				if (getQuestItemsCount(player, TRADE_CARGO) >= 30)
+				{
+					giveAdena(player, 4090, true);
+					takeItems(player, TRADE_CARGO, -1);
+					qs.exitQuest(false, true);
+					htmltext = event;
+				}
+				break;
+			}
+			case "30037-02.html":
+			{
+				qs.setMemoState(5);
+				qs.setCond(5, true);
+				htmltext = event;
+				break;
+			}
+			case "30375-02.html":
+			{
+				qs.setMemoState(3);
+				qs.setCond(3, true);
+				htmltext = event;
+				break;
+			}
+			case "30989-02.html":
+			{
+				if (qs.isMemoState(5))
+				{
+					qs.setMemoState(6);
+					qs.setCond(6, true);
+					giveItems(player, SINISTER_TOTEM, 1);
+					htmltext = event;
+				}
+				else
+				{
+					htmltext = "30989-03.html";
+				}
+				break;
+			}
+		}
+		return htmltext;
+	}
+	
+	@Override
+	public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+	{
+		final QuestState qs = getQuestState(killer, false);
+		if ((qs != null) && qs.isStarted() && Util.checkIfInRange(1500, npc, killer, true))
+		{
+			switch (npc.getId())
+			{
+				case FELIM_LIZARDMAN:
+				case FELIM_LIZARDMAN_SCOUT:
+				{
+					if (qs.isMemoState(1))
+					{
+						giveItemRandomly(killer, npc, TRADE_CARGO, 1, 30, 0.63, true);
+					}
+					break;
+				}
+				case FELIM_LIZARDMAN_WARRIOR:
+				{
+					if (qs.isMemoState(1))
+					{
+						giveItemRandomly(killer, npc, TRADE_CARGO, 1, 30, 0.68, true);
+					}
+					break;
+				}
+				case LANGK_LIZARDMAN_WARRIOR:
+				{
+					if (qs.isMemoState(3))
+					{
+						if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 19))
+						{
+							giveItems(killer, AGNESS_HOLY_SYMBOL, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						}
+						else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18))
+						{
+							giveItems(killer, AGNESS_ROSARY, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						}
+					}
+					break;
+				}
+				case LANGK_LIZARDMAN_SCOUT:
+				case LANGK_LIZARDMAN:
+				{
+					if (qs.isMemoState(3))
+					{
+						if (!hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && (getRandom(100) <= 18))
+						{
+							giveItems(killer, AGNESS_HOLY_SYMBOL, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						}
+						else if (hasQuestItems(killer, AGNESS_HOLY_SYMBOL) && !hasQuestItems(killer, AGNESS_ROSARY) && (getRandom(100) <= 18))
+						{
+							giveItems(killer, AGNESS_ROSARY, 1);
+							playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+						}
+					}
+					break;
+				}
+				case SERPENT_DEMON_BIFRONS:
+				{
+					addSpawn(CHEST_OF_BIFRONS, npc, true, 30000);
+					break;
+				}
+			}
+		}
+		return super.onKill(npc, killer, isSummon);
+	}
+	
+	@Override
+	public String onTalk(L2Npc npc, L2PcInstance player)
+	{
+		final QuestState qs = getQuestState(player, true);
+		final int memoState = qs.getMemoState();
+		String htmltext = getNoQuestMsg(player);
+		if (qs.isCreated())
+		{
+			if (npc.getId() == GUARD_WEISZ)
+			{
+				htmltext = (player.getLevel() >= MIN_LEVEL) ? "30385-02.htm" : "30385-01.htm";
+			}
+		}
+		else if (qs.isStarted())
+		{
+			switch (npc.getId())
+			{
+				case GUARD_WEISZ:
+				{
+					if (memoState == 1)
+					{
+						if (getQuestItemsCount(player, TRADE_CARGO) < 30)
+						{
+							htmltext = "30385-05.html";
+						}
+						else
+						{
+							htmltext = "30385-06.html";
+						}
+					}
+					else if (memoState == 2)
+					{
+						htmltext = "30385-11.html";
+					}
+					else if ((memoState >= 3) && (memoState < 7))
+					{
+						htmltext = "30385-12.html";
+					}
+					else if (memoState == 7)
+					{
+						giveAdena(player, 14700, true);
+						qs.exitQuest(false, true);
+						htmltext = "30385-13.html";
+					}
+					break;
+				}
+				case HIGH_PRIESTESS_LEVIAN:
+				{
+					if (memoState == 4)
+					{
+						htmltext = "30037-01.html";
+					}
+					else if (memoState == 5)
+					{
+						htmltext = "30037-03.html";
+					}
+					else if (memoState == 6)
+					{
+						takeItems(player, SINISTER_TOTEM, 1);
+						qs.setMemoState(7);
+						qs.setCond(7, true);
+						htmltext = "30037-04.html";
+					}
+					else if (memoState == 7)
+					{
+						htmltext = "30037-05.html";
+					}
+					break;
+				}
+				case PRIEST_ADONIUS:
+				{
+					if (memoState == 2)
+					{
+						htmltext = "30375-01.html";
+					}
+					else if (memoState == 3)
+					{
+						if (hasQuestItems(player, AGNESS_HOLY_SYMBOL, AGNESS_ROSARY))
+						{
+							takeItems(player, AGNESS_HOLY_SYMBOL, 1);
+							takeItems(player, AGNESS_ROSARY, 1);
+							qs.setMemoState(4);
+							qs.setCond(4, true);
+							htmltext = "30375-04.html";
+						}
+						else
+						{
+							htmltext = "30375-03.html";
+						}
+					}
+					else if (memoState == 4)
+					{
+						htmltext = "30375-05.html";
+					}
+					else if (memoState >= 5)
+					{
+						htmltext = "30375-06.html";
+					}
+					break;
+				}
+				case CHEST_OF_BIFRONS:
+				{
+					if (memoState == 5)
+					{
+						htmltext = "30989-01.html";
+					}
+					break;
+				}
+			}
+		}
+		else if (qs.isCompleted())
+		{
+			if (npc.getId() == GUARD_WEISZ)
+			{
+				htmltext = getAlreadyCompletedMsg(player);
+			}
+		}
+		return htmltext;
+	}
+}
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
index 9f4768a3c3..45f35b2724 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -292,6 +292,7 @@ import quests.Q00328_SenseForBusiness.Q00328_SenseForBusiness;
 import quests.Q00329_CuriosityOfADwarf.Q00329_CuriosityOfADwarf;
 import quests.Q00331_ArrowOfVengeance.Q00331_ArrowOfVengeance;
 import quests.Q00338_AlligatorHunter.Q00338_AlligatorHunter;
+import quests.Q00340_SubjugationOfLizardmen.Q00340_SubjugationOfLizardmen;
 import quests.Q00341_HuntingForWildBeasts.Q00341_HuntingForWildBeasts;
 import quests.Q00344_1000YearsTheEndOfLamentation.Q00344_1000YearsTheEndOfLamentation;
 import quests.Q00345_MethodToRaiseTheDead.Q00345_MethodToRaiseTheDead;
@@ -751,6 +752,7 @@ public class QuestMasterHandler
 		Q00329_CuriosityOfADwarf.class,
 		Q00331_ArrowOfVengeance.class,
 		Q00338_AlligatorHunter.class,
+		Q00340_SubjugationOfLizardmen.class,
 		Q00341_HuntingForWildBeasts.class,
 		Q00344_1000YearsTheEndOfLamentation.class,
 		Q00345_MethodToRaiseTheDead.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20150101update.sql b/L2J_DataPack/dist/sql/game/updates/20150101update.sql
new file mode 100644
index 0000000000..83eda2506c
--- /dev/null
+++ b/L2J_DataPack/dist/sql/game/updates/20150101update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00340_SubjugationOfLizardmen' WHERE name='340_SubjugationOfLizardmen'; 
\ No newline at end of file
-- 
GitLab