diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 238441472f968be910ababe017d3dcea887f39ea..f84d377330b73afb800e6cefbf4983bd456fa489 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -463,9 +463,9 @@ quests/Q00288_HandleWithCare/Q00288_HandleWithCare.java
quests/Q00289_NoMoreSoupForYou/Q00289_NoMoreSoupForYou.java
quests/Q00290_ThreatRemoval/Q00290_ThreatRemoval.java
quests/Q00291_RevengeOfTheRedbonnet/Q00291_RevengeOfTheRedbonnet.java
-quests/292_CrushBrigands/__init__.py
+quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
quests/Q00293_TheHiddenVeins/Q00293_TheHiddenVeins.java
-quests/294_CovertBusiness/__init__.py
+quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
quests/295_DreamsOfFlight/__init__.py
quests/296_SilkOfTarantula/__init__.py
quests/Q00297_GatekeepersFavor/Q00297_GatekeepersFavor.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-01.htm
deleted file mode 100644
index b3b3a839da89d97a8c7ce8bb992bdb797f09d04b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-01.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Elder Balanki:<br>
-I heard you work for the Golden Wheel Guild ... Is this true?<br>
-Oh ... I see. Young friend, let me give you a piece of advice. Spiron is only taking advantage of you. That mean old man is only interested in generating profits for his guild!<br>
-Even if you should get hurt or run into trouble while carrying out guild business, don't expect Spiron to help you. He'll only argue that that wasn't in the contract.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/__init__.py
deleted file mode 100644
index 50e8de529dcaf66ca16ecc8acbdfe926dd40d371..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/__init__.py
+++ /dev/null
@@ -1,128 +0,0 @@
-# Made by Mr. Have fun! Version 0.2
-import sys
-from com.l2jserver import Config
-from com.l2jserver.gameserver.model.quest import State
-from com.l2jserver.gameserver.model.quest import QuestState
-from com.l2jserver.gameserver.model.quest import Quest as JQuest
-
-qn = "292_CrushBrigands"
-
-GOBLIN_NECKLACE = 1483
-GOBLIN_PENDANT = 1484
-GOBLIN_LORD_PENDANT = 1485
-SUSPICIOUS_MEMO = 1486
-SUSPICIOUS_CONTRACT = 1487
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [GOBLIN_NECKLACE, GOBLIN_PENDANT, GOBLIN_LORD_PENDANT, SUSPICIOUS_CONTRACT, SUSPICIOUS_MEMO]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "30532-03.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30532-06.htm" :
- st.takeItems(SUSPICIOUS_MEMO,-1)
- 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 npcId != 30532 and id != State.STARTED : return htmltext
-
- if id == State.CREATED :
- st.set("cond","0")
- if npcId == 30532 :
- if st.getInt("cond")==0 :
- if player.getRace().ordinal() != 4 :
- htmltext = "30532-00.htm"
- st.exitQuest(1)
- elif player.getLevel() >= 5 :
- htmltext = "30532-02.htm"
- return htmltext
- else:
- htmltext = "30532-01.htm"
- st.exitQuest(1)
- else :
- neckl=st.getQuestItemsCount(GOBLIN_NECKLACE)
- penda=st.getQuestItemsCount(GOBLIN_PENDANT)
- lordp=st.getQuestItemsCount(GOBLIN_LORD_PENDANT)
- smemo=st.getQuestItemsCount(SUSPICIOUS_MEMO)
- scont=st.getQuestItemsCount(SUSPICIOUS_CONTRACT)
- if neckl==penda==lordp==smemo==scont==0 :
- htmltext = "30532-04.htm"
- else :
- st.takeItems(GOBLIN_NECKLACE,-1)
- st.takeItems(GOBLIN_PENDANT,-1)
- st.takeItems(GOBLIN_LORD_PENDANT,-1)
- if scont == 0 :
- if smemo == 1 :
- htmltext = "30532-08.htm"
- elif smemo >= 2 :
- htmltext = "30532-09.htm"
- else :
- htmltext = "30532-05.htm"
- else :
- htmltext = "30532-10.htm"
- st.takeItems(SUSPICIOUS_CONTRACT,-1)
- st.giveItems(57,12*neckl+36*penda+33*lordp+100*scont)
- elif npcId == 30533 :
- if st.getQuestItemsCount(SUSPICIOUS_CONTRACT)==0 :
- htmltext = "30533-01.htm"
- else :
- htmltext = "30533-02.htm"
- st.giveItems(57,st.getQuestItemsCount(SUSPICIOUS_CONTRACT)*120)
- st.takeItems(SUSPICIOUS_CONTRACT,-1)
- 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()
- if npcId in [20322, 20323]: item = GOBLIN_NECKLACE
- if npcId in [20324, 20327]: item = GOBLIN_PENDANT
- if npcId == 20528 : item = GOBLIN_LORD_PENDANT
- if st.getInt("cond") :
- n = self.getRandom(10)
- if n > 5 :
- st.giveItems(item,1)
- st.playSound("ItemSound.quest_itemget")
- elif n > 4 :
- if st.getQuestItemsCount(SUSPICIOUS_CONTRACT) == 0 :
- if st.getQuestItemsCount(SUSPICIOUS_MEMO) < 3 :
- st.giveItems(SUSPICIOUS_MEMO,1)
- st.playSound("ItemSound.quest_itemget")
- else :
- st.giveItems(SUSPICIOUS_CONTRACT,1)
- st.takeItems(SUSPICIOUS_MEMO,-1)
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- return
-
-QUEST = Quest(292,qn,"Crush Brigands")
-
-QUEST.addStartNpc(30532)
-
-QUEST.addTalkId(30532)
-
-QUEST.addTalkId(30533)
-
-QUEST.addKillId(20322)
-QUEST.addKillId(20323)
-QUEST.addKillId(20324)
-QUEST.addKillId(20327)
-QUEST.addKillId(20528)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/__init__.py
deleted file mode 100644
index 3543364a0cb2f7f0525e5629b8fcebba4a8e9df5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/__init__.py
+++ /dev/null
@@ -1,95 +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 = "294_CovertBusiness"
-
-BAT_FANG = 1491
-RING_OF_RACCOON = 1508
-ADENA = 57
-DROP = {
-20480:[[6,10,1],[3,6,2],[0,3,3]],
-20370:[[7,10,1],[4,7,2],[2,4,3],[0,2,4]]
-}
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [BAT_FANG]
-
- def onAdvEvent (self,event,npc, player) :
- htmltext = event
- st = player.getQuestState(qn)
- if not st : return
- if event == "30534-03.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- npcId = npc.getId()
- id = st.getState()
- if id == State.CREATED :
- st.set("cond","0")
- if st.getInt("cond")==0 :
- if player.getRace().ordinal() != 4 :
- htmltext = "30534-00.htm"
- st.exitQuest(1)
- elif player.getLevel() >= 10 :
- htmltext = "30534-02.htm"
- else:
- htmltext = "30534-01.htm"
- st.exitQuest(1)
- else:
- if st.getQuestItemsCount(BAT_FANG)<100 :
- htmltext = "30534-04.htm"
- else :
- if st.getQuestItemsCount(RING_OF_RACCOON) ==0 :
- htmltext = "30534-05.htm"
- st.giveItems(RING_OF_RACCOON,1)
- else :
- htmltext = "30534-06.htm"
- st.giveItems(ADENA,2400)
- st.addExpAndSp(0,600)
- st.takeItems(BAT_FANG,-1)
- st.exitQuest(1)
- st.playSound("ItemSound.quest_finish")
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
-
- if st.getInt("cond") == 1:
- npcId = npc.getId()
- count=st.getQuestItemsCount(BAT_FANG)
- chance = self.getRandom(10)
- for i in DROP[npcId]:
- if i[0]<=chance<i[1]:
- qty=i[2]
- if count+qty>100 :
- qty=100-count
- if count+qty==100:
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- else :
- st.playSound("ItemSound.quest_itemget")
- st.giveItems(BAT_FANG,qty)
- return
-
-QUEST = Quest(294,qn,"Covert Business")
-
-QUEST.addStartNpc(30534)
-
-QUEST.addTalkId(30534)
-
-QUEST.addKillId(20370)
-QUEST.addKillId(20480)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-00.htm
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-00.htm
index d479b174befa9f1e541e63a363e2a294ff8a864a..639aa0aec673db19a189f7ae92d6c20af26d65f9 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-00.htm
@@ -1,4 +1,4 @@
-<html><body>Elder Spiron:<br>
-Young stranger of a foreign race, you wish to help me? I appreciate the thought, but ... I cannot entrust guild business to an outsider.<br>
-(Quest for Dwarven characters.)
+<html><body>Elder Spiron:<br>
+Young stranger of a foreign race, you wish to help me? I appreciate the thought, but ... I cannot entrust guild business to an outsider.<br>
+(Quest for Dwarven characters.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-01.htm
similarity index 86%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-01.htm
index 9b67f2866a73804025f9e4d1a5a5f089a8bc01e0..efda5fc3a3b155709680ccf3f4cb0ee027bf42f5 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-01.htm
@@ -1,5 +1,5 @@
-<html><body>Elder Spiron:<br>
-Business is bad these days because of the<font color="LEVEL"> Goblin brigands</font>. The goblins have become so bold that they attack freight wagons now!<br>
-Just last week, a wagon belonging to our guild was attacked by the goblin brigands. I am thinking of addressing this brigand issue next month at the Guild Association Elder Council ... But I can't wait that long ... I need to do something about this ...<br>
-(Quest for Dwarven characters level 5 and above.)
+<html><body>Elder Spiron:<br>
+Business is bad these days because of the <font color="LEVEL">goblin brigands</font>. The goblins have become so bold that they attack freight wagons now!<br>
+Just last week, a wagon belonging to our guild was attacked by the goblin brigands. I am thinking of addressing this brigand issue next month at the Guild Association Elder Council ... But I can't wait that long ... I need to do something about this ...<br>
+(Quest for Dwarven characters level 5 and above.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-02.htm
similarity index 52%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-02.htm
index a3c11bd2dfa63582683c3247999218cd0a21359f..2ea49796217c5b80666cf5c5c5a24a98dba28f7b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-02.htm
@@ -1,6 +1,6 @@
-<html><body>Elder Spiron:<br>
-Business is bad these days because of the<font color="LEVEL"> goblin brigands</font>. The goblins have become so bold that they attack freight wagons now!<br>
-The our guild has been taking great losses lately, because only our wagons are being attacked. I am thinking of addressing this brigand issue next month at the Guild Association Elder Council ... But I can't wait that long ...<br>
-So, I need to ask you a favor ... Would you like to work for me? If you work for our glorious Golden Wheel Guild, your friends and colleagues will respect you even more. Oh, and of course I will reward you based on your work. Nothing is free for Dwarves. What do you think? Will you give it a try?<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-03.htm">Say you want to be a talented Dwarf</a>
+<html><body>Elder Spiron:<br>
+Business is bad these days because of the <font color="LEVEL">goblin brigands</font>. The goblins have become so bold that they attack freight wagons now!<br>
+Our guild has been taking great losses lately because our wagons are being attacked. I am thinking of addressing this brigand issue next month at the Guild Association Elder Council ... But I can't wait that long ...<br>
+So, I need to ask you a favor ... Would you like to work for me? If you work for our glorious Golden Wheel Guild, your friends and colleagues will respect you even more. Oh, and of course I will reward you based on your work. Nothing is free for Dwarves. What do you think? Will you give it a try?<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-03.htm">Say you want to be a talented Dwarf.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-03.htm
similarity index 54%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-03.htm
index 1a80d1a31d084c82f0e22a9b89ef023f6a28ca78..5ba086610910e54b9caef677023a839af20f0708 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-03.htm
@@ -1,5 +1,5 @@
-<html><body>Elder Spiron:<br>
-Very well! Now let me give you the details Your job is to wipe out the insolent goblins that have been attacking our Guild freight wagons. Of course, I could hire guard escorts, but under these circumstances I cannot trust anyone except for my guild members ...<br>
-In the interest of good business, I need proof of your qualifications. All goblins wear<font color="LEVEL"> necklaces that represent their rank</font>, so collect them and bring them to me. I will reward you based on the number and type of necklaces that you bring. That means, if you bring necklaces that belong to high-ranking goblins, I will reward you even more, understood?<br>
-Now! Leave at once! Time is money!
+<html><body>Elder Spiron:<br>
+Very well! Now let me give you the details. Your job is to wipe out the insolent goblins that have been attacking our Guild freight wagons. Of course, I could hire guard escorts, but under these circumstances I cannot trust anyone except for my guild members.<br>
+In the interest of good business, I need proof of your qualifications. All goblins wear <font color="LEVEL">necklaces that represent their rank</font>, so collect them and bring them to me. I will reward you based on the number and type of necklaces that you bring. That means, if you bring necklaces that belong to high-ranking goblins, I will reward you even more, understood?<br>
+Now! Leave at once! Time is money!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-04.html
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-04.html
index 74535babf5acdc5a1fa2a7e7329393d22617643b..e6cb5aa28d7a3df829a63eb3e46e8ba5bfd89764 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-04.html
@@ -1,7 +1,7 @@
-<html><body>Elder Spiron:<br>
-Why have you returned empty handed? Don't tell me that you've forgotten what your job is.<br>
-Given the urgency of the situation, let me tell you one more time! Your job is to punish the insolent goblins that are interrupting our guild's trade.<font color="LEVEL"> Defeat the goblins and bring their necklaces as proof.</font> I will reward you based on the number and type of necklaces that you bring.<br>
-Now! Leave at once! Time is money!<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-07.htm">Say you will continue</a>
+<html><body>Elder Spiron:<br>
+Why have you returned empty handed? Don't tell me that you've forgotten what your job is.<br>
+Given the urgency of the situation, let me tell you one more time! Your job is to punish the insolent goblins that are interrupting our guild's trade. <font color="LEVEL">Defeat the goblins and bring their necklaces as proof.</font> I will reward you based on the number and type of necklaces that you bring.<br>
+Now! Leave at once! Time is money!<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-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/292_CrushBrigands/30532-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-05.html
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-05.html
index fe787801e3b37111266582bcdc7005021f825685..7f8313f6d7c88ecefcbae2a659bd75741443bf59 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-05.html
@@ -1,6 +1,6 @@
-<html><body>Elder Spiron:<br>
-Welcome back! So you have taken care of the insolent goblins that interfered with our business! Now I'll finally get a good night's sleep! Of course, we need to work very hard to cover last month's loss ... Whew ...<br>
-Anyway, you have done well! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Thanks to your efforts, the insolent brigands have been taught a lesson, but I am still worried ... A freight wagon is departing for Shootguart tonight ... Would you do me another favor?<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-07.htm">Say you will continue</a>
+<html><body>Elder Spiron:<br>
+Welcome back! So you have taken care of the insolent goblins that interfered with our business! Now I'll finally get a good night's sleep! Of course, we need to work very hard to cover last month's loss ... Whew ...<br>
+Anyway, you have done well! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Thanks to your efforts, the insolent brigands have been taught a lesson, but I am still worried ... A freight wagon is departing for Shootguart tonight ... Would you do me another favor?<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-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/292_CrushBrigands/30532-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-06.html
similarity index 99%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-06.html
index 0e047881a482c97fda043dde7e44d8499249d724..fd901e0ebfa5b17a650f2c49ced0a8f636e34480 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-06.html
@@ -1,4 +1,4 @@
-<html><body>Elder Spiron:<br>
-You want to quit? Why? It's not because you think the reward isn't enough, is it? People may say that I'm stingy, but upon my word I always treat those who work for our guild very well.<br>
-You should think again, young friend! You can broaden your experience, while making money. Don't miss this opportunity!
+<html><body>Elder Spiron:<br>
+You want to quit? Why? It's not because you think the reward isn't enough, is it? People may say that I'm stingy, but upon my word I always treat those who work for our guild very well.<br>
+You should think again, young friend! You can broaden your experience, while making money. Don't miss this opportunity!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-07.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-07.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-07.html
index 12fb765616d7d6727ec42b61123d5170cb568ef7..8a9428c2a72bd70d3e0a5148bc24991d8c873b58 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-07.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-07.html
@@ -1,3 +1,3 @@
-<html><body>Elder Spiron:<br>
-Please carry on then! It is thanks to earnest youngsters like you that the business of our Dwarven Guilds flourishes!
+<html><body>Elder Spiron:<br>
+Please carry on then! It is thanks to earnest youngsters like you that the business of our Dwarven Guilds flourishes!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-08.html
similarity index 61%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-08.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-08.html
index a1d8f3ed260bb421b43f1d58e783445f7d41eea1..1467eca5ef5d0b6dc01850f4b30c6974dee14fb2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-08.html
@@ -1,7 +1,7 @@
-<html><body>Elder Spiron:<br>
-Well done! As promised, I will reward you based on the number and types of necklaces you have brought after killing the goblins. What are these memos ...? This paper is used by Dwarven Guilds when writing<font color="LEVEL"> official documents</font> ... Also, the handwriting is Dwarvish ...<br>
-This means those insolent goblins were in<font color="LEVEL"> secret communication</font> with one of us Dwarves ...! How can this be ...! This must be a plot by one of the other guilds to destroy our business!<br>
-Look here, my friend.<font color="LEVEL"> Please find rest of these memos!</font> That's the only way to reveal the truth behind this secret plot! I'll give you more than enough reward, never you worry about that!<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-07.htm">Say you will continue</a>
+<html><body>Elder Spiron:<br>
+Well done! As promised, I will reward you based on the number and types of necklaces you have brought after killing the goblins. What are these memos ...? This paper is used by Dwarven Guilds when writing <font color="LEVEL">official documents</font> ... Also, the handwriting is Dwarvish ...<br>
+This means those insolent goblins were in <font color="LEVEL">secret communication</font> with one of us Dwarves ...! How can this be ...! This must be a plot by one of the other guilds to destroy our business!<br>
+Look here, my friend. <font color="LEVEL">Please find rest of these memos!</font> That's the only way to reveal the truth behind this secret plot! I'll give you more than enough reward, never you worry about that!<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-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/292_CrushBrigands/30532-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-09.html
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-09.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-09.html
index aeb50e576ad89929d213a4fb240304c2af74dca4..487569e13d1283623774a7768ecc91dc6b3d4fba 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-09.html
@@ -1,6 +1,6 @@
-<html><body>Elder Spiron:<br>
-Well done! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Have you found the rest of the suspicious memos?<br>
-Please help me out once more, my friend! You know that you are the only one I can trust. I must find the rest of the memos and find out who is trying to destroy our Guild!<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-07.htm">Say you will continue</a>
+<html><body>Elder Spiron:<br>
+Well done! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Have you found the rest of the Suspicious Memos?<br>
+Please help me out once more, my friend! You know that you are the only one I can trust. I must find the rest of the memos and find out who is trying to destroy our Guild!<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-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/292_CrushBrigands/30532-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-10.html
similarity index 77%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-10.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-10.html
index 79ed1b3be118e41806897475e496fd327b20536c..c110c197bb75c25ba3408ed485d739b0e969b7ec 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30532-10.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30532-10.html
@@ -1,8 +1,8 @@
-<html><body>Elder Spiron:<br>
-Well done! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Their spirits must be significantly deflated!<br>
-What is this, a contract ...? This is the suspicious memos all combined! Let me see ... Hmm ... Yes ... As I thought ...<font color="LEVEL">The goblins were hired by the Silver Scale Guild.</font> I can't believe Balanki would hatch such a bold plot ... Well, I must do something!<br>
-Going straight to the Guild Elder Council is not much fun ... I think meeting Balanki and coming to a mutual agreement is better! I finally have his weak point ... He must pay a high price for his actions!<br>
-Thanks to you, I have obtained valuable information. Since I am a fair Dwarf, I will reward you additionally for your unexpected achievement. Many thanks for your troubles!<br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-06.htm">Say you will quit</a><br>
-<a action="bypass -h Quest 292_CrushBrigands 30532-07.htm">Say you will continue</a>
+<html><body>Elder Spiron:<br>
+Well done! As promised, I will reward you based on the number and type of necklaces you have brought after killing the goblins. Their spirits must be significantly deflated!<br>
+What is this, a Contract ...? This is the Suspicious Memos all combined! Let me see ... Hmm ... Yes ... As I thought ...<font color="LEVEL">The goblins were hired by the Silver Scale Guild.</font> I can't believe Balanki would hatch such a bold plot ... Well, I must do something!<br>
+Going straight to the Guild Elder Council is not much fun ... I think meeting Balanki and coming to a mutual agreement is better! I finally have his weak point ... He must pay a high price for his actions!<br>
+Thanks to you, I have obtained valuable information. Since I am a fair Dwarf, I will reward you additionally for your unexpected achievement. Many thanks for your troubles!<br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-06.html">Say you will quit</a><br>
+<a action="bypass -h Quest Q00292_BrigandsSweep 30532-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/Q00292_BrigandsSweep/30533-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30533-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..c8b2f6736fad5e62d63b9dfaa8d445d464f316cf
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30533-01.html
@@ -0,0 +1,5 @@
+<html><body>Elder Balanki:<br>
+I've heard that you work for the Golden Wheel Guild ... Is this true?<br>
+Young friend, let me give you a piece of advice. Spiron is only taking advantage of you. That mean old man is only interested in generating profits for his guild!<br>
+If you should ever get hurt or run into trouble while carrying out guild business, don't expect Spiron to help you. He'll only argue that your demise wasn't in the original deal or contract.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30533-02.html
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30533-02.html
index 2ace526cdda9d8f365e512b05b3e511f29e5aaae..55dc5536f0175554aadeae3587acdc8ba438b06e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/292_CrushBrigands/30533-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/30533-02.html
@@ -1,6 +1,6 @@
-<html><body>Elder Balanki:<br>
-Aren't you Spiron's messenger? What business do you have with me? Hmm? What is this contract?<br>
-Oh no. Those goblins ...! I told them to tear this contract to pieces and throw it away ... This puts me in quite a difficult situation ... However ... Why did you bring this contract to me?<br>
-Oh ... Now I understand ... If I give you the proper price, you will forget about this contract, right? You are as cunning as that old man ... Ok. Is this enough? Not enough? Now, this should be enough. You are a greedy one ...<br>
-Give me the contract now! I will throw this into the brazier in the forge tonight ...!
+<html><body>Elder Balanki:<br>
+Aren't you Spiron's messenger? What business do you have with me? Hmm? What is this Contract?<br>
+Oh no. Those goblins ...! I told them to tear this Contract to pieces and throw it away ... This puts me in quite a difficult situation ... However ... Why did you bring this Contract to me?<br>
+Oh ... Now I understand ... If I give you the proper price, you will forget about this Contract, right? You are as cunning as that old man ... Ok. Is this enough? Not enough? Now, this should be enough. You are a greedy one ...<br>
+Give me the Contract now! I will throw this into the brazier in the forge tonight ...!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
new file mode 100644
index 0000000000000000000000000000000000000000..8b7dad51528d08417c46b48e8fcac5cd97a776c0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00292_BrigandsSweep/Q00292_BrigandsSweep.java
@@ -0,0 +1,233 @@
+/*
+ * 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.Q00292_BrigandsSweep;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.PcRace;
+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.model.quest.State;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Brigands Sweep (292)
+ * @author xban1x
+ */
+public final class Q00292_BrigandsSweep extends Quest
+{
+ // NPC's
+ private static final int SPIRON = 30532;
+ private static final int BALANKI = 30533;
+ // Items
+ private static final int GOBLIN_NECKLACE = 1483;
+ private static final int GOBLIN_PENDANT = 1484;
+ private static final int GOBLIN_LORD_PENDANT = 1485;
+ private static final int SUSPICIOUS_MEMO = 1486;
+ private static final int SUSPICIOUS_CONTRACT = 1487;
+ // Monsters
+ private static final Map<Integer, Integer> MOB_ITEM_DROP = new HashMap<>();
+ static
+ {
+ MOB_ITEM_DROP.put(20322, GOBLIN_NECKLACE); // Goblin Brigand
+ MOB_ITEM_DROP.put(20323, GOBLIN_PENDANT); // Goblin Brigand Leader
+ MOB_ITEM_DROP.put(20324, GOBLIN_NECKLACE); // Goblin Brigand Lieutenant
+ MOB_ITEM_DROP.put(20327, GOBLIN_NECKLACE); // Goblin Snooper
+ MOB_ITEM_DROP.put(20528, GOBLIN_LORD_PENDANT); // Goblin Lord
+ }
+ // Misc
+ private static final int MIN_LVL = 5;
+
+ private Q00292_BrigandsSweep()
+ {
+ super(292, Q00292_BrigandsSweep.class.getSimpleName(), "Brigands Sweep");
+ addStartNpc(SPIRON);
+ addTalkId(SPIRON, BALANKI);
+ addKillId(MOB_ITEM_DROP.keySet());
+ registerQuestItems(GOBLIN_NECKLACE, GOBLIN_PENDANT, GOBLIN_LORD_PENDANT, SUSPICIOUS_MEMO, SUSPICIOUS_CONTRACT);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ String html = null;
+ if (qs == null)
+ {
+ return html;
+ }
+
+ switch (event)
+ {
+ case "30532-03.htm":
+ {
+ if (qs.isCreated())
+ {
+ qs.startQuest();
+ html = event;
+ }
+ break;
+ }
+ case "30532-06.html":
+ {
+ if (qs.isStarted())
+ {
+ qs.exitQuest(true, true);
+ html = event;
+ }
+ break;
+ }
+ case "30532-07.html":
+ {
+ if (qs.isStarted())
+ {
+ html = event;
+ }
+ break;
+ }
+ }
+ return html;
+ }
+
+ @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))
+ {
+ final int chance = getRandom(10);
+ if (chance > 5)
+ {
+ giveItemRandomly(killer, npc, MOB_ITEM_DROP.get(npc.getId()), 1, 0, 1.0, true);
+ }
+ else if (qs.isCond(1) && (chance > 4) && !hasQuestItems(killer, SUSPICIOUS_CONTRACT))
+ {
+ final long memos = getQuestItemsCount(killer, SUSPICIOUS_MEMO);
+ if (memos < 3)
+ {
+ if (giveItemRandomly(killer, npc, SUSPICIOUS_MEMO, 1, 3, 1.0, false))
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ giveItems(killer, SUSPICIOUS_CONTRACT, 1);
+ takeItems(killer, SUSPICIOUS_MEMO, -1);
+ qs.setCond(2, true);
+ }
+ else
+ {
+ playSound(killer, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+ }
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState qs = getQuestState(talker, true);
+ String html = getNoQuestMsg(talker);
+ switch (npc.getId())
+ {
+ case SPIRON:
+ {
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ html = (talker.getRace() == PcRace.Dwarf) ? (talker.getLevel() >= MIN_LVL) ? "30532-02.htm" : "30532-01.htm" : "30532-00.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ if (!hasAtLeastOneQuestItem(talker, getRegisteredItemIds()))
+ {
+ html = "30532-04.html";
+ }
+ else
+ {
+ final long necklaces = getQuestItemsCount(talker, GOBLIN_NECKLACE);
+ final long pendants = getQuestItemsCount(talker, GOBLIN_PENDANT);
+ final long lordPendants = getQuestItemsCount(talker, GOBLIN_LORD_PENDANT);
+ final long sum = necklaces + pendants + lordPendants;
+ if (sum > 0)
+ {
+ giveAdena(talker, (necklaces * 12) + (pendants * 36) + (lordPendants * 33) + (sum >= 10 ? 1000 : 0), true);
+ takeItems(talker, -1, GOBLIN_NECKLACE, GOBLIN_PENDANT, GOBLIN_LORD_PENDANT);
+ }
+ if ((sum > 0) && !hasAtLeastOneQuestItem(talker, SUSPICIOUS_MEMO, SUSPICIOUS_CONTRACT))
+ {
+ html = "30532-05.html";
+ }
+ else
+ {
+ final long memos = getQuestItemsCount(talker, SUSPICIOUS_MEMO);
+ if ((memos == 0) && hasQuestItems(talker, SUSPICIOUS_CONTRACT))
+ {
+ giveAdena(talker, 1120, true);
+ takeItems(talker, -1, SUSPICIOUS_CONTRACT); // Retail like, reward is given in 2 pieces if both conditions are meet.
+ html = "30523-10.html";
+ }
+ else
+ {
+ if (memos == 1)
+ {
+ html = "30523-08.html";
+ }
+ else if (memos >= 2)
+ {
+ html = "30523-09.html";
+ }
+ }
+ }
+ }
+ }
+ }
+ break;
+ }
+ case BALANKI:
+ {
+ if (qs.isStarted())
+ {
+ if (hasQuestItems(talker, SUSPICIOUS_CONTRACT))
+ {
+ giveAdena(talker, 620, true);
+ takeItems(talker, 1487, -1);
+ html = "30533-02.html";
+ }
+ else
+ {
+ html = "30533-01.html";
+ }
+ }
+ break;
+ }
+ }
+ return html;
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00292_BrigandsSweep();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-00.htm
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-00.htm
index 99d07085125b14bd5d028398c1a00c378dcfb555..7a0b47454555fcbf8fcc157440027347983421b6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-00.htm
@@ -1,4 +1,4 @@
-<html><body>Elder Keef:<br>
-You want work? It's true that we are overloaded at the moment, but according to guild rules, I cannot entrust any work to an outsider. I am sorry.<br>
-(Quest for Dwarven characters.)
+<html><body>Elder Keef:<br>
+You want work? It's true that we are overloaded at the moment, but according to guild rules, I cannot entrust any work to an outsider. I am sorry.<br>
+(Quest for Dwarven characters.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-01.htm
similarity index 60%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-01.htm
index 0aa01bfae9a8fb62b81128ed0cc3aa8e2f707e48..0d54d1283abb12d9189f893946c16b2dde64df69 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-01.htm
@@ -1,5 +1,5 @@
-<html><body>Elder Keef:<br>
-As you know, the<font color="LEVEL"> Bronze Key Guild</font> travels the continent collecting rare materials. We received a request, and I'm looking for a person with the right qualification to manage the assignment.<br>
-I'm in urgent need of a person, but I can't give this job to just anybody in off the street ... It's hard to find reliable help these days. Do you have any friends for this job? Someone diligent, and responsible, and that can keep a secret.<br>
-(Quest for Dwarven characters level 10 and above.)
+<html><body>Elder Keef:<br>
+As you know, the <font color="LEVEL"> Bronze Key Guild</font> travels the continent collecting rare materials. We received a request, and I'm looking for a person with the right qualification to manage the assignment.<br>
+I'm in urgent need of a person, but I can't give this job to just anybody in off the street ... It's hard to find reliable help these days. Do you have any friends for this job? Someone diligent, and responsible, and that can keep a secret.<br>
+(Quest for Dwarven characters level 10 and above.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-02.htm
similarity index 63%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-02.htm
index bd1768fa913f3188a37d2291acdf37a531492fcd..c5cea9c87ccfc84ae6fc179c9730deafa0677b07 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-02.htm
@@ -1,6 +1,6 @@
-<html><body>Elder Keef:<br>
-As you know, the<font color="LEVEL"> Bronze Key Guild</font> travels the continent collecting rare materials. We received a request, and I'm looking for a person with the right qualifications to manage the assignment.<br>
-I'm in urgent need of a person, but I can't give this job to just anybody in off the street ... It's hard to find reliable help these days.<br>
-But it seems like I can trust you. I am a good judge of character. I can tell what a person is like at a single glance. Let me see your eyes ... You do your work in silence no matter what others may think about it ... You seem to be that kind of person ... What do you think? Am I right? I want to give you a task. How does that sound? You want to give it a try?<br>
-<a action="bypass -h Quest 294_CovertBusiness 30534-03.htm">Say you will take the task</a>
+<html><body>Elder Keef:<br>
+As you know, the <font color="LEVEL"> Bronze Key Guild</font> travels the continent collecting rare materials. We received a request, and I'm looking for a person with the right qualifications to manage the assignment.<br>
+I'm in urgent need of a person, but I can't give this job to just anybody in off the street ... It's hard to find reliable help these days.<br>
+But it seems like I can trust you. I am a good judge of character. I can tell what a person is like at a single glance. Let me see your eyes ... You do your work in silence no matter what others may think about it ... You seem to be that kind of person ... What do you think? Am I right? I want to give you a task. How does that sound? You want to give it a try?<br>
+<a action="bypass -h Quest Q00294_CovertBusiness 30534-03.htm">Say you will take the task</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-03.htm
similarity index 55%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-03.htm
index 7b67744b5761ab398253b406fa3c04e658544faa..7bd08eac0ddd060832aeb0cc62908fae99766a81 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-03.htm
@@ -1,5 +1,5 @@
-<html><body>Elder Keef:<br>
-Your job is to collect bat fangs. While wandering the Spine Mine Field, you will often see<font color="LEVEL"> blade bats</font> and<font color="LEVEL"> barbed bats</font>. You will hunt them and bring me their<font color="LEVEL"> fangs</font>. You need to collect exactly<font color="LEVEL"> 100</font> fangs.<br>
-I don't know what such an odd material is used for, but all we need to do is find the items that our clients want. Our guild members should be able to bring anything, even dragon scales, to our clients. That's our belief.<br>
-There's one thing I don't really like about this quest ... the client is<font color="LEVEL"> Hardin</font>, who has been branded as a black magician by the Humans. Things could become complicated if anyone finds out that our Guild is dealing with such a notorious person ... I hope you won't talk to anyone else about this. Do you understand what I'm saying?<br>
+<html><body>Elder Keef:<br>
+Your job is to collect Bat Fangs. While wandering west of the Mine Field, you will often see <font color="LEVEL">blade bats</font> and <font color="LEVEL">barbed bats</font>. You will hunt them and bring me their <font color="LEVEL">fangs</font>. You need to collect exactly <font color="LEVEL">100</font> fangs.<br>
+I don't know what such an odd material is used for, but all we need to do is find the items that our clients want. Our guild members should be able to bring anything, even dragon scales, to our clients. That's our belief.<br>
+There's one thing I don't really like about this quest ... the client is <font color="LEVEL">Hardin</font>, who has been branded as a black magician by the Humans. Things could become complicated if anyone finds out that our Guild is dealing with such a notorious person ... I hope you won't talk to anyone else about this. Do you understand what I'm saying?
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-04.html
similarity index 78%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-04.html
index 4a88db83794c74c3dc588a2ab71c89d3e70a7604..4bbf37e905bf0915d16e59afc4a228de6ec712d4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-04.html
@@ -1,3 +1,3 @@
-<html><body>Elder Keef:<br>
-I don't want you to come back here until the quest is complete. It is not good for us to be seen together. Come back when you have<font color="LEVEL"> 100 bat fangs</font>!
+<html><body>Elder Keef:<br>
+I don't want you to come back here until the quest is complete. It is not good for us to be seen together. Come back when you have <font color="LEVEL">100 Bat Fangs</font>!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-05.html
similarity index 81%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-05.html
index d521396ca1cc15beb05f420ec0666ab7bad43d29..dbbbad6b11f72721f54b13fac5abb9d25e2119f6 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-05.html
@@ -1,4 +1,4 @@
-<html><body>Elder Keef:<br>
-You've done well, my friend. You have brought me 100 bat fangs. Magnificent! I can send these to<font color="LEVEL"> Hardin's Academy</font> by this week's wagon. I will give you this ring for your work on behalf of the Bronze Key Guild. This token signifies that our Guild trusts you.<br>
-Actually, I had a cup of tea with Hardin few days ago. Contrary to the rumors, he was a well-mannered, pleasant person. Having a business relationship with such a person is actually investing in the future. We never know when we'll be put into a tight spot, just like when we were attacked by Orcs before ... We need to have few solid allies as a simple precaution, don't you think?
+<html><body>Elder Keef:<br>
+You've done well, my friend. You have brought me 100 Bat Fangs. Magnificent! I can send these to <font color="LEVEL">Hardin's Academy</font> by this week's wagon. I will give you this ring for your work on behalf of the Bronze Key Guild. This token signifies that our Guild trusts you.<br>
+Actually, I had a cup of tea with Hardin few days ago. Contrary to the rumors, he was a well-mannered, pleasant person. Having a business relationship with such a person is actually investing in the future. We never know when we'll be put into a tight spot, just like when we were attacked by Orcs before ... We need to have few solid allies as a simple precaution, don't you think?
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-06.html
similarity index 82%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-06.html
index 701fb98590ea68c4e2effae5ba96879fa5b3a681..73915507c686ea998973e7e23d76a35664ad157e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/294_CovertBusiness/30534-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/30534-06.html
@@ -1,4 +1,4 @@
-<html><body>Elder Keef:<br>
-You've done well, my friend. You have brought me 100 bat fangs. Magnificent! I can send these to<font color="LEVEL"> Hardin's Academy</font> by this week's wagon. As promised, I will reward you for your hard work. This should be enough, no? Our guild's rule is to give appropriate rewards to those who have worked for us.<br>
-Actually, I had a cup of tea with Hardin few days ago. Contrary to the rumors, he was a well-mannered, pleasant person. Having a business relationship with such a person is actually investing in the future. We never know when we'll be put into a tight spot, just like when we were attacked by Orcs before ... We need to have few solid allies as a simple precaution, don't you think?
+<html><body>Elder Keef:<br>
+You've done well, my friend. You have brought me 100 Bat Fangs. Magnificent! I can send these to <font color="LEVEL">Hardin's Academy</font> by this week's wagon. As promised, I will reward you for your hard work. This should be enough, no? Our guild's rule is to give appropriate rewards to those who have worked for us.<br>
+Actually, I had a cup of tea with Hardin few days ago. Contrary to the rumors, he was a well-mannered, pleasant person. Having a business relationship with such a person is actually investing in the future. We never know when we'll be put into a tight spot, just like when we were attacked by Orcs before ... We need to have few solid allies as a simple precaution, don't you think?
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
new file mode 100644
index 0000000000000000000000000000000000000000..9ed2f4b48ea4665fe140179629739021fc0b52c1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00294_CovertBusiness/Q00294_CovertBusiness.java
@@ -0,0 +1,138 @@
+/*
+ * 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.Q00294_CovertBusiness;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.l2jserver.gameserver.enums.PcRace;
+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;
+
+/**
+ * Covert Business (294)
+ * @author xban1x
+ */
+public final class Q00294_CovertBusiness extends Quest
+{
+ // NPC
+ private static final int KEEF = 30534;
+ // Item
+ private static final int BAT_FANG = 1491;
+ // Monsters
+ private static final Map<Integer, List<Integer>> MONSTER_DROP_CHANCE = new HashMap<>();
+ static
+ {
+ MONSTER_DROP_CHANCE.put(20370, Arrays.asList(6, 3, 1, -1));
+ MONSTER_DROP_CHANCE.put(20480, Arrays.asList(5, 2, -1));
+ }
+ // Reward
+ private static final int RING_OF_RACCOON = 1508;
+ // Misc
+ private static final int MIN_LVL = 10;
+
+ private Q00294_CovertBusiness()
+ {
+ super(294, Q00294_CovertBusiness.class.getSimpleName(), "Covert Business");
+ addStartNpc(KEEF);
+ addTalkId(KEEF);
+ addKillId(MONSTER_DROP_CHANCE.keySet());
+ registerQuestItems(BAT_FANG);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if ((qs != null) && qs.isCreated() && event.equals("30534-03.htm"))
+ {
+ qs.startQuest();
+ return event;
+ }
+ return null;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+ if ((qs != null) && qs.isCond(1) && Util.checkIfInRange(1500, npc, killer, true))
+ {
+ final int chance = getRandom(10);
+ int count = 0;
+ for (int i : MONSTER_DROP_CHANCE.get(npc.getId()))
+ {
+ count++;
+ if (chance > i)
+ {
+ if (giveItemRandomly(killer, npc, BAT_FANG, count, 100, 1.0, true))
+ {
+ qs.setCond(2);
+ }
+ break;
+ }
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState qs = getQuestState(talker, true);
+ String html = getNoQuestMsg(talker);
+ if (qs.isCreated())
+ {
+ html = (talker.getRace() == PcRace.Dwarf) ? (talker.getLevel() >= MIN_LVL) ? "30534-02.htm" : "30534-01.htm" : "30534-00.htm";
+ }
+ else if (qs.isStarted())
+ {
+ if (qs.isCond(2))
+ {
+ if (hasQuestItems(talker, RING_OF_RACCOON))
+ {
+ giveAdena(talker, 2400, true);
+ html = "30534-06.html";
+ }
+ else
+ {
+ giveItems(talker, RING_OF_RACCOON, 1);
+ html = "30534-05.html";
+ }
+ addExpAndSp(talker, 0, 600);
+ qs.exitQuest(true, true);
+ }
+ else
+ {
+ html = "30534-04.html";
+ }
+ }
+ return html;
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00294_CovertBusiness();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140320update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140320update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..8631d6d4991db668d4aed0b009a0f347970bd2e6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140320update.sql
@@ -0,0 +1,2 @@
+UPDATE character_quests SET name='Q00292_BrigandsSweep' WHERE name='292_CrushBrigands';
+UPDATE character_quests SET name='Q00294_CovertBusiness' WHERE name='294_CovertBusiness';
\ No newline at end of file