From b1a5ff9dbae51bdb40554107888eaf26f3780858 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 14 Jan 2020 19:09:38 +0000
Subject: [PATCH] Fixes for quest 341, 380 and 383. Source:
 https://bitbucket.org/l2jserver/l2j-server-datapack/commits/f7fc3cd95f992425d73c9b8f4b77e12e7b7d7050

---
 .../Q00341_HuntingForWildBeasts.java                 |  2 +-
 .../Q00380_BringOutTheFlavorOfIngredients.java       | 12 ++++++++++--
 .../Q00383_TreasureHunt/Q00383_TreasureHunt.java     |  2 +-
 .../Q00341_HuntingForWildBeasts.java                 |  2 +-
 .../Q00380_BringOutTheFlavorOfIngredients.java       | 12 ++++++++++--
 .../Q00383_TreasureHunt/Q00383_TreasureHunt.java     |  2 +-
 6 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index 0067c58ccd..c4acc24ea6 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -87,7 +87,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 	@Override
 	public String onTalk(Npc npc, PlayerInstance player)
 	{
-		final QuestState qs = getQuestState(player, false);
+		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		
 		switch (qs.getState())
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index f2b5475271..eb6833d21e 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -19,6 +19,7 @@ package quests.Q00380_BringOutTheFlavorOfIngredients;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -193,9 +194,16 @@ public 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))
+			if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), false))
 			{
-				qs.setCond(qs.getCond() + 1, true);
+				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, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				}
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index cfb951c071..c9d4f8c95b 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -139,7 +139,7 @@ public 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;
 						
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
index 0067c58ccd..c4acc24ea6 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00341_HuntingForWildBeasts/Q00341_HuntingForWildBeasts.java
@@ -87,7 +87,7 @@ public class Q00341_HuntingForWildBeasts extends Quest
 	@Override
 	public String onTalk(Npc npc, PlayerInstance player)
 	{
-		final QuestState qs = getQuestState(player, false);
+		final QuestState qs = getQuestState(player, true);
 		String htmltext = getNoQuestMsg(player);
 		
 		switch (qs.getState())
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
index f2b5475271..eb6833d21e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00380_BringOutTheFlavorOfIngredients/Q00380_BringOutTheFlavorOfIngredients.java
@@ -19,6 +19,7 @@ package quests.Q00380_BringOutTheFlavorOfIngredients;
 import java.util.HashMap;
 import java.util.Map;
 
+import org.l2jmobius.gameserver.enums.QuestSound;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.model.holders.ItemChanceHolder;
@@ -193,9 +194,16 @@ public 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))
+			if (giveItemRandomly(qs.getPlayer(), npc, item.getId(), 1, item.getCount(), item.getChance(), false))
 			{
-				qs.setCond(qs.getCond() + 1, true);
+				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, QuestSound.ITEMSOUND_QUEST_ITEMGET);
+				}
 			}
 		}
 		return super.onKill(npc, killer, isSummon);
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
index cfb951c071..c9d4f8c95b 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/scripts/quests/Q00383_TreasureHunt/Q00383_TreasureHunt.java
@@ -139,7 +139,7 @@ public 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;