diff --git a/L2J_DataPack/dist/game/data/scripts.cfg b/L2J_DataPack/dist/game/data/scripts.cfg
index 7e04226195aa62338337a3cda3dbf93f983288bb..7cae3586dddc3720027d2bf2706ff1f436a29053 100644
--- a/L2J_DataPack/dist/game/data/scripts.cfg
+++ b/L2J_DataPack/dist/game/data/scripts.cfg
@@ -249,7 +249,6 @@ quests/348_ArrogantSearch/__init__.py
quests/351_BlackSwan/__init__.py
quests/372_LegacyOfInsolence/__init__.py
quests/373_SupplierOfReagents/__init__.py
-quests/379_FantasyWine/__init__.py
quests/383_SearchingForTreasure/__init__.py
quests/384_WarehouseKeepersPastime/__init__.py
quests/386_StolenDignity/__init__.py
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-2.htm b/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-2.htm
deleted file mode 100644
index 3425c5b5e27a2c2ad6245fd586b4e818cfef984b..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-2.htm
+++ /dev/null
@@ -1,5 +0,0 @@
-<html><body>Guard Harlan:<br>
-Well, let's see, I'll need some leaves of eucalyptus... They can be obtained from an<font color="LEVEL"> Enku orc champion</font>. To properly age the wine I'll require some stones of chill... They're made and used by the<font color="LEVEL"> Enku orc shaman</font>. Bring these items to me and I'll make the wine.<br>
-<a action="bypass -h Quest 379_FantasyWine 30074-3.htm">"I'll help you." </a><br>
-<a action="bypass -h Quest 379_FantasyWine 30074-2a.htm">"I'm sorry. I can't help you."</a>
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4.htm b/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4.htm
deleted file mode 100644
index 376a0e0ec46ffb5b1a1761f15d0a8bfe514e7b2c..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4.htm
+++ /dev/null
@@ -1,4 +0,0 @@
-<html><body>Guard Harlan:<br>
-Have you brought the ingredients for the fantasy wine?<br>
-I'll need 80 leaves of eucalyptus from the<font color="LEVEL"> Enku Orc Champions</font> and 100 stones of chill from the<font color="LEVEL"> Enku Orc Shamans</font>.
-</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/__init__.py b/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/__init__.py
deleted file mode 100644
index b42f650b77a72a3a1d5d9fd05fe71a67156244a8..0000000000000000000000000000000000000000
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/__init__.py
+++ /dev/null
@@ -1,110 +0,0 @@
-# Made by disKret & DrLecter
-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 = "379_FantasyWine"
-
-#NPC
-HARLAN = 30074
-
-#MOBS
-ENKU_CHAMPION = 20291
-ENKU_SHAMAN = 20292
-
-#ITEMS
-LEAF = 5893
-STONE = 5894
-
-MOB = {
-ENKU_CHAMPION:[LEAF,80],
-ENKU_SHAMAN:[STONE,100]
-}
-
-class Quest (JQuest) :
-
- def __init__(self,id,name,descr):
- JQuest.__init__(self,id,name,descr)
- self.questItemIds = [LEAF, STONE]
-
- def onEvent (self,event,st) :
- htmltext = event
- leaf = st.getQuestItemsCount(LEAF)
- stone = st.getQuestItemsCount(STONE)
- if event == "30074-3.htm" :
- st.set("cond","1")
- st.setState(State.STARTED)
- st.playSound("ItemSound.quest_accept")
- elif event == "30074-6.htm" :
- if leaf == 80 and stone == 100 :
- st.takeItems(LEAF,leaf)
- st.takeItems(STONE,stone)
- item = self.getRandom(3)
- st.giveItems(5956+item,1)
- htmltext = "30074-"+str(6+item)+".htm"
- st.playSound("ItemSound.quest_finish")
- st.exitQuest(1)
- else :
- htmltext = "30074-4.htm"
- elif event == "30074-2a.htm" :
- st.exitQuest(1)
- return htmltext
-
- def onTalk (self,npc,player):
- htmltext = Quest.getNoQuestMsg(player)
- st = player.getQuestState(qn)
- if not st : return htmltext
-
- cond = st.getInt("cond")
- leaf = st.getQuestItemsCount(LEAF)
- stone = st.getQuestItemsCount(STONE)
- if cond == 0 :
- if player.getLevel() >= 20 :
- htmltext = "30074-0.htm"
- else:
- htmltext = "30074-0a.htm"
- st.exitQuest(1)
- elif cond == 1 :
- if leaf < 80 and stone < 100 :
- htmltext = "30074-4.htm"
- elif leaf == 80 and stone < 100 :
- htmltext = "30074-4a.htm"
- elif leaf < 80 and stone == 100 :
- htmltext = "30074-4b.htm"
- elif cond == 2 and leaf == 80 and stone == 100 :
- htmltext = "30074-5.htm"
- return htmltext
-
- def onKill(self,npc,player,isPet):
- st = player.getQuestState(qn)
- if not st : return
- if st.getState() != State.STARTED : return
-
- npcId = npc.getId()
- numItems,chance = divmod(100*Config.RATE_QUEST_DROP,100)
- item,count = MOB[npcId]
- if item :
- if self.getRandom(100) <chance :
- numItems = numItems + 1
- prevItems = st.getQuestItemsCount(item)
- if prevItems < count :
- if prevItems + numItems > count :
- numItems = count - prevItems
- if int(numItems) != 0 :
- st.giveItems(item,int(numItems))
- if (st.getQuestItemsCount(LEAF) != 80 and st.getQuestItemsCount(STONE) != 100) :
- st.playSound("ItemSound.quest_itemget")
- else :
- st.playSound("ItemSound.quest_middle")
- st.set("cond","2")
- return
-
-QUEST = Quest(379,qn,"Fantasy Wine")
-
-QUEST.addStartNpc(HARLAN)
-QUEST.addTalkId(HARLAN)
-
-QUEST.addKillId(ENKU_CHAMPION)
-QUEST.addKillId(ENKU_SHAMAN)
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
index 406563f36741b6c843896b3630988d6b5aaebef6..d91d1cf63e5412558df592f7c05fe315adfa4a2f 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00356_DigUpTheSeaOfSpores/Q00356_DigUpTheSeaOfSpores.java
@@ -148,7 +148,7 @@ public final class Q00356_DigUpTheSeaOfSpores extends Quest
final int dropItem = ((npc.getId() == ROTTING_TREE) ? HERBIVOROUS_SPORE : CARNIVORE_SPORE);
final int otherItem = ((dropItem == HERBIVOROUS_SPORE) ? CARNIVORE_SPORE : HERBIVOROUS_SPORE);
- if (giveItemRandomly(killer, npc, dropItem, 1, 50, MONSTER_DROP_CHANCES.get(npc.getId()), true))
+ if (giveItemRandomly(qs.getPlayer(), npc, dropItem, 1, 50, MONSTER_DROP_CHANCES.get(npc.getId()), true))
{
if (getQuestItemsCount(killer, otherItem) >= 50)
{
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-0.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-01.htm
similarity index 86%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-0.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-01.htm
index 1a26c7c298935255bc253a4c6cc39f9d74cf4405..cefbe3dfc6f982385de242beeb9bbf8f20a14890 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-0.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-01.htm
@@ -3,5 +3,5 @@ Hello, stranger! My wife just recently gave birth to a beautiful baby girl!<br>
The countless amusements of fatherhood fill me with indescribable joy... I just want to play peek-a-boo all day! I don't care if people laugh... I would do anything for my precious baby!<br>
I see that you disapprove, but you must understand... My wife and I tried for 10 years to have a child! To finally have produced such a perfect baby would drive anyone to distraction!<br>
You are obviously not a parent!<br>
-<a action="bypass -h Quest 379_FantasyWine 30074-1.htm">I'm sorry.</a>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-02.htm">"I'm sorry."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-1.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-02.htm
similarity index 74%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-1.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-02.htm
index c3795df9f755e538da3301f6c6e8a30b5d9fb26e..019ef9ff6718c9662a8de629553d8717d21c7755 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-1.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-02.htm
@@ -1,6 +1,6 @@
<html><body>Guard Harlan:<br>
Apology accepted, my friend... I suppose I overreacted. To mark the birth of my daughter I want to make fantasy wine. The recipe has been in my family for many generations. When she marries I will serve it at her wedding!<br>
I am lacking some of the ingredients I need to make the wine. These ingredients have always been rare, but nowadays it's practically impossible to get them. To make matters worse, my duties as a guard keep me from going out and finding them myself. Would you help me?<br>
-<a action="bypass -h Quest 379_FantasyWine 30074-2.htm">"What are the ingredients?"</a><br>
-<a action="bypass -h Quest 379_FantasyWine 30074-2a.htm">"I can't help you."</a>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-03.htm">"What are the ingredients?"</a><br>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-05.html">"I can't help you. "</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-03.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-03.htm
new file mode 100644
index 0000000000000000000000000000000000000000..67f2f7b5dbf106a8af2148f0d3365e8061ee3c36
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-03.htm
@@ -0,0 +1,5 @@
+<html><body>Guard Harlan:<br>
+Well, let's see, I'll need some leaves of eucalyptus... They can be obtained from an <font color="LEVEL">Enku Orc champion</font>. To properly age the wine I'll require some stones of chill... They're made and used by the <font color="LEVEL">Enku Orc shaman</font>. Bring these items to me and I'll make the wine.<br>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-04.htm">"I'll help you."</a><br>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-05.html">"I'm sorry. I can't help you."</a>
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-3.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-04.htm
similarity index 57%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-3.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-04.htm
index 92fb48b102bb16054e228080f0a1c6500427168c..3099db58fc145a2f69ac8a970d838bb25e7df100 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-3.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-04.htm
@@ -1,5 +1,5 @@
<html><body>Guard Harlan:<br>
-Oh, great! Please bring me 80<font color="LEVEL"> Leaves of Eucalyptus</font>... That should be enough for one barrel of wine.<br>
-I'll need some<font color="LEVEL"> Stones of Chill </font>to properly age the wine... 100 should be enough.<br>
+Oh, great! Please bring me 80 <font color="LEVEL">leaves of eucalyptus</font>... That should be enough for one barrel of wine.<br>
+I'll need some <font color="LEVEL">stones of chill </font> to properly age the wine... 100 should be enough.<br>
If you bring me these items, I'll give you a genuine bottle of Dion wine! No cost is too high for the sake of my precious daughter!
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-2a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-05.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-2a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-05.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-0a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-06.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-0a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-06.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-07.html b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-07.html
new file mode 100644
index 0000000000000000000000000000000000000000..cf8c4536f5657b4da8f326a1b36cd15df7e46847
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-07.html
@@ -0,0 +1,4 @@
+<html><body>Guard Harlan:<br>
+Have you brought the ingredients for the fantasy wine?<br>
+I'll need 80 leaves of eucalyptus from the <font color="LEVEL">Enku Orc champions</font> and 100 stones of chill from the <font color="LEVEL">Enku Orc shamans</font>.
+</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4a.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-08.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4a.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-08.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4b.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-09.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-4b.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-09.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-5.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-10.html
similarity index 52%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-5.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-10.html
index a370a5f4a2965814c63e11178d783cd05f8d4f3e..634658399fed33f840b245ca1d2019cca9f048e9 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-5.htm
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-10.html
@@ -1,4 +1,4 @@
<html><body>Guard Harlan:<br>
Do you have all the ingredients? Let me see them!<br>
-<a action="bypass -h Quest 379_FantasyWine 30074-6.htm">"Here, take them..."</a>
+<a action="bypass -h Quest Q00379_FantasyWine 30074-11.html">"Here, take them..."</a>
</body></html>
\ No newline at end of file
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-6.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-11.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-6.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-11.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-7.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-12.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-7.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-12.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-8.htm b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-13.html
similarity index 100%
rename from L2J_DataPack/dist/game/data/scripts/quests/379_FantasyWine/30074-8.htm
rename to L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/30074-13.html
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
new file mode 100644
index 0000000000000000000000000000000000000000..8dc54bda33af4697feb4df0034420ef4c8de1336
--- /dev/null
+++ b/L2J_DataPack/dist/game/data/scripts/quests/Q00379_FantasyWine/Q00379_FantasyWine.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (C) 2004-2014 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.Q00379_FantasyWine;
+
+import com.l2jserver.gameserver.model.actor.L2Npc;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.holders.ItemHolder;
+import com.l2jserver.gameserver.model.quest.Quest;
+import com.l2jserver.gameserver.model.quest.QuestState;
+import com.l2jserver.gameserver.util.Util;
+
+/**
+ * Fantasy Wine (379)
+ * @author Adry_85
+ */
+public final class Q00379_FantasyWine extends Quest
+{
+ // NPC
+ private static final int HARLAN = 30074;
+ // Items
+ private static final ItemHolder LEAF_OF_EUCALYPTUS = new ItemHolder(5893, 80);
+ private static final ItemHolder STONE_OF_CHILL = new ItemHolder(5894, 100);
+ private static final int OLD_WINE_15_YEAR = 5956;
+ private static final int OLD_WINE_30_YEAR = 5957;
+ private static final int OLD_WINE_60_YEAR = 5958;
+ // Monsters
+ private static final int ENKU_ORC_CHAMPION = 20291;
+ private static final int ENKU_ORC_SHAMAN = 20292;
+ // Misc
+ private static final int MIN_LEVEL = 20;
+
+ public Q00379_FantasyWine()
+ {
+ super(379, Q00379_FantasyWine.class.getSimpleName(), "Fantasy Wine");
+ addStartNpc(HARLAN);
+ addTalkId(HARLAN);
+ addKillId(ENKU_ORC_CHAMPION, ENKU_ORC_SHAMAN);
+ registerQuestItems(LEAF_OF_EUCALYPTUS.getId(), STONE_OF_CHILL.getId());
+ }
+
+ @Override
+ public String onAdvEvent(String event, L2Npc npc, L2PcInstance player)
+ {
+ final QuestState qs = getQuestState(player, false);
+ if (qs == null)
+ {
+ return null;
+ }
+
+ String htmltext = null;
+ switch (event)
+ {
+ case "30074-02.htm":
+ case "30074-03.htm":
+ case "30074-05.html":
+ {
+ htmltext = event;
+ break;
+ }
+ case "30074-04.htm":
+ {
+ qs.startQuest();
+ htmltext = event;
+ break;
+ }
+ case "30074-11.html":
+ {
+ if (hasAllItems(player, true, LEAF_OF_EUCALYPTUS, STONE_OF_CHILL))
+ {
+ final int random = getRandom(10);
+ final int item;
+
+ if (random < 3)
+ {
+ item = OLD_WINE_15_YEAR;
+ htmltext = event;
+ }
+ else if (random < 9)
+ {
+ item = OLD_WINE_30_YEAR;
+ htmltext = "30074-12.html";
+ }
+ else
+ {
+ item = OLD_WINE_60_YEAR;
+ htmltext = "30074-13.html";
+ }
+
+ giveItems(player, item, 1);
+ takeAllItems(player, LEAF_OF_EUCALYPTUS, STONE_OF_CHILL);
+ qs.exitQuest(true, true);
+ }
+ break;
+ }
+ }
+ return htmltext;
+ }
+
+ @Override
+ public String onKill(L2Npc npc, L2PcInstance killer, boolean isSummon)
+ {
+ final QuestState qs = getQuestState(killer, false);
+
+ if ((qs == null) || !Util.checkIfInRange(1500, npc, killer, true))
+ {
+ return null;
+ }
+
+ final ItemHolder dropItem = ((npc.getId() == ENKU_ORC_CHAMPION) ? LEAF_OF_EUCALYPTUS : STONE_OF_CHILL);
+
+ if (giveItemRandomly(killer, npc, dropItem.getId(), 1, dropItem.getCount(), 1.0, true) && hasAllItems(killer, true, LEAF_OF_EUCALYPTUS, STONE_OF_CHILL))
+ {
+ qs.setCond(2);
+ }
+ return super.onKill(npc, killer, isSummon);
+ }
+
+ @Override
+ public String onTalk(L2Npc npc, L2PcInstance player)
+ {
+ QuestState qs = getQuestState(player, true);
+ String htmltext = getNoQuestMsg(player);
+ if (qs.isCreated())
+ {
+ htmltext = (player.getLevel() >= MIN_LEVEL) ? "30074-01.htm" : "30074-06.html";
+ }
+ else if (qs.isStarted())
+ {
+ final boolean hasLeafOfEucalyptus = hasItem(player, LEAF_OF_EUCALYPTUS);
+ final boolean hasStoneOfChill = hasItem(player, STONE_OF_CHILL);
+
+ if (!hasLeafOfEucalyptus && !hasStoneOfChill)
+ {
+ htmltext = "30074-07.html";
+ }
+ else if (hasLeafOfEucalyptus && !hasStoneOfChill)
+ {
+ htmltext = "30074-08.html";
+ }
+ else if (!hasLeafOfEucalyptus && hasStoneOfChill)
+ {
+ htmltext = "30074-09.html";
+ }
+ else
+ {
+ htmltext = "30074-10.html";
+ }
+ }
+ return htmltext;
+ }
+}
diff --git a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
index 223d3501dab710263c302a9f91634fb054a7ed2c..317b5f40366d859fa11240e463fdfd061e694f04 100644
--- a/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
+++ b/L2J_DataPack/dist/game/data/scripts/quests/QuestMasterHandler.java
@@ -300,6 +300,7 @@ import quests.Q00371_ShrieksOfGhosts.Q00371_ShrieksOfGhosts;
import quests.Q00376_ExplorationOfTheGiantsCavePart1.Q00376_ExplorationOfTheGiantsCavePart1;
import quests.Q00377_ExplorationOfTheGiantsCavePart2.Q00377_ExplorationOfTheGiantsCavePart2;
import quests.Q00378_GrandFeast.Q00378_GrandFeast;
+import quests.Q00379_FantasyWine.Q00379_FantasyWine;
import quests.Q00380_BringOutTheFlavorOfIngredients.Q00380_BringOutTheFlavorOfIngredients;
import quests.Q00381_LetsBecomeARoyalMember.Q00381_LetsBecomeARoyalMember;
import quests.Q00382_KailsMagicCoin.Q00382_KailsMagicCoin;
@@ -737,6 +738,7 @@ public class QuestMasterHandler
Q00376_ExplorationOfTheGiantsCavePart1.class,
Q00377_ExplorationOfTheGiantsCavePart2.class,
Q00378_GrandFeast.class,
+ Q00379_FantasyWine.class,
Q00380_BringOutTheFlavorOfIngredients.class,
Q00381_LetsBecomeARoyalMember.class,
Q00382_KailsMagicCoin.class,
diff --git a/L2J_DataPack/dist/sql/game/updates/20141112update.sql b/L2J_DataPack/dist/sql/game/updates/20141112update.sql
index ab486a48150df146f3dfab7ffa96adc7d4e41b23..393d1fe0f4ca3f5d4f426c11e821a3de3f1b7873 100644
--- a/L2J_DataPack/dist/sql/game/updates/20141112update.sql
+++ b/L2J_DataPack/dist/sql/game/updates/20141112update.sql
@@ -1 +1,2 @@
-UPDATE character_quests SET name='Q00371_ShrieksOfGhosts' WHERE name='371_ShriekOfGhosts';
\ No newline at end of file
+UPDATE character_quests SET name='Q00371_ShrieksOfGhosts' WHERE name='371_ShriekOfGhosts';
+UPDATE character_quests SET name='Q00379_FantasyWine' WHERE name='379_FantasyWine';
\ No newline at end of file