From 6a0399433fe9a0308c781c97b4b5543939477463 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 2 Jan 2022 00:43:39 +0000
Subject: [PATCH] Corrections for quest Best Choice (10566). Contributed by
 Index.

---
 .../dist/game/data/html/default/30471.htm            |  1 +
 .../dist/game/data/html/default/31316.htm            |  1 +
 .../quests/Q10566_BestChoice/Q10566_BestChoice.java  | 12 ++++++++++--
 .../scripts/quests/Q10566_BestChoice/noLevel.html    |  6 +++---
 .../dist/game/data/html/default/30471.htm            |  1 +
 .../dist/game/data/html/default/31316.htm            |  1 +
 .../quests/Q10566_BestChoice/Q10566_BestChoice.java  | 12 ++++++++++--
 .../scripts/quests/Q10566_BestChoice/noLevel.html    |  6 +++---
 .../dist/game/data/html/default/30471.htm            |  1 +
 .../dist/game/data/html/default/31316.htm            |  1 +
 .../quests/Q10566_BestChoice/Q10566_BestChoice.java  | 12 ++++++++++--
 .../scripts/quests/Q10566_BestChoice/noLevel.html    |  6 +++---
 12 files changed, 45 insertions(+), 15 deletions(-)

diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/30471.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/30471.htm
index 6b0e9d44ec..bb7a9fc062 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/30471.htm
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/30471.htm
@@ -7,4 +7,5 @@ My brother Pushkin and I are going to open the best blacksmith shop in the town.
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/31316.htm b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/31316.htm
index c7469b5ddb..e6876d9a20 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/31316.htm
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/html/default/31316.htm
@@ -7,4 +7,5 @@ What would you like? I can craft everything, from jewelry to battle golems! Your
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..86fea11e6d 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10566_BestChoice;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.QuestType;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,7 +34,7 @@ public class Q10566_BestChoice extends Quest
 	// NPC
 	private static final int HERPHAH = 34362;
 	// Misc
-	private static final int MIN_LEVEL = 95;
+	private static final int MIN_LEVEL = 100;
 	// Items
 	private static final int CERTIFICATE_SANTIAGO = 48173;
 	private static final int CERTIFICATE_RUPIO = 48174;
@@ -95,7 +96,14 @@ public class Q10566_BestChoice extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				if (Config.PREMIUM_SYSTEM_ENABLED)
+				{
+					htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				}
+				else
+				{
+					htmltext = "34362-01.htm";
+				}
 				break;
 			}
 			case State.STARTED:
diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
index 089e4f3aa4..1ea74670e9 100644
--- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
+++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
@@ -1,4 +1,4 @@
-<html><body>Fishing Guild Member:<br>
-Hmm, it would seem that it's a bit too early still to discuss the Fishing Guild with you. Please return after you've become stronger.<br>
-(Only characters with Lv. 95 or above may undertake this quest.)
+<html><body>Herphah:<br>
+I don't understand why someone like you is intrested in this mission?<br>
+(This quest is for characters Lv. 100 and higher.)
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/30471.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/30471.htm
index 6b0e9d44ec..bb7a9fc062 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/30471.htm
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/30471.htm
@@ -7,4 +7,5 @@ My brother Pushkin and I are going to open the best blacksmith shop in the town.
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/31316.htm b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/31316.htm
index c7469b5ddb..e6876d9a20 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/31316.htm
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/html/default/31316.htm
@@ -7,4 +7,5 @@ What would you like? I can craft everything, from jewelry to battle golems! Your
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..86fea11e6d 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10566_BestChoice;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.QuestType;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,7 +34,7 @@ public class Q10566_BestChoice extends Quest
 	// NPC
 	private static final int HERPHAH = 34362;
 	// Misc
-	private static final int MIN_LEVEL = 95;
+	private static final int MIN_LEVEL = 100;
 	// Items
 	private static final int CERTIFICATE_SANTIAGO = 48173;
 	private static final int CERTIFICATE_RUPIO = 48174;
@@ -95,7 +96,14 @@ public class Q10566_BestChoice extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				if (Config.PREMIUM_SYSTEM_ENABLED)
+				{
+					htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				}
+				else
+				{
+					htmltext = "34362-01.htm";
+				}
 				break;
 			}
 			case State.STARTED:
diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
index 089e4f3aa4..1ea74670e9 100644
--- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
+++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
@@ -1,4 +1,4 @@
-<html><body>Fishing Guild Member:<br>
-Hmm, it would seem that it's a bit too early still to discuss the Fishing Guild with you. Please return after you've become stronger.<br>
-(Only characters with Lv. 95 or above may undertake this quest.)
+<html><body>Herphah:<br>
+I don't understand why someone like you is intrested in this mission?<br>
+(This quest is for characters Lv. 100 and higher.)
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/30471.htm b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/30471.htm
index 6b0e9d44ec..bb7a9fc062 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/30471.htm
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/30471.htm
@@ -7,4 +7,5 @@ My brother Pushkin and I are going to open the best blacksmith shop in the town.
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/31316.htm b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/31316.htm
index c7469b5ddb..e6876d9a20 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/31316.htm
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/html/default/31316.htm
@@ -7,4 +7,5 @@ What would you like? I can craft everything, from jewelry to battle golems! Your
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_03.htm">Upgrade R-grade or higher grade items</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_Link common/crafting_01.htm">Crafting</Button>
 <Button ALIGN=LEFT ICON="NORMAL" action="bypass -h npc_%objectId%_TerritoryStatus">Ask about local governor and taxes</Button>
+<Button ALIGN=LEFT ICON="QUEST" action="bypass -h npc_%objectId%_Quest">Quest</Button>
 </body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
index 06dce8cce6..86fea11e6d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/Q10566_BestChoice.java
@@ -16,6 +16,7 @@
  */
 package quests.Q10566_BestChoice;
 
+import org.l2jmobius.Config;
 import org.l2jmobius.gameserver.enums.QuestType;
 import org.l2jmobius.gameserver.model.actor.Npc;
 import org.l2jmobius.gameserver.model.actor.Player;
@@ -33,7 +34,7 @@ public class Q10566_BestChoice extends Quest
 	// NPC
 	private static final int HERPHAH = 34362;
 	// Misc
-	private static final int MIN_LEVEL = 95;
+	private static final int MIN_LEVEL = 100;
 	// Items
 	private static final int CERTIFICATE_SANTIAGO = 48173;
 	private static final int CERTIFICATE_RUPIO = 48174;
@@ -95,7 +96,14 @@ public class Q10566_BestChoice extends Quest
 		{
 			case State.CREATED:
 			{
-				htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				if (Config.PREMIUM_SYSTEM_ENABLED)
+				{
+					htmltext = (player.hasPremiumStatus()) ? "34362-01.htm" : "34362-99.html";
+				}
+				else
+				{
+					htmltext = "34362-01.htm";
+				}
 				break;
 			}
 			case State.STARTED:
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
index 089e4f3aa4..1ea74670e9 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/quests/Q10566_BestChoice/noLevel.html
@@ -1,4 +1,4 @@
-<html><body>Fishing Guild Member:<br>
-Hmm, it would seem that it's a bit too early still to discuss the Fishing Guild with you. Please return after you've become stronger.<br>
-(Only characters with Lv. 95 or above may undertake this quest.)
+<html><body>Herphah:<br>
+I don't understand why someone like you is intrested in this mission?<br>
+(This quest is for characters Lv. 100 and higher.)
 </body></html>
\ No newline at end of file