diff --git a/L2J_DataPack_BETA/dist/game/data/scripts.cfg b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
index 12ab8441bad1e08af10c63da85ff3b01123c3051..a039dac29d3a70a749de811d9d939fba7510f4f8 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts.cfg
+++ b/L2J_DataPack_BETA/dist/game/data/scripts.cfg
@@ -589,7 +589,7 @@ quests/Q00617_GatherTheFlames/Q00617_GatherTheFlames.java
quests/Q00618_IntoTheFlame/Q00618_IntoTheFlame.java
quests/Q00619_RelicsOfTheOldEmpire/Q00619_RelicsOfTheOldEmpire.java
quests/620_FourGoblets/__init__.py
-quests/621_EggDelivery/__init__.py
+quests/Q00621_EggDelivery/Q00621_EggDelivery.java
quests/622_DeliveryOfSpecialLiquor/__init__.py
quests/623_TheFinestFood/__init__.py
quests/Q00624_TheFinestIngredientsPart1/Q00624_TheFinestIngredientsPart1.java
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-0.htm
deleted file mode 100644
index 1d7a5af74c6de1fa8fa282d1e20a590cc65d485c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-0.htm
+++ /dev/null
@@ -1,6 +0,0 @@
-<html><body>Chef Jeremy:<br>
-You look like you could use a few extra adena...<br>
-Well I'm looking for a helper! You'll earn an honest wage around here, that's for sure!<br>
-All you have to do is take these hard-boiled eggs to my customers. Their names are already written on them. Deliver them quickly, and who knows? I might teach you a secret cooking technique! Ha!<br>
-<a action="bypass -h Quest 621_EggDelivery 31521-1.htm">I'll deliver your eggs.</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-1.htm
deleted file mode 100644
index b1b9bcf47f2bd22930c12c85f1756202cac9790a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-1.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Chef Jeremy:<br>
-Take these hard-boiled eggs to my customers at the hot springs resort.<br>
-Everyone likes their eggs done a different way. You must deliver them in the order!<br>
-Look at the note I gave you for details, and don't ever forget our motto, "The Customer Always Comes First"!
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-2.htm
deleted file mode 100644
index 17a85679d1f6f65dab17f6bab518a9c88146490b..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-2.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Chef Jeremy:<br>
-OK, OK!<br>
-Did Did you?<br>
-<a action="bypass -h Quest 621_EggDelivery 31521-3.htm">"I completed the delivery."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-4.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-4.htm
deleted file mode 100644
index fa16294a31bb254b0007abf863acefdbbecd15f0..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-4.htm
+++ /dev/null
@@ -1,3 +0,0 @@
-<html><body>Jeremy:<br>
-Hey, what are you doing here? you should've visited Valentine in the Town of Goddard. I don't have any adena to give you.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-0.htm
deleted file mode 100644
index c79f317ac2a485071140e5972a4501e9c9a05a1c..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-0.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Pulin:<br>I'm starving! When will that eggman get here?<br>
-<a action="bypass -h Quest 621_EggDelivery 31543-1.htm">I've got some boiled eggs for you.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-1.htm
deleted file mode 100644
index b7455a5d3f2c8d5e739868dc04f810be02d9789a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31543-1.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Pulin:<br>Woohoo!<br>Yummy! There's nothing like a nice boiled egg at the hot springs!<br>I could eat a thousand of these!<br>Oh, thank you for the eggs! Here's your money. I know you are busy, so leave now. There are many places you must be, but here is not one of them.</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-0.htm
deleted file mode 100644
index 12b56a02279df6d27764675c19357f1f510a8f6d..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-0.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Naff:<br>Oh, that feels great! If only I had some boiled eggs to go with it!<br>
-<a action="bypass -h Quest 621_EggDelivery 31544-1.htm">I have some boiled eggs for you!</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-1.htm
deleted file mode 100644
index e8d36a5ecf6ac8462b99ff2f693834563d550bcb..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31544-1.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Naff:<br>Wow, this is great!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-0.htm
deleted file mode 100644
index 09368dc2669866dd40e0df68346e58e629fc7ce3..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-0.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Crocus:<br>The hot springs just aren't the same without hard boiled eggs! Do you have any eggs? Do you?!<br>
-<a action="bypass -h Quest 621_EggDelivery 31545-1.htm">I've got your eggs right here.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-1.htm
deleted file mode 100644
index bfb821740535be915125da475fe53ce567c09019..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31545-1.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Crocus:<br>There's nothing quite like the taste of a good egg!<br>Jeremy's eggs taste better than anybody's</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-0.htm
deleted file mode 100644
index 73e7b6566a706550c12efd55cdc5671f83d4bf7a..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-0.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Kuber:<br>Hot hot hot springs!<br>
-I'm so happy to be here! It's so heavenly... My spirit soars!<br>
-All my worries~ Far~far~away~ Come what may~<br>
-I'll take it easy~~whatever happens~<br>
-<a action="bypass -h Quest 621_EggDelivery 31546-1.htm">Egg delivery, sir!</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-1.htm
deleted file mode 100644
index de9017fda4c8e72f1623471e077ecaec767363a4..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31546-1.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Kuber:<br>Oh my god!<br>This is it! It's so good!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-0.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-0.htm
deleted file mode 100644
index 739549f6a3b1597e6c7ebc340808dec2b586e348..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-0.htm
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><body>Beorin:<br>I'm so hungry I could eat a thousand wyvern eggs! You don't happen to have any eggs, do you?<br>
-<a action="bypass -h Quest 621_EggDelivery 31547-1.htm">I've got your eggs right here.</a></body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-1.htm
deleted file mode 100644
index 61f43a1da8c2f6d1121ac8759eaaa3ab5438ed85..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31547-1.htm
+++ /dev/null
@@ -1 +0,0 @@
-<html><body>Beorin:<br>What excellent timing! If you were a minute later, I would've starved to death! Here's some money for your eggs!</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-1.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-1.htm
deleted file mode 100644
index e2389a9a5bc40b70b7c51b5aecd64da8c9c34e43..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-1.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Brewer Valentine:<br>
-Would you like a drink? What is it that you want?<br>
-<a action="bypass -h Quest 621_EggDelivery 31584-2.htm">"Jeremy sent me."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/__init__.py b/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/__init__.py
deleted file mode 100644
index 991cd58968603fd9004915b8cabd8899826d3738..0000000000000000000000000000000000000000
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/__init__.py
+++ /dev/null
@@ -1,157 +0,0 @@
-# Made by disKret
-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 = "621_EggDelivery"
-
-#NPC
-JEREMY = 31521
-PULIN = 31543
-NAFF = 31544
-CROCUS = 31545
-KUBER = 31546
-BEORIN = 31547
-VALENTINE = 31584
-
-#QUEST ITEMS
-BOILED_EGGS = 7195
-FEE_OF_EGGS = 7196
-
-#REWARDS
-ADENA = 57
-HASTE_POTION = 734
-
-#Chance to get an S-grade random recipe instead of just adena and haste potion
-RPCHANCE=10
-#Change this value to 1 if you wish 100% recipes, default 70%
-ALT_RP100=0
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [BOILED_EGGS, FEE_OF_EGGS]
-
- def onEvent (self,event,st) :
- htmltext = event
- cond=st.getInt("cond")
- if event == "31521-1.htm" :
- if cond==0:
- st.set("cond","1")
- st.setState(State.STARTED)
- st.giveItems(BOILED_EGGS,5)
- st.playSound("ItemSound.quest_accept")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- elif event == "31543-1.htm" :
- if st.getQuestItemsCount(BOILED_EGGS):
- if cond==1:
- st.takeItems(BOILED_EGGS,1)
- st.giveItems(FEE_OF_EGGS,1)
- st.set("cond","2")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- else:
- htmltext="LMFAO!"
- st.exitQuest(1)
- elif event == "31544-1.htm" :
- if st.getQuestItemsCount(BOILED_EGGS):
- if cond==2:
- st.takeItems(BOILED_EGGS,1)
- st.giveItems(FEE_OF_EGGS,1)
- st.set("cond","3")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- else:
- htmltext="LMFAO!"
- st.exitQuest(1)
- elif event == "31545-1.htm" :
- if st.getQuestItemsCount(BOILED_EGGS):
- if cond==3:
- st.takeItems(BOILED_EGGS,1)
- st.giveItems(FEE_OF_EGGS,1)
- st.set("cond","4")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- else:
- htmltext="LMFAO!"
- st.exitQuest(1)
- elif event == "31546-1.htm" :
- if st.getQuestItemsCount(BOILED_EGGS):
- if cond==4:
- st.takeItems(BOILED_EGGS,1)
- st.giveItems(FEE_OF_EGGS,1)
- st.set("cond","5")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- else:
- htmltext="LMFAO!"
- st.extiQuest(1)
- elif event == "31547-1.htm" :
- if st.getQuestItemsCount(BOILED_EGGS):
- if cond==5:
- st.takeItems(BOILED_EGGS,1)
- st.giveItems(FEE_OF_EGGS,1)
- st.set("cond","6")
- else:
- htmltext = Quest.getNoQuestMsg(player)
- else:
- htmltext="LMFAO!"
- st.extiQuest(1)
- elif event == "31521-3.htm" :
- st.set("cond","7")
- elif event == "31584-2.htm" :
- if st.getQuestItemsCount(FEE_OF_EGGS) == 5:
- st.takeItems(FEE_OF_EGGS,5)
- if self.getRandom(100) < RPCHANCE :
- st.giveItems(range(6847+ALT_RP100,6853,2)[self.getRandom(3)],1)
- else:
- st.giveItems(ADENA,18800)
- st.giveItems(HASTE_POTION,1)
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- else:
- htmltext = Quest.getNoQuestMsg(player)
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if st :
- npcId = npc.getId()
- id = st.getState()
- if id == State.CREATED :
- st.set("cond","0")
- cond = st.getInt("cond")
- if npcId == 31521 and cond == 0 :
- if player.getLevel() >= 68 :
- htmltext = "31521-0.htm"
- else :
- st.exitQuest(1)
- elif id == State.STARTED :
- if npcId == 31543 and cond == 1 and st.getQuestItemsCount(BOILED_EGGS) :
- htmltext = "31543-0.htm"
- elif npcId == 31544 and cond == 2 and st.getQuestItemsCount(BOILED_EGGS) :
- htmltext = "31544-0.htm"
- elif npcId == 31545 and cond == 3 and st.getQuestItemsCount(BOILED_EGGS) :
- htmltext = "31545-0.htm"
- elif npcId == 31546 and cond == 4 and st.getQuestItemsCount(BOILED_EGGS) :
- htmltext = "31546-0.htm"
- elif npcId == 31547 and cond == 5 and st.getQuestItemsCount(BOILED_EGGS) :
- htmltext = "31547-0.htm"
- elif npcId == 31521 and cond == 6 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
- htmltext = "31521-2.htm"
- elif npcId == 31521 and cond == 7 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
- htmltext = "31521-4.htm"
- elif npcId == 31584 and cond == 7 and st.getQuestItemsCount(FEE_OF_EGGS) == 5 :
- htmltext = "31584-1.htm"
- return htmltext
-
-QUEST = Quest(621,qn,"Egg Delivery")
-
-QUEST.addStartNpc(31521)
-
-for i in range(31543,31548)+[31521,31584]:
- QUEST.addTalkId(i)
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-01.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-01.htm
new file mode 100644
index 0000000000000000000000000000000000000000..b8ec4d5ece9ea43baa2778081b3ecb3b28253340
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-01.htm
@@ -0,0 +1,6 @@
+<html><body>Chef Jeremy:<br>
+You look like you could use a few extra Adena...<br>
+Well I'm looking for a helper! You'll earn an honest wage around here, that's for sure!<br>
+All you have to do is take these steaming hot hard-boiled eggs I just made to my customers. Their names are already written on them. Deliver them quickly, and who knows? I might teach you a secret cooking technique! Ha!<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31521-03.htm">"I'll deliver your eggs."</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-02.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-02.htm
new file mode 100644
index 0000000000000000000000000000000000000000..0a4d282fd5e24556b554710b59ad6ddccd6228bb
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-02.htm
@@ -0,0 +1,4 @@
+<html><body>Chef Jeremy:<br>
+Many dangerous and ferocious beasts lurk these parts. I'd really hate to have to bury another assistant!<br>
+(Only a character of level 68 or above may undertake this quest.)
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-03.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..2402c6b502d537d0a75033e288c4c946c393e414
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-03.htm
@@ -0,0 +1,5 @@
+<html><body>Chef Jeremy:<br>
+Take these hard-Boiled Eggs to my customers at the hot springs resort.<br>
+Everyone likes their eggs done a different way.You must deliver them in the order!<br>
+Look at the note I gave you for details, and don't ever forget our motto, "The Customer Always Comes First"!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..92db1780ef3c97d74df12eecaa00d680e1e79a26
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-04.html
@@ -0,0 +1,4 @@
+<html><body>Chef Jeremy:<br>
+What are you waiting for?<br>
+My customers must be salivating, waiting for my delicious eggs to arrive! Get going!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-05.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-05.html
new file mode 100644
index 0000000000000000000000000000000000000000..351e34a59cd7db714b03ee61a6057b59309786c6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-05.html
@@ -0,0 +1,5 @@
+<html><body>Jeremy:<br>
+OK, OK!<br>
+Did you finish the delivery?<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31521-06.html">"I completed the delivery."</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-3.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-06.html
similarity index 67%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-3.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-06.html
index 5ce189bad9fa65785b1b8310f235d01183b1d4a1..53e4e97bd97d134210e34298c929d4a3189a8cbb 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31521-3.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-06.html
@@ -1,4 +1,4 @@
-<html><body>Chef Jeremy:<br>
-Excellent!<br>
-You seem to have more aptitude for delivery work than I thought. You did a good job, but unfortunately, I don't have the adena to pay you. I don't have any more work for you, either... Talk to Valentine in the Town of Goddard. He owes me, and he'll give you a satisfactory reward.
-</body></html>
\ No newline at end of file
+<html><body>Jeremy:<br>
+Excellent!<br>
+You seem to have more aptitude for delivery work than I thought. You did a good job, but unfortunately, I don't have the Adena to pay you. I don't have any more work for you, either... Talk to Valentine in the Town of Goddard. He owes me, and he'll give you a satisfactory reward.
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-07.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..d0e50b899fbfed9ffe502576036e94155376fb4a
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-07.html
@@ -0,0 +1,3 @@
+<html><body>Jeremy:<br>
+Hey, hey. You didn't just deliver that food without getting paid, right? Do make me sweat over small stuff like this. I'm leaving the small stuff up to you!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-08.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-08.html
new file mode 100644
index 0000000000000000000000000000000000000000..612e7321717895af8d54857ab3297b0e4172ada1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31521-08.html
@@ -0,0 +1,3 @@
+<html><body>Jeremy:<br>
+Hey, what are you doing here? You should've visited Valentine in the Town of Goddard. I don't have any Adena to give you.
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..bc0a3d63e1bd5ad17d2e4b193c562e87fbd5a657
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-01.html
@@ -0,0 +1,4 @@
+<html><body>Pulin:<br>
+I'm starving! When will that eggman get here?<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31543-02.html">"I've got some Boiled Eggs for you."</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..09c90e54769614eb7faec541e431c33c6aaa5482
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-02.html
@@ -0,0 +1,6 @@
+<html><body>Pulin:<br>
+Woohoo!<br>
+Yummy! There's nothing like a nice boiled egg at the hot springs!<br>
+I could eat a thousand of these!<br>
+Oh, thank you for the eggs! Here's your money. I know you are busy, so leave now. There are many places you must be, but here is not one of them.
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..1eca1e214a31f1918aa6095f9976a9daa7f77c2d
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-03.html
@@ -0,0 +1,3 @@
+<html><body>Pulin:<br>
+Aren't you Jeremy's delivery man? I've been waiting!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..bc92b6949e85392c12dab2116b771c37b23456ae
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31543-04.html
@@ -0,0 +1,6 @@
+<html><body>Pulin:<br>
+Smack!<br>
+Mmm... Chomp!<br>
+Snort!<br>
+Can't talk! ...Gulp! ...Eating!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..1407351961666ee5f2b7c5f58406d81f57d26c27
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-01.html
@@ -0,0 +1,4 @@
+<html><body>Naff:<br>
+Oh, that feels great! If only I had some Boiled Eggs to go with it!<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31544-02.html">"I have some Boiled Eggs for you!"</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..2bed41bb3c70b35380b80818525b8cb8da30bdc9
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-02.html
@@ -0,0 +1,3 @@
+<html><body>Naff:<br>
+Wow, this is great!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..764a5a841274ffb597ebc65bfc7bdf72d6e1f6b7
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-03.html
@@ -0,0 +1,3 @@
+<html><body>Naff:<br>
+Come on in! The water's fine!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..5aa95dd3578e8a130ee92b378fe46158d0b9b962
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31544-04.html
@@ -0,0 +1,5 @@
+<html><body>Naff:<br>
+Hmm...<br>
+I know I'm sexy, but you're embarrassing me!<br>
+Don't you have something else to do?
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..3eadb615dc615020ca968b9b31e691d64dd0fd0e
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-01.html
@@ -0,0 +1,4 @@
+<html><body>Crocus:<br>
+The hot springs just aren't the same without hard Boiled Eggs! Do you have any eggs? Do you?!<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31545-02.html">I've got your eggs right here.</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..ad9f3d5273441477a17865df230708f1ef801a54
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-02.html
@@ -0,0 +1,4 @@
+<html><body>Crocus:<br>
+There's nothing quite like the taste of a good egg!<br>
+Jeremy's eggs taste better than anybody's!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..644a8e27aba1dbe5b95dc3fbd91f188c7ce8e9d4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-03.html
@@ -0,0 +1,3 @@
+<html><body>Crocus:<br>
+What a wonderful diversion! I'll wager that even the gods are jealous!If only I could have a taste of Jeremy's eggs...
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..a3ddf1e6a64116b9194bb1773d808e37dcb7a9c6
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31545-04.html
@@ -0,0 +1,3 @@
+<html><body>Crocus:<br>
+If I only had a drink... I'd be the happiest person in the world!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..3be5d51db2f87b7fa9fe03b50d96c62c65f92794
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-01.html
@@ -0,0 +1,7 @@
+<html><body>Kuber:<br>
+Hot hot hot springs!<br>
+I'm so happy to be here! It's so heavenly... My spirit soars!<br>
+All my worries~ Far~ far~ away~ Come what may~<br>
+I'll take it easy~ ~whatever happens~<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31546-02.html">"Egg delivery, sir!"</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..3c95dda6a7c2a47e145f9b8c6b6c170430e22f37
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-02.html
@@ -0,0 +1,4 @@
+<html><body>Kuber:<br>
+Oh my god!<br>
+This is it! It's so good!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..82f019c9d4a73195796e58d48c31a58b300db3e4
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-03.html
@@ -0,0 +1,3 @@
+<html><body>Kuber:<br>
+If you're hungry, take a bite of this delicious hard-boiled egg! Mmm mmm mmm...!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..acf506f7b7c8e91da504aa79e4ff0baa236dcb16
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31546-04.html
@@ -0,0 +1,3 @@
+<html><body>Kuber:<br>
+I need a nap.
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..4aa3f5da2724e9fe95c5e90555066363957692df
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-01.html
@@ -0,0 +1,4 @@
+<html><body>Beolin:<br>
+I'm so hungry I could eat a thousand wyvern eggs!You don't happen to have any eggs, do you?<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31547-02.html">I've got your eggs right here.</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-02.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-02.html
new file mode 100644
index 0000000000000000000000000000000000000000..048e5b1754f2ecd6ff3b8c681bf00c52607d3366
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-02.html
@@ -0,0 +1,3 @@
+<html><body>Beolin:<br>
+What excellent timing! If you were a minute later, I would've starved to death! Here's some money for your eggs!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-03.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-03.html
new file mode 100644
index 0000000000000000000000000000000000000000..fd0814d1950b7da42f5c40b86ba7c1705eeb7ba1
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-03.html
@@ -0,0 +1,3 @@
+<html><body>Beolin:<br>
+Do you have any eggs? I'm starving!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-04.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-04.html
new file mode 100644
index 0000000000000000000000000000000000000000..39d7b75d595ce285b2d04713282f332dd745e80c
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31547-04.html
@@ -0,0 +1,3 @@
+<html><body>Beolin:<br>
+That was awesome! I feel so much better! Tell Jeremy that the food was delicious!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-01.html b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-01.html
new file mode 100644
index 0000000000000000000000000000000000000000..339bdde412808ca21aa6832ebce4689120ad3785
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-01.html
@@ -0,0 +1,4 @@
+<html><body>Brewer Valentine:<br>
+Would you like a drink? What is it that you want?<br>
+<a action="bypass -h Quest Q00621_EggDelivery 31584-02.html">"Jeremy sent me."</a>
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-2.htm b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-02.html
similarity index 65%
rename from L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-2.htm
rename to L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-02.html
index cca41f90b85976348a3e3cf0d69ad897b138bbaf..16c89cb0b649d3b12ca94d420565ad2f698018c3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/quests/621_EggDelivery/31584-2.htm
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/31584-02.html
@@ -1,4 +1,5 @@
-<html><body>Brewer Valentine:<br>
-Jeremy? <br>He wants to be paid?...<br>
-I thought this matter was settled! I distinctly remember paying you before!
-</body></html>
\ No newline at end of file
+<html><body>Brewer Valentine:<br>
+Jeremy?<br>
+He wants to be paid?...<br>
+I thought this matter was settled! I distinctly remember paying you before!
+</html></body>
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
new file mode 100644
index 0000000000000000000000000000000000000000..2fd5f80740561a4e02713ad5bf98704373e859a2
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/quests/Q00621_EggDelivery/Q00621_EggDelivery.java
@@ -0,0 +1,284 @@
+/*
+ * 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.Q00621_EggDelivery;
+
+import java.util.Arrays;
+import java.util.List;
+
+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;
+
+/**
+ * Egg Delivery (621)
+ * @author Janiko
+ */
+public final class Q00621_EggDelivery extends Quest
+{
+ // NPCs
+ private static final int JEREMY = 31521;
+ private static final int PULIN = 31543;
+ private static final int NAFF = 31544;
+ private static final int CROCUS = 31545;
+ private static final int KUBER = 31546;
+ private static final int BOELIN = 31547;
+ private static final int VALENTINE = 31584;
+ // Items
+ private static final int BOILED_EGG = 7195;
+ private static final int EGG_PRICE = 7196;
+ // Misc
+ private static final int MIN_LVL = 68;
+ // Reward
+ private static final int QUICK_STEP_POTION = 734;
+ private static final int SEALED_RING_OF_AURAKYRA = 6849;
+ private static final int SEALED_SANDDRAGONS_EARING = 6847;
+ private static final int SEALED_DRAGON_NECKLACE = 6851;
+ // Talkers
+ private static final List<Integer> TALKERS = Arrays.asList(NAFF, CROCUS, KUBER, BOELIN);
+
+ private Q00621_EggDelivery()
+ {
+ super(621, Q00621_EggDelivery.class.getSimpleName(), "Egg Delivery");
+ addStartNpc(JEREMY);
+ addTalkId(JEREMY, PULIN, VALENTINE);
+ addTalkId(TALKERS);
+ registerQuestItems(BOILED_EGG, EGG_PRICE);
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ String htmltext = null;
+ if (qs == null)
+ {
+ return htmltext;
+ }
+ switch (event)
+ {
+ case "31521-03.htm":
+ {
+ if (qs.isCreated())
+ {
+ qs.startQuest();
+ giveItems(player, BOILED_EGG, 5);
+ htmltext = event;
+ }
+ break;
+ }
+ case "31521-06.html":
+ {
+ if (qs.isCond(6))
+ {
+ if (getQuestItemsCount(player, EGG_PRICE) >= 5)
+ {
+ qs.setCond(7, true);
+ takeItems(player, EGG_PRICE, -1);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "31521-07.html";
+ }
+ }
+ break;
+ }
+ case "31543-02.html":
+ {
+ if (qs.isCond(1))
+ {
+ if (hasQuestItems(player, BOILED_EGG))
+ {
+ qs.setCond(2, true);
+ takeItems(player, BOILED_EGG, 1);
+ giveItems(player, EGG_PRICE, 1);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = "31543-03.html";
+ }
+ }
+ break;
+ }
+ case "31544-02.html":
+ case "31545-02.html":
+ case "31546-02.html":
+ case "31547-02.html":
+ {
+ if (TALKERS.contains(npc.getId()) && qs.isCond(TALKERS.indexOf(npc.getId()) + 2))
+ {
+ if (hasQuestItems(player, BOILED_EGG))
+ {
+ qs.setCond(qs.getCond() + 1, true);
+ takeItems(player, BOILED_EGG, 1);
+ giveItems(player, EGG_PRICE, 1);
+ htmltext = event;
+ }
+ else
+ {
+ htmltext = npc.getId() + "-03.html";
+ }
+ }
+ break;
+ }
+ case "31584-02.html":
+ {
+ if (qs.isCond(7))
+ {
+ int rnd = getRandom(1000);
+ if (rnd < 800)
+ {
+ rewardItems(player, QUICK_STEP_POTION, 1);
+ giveAdena(player, 18800, true);
+ }
+ else if (rnd < 880)
+ {
+ rewardItems(player, SEALED_RING_OF_AURAKYRA, 1);
+ }
+ else if (rnd < 960)
+ {
+ rewardItems(player, SEALED_SANDDRAGONS_EARING, 1);
+ }
+ else if (rnd < 1000)
+ {
+ rewardItems(player, SEALED_DRAGON_NECKLACE, 1);
+ }
+ qs.exitQuest(true, true);
+ htmltext = event;
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance talker)
+ {
+ final QuestState qs = getQuestState(talker, true);
+ String htmltext = getNoQuestMsg(talker);
+ switch (npc.getId())
+ {
+ case JEREMY:
+ {
+ switch (qs.getState())
+ {
+ case State.CREATED:
+ {
+ htmltext = (talker.getLevel() >= MIN_LVL) ? "31521-01.htm" : "31521-02.htm";
+ break;
+ }
+ case State.STARTED:
+ {
+ switch (qs.getCond())
+ {
+ case 1:
+ {
+ htmltext = "31521-04.html";
+ break;
+ }
+ case 6:
+ {
+ if (hasQuestItems(talker, EGG_PRICE))
+ {
+ htmltext = "31521-05.html";
+ }
+ break;
+ }
+ case 7:
+ {
+ if (!hasQuestItems(talker, BOILED_EGG))
+ {
+ htmltext = "31521-08.html";
+ }
+ break;
+ }
+ }
+ break;
+ }
+ case State.COMPLETED:
+ {
+ htmltext = getAlreadyCompletedMsg(talker);
+ break;
+ }
+ }
+ break;
+ }
+ case PULIN:
+ {
+ if (qs.isStarted())
+ {
+ switch (qs.getCond())
+ {
+ case 1:
+ {
+ if (getQuestItemsCount(talker, BOILED_EGG) >= 5)
+ {
+ htmltext = "31543-01.html";
+ }
+ break;
+ }
+ case 2:
+ {
+ htmltext = "31543-04.html";
+ break;
+ }
+ }
+ }
+ break;
+ }
+ case NAFF:
+ case CROCUS:
+ case KUBER:
+ case BOELIN:
+ {
+ if (qs.isStarted())
+ {
+ final int cond = TALKERS.indexOf(npc.getId()) + 2;
+ if (qs.isCond(cond) && hasQuestItems(talker, EGG_PRICE)) // 2,3,4,5
+ {
+ htmltext = npc.getId() + "-01.html";
+ }
+ else if (qs.isCond(cond + 1)) // 3,4,5,6
+ {
+ htmltext = npc.getId() + "-04.html";
+ }
+ }
+ break;
+ }
+ case VALENTINE:
+ {
+ if (qs.isStarted() && qs.isCond(7))
+ {
+ htmltext = "31584-01.html";
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ public static void main(String[] args)
+ {
+ new Q00621_EggDelivery();
+ }
+}
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/sql/game/updates/20131220update.sql b/L2J_DataPack_BETA/dist/sql/game/updates/20131220update.sql
new file mode 100644
index 0000000000000000000000000000000000000000..f43433f516c4eacdc482b0242c225e0b745bd89b
--- /dev/null
+++ b/L2J_DataPack_BETA/dist/sql/game/updates/20131220update.sql
@@ -0,0 +1 @@
+UPDATE character_quests SET name='Q00621_EggDelivery' WHERE name='621_EggDelivery';
\ No newline at end of file