From 0bdd4e455c994c37f1ce89a4c386cd1560a90403 Mon Sep 17 00:00:00 2001
From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 16 Dec 2018 18:55:03 +0000
Subject: [PATCH] Fishing value corrections. Contributed by Mantra.

---
 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Fishing.xml     | 4 ++--
 .../java/com/l2jmobius/gameserver/model/Fishing.java          | 3 +--
 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Fishing.xml       | 4 ++--
 .../java/com/l2jmobius/gameserver/model/Fishing.java          | 3 +--
 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Fishing.xml    | 4 ++--
 .../java/com/l2jmobius/gameserver/model/Fishing.java          | 3 +--
 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Fishing.xml  | 4 ++--
 .../java/com/l2jmobius/gameserver/model/Fishing.java          | 3 +--
 8 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Fishing.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Fishing.xml
index ac86e24a79..a4d243bc44 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/Fishing.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./xsd/Fishing.xsd">
 	<baitDistance min="90" max="250" />
-	<experienceRate min="650" max="700" />
-	<skillPointsRate min="40" max="45" />
+	<experienceRate min="1" max="1" />
+	<skillPointsRate min="0.033" max="0.033" />
 	<baits>
 		<bait itemId="45495" level="1" minPlayerLevel="20" chance="64" timeMin="45000" timeMax="45000" waitMin="15000" waitMax="15000"> <!-- Normal Bait -->
 			<catch itemId="45473" /> <!-- Blue Mackerel -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java
index 772f812e21..524dce60c9 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java
+++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/Fishing.java
@@ -144,7 +144,7 @@ public class Fishing
 		final int minPlayerLevel = baitData == null ? 20 : baitData.getMinPlayerLevel();
 		if (_player.getLevel() < minPlayerLevel)
 		{
-			if (minPlayerLevel == 85)
+			if (minPlayerLevel == 20)
 			{
 				_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
 			}
@@ -287,7 +287,6 @@ public class Fishing
 				final int numRewards = baitData.getRewards().size();
 				if (numRewards > 0)
 				{
-					// TODO: verify, totally guessed
 					final FishingData fishingData = FishingData.getInstance();
 					final int lvlModifier = _player.getLevel() * _player.getLevel();
 					_player.addExpAndSp(Rnd.get(fishingData.getExpRateMin(), fishingData.getExpRateMax()) * lvlModifier, Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier, true);
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Fishing.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Fishing.xml
index ac86e24a79..a4d243bc44 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/Fishing.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./xsd/Fishing.xsd">
 	<baitDistance min="90" max="250" />
-	<experienceRate min="650" max="700" />
-	<skillPointsRate min="40" max="45" />
+	<experienceRate min="1" max="1" />
+	<skillPointsRate min="0.033" max="0.033" />
 	<baits>
 		<bait itemId="45495" level="1" minPlayerLevel="20" chance="64" timeMin="45000" timeMax="45000" waitMin="15000" waitMax="15000"> <!-- Normal Bait -->
 			<catch itemId="45473" /> <!-- Blue Mackerel -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java
index 772f812e21..524dce60c9 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java
+++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/Fishing.java
@@ -144,7 +144,7 @@ public class Fishing
 		final int minPlayerLevel = baitData == null ? 20 : baitData.getMinPlayerLevel();
 		if (_player.getLevel() < minPlayerLevel)
 		{
-			if (minPlayerLevel == 85)
+			if (minPlayerLevel == 20)
 			{
 				_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
 			}
@@ -287,7 +287,6 @@ public class Fishing
 				final int numRewards = baitData.getRewards().size();
 				if (numRewards > 0)
 				{
-					// TODO: verify, totally guessed
 					final FishingData fishingData = FishingData.getInstance();
 					final int lvlModifier = _player.getLevel() * _player.getLevel();
 					_player.addExpAndSp(Rnd.get(fishingData.getExpRateMin(), fishingData.getExpRateMax()) * lvlModifier, Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier, true);
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Fishing.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Fishing.xml
index ac86e24a79..a4d243bc44 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/Fishing.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./xsd/Fishing.xsd">
 	<baitDistance min="90" max="250" />
-	<experienceRate min="650" max="700" />
-	<skillPointsRate min="40" max="45" />
+	<experienceRate min="1" max="1" />
+	<skillPointsRate min="0.033" max="0.033" />
 	<baits>
 		<bait itemId="45495" level="1" minPlayerLevel="20" chance="64" timeMin="45000" timeMax="45000" waitMin="15000" waitMax="15000"> <!-- Normal Bait -->
 			<catch itemId="45473" /> <!-- Blue Mackerel -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java
index 772f812e21..524dce60c9 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java
+++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/Fishing.java
@@ -144,7 +144,7 @@ public class Fishing
 		final int minPlayerLevel = baitData == null ? 20 : baitData.getMinPlayerLevel();
 		if (_player.getLevel() < minPlayerLevel)
 		{
-			if (minPlayerLevel == 85)
+			if (minPlayerLevel == 20)
 			{
 				_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
 			}
@@ -287,7 +287,6 @@ public class Fishing
 				final int numRewards = baitData.getRewards().size();
 				if (numRewards > 0)
 				{
-					// TODO: verify, totally guessed
 					final FishingData fishingData = FishingData.getInstance();
 					final int lvlModifier = _player.getLevel() * _player.getLevel();
 					_player.addExpAndSp(Rnd.get(fishingData.getExpRateMin(), fishingData.getExpRateMax()) * lvlModifier, Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier, true);
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Fishing.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Fishing.xml
index ac86e24a79..a4d243bc44 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Fishing.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/Fishing.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="./xsd/Fishing.xsd">
 	<baitDistance min="90" max="250" />
-	<experienceRate min="650" max="700" />
-	<skillPointsRate min="40" max="45" />
+	<experienceRate min="1" max="1" />
+	<skillPointsRate min="0.033" max="0.033" />
 	<baits>
 		<bait itemId="45495" level="1" minPlayerLevel="20" chance="64" timeMin="45000" timeMax="45000" waitMin="15000" waitMax="15000"> <!-- Normal Bait -->
 			<catch itemId="45473" /> <!-- Blue Mackerel -->
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/Fishing.java
index 772f812e21..524dce60c9 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/Fishing.java
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/Fishing.java
@@ -144,7 +144,7 @@ public class Fishing
 		final int minPlayerLevel = baitData == null ? 20 : baitData.getMinPlayerLevel();
 		if (_player.getLevel() < minPlayerLevel)
 		{
-			if (minPlayerLevel == 85)
+			if (minPlayerLevel == 20)
 			{
 				_player.sendPacket(SystemMessageId.YOU_CANNOT_FISH_AS_YOU_DO_NOT_MEET_THE_REQUIREMENTS);
 			}
@@ -287,7 +287,6 @@ public class Fishing
 				final int numRewards = baitData.getRewards().size();
 				if (numRewards > 0)
 				{
-					// TODO: verify, totally guessed
 					final FishingData fishingData = FishingData.getInstance();
 					final int lvlModifier = _player.getLevel() * _player.getLevel();
 					_player.addExpAndSp(Rnd.get(fishingData.getExpRateMin(), fishingData.getExpRateMax()) * lvlModifier, Rnd.get(fishingData.getSpRateMin(), fishingData.getSpRateMax()) * lvlModifier, true);