diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/src/main/java/com/l2jserver/datapack/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java index 7d9c469abb99c1ba4a19adc361537361eb72a886..58486438f2c2d83a81f6fa64326a25c49f5149f8 100644 --- a/src/main/java/com/l2jserver/datapack/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java +++ b/src/main/java/com/l2jserver/datapack/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java @@ -89,9 +89,9 @@ public class Q00341_HuntingForWildBeasts extends Quest @Override public String onTalk(L2Npc npc, L2PcInstance player) { - final QuestState st = getQuestState(player, false); + final QuestState qs = getQuestState(player, true); String htmltext = getNoQuestMsg(player); - switch (st.getState()) + switch (qs.getState()) { case State.CREATED: { @@ -100,10 +100,10 @@ public class Q00341_HuntingForWildBeasts extends Quest } case State.STARTED: { - if (st.isCond(2) && (st.getQuestItemsCount(BEAR_SKIN) >= REQUIRED_COUNT)) + if (qs.isCond(2) && (qs.getQuestItemsCount(BEAR_SKIN) >= REQUIRED_COUNT)) { - st.giveAdena(ADENA_COUNT, true); - st.exitQuest(true, true); + qs.giveAdena(ADENA_COUNT, true); + qs.exitQuest(true, true); htmltext = "30078-05.html"; } else diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/src/main/java/com/l2jserver/datapack/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java index ab360d536ac3c2fa056aa4dbe0e79156a804aacd..79ded529634ff81baf1a363b38513f2aface133a 100644 --- a/src/main/java/com/l2jserver/datapack/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java +++ b/src/main/java/com/l2jserver/datapack/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java @@ -18,6 +18,8 @@ */ package com.l2jserver.datapack.quests.Q00380_BringOutTheFlavorOfIngredients; +import static com.l2jserver.gameserver.enums.audio.Sound.ITEMSOUND_QUEST_ITEMGET; + import java.util.HashMap; import java.util.Map; @@ -194,9 +196,12 @@ public final class Q00380_BringOutTheFlavorOfIngredients extends Quest if ((qs != null) && (qs.getCond() < 4)) { final ItemChanceHolder item = MONSTER_CHANCES.get(npc.getId()); - if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), true)) - { - qs.setCond(qs.getCond() + 1, true); + if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), false)) { + if ((getQuestItemsCount(killer, RITRON_FRUIT) >= 3) && (getQuestItemsCount(killer, MOON_FLOWER) >= 20) && (getQuestItemsCount(killer, LEECH_FLUIDS) >= 10)) { + qs.setCond(qs.getCond() + 1, true); + } else { + playSound(killer, ITEMSOUND_QUEST_ITEMGET); + } } } return super.onKill(npc, killer, isSummon); diff --git a/src/main/java/com/l2jserver/datapack/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/src/main/java/com/l2jserver/datapack/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java index 98b328c63d10aa88434e680fd9709cda03636dc0..943c6f3e4c7504447245342f05ef7cfff0076253 100644 --- a/src/main/java/com/l2jserver/datapack/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java +++ b/src/main/java/com/l2jserver/datapack/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java @@ -141,7 +141,7 @@ public final class Q00383_TreasureHunt extends Quest { if (hasQuestItems(player, THIEF_KEY)) { - takeItems(player, THIEF_KEY, -1); + takeItems(player, THIEF_KEY, 1); qs.exitQuest(true, true); htmltext = event;