Proper soulshot toggle.

Contributed by gigilo1968.
2017-09-23 14:51:18 +00:00
parent 013b789b40
commit 74f1bdbf36
77 changed files with 262 additions and 829 deletions
--- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java
+++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/Fishing.java
@@ -245,14 +245,18 @@ public class Fishing
 		}
 		
 		double chance = baitData.getChance();
-		if (_player.isChargedShot(ShotType.FISH_SOULSHOTS))
+		final boolean isCharged = _player.isChargedShot(ShotType.FISH_SOULSHOTS);
+		if (isCharged)
 		{
-			chance *= 1.25; // +25 % chance to win
-			_player.setChargedShot(ShotType.FISH_SOULSHOTS, false);
+			chance *= 1.50; // +50 % chance to win
 		}
 		
 		if (Rnd.get(0, 100) <= chance)
 		{
+			if (isCharged)
+			{
+				_player.setChargedShot(ShotType.FISH_SOULSHOTS, false);
+			}
 			reelIn(FishingEndReason.WIN, true);
 		}
 		else