Proper soulshot toggle.

Contributed by gigilo1968.
This commit is contained in:
MobiusDev
2017-09-23 14:51:18 +00:00
parent 013b789b40
commit 74f1bdbf36
77 changed files with 262 additions and 829 deletions

View File

@@ -63,7 +63,6 @@ public class BeastSoulShot implements IItemHandler
final List<L2Summon> aliveServitor = playable.getServitors().values().stream().filter(s -> !s.isDead()).collect(Collectors.toList());
if ((pet == null) && aliveServitor.isEmpty())
{
activeOwner.sendMessage("asdas");
activeOwner.sendPacket(SystemMessageId.SOULSHOTS_AND_SPIRITSHOTS_ARE_NOT_AVAILABLE_FOR_A_DEAD_PET_OR_SERVITOR_SAD_ISN_T_IT);
return false;
}

View File

@@ -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