diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index bba68c160684ff7ff542ef6826194e3149e86f3f..9bd7dcfaae1753f7123d6bfc042d5f37fc116e75 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -614,7 +614,7 @@ quests/Q00644_GraveRobberAnnihilation/Q00644_GraveRobberAnnihilation.java
quests/Q00645_GhostsOfBatur/Q00645_GhostsOfBatur.java
quests/Q00646_SignsOfRevolt/Q00646_SignsOfRevolt.java
quests/Q00647_InfluxOfMachines/Q00647_InfluxOfMachines.java
-quests/648_AnIceMerchantsDream/__init__.py
+quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
quests/Q00649_ALooterAndARailroadMan/Q00649_ALooterAndARailroadMan.java
quests/Q00650_ABrokenDream/Q00650_ABrokenDream.java
quests/Q00651_RunawayYouth/Q00651_RunawayYouth.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-02.htm
deleted file mode 100644
index a1b77a50c0afc303a7393d046df76c61f453af8f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-02.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Rafforty:<br>
-Most of the creatures around here have a Black Ice Crystal in their bodies. It seems that the crystals make them very violent. We need to study those crystals. Bring me some and you'll be well-rewarded! Of course, you probably will not always get Black Ice Crystals, sometimes you will get Silver Ice Crystals. If you bring me these Silver Ice Crystals, I will also reward you. <br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-03.htm">"How do I get the Black Ice Crystals?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-05.htm
deleted file mode 100644
index 7f09c8a6fb28d31775431ff2c35c49b3e6c82f90..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-05.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Rafforty:<br>
-You look like you did something big outside. I can feel the unique energy of Ice Crystals coming from you! You have them, don't you? Don't you want to give it to me? I'll pay you well!<br><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-06.htm">"What's the reward?" </a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-08.htm">"I'll give it to you later." </a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-09.htm">"I want to quit doing this." </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-06.htm
deleted file mode 100644
index eea61cb2cc89e0a1bd36e8462b59fa49e3ee0334..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-06.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Rafforty:<br>
-Well, of course, I'll pay you with adena! You can use it anywhere! Are you willing to hand over the Black Ice Crystals to me? <br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-07.htm">"Here they are." </a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-08.htm">"I'll give them to you later." </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-07.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-07.htm
deleted file mode 100644
index 26f2985b4c8e41fcd44e4a399e25729436a80cc2..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-07.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Rafforty:<br>
-Here's your reward. This should compensate you for your hard work. If you find any more Ice Crystals, come back to see me again.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-10.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-10.htm
deleted file mode 100644
index c63bcc09702f4b808c1248fb4f05542001a01929..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-10.htm
+++ /dev/null
@@ -1,8 +0,0 @@
-<html><body>Rafforty:<br>
-Any success? You look exhausted, my friend!<br>
-I can feel the unique energy of Ice Crystals coming from you! Can I have them? I'll pay you well!<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-11.htm">"What's the reward?" </a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-08.htm">"I'll give it to you later."</a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-09.htm">"I quit."</a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-12.htm">"How do I use Silver Hemocytes?"</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-12.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-12.htm
deleted file mode 100644
index 34b16a6e9ac9f2a42b0ae6046c941aceac18564f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-12.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Rafforty:<br>
-The blood of the creatures that have been under the control of the Black Ice Crystal for a long time gradually changes to silver. The Ice Queen's pets are enticed by this blood, and we must have it for our plan as well. Please collect the Silver Hemocytes for us. The monsters in the Frozen Labyrinth that have Silver Hemocytes are the Massive Maze Bandersnatch, Panthera, Pronghorn, Ice Tarantula, Frost Tarantula, Frost Buffalo, Lost Buffalo, Ursus, Lost Yeti and Frost Yeti.<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-13.htm">"Tell me more about your plan."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-13.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-13.htm
deleted file mode 100644
index 85959de207b3d73862b13e6d345787a954aebaa5..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-13.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Rafforty:<br>
-Our Zinnia Guild's goal is to restore Queen Freya to her original self. First, we must eliminate the Ice Fairy Sirra, who is a major obstacle between us and our Queen.<br>
-If you want to join us, speak with <font color="LEVEL">Steward</font> at the <font color="LEVEL">Ice Queen's Castle</font>. And don't forget to bring your friends with you! When you go, take <font color="LEVEL">10 Silver Hemocytes</font> to him.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-00.htm
deleted file mode 100644
index dee35cf24bfc43a1b40178584a1b30af9ab37b9c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-00.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Ice Shelf:<br>
-What am I to do with this? What is important about it?
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-03.htm
deleted file mode 100644
index b192ccc920ba50e1dff12b67564cb8e4bb224c49..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-03.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Ice Shelf:<br>
-To work, then. Which tool should I use to begin?<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32023-04.htm"> Trim with a chisel.</a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32023-04.htm">Trim with a scraper. </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-04.htm
deleted file mode 100644
index f98dae8ea9361efab7da9f34c36d4c6d23f19681..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-04.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>
-Now it emits black light. Success is very near! There is but one step left to finish the project.<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32023-05.htm">Use the engraving knife. </a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32023-05.htm">Use the file. </a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/__init__.py
deleted file mode 100644
index 0a5a3124e025fac7e92c982b857a03642f01226f..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/__init__.py
+++ /dev/null
@@ -1,131 +0,0 @@
-# Made by Kerberos
-# this script is part of the Official L2J Datapack Project.
-# Visit http://www.l2jdp.com/forum/ for more details.
-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 = "648_AnIceMerchantsDream"
-
-#NPCs
-Rafforty = 32020
-Ice_Shelf = 32023
-
-#MOBs
-MOBS = range(22080,22095)+range(22096,22099)
-
-#Items
-Hemocyte = 8057
-Silver_Ice = 8077
-Black_Ice = 8078
-
-class Quest (JQuest) :
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
-
- def onEvent (self,event,st) :
- htmltext = event
- if event == "32020-02.htm" :
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- st.set("cond","1")
- elif event == "32020-07.htm" :
- silver = st.getQuestItemsCount(Silver_Ice)
- black = st.getQuestItemsCount(Black_Ice)
- r1 = silver * 300
- r2 = black * 1200
- reward = r1 + r2
- st.rewardItems(57,reward)
- st.takeItems(Silver_Ice,silver)
- st.takeItems(Black_Ice,black)
- elif event == "32020-09.htm" :
- st.exitQuest(1)
- st.playSound("ItemSound.quest_finish")
- elif event == "32023-04.htm" :
- st.playSound("ItemSound2.broken_key")
- st.takeItems(Silver_Ice,1)
- elif event == "32023-05.htm" :
- if self.getRandom(100) <= 25 :
- st.giveItems(Black_Ice,1)
- st.playSound("ItemSound3.sys_enchant_success")
- else:
- htmltext = "32023-06.htm"
- st.playSound("ItemSound3.sys_enchant_failed")
- return htmltext
-
- def onTalk (self,npc,player):
- st = player.getQuestState(qn)
- htmltext = Quest.getNoQuestMsg(player)
- if not st: return htmltext
- npcId = npc.getId()
- id = st.getState()
- cond = st.getInt("cond")
- silver = st.getQuestItemsCount(Silver_Ice)
- black = st.getQuestItemsCount(Black_Ice)
- if npcId == Rafforty :
- if id == State.CREATED :
- if player.getLevel() >= 53 :
- htmltext = "32020-01.htm"
- else :
- htmltext = "32020-00.htm"
- st.exitQuest(1)
- elif cond == 1:
- if silver or black :
- st2 = player.getQuestState("Q00115_TheOtherSideOfTruth")
- htmltext = "32020-05.htm"
- if st2 :
- if st2.getState() == State.COMPLETED :
- htmltext = "32020-10.htm"
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- else:
- htmltext = "32020-04.htm"
- elif cond == 2:
- if silver or black :
- htmltext = "32020-10.htm"
- else:
- htmltext = "32020-04a.htm"
- elif npcId == Ice_Shelf :
- if id == State.CREATED :
- htmltext = "32023-00.htm"
- else:
- if silver > 0 :
- htmltext = "32023-02.htm"
- else:
- htmltext = "32023-01.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- partyMember = self.getRandomPartyMemberState(player, State.STARTED)
- if not partyMember : return
- st = partyMember.getQuestState(qn)
- if st :
- chance = int((npc.getId() - 22050)*Config.RATE_QUEST_DROP)
- numItems, chance = divmod(chance,100)
- random = self.getRandom(100)
- if random <= chance:
- numItems += 1
- if int(numItems) != 0 :
- st.giveItems(Silver_Ice,int(numItems))
- st.playSound("ItemSound.quest_itemget")
- #solo part
- st = player.getQuestState(qn)
- if st:
- cond=st.getInt("cond")
- random = self.getRandom(100)
- if cond == 2 and random <=10:
- st.giveItems(Hemocyte,1)
- st.playSound("ItemSound.quest_itemget")
- return
-
-QUEST = Quest(648,qn,"An Ice Merchant's Dream")
-
-QUEST.addStartNpc(Rafforty)
-QUEST.addStartNpc(Ice_Shelf)
-QUEST.addTalkId(Rafforty)
-QUEST.addTalkId(Ice_Shelf)
-
-for m in MOBS:
- QUEST.addKillId(m)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-00.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-01.htm
similarity index 88%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-00.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-01.htm
index e6bbf0acae41bdbfe0e80b84918b3ffed76c2a8d..12c7a51c7a4598734049633d550fc18729d139df 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-00.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-01.htm
@@ -1,4 +1,4 @@
-<html><body>Rafforty:<br>
-I don't know how you got here, but you shouldn't be wandering around by yourself. You must leave this place before the Ice Queen finds out you're here! <br>
-(Characters must have achieved at least level 53 to undertake this quest.)
+<html><body>Rafforty:<br>
+I don't know how you got here, but you shouldn't be wandering around by yourself. You must leave this place before the Ice Queen finds out you're here!<br>
+(Characters must have achieved at least level 53 to undertake this quest.)
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b67f7781801981940840d73a0f246dfc83c8dd82
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-02.htm
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+Welcome! You've helped to give our Zinnia Guild a long-term goal. Honestly though, we could use some more help. Could you help us again? We'll give you reward, but I'm not sure if you'll be satisfied with it...<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream ACCEPT">I'll help you.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-03.htm
similarity index 59%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-03.htm
index 4309f7a23771100734d21735a388ac788c2cffff..dc49d6ea3586c615ed45f7ecfe8e402349cfa87a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-03.htm
@@ -1,4 +1,4 @@
-<html><body>Rafforty:<br>
-Why are you here? Well, since you're here anyway, why you take a little rest and then help us out?<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-02.htm">"What can I do for you?"</a>
+<html><body>Rafforty:<br>
+Why are you here? Well, since you're here anyway, why you take a little rest and then help us out?<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream ACCEPT">What can I do for you?</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-04.htm
new file mode 100644
index 0000000000000000000000000000000000000000..ca52ff82dae99f4065012ff40c0244818dc921c3
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-04.htm
@@ -0,0 +1,4 @@
+<html><body>Repre:<br>
+I'm saying that the lifeforms in this area for the most part have something called Black Ice Crystals inside their bodies. The crystals cause the creatures to become violent, which is why there are a few hunters collecting the crystals for research. If you collect some for them, you'll get a pretty decent reward. Of course, most of the time, you'll find a Silver Ice Crystal rather than a Black Ice Crystal. But even if you bring back some Silver Ice Crystals, you'll still get a reward.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-07.html">"How do I obtain Black Ice Crystals?"</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-05.htm
new file mode 100644
index 0000000000000000000000000000000000000000..08cabf32412f7af7be4f4f620e2eeb173d9610b0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-05.htm
@@ -0,0 +1,8 @@
+<html><body>Rafforty:<br>
+Thank you for your help.<br>
+According to the information we acquired from you, to turn Freya back into her old self, we have to collect Ice Crystals that are spread all over this territory and which are grown within creatures' bodies.<br>
+They usually have a silver color, and that's why they're called Silver Ice Crystals. If you can bring these back to me, I will reward you for your work. And, I know it will be even more difficult to get Black Ice Crystals, but if you bring those back to me, I will reward you even more.<br>
+Oh, yes! And if you ever find any Silver Hemocytes, don't throw them away.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-06.html">How do I get a Black Ice Crystal?</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-08.html">Where do I use Silver Hemocytes?</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..31a6fd6af45de0086aa10bbbfeba01e5c0852b22
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-06.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+A Black Ice Crystal can be made out of a Silver Ice Crystal by using the tools on the shelf. Generally, Artisans do this, so it is not easy, but if you can make it into a Black Ice Crystal, then I'll reward you well. Failure will bring you nothing, so be careful.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-07.html
similarity index 84%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-03.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-07.html
index 255a6f9eaa5d5c66e18243e46cae5e2f0fd05f96..996289dd9b894ca53be236ee1a12fbedbebaf05a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-03.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-07.html
@@ -1,4 +1,4 @@
-<html><body>Rafforty:<br>
-You may get a Black Ice Crystal by processing a Silver Ice Crystal using the tools on the shelf. It won't be easy, as it is a job usually done only by professional craftsmen. If you succeed in creating the Black Ice Crystal, I'll pay you very well for it. Be careful, however, because failure won't pay you a thing. <br>
-If you were to stay around for a while we might could work out a deal...
+<html><body>Rafforty:<br>
+You may get a Black Ice Crystal by processing a Silver Ice Crystal using the tools on the shelf. It won't be easy, as it is a job usually done only by professional craftsmen. If you succeed in creating the Black Ice Crystal, I'll pay you very well for it. Be careful, however, because failure won't pay you a thing.<br>
+If you were to stay around for a while we might could work out a deal...
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..46bfcf7a84c4b0fb93aaf5e820c25ec9fdad48db
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-08.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+The blood of the creatures that have been under the control of the Black Ice Crystal for a long time gradually changes to silver. The Ice Queen's pets are enticed by this blood, and we must have it for our plan as well. Please collect the Silver Hemocytes for us. The monsters in the Frozen Labyrinth that have Silver Hemocytes are the Massive Maze Bandersnatch, Panthera, Pronghorn, Ice Tarantula, Frost Tarantula, Frost Buffalo, Lost Buffalo, Ursus, Lost Yeti and Frost Yeti.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-09.html">"Tell me more about your plan."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..fe44a89ad7390e964b0d2beec862dda15b8e9a3d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-09.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+As part of the Jinia Guild's goal to restore Queen Freya to her original self, we needed Silver Hemocytes to enter the Ice Queen's Castle. Now that Ice Fairy Sirra has been defeated and we've entered the next stage in our plan... that is to say, fight Freya herself... we no longer need you to bring Silver Hemocytes to the castle. However, when you're strong enough, come back and talk to me about the Guild's new plans regarding Freya.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-10.html
similarity index 74%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-10.html
index 42ae302d4b51cdad96098d968a55928685c2f04f..4f8b1f23c50cb0b7e5351515ddcbfe02f25c7fe3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-10.html
@@ -1,4 +1,4 @@
-<html><body>Rafforty:<br>
-Haven't you left yet? I'm telling you again, most of the creatures around here have a Black Ice Crystal in their bodies! It seems like those crystals make them very violent. We need to study those crystals. Bring me some and you'll be well-rewarded! Of course, you probably won't get a Black Ice Crystal at first. You'll get a Silver Ice Crystal. Bring me some Silver Ice Crystals and I'll reward you for them, too. <br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-03.htm">"How do I get the Black Ice Crystals?"</a>
+<html><body>Rafforty:<br>
+Haven't you left yet? I'm telling you again, most of the creatures around here have a Black Ice Crystal in their bodies! It seems like those crystals make them very violent. We need to study those crystals. Bring me some and you'll be well-rewarded! Of course, you probably won't get a Black Ice Crystal at first. You'll get a Silver Ice Crystal. Bring me some Silver Ice Crystals and I'll reward you for them, too.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-07.html">How do I get the Black Ice Crystals?</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04a.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-11.html
similarity index 67%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04a.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-11.html
index d6c11c3e16d10dda3d9bc533d1f810519d42f2fe..56e4b31b7b7634d81a57f76d186a3ed268b4bb8e 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-04a.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-11.html
@@ -1,6 +1,6 @@
-<html><body>Rafforty:<br>
-It's dangerous outside, so please be careful! I'm telling you, most of the creatures living in the Frozen Labyrinth have a Silver Ice Crystal in their bodies. Bring me these crystals and you'll be well-rewarded. Black Ice Crystals are quite rare, but if you find one and bring it back to me, you'll be rewarded even more!<br>
-Oh, by the way... If you ever get any Silver Hemocytes, don't throw them away.<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-03.htm">"How do I get Black Ice Crystals?"</a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-12.htm">"Where do I use Silver Hemocytes?"</a>
+<html><body>Rafforty:<br>
+It's dangerous outside, so please be careful! I'm telling you, most of the creatures living in the Frozen Labyrinth have a Silver Ice Crystal in their bodies. Bring me these crystals and you'll be well-rewarded. Black Ice Crystals are quite rare, but if you find one and bring it back to me, you'll be rewarded even more!<br>
+Oh, by the way... If you ever get any Silver Hemocytes, don't throw them away.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-06.html">How do I get Black Ice Crystals?</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-08.html">Where do I use Silver Hemocytes?</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-12.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-12.html
new file mode 100644
index 0000000000000000000000000000000000000000..767e7110df5dda2c4d4aa2f9f83776469860f205
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-12.html
@@ -0,0 +1,6 @@
+<html><body>Rafforty:<br>
+You look like you did something big outside. I can feel the unique energy of Ice Crystals coming from you! You have them, don't you? Don't you want to give it to me? I'll pay you well!<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream ASK">What's the reward?</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream LATER">I'll give it to you later.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream QUIT">I want to quit doing this.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-13.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-13.html
new file mode 100644
index 0000000000000000000000000000000000000000..dc08705e461e06c9a18162a0cc94e52b031f2b64
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-13.html
@@ -0,0 +1,8 @@
+<html><body>Rafforty:<br>
+Any success? You look exhausted, my friend!<br>
+I can feel the unique energy of Ice Crystals coming from you! Can I have them? I'll pay you well!<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream ASK">What's the reward?</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream LATER">I'll give it to you later.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream QUIT">I quit.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-08.html">How do I use Silver Hemocytes?</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-14.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-14.html
new file mode 100644
index 0000000000000000000000000000000000000000..75d671d1d006fa050cea35f98528f54ba1752222
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-14.html
@@ -0,0 +1,5 @@
+<html><body>Rafforty:<br>
+Well, of course, I'll pay you with Adena! You can use it anywhere! Are you willing to hand over the Black Ice Crystals to me?<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REWARD">Here they are.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream LATER">I'll give them to you later.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-11.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-15.html
similarity index 52%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-11.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-15.html
index 93d6f7603d1f77d6aa7109f7797224de122ef1a7..c0ed267ccd1d3452b471b092bb9a8abd0ab4552d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-11.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-15.html
@@ -1,7 +1,7 @@
-<html><body>Rafforty:<br>
-Yes. Then will you give the Ice Crystals to me? <br>
-Ah! How would you like be paid? Do you want Adena for it all? Or perhaps you'd like to trade for some other items? I must warn you, however... If you want good materials, you'd better have lots of Ice Crystals.<br><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-07.htm">"Give me money." </a><br>
-<a action="bypass -h npc_%objectId%_multisell 648">"Show me the items."</a><br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32020-08.htm">"I changed my mind. I'll do it later."</a>
+<html><body>Rafforty:<br>
+Yes. Then will you give the Ice Crystals to me?<br>
+Ah! How would you like be paid? Do you want Adena for it all? Or perhaps you'd like to trade for some other items? I must warn you, however... If you want good materials, you'd better have lots of Ice Crystals.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REWARD">Give me money.</a><br>
+<a action="bypass -h npc_%objectId%_multisell 648">"Show me the items."</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream LATER">I changed my mind. I'll do it later.</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-16.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-16.html
new file mode 100644
index 0000000000000000000000000000000000000000..724549975a7b52efa8755800a861f9a7ea74b215
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-16.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Here's your reward. This should compensate you for your hard work. If you find any more Ice Crystals, come back to see me again.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-17.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-17.html
new file mode 100644
index 0000000000000000000000000000000000000000..a9852ac4b6e2a3fe27b7072a4e4bd117803ef1a0
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-17.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Here, I've filled this full of Adena for you. If you find more Ice Crystals, please bring them to me.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-18.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-18.html
new file mode 100644
index 0000000000000000000000000000000000000000..44a3de5858ee40a5968f719f322855d0a708a5f2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-18.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Where did you put the crystals? There's nothing in this pouch.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-08.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-19.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-08.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-19.html
index 2386da674e3db3d38bed886a624796fa35f101ab..2fbf327b08bd49dc515e253260930e75c42d3a18 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-08.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-19.html
@@ -1,3 +1,3 @@
-<html><body>Rafforty:<br>
-OK. If you change your mind, please come back and find me.
+<html><body>Rafforty:<br>
+OK. If you change your mind, please come back and find me.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-20.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-20.html
new file mode 100644
index 0000000000000000000000000000000000000000..22dfc0c02e87f5b747e58f4d62c3640c7bbdef0c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-20.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Very well. You know how important those crystals are to us, so I'll wait. Please, be careful!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-09.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-21.html
similarity index 97%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-09.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-21.html
index c6090cf8c0aa4f97ea40cced8795aa3174e169a5..05bcdd137d73783403922ebd2451e86df070fd0a 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32020-09.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-21.html
@@ -1,3 +1,3 @@
-<html><body>Rafforty:<br>
-OK. I won't do any more business with you. Good-bye.
+<html><body>Rafforty:<br>
+OK. I won't do any more business with you. Good-bye.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-22.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-22.html
new file mode 100644
index 0000000000000000000000000000000000000000..a26cbaba860b38e50908a70c4e41cf9a0deabdde
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-22.html
@@ -0,0 +1,4 @@
+<html><body>Rafforty:<br>
+Are you really quitting? Is something bothering you?<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32020-23.html">I just need a rest.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-23.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-23.html
new file mode 100644
index 0000000000000000000000000000000000000000..5c6bb957606228bd9eb50484653d660aa3530c4a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32020-23.html
@@ -0,0 +1,3 @@
+<html><body>Rafforty:<br>
+Very well! You've been a lot of help to us! Come back anytime!
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..300cb3c898516c24b5446dcbc8ff4aceb84da71f
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-01.html
@@ -0,0 +1,3 @@
+<html><body>Ice Shelf:<br>
+What am I to do with this? What is important about it?
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-02.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-01.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-02.html
index d9c3531fbb3b58044ab52eddd55522fe4a8f0e62..98a74a3cc8854cf3fb5efb5a51a118c1b9e6cf3b 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-01.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-02.html
@@ -1,3 +1,3 @@
-<html><body>Ice Shelf:<br>
-The ice shards on the shelf indicate that it was used quite recently. Hm...are these shards from the Silver Ice Crystal that Rafforty spoke of?
+<html><body>Ice Shelf:<br>
+The ice shards on the shelf indicate that it was used quite recently. Hm...are these shards from the Silver Ice Crystal that Rafforty spoke of?
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-03.html
similarity index 61%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-02.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-03.html
index f712b10a90793284087af1ef8fc708d0c9f55b6c..e40730c4f2e82177ec5366216b3e617a813514b4 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-02.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-03.html
@@ -1,5 +1,5 @@
-<html><body>Ice Shelf:<br>
-It is obvious from looking at this shelf that someone has been using it as a workbench. I have the Silver Ice Crystal...I wonder if it would be reasonable to work on it here? <br>
-Here are some old tools on the shelf I can use.<br>
-<a action="bypass -h Quest 648_AnIceMerchantsDream 32023-03.htm">Start working </a>
+<html><body>Ice Shelf:<br>
+It is obvious from looking at this shelf that someone has been using it as a workbench. I have the Silver Ice Crystal...I wonder if it would be reasonable to work on it here?<br>
+Here are some old tools on the shelf I can use.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32023-04.html">Start working</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..ec9394f30f0dc561164f049ad0cc673cef22b1b4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-04.html
@@ -0,0 +1,5 @@
+<html><body>Ice Shelf:<br>
+To work, then. Which tool should I use to begin?<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32023-05.html">Trim with a chisel.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream 32023-06.html">Trim with a scraper.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..a9552356dfb2a92eb05722883a153904fae1f251
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-05.html
@@ -0,0 +1,5 @@
+<html><body>Ice Shelf:<br>
+Now it emits black light. Success is very near! There is but one step left to finish the project.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY4">Use the engraving knife.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY5">Use the file.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-06.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-06.html
new file mode 100644
index 0000000000000000000000000000000000000000..a9552356dfb2a92eb05722883a153904fae1f251
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-06.html
@@ -0,0 +1,5 @@
+<html><body>Ice Shelf:<br>
+Now it emits black light. Success is very near! There is but one step left to finish the project.<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY4">Use the engraving knife.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY5">Use the file.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-05.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-07.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-05.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-07.html
index 73c0b1e18e8acd7a67f90d84c31cb007adbc079e..d1ff743f0ae5a2e4f2304f3199c1721593a2b467 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-05.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-07.html
@@ -1,3 +1,3 @@
-<html><body>Ice Shelf:<br>
-I have completed the Black Ice Crystal, and its black light appears to absorb all the light around it. Success!
+<html><body>Ice Shelf:<br>
+I have completed the Black Ice Crystal, and its black light appears to absorb all the light around it. Success!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-06.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-08.html
similarity index 98%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-06.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-08.html
index c1b9974169f334d771f764fb817e6c5861972894..db602b889c30582e4b6de610020ef19234447707 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/648_AnIceMerchantsDream/32023-06.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-08.html
@@ -1,3 +1,3 @@
-<html><body>Ice Shelf:<br>
-Alas! It was all for nothing because of a minor mistake. The tools were not as easy to use as I had thought. It was all a waste of crystals.
+<html><body>Ice Shelf:<br>
+Alas! It was all for nothing because of a minor mistake. The tools were not as easy to use as I had thought. It was all a waste of crystals.
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-09.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-09.html
new file mode 100644
index 0000000000000000000000000000000000000000..46cb598244fc76f6508a367d8434b7e6523be11e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/32023-09.html
@@ -0,0 +1,5 @@
+<html><body>Ice Shelf:<br>
+Now to apply the finishing touches. What implement should I use?<br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY4">Use an engraving knife.</a><br>
+<a action="bypass -h Quest Q00648_AnIceMerchantsDream REPLY5">Use a file.</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
new file mode 100644
index 0000000000000000000000000000000000000000..de933008411271fd35afea6ce39b769410e61509
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00648_AnIceMerchantsDream/Q00648_AnIceMerchantsDream.java
@@ -0,0 +1,379 @@
+/*
+ * 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.Q00648_AnIceMerchantsDream;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import quests.Q00115_TheOtherSideOfTruth.Q00115_TheOtherSideOfTruth;
+
+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;
+
+/**
+ * An Ice Merchant's Dream (648)
+ * @author netvirus, Adry_85
+ */
+public final class Q00648_AnIceMerchantsDream extends Quest
+{
+ private static class DropInfo
+ {
+ private final double _firstChance;
+ private final double _secondChance;
+
+ public DropInfo(double firstChance, double secondChance)
+ {
+ _firstChance = firstChance;
+ _secondChance = secondChance;
+ }
+
+ public double getFirstChance()
+ {
+ return _firstChance;
+ }
+
+ public double getSecondChance()
+ {
+ return _secondChance;
+ }
+ }
+
+ // NPCs
+ private static final int RAFFORTY = 32020;
+ private static final int ICE_SHELF = 32023;
+ // Items
+ private static final int SILVER_HEMOCYTE = 8057;
+ private static final int SILVER_ICE_CRYSTAL = 8077;
+ private static final int BLACK_ICE_CRYSTAL = 8078;
+ // Misc
+ private static final int MIN_LVL = 53;
+ // Monsters
+ private static final Map<Integer, DropInfo> MONSTERS = new HashMap<>();
+ static
+ {
+ MONSTERS.put(22080, new DropInfo(0.285, 0.048)); // Massive Maze Bandersnatch
+ MONSTERS.put(22081, new DropInfo(0.443, 0.0)); // Lost Watcher
+ MONSTERS.put(22082, new DropInfo(0.510, 0.0)); // Elder Lost Watcher
+ MONSTERS.put(22083, new DropInfo(0.477, 0.049)); // Baby Panthera
+ MONSTERS.put(22084, new DropInfo(0.477, 0.049)); // Panthera
+ MONSTERS.put(22085, new DropInfo(0.420, 0.043)); // Lost Gargoyle
+ MONSTERS.put(22086, new DropInfo(0.490, 0.050)); // Lost Gargoyle Youngling
+ MONSTERS.put(22087, new DropInfo(0.787, 0.081)); // Pronghorn Spirit
+ MONSTERS.put(22088, new DropInfo(0.480, 0.049)); // Pronghorn
+ MONSTERS.put(22089, new DropInfo(0.550, 0.056)); // Ice Tarantula
+ MONSTERS.put(22090, new DropInfo(0.570, 0.058)); // Frost Tarantula
+ MONSTERS.put(22091, new DropInfo(0.623, 0.0)); // Lost Iron Golem
+ MONSTERS.put(22092, new DropInfo(0.623, 0.0)); // Frost Iron Golem
+ MONSTERS.put(22093, new DropInfo(0.910, 0.093)); // Lost Buffalo
+ MONSTERS.put(22094, new DropInfo(0.553, 0.057)); // Frost Buffalo
+ MONSTERS.put(22095, new DropInfo(0.593, 0.061)); // Ursus Cub
+ MONSTERS.put(22096, new DropInfo(0.593, 0.061)); // Ursus
+ MONSTERS.put(22097, new DropInfo(0.693, 0.071)); // Lost Yeti
+ MONSTERS.put(22098, new DropInfo(0.717, 0.074)); // Frost Yeti
+ }
+
+ private Q00648_AnIceMerchantsDream()
+ {
+ super(648, Q00648_AnIceMerchantsDream.class.getSimpleName(), "An Ice Merchants Dream");
+ addStartNpc(RAFFORTY);
+ addTalkId(RAFFORTY, ICE_SHELF);
+ addKillId(MONSTERS.keySet());
+ registerQuestItems(SILVER_HEMOCYTE, SILVER_ICE_CRYSTAL, BLACK_ICE_CRYSTAL);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, false);
+ final QuestState q115 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
+ if (st == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "ACCEPT":
+ {
+ st.startQuest();
+ if ((q115 != null) && (q115.isCompleted()))
+ {
+ htmltext = "32020-04.htm";
+ }
+ else
+ {
+ st.setCond(2);
+ htmltext = "32020-05.htm";
+ }
+ break;
+ }
+ case "ASK":
+ {
+ if (st.getCond() >= 1)
+ {
+ htmltext = ((q115 != null) && !q115.isCompleted()) ? "32020-14.html" : "32020-15.html";
+ }
+ break;
+ }
+ case "LATER":
+ {
+ if (st.getCond() >= 1)
+ {
+ htmltext = ((q115 != null) && !q115.isCompleted()) ? "32020-19.html" : "32020-20.html";
+ }
+ break;
+ }
+ case "REWARD":
+ {
+ if (st.getCond() >= 1)
+ {
+ final long silverCryCount = getQuestItemsCount(player, SILVER_ICE_CRYSTAL);
+ final long blackCryCount = getQuestItemsCount(player, BLACK_ICE_CRYSTAL);
+ if ((silverCryCount + blackCryCount) > 0)
+ {
+ giveAdena(player, (silverCryCount * 300) + (blackCryCount * 1200), true);
+ takeItems(player, -1, SILVER_ICE_CRYSTAL, BLACK_ICE_CRYSTAL);
+ htmltext = ((q115 != null) && !q115.isCompleted()) ? "32020-16.html" : "32020-17.html";
+ }
+ else
+ {
+ htmltext = "32020-18.html";
+ }
+ }
+ break;
+ }
+ case "QUIT":
+ {
+ if (st.getCond() >= 1)
+ {
+ if ((q115 != null) && !q115.isCompleted())
+ {
+ htmltext = "32020-21.html";
+ st.exitQuest(true, true);
+ }
+ else
+ {
+ htmltext = "32020-22.html";
+ }
+ }
+ break;
+ }
+ case "32020-06.html":
+ case "32020-07.html":
+ case "32020-08.html":
+ case "32020-09.html":
+ {
+ if (st.getCond() >= 1)
+ {
+ htmltext = event;
+ }
+ break;
+ }
+ case "32020-23.html":
+ {
+ if (st.getCond() >= 1)
+ {
+ st.exitQuest(true, true);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32023-04.html":
+ {
+ if ((st.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (st.getInt("ex") == 0))
+ {
+ st.set("ex", ((getRandom(4) + 1) * 10));
+ htmltext = event;
+ }
+ break;
+ }
+ case "32023-05.html":
+ {
+ if ((st.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (st.getInt("ex") > 0))
+ {
+ takeItems(player, SILVER_ICE_CRYSTAL, 1);
+ int val = (st.getInt("ex") + 1);
+ st.set("ex", val);
+ playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
+ htmltext = event;
+ }
+ break;
+ }
+ case "32023-06.html":
+ {
+ if ((st.getCond() >= 1) && hasQuestItems(player, SILVER_ICE_CRYSTAL) && (st.getInt("ex") > 0))
+ {
+ takeItems(player, SILVER_ICE_CRYSTAL, 1);
+ int val = (st.getInt("ex") + 2);
+ st.set("ex", val);
+ playSound(player, QuestSound.ITEMSOUND_BROKEN_KEY);
+ htmltext = event;
+ }
+ break;
+ }
+ case "REPLY4":
+ {
+ if ((st.getCond() >= 1) && (st.getInt("ex") > 0))
+ {
+ int ex = st.getInt("ex");
+ int val1 = ex / 10;
+ int val2 = ex - (val1 * 10);
+ if (val1 == val2)
+ {
+ htmltext = "32023-07.html";
+ giveItems(player, BLACK_ICE_CRYSTAL, 1);
+ playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS);
+ }
+ else
+ {
+ htmltext = "32023-08.html";
+ playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED);
+ }
+ st.set("ex", 0);
+ }
+ break;
+ }
+ case "REPLY5":
+ {
+ if ((st.getCond() >= 1) && (st.getInt("ex") > 0))
+ {
+ int ex = st.getInt("ex");
+ int val1 = ex / 10;
+ int val2 = ((ex - (val1 * 10)) + 2);
+ if (val1 == val2)
+ {
+ htmltext = "32023-07.html";
+ giveItems(player, BLACK_ICE_CRYSTAL, 1);
+ playSound(player, QuestSound.ITEMSOUND_ENCHANT_SUCCESS);
+ }
+ else
+ {
+ htmltext = "32023-08.html";
+ playSound(player, QuestSound.ITEMSOUND_ENCHANT_FAILED);
+ }
+ st.set("ex", 0);
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState st = getRandomPartyMemberState(killer, -1, 3, npc);
+ if (st != null)
+ {
+ final DropInfo info = MONSTERS.get(npc.getId());
+ if (st.getCond() >= 1)
+ {
+ giveItemRandomly(st.getPlayer(), npc, SILVER_ICE_CRYSTAL, 1, 0, info.getFirstChance(), true);
+ }
+
+ final QuestState st2 = st.getPlayer().getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
+ if ((st.getCond() >= 2) && (st2 != null) && st2.isCompleted())
+ {
+ giveItemRandomly(st.getPlayer(), npc, SILVER_HEMOCYTE, 1, 0, info.getSecondChance(), true);
+ }
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ final QuestState st = getQuestState(player, true);
+ final QuestState st2 = player.getQuestState(Q00115_TheOtherSideOfTruth.class.getSimpleName());
+ String htmltext = getNoQuestMsg(player);
+ switch (npc.getId())
+ {
+ case RAFFORTY:
+ {
+ if (st.isCreated())
+ {
+ if (player.getLevel() < MIN_LVL)
+ {
+ htmltext = "32020-01.htm";
+ }
+ else
+ {
+ htmltext = ((st2 != null) && (st2.isCompleted())) ? "32020-02.htm" : "32020-03.htm";
+ }
+ }
+ else if (st.isStarted())
+ {
+ final long hasQuestItems = getQuestItemsCount(player, SILVER_ICE_CRYSTAL, BLACK_ICE_CRYSTAL);
+ if ((st2 != null) && st2.isCompleted())
+ {
+ htmltext = (hasQuestItems > 0) ? "32020-13.html" : "32020-11.html";
+ if (st.isCond(1))
+ {
+ st.setCond(2, true);
+ }
+ }
+ else
+ {
+ htmltext = (hasQuestItems > 0) ? "32020-12.html" : "32020-10.html";
+ }
+ }
+ break;
+ }
+ case ICE_SHELF:
+ {
+ // TODO: In High Five this quest have an updated reward system.
+ if (st.isStarted())
+ {
+ if (hasQuestItems(player, SILVER_ICE_CRYSTAL))
+ {
+ final int val = st.getInt("ex") % 10;
+ if (val == 0)
+ {
+ htmltext = "32023-03.html";
+ st.set("ex", 0);
+ }
+ else
+ {
+ htmltext = "32023-09.html";
+ }
+ }
+ else
+ {
+ htmltext = "32023-02.html";
+ }
+ }
+ else
+ {
+ htmltext = "32023-01.html";
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00648_AnIceMerchantsDream();
+ }
+}
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20140110update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20140110update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f73a88f6e05de3b62293705ea55e25e054392d14
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20140110update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00648_AnIceMerchantsDream' WHERE name='648_AnIceMerchantsDream';
\ No newline at end of file