Removing custom setting from quest Linnaeus Special Bait (53)

06773260 · Adry85 · Zoey76 · 2a0f9706 · 06773260 · 06773260
Commit 06773260 authored 7 years ago by Adry85 Committed by Zoey76 4 years ago
--- a/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/31577-0a.html
+++ b/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/31577-0a.html
 <html><body>Fishermen's Guild Member Linnaeus:<br>
-Not long ago while fishing, I caught several strange boxes containing assorted valuable items. They ended up being more valuable than fish!<br>
+A while back, I accidently reeled in several strange boxes while fishing. When I opened them, I discovered that they contained many valuable items, much more precious than fish!<br>
 I have a knack for finding these boxes, but I can't show you how to do it yet.<br>
-(This quest may only be undertaken by a character of level 60 or above with a fishing skill of 20.)
+(This quest may only be undertaken by a character of level 60 or above.)
 </body></html>
\ No newline at end of file
--- a/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
+++ b/dist/game/data/scripts/quests/Q00053_LinnaeusSpecialBait/Q00053_LinnaeusSpecialBait.java
@@ -25,7 +25,6 @@ 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;
-import com.l2jserver.gameserver.model.skills.BuffInfo;

 /**
 * Linnaeus Special Bait (53)<br>
@@ -40,10 +39,6 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 	// Items
 	private static final int CRIMSON_DRAKE_HEART = 7624;
 	private static final int FLAMING_FISHING_LURE = 7613;
-	// Misc
-	// TODO: Custom setting: whether or not to check for fishing skill level?
-	// Default False to require fishing skill level, any other value to ignore fishing and evaluate char level only.
-	private static final boolean ALT_IGNORE_FISHING = false;
 	
 	public Q00053_LinnaeusSpecialBait()
 	{
@@ -126,7 +121,7 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 				htmltext = getAlreadyCompletedMsg(player);
 				break;
 			case State.CREATED:
-				htmltext = ((player.getLevel() > 59) && (fishingLevel(player) > 19)) ? "31577-0.htm" : "31577-0a.html";
+				htmltext = (player.getLevel() > 59) ? "31577-0.htm" : "31577-0a.html";
 				break;
 			case State.STARTED:
 				htmltext = (st.isCond(1)) ? "31577-4.html" : "31577-2.html";
@@ -134,19 +129,4 @@ public class Q00053_LinnaeusSpecialBait extends Quest
 		}
 		return htmltext;
 	}
-	
-	private static int fishingLevel(L2PcInstance player)
-	{
-		int level = 20;
-		if (!ALT_IGNORE_FISHING)
-		{
-			level = player.getSkillLevel(1315);
-			final BuffInfo info = player.getEffectList().getBuffInfoBySkillId(2274);
-			if (info != null)
-			{
-				level = (int) info.getSkill().getPower();
-			}
-		}
-		return level;
-	}
 }