lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fishing bait rework.

Browse Source
This commit is contained in:
MobiusDev
2017-04-23 14:19:23 +00:00
parent 1610d0f443
commit 0c55e7e142
10 changed files with 198 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java
View File

@@ -36,13 +36,8 @@ public final class FishingData implements IGameXmlReader
{
private static final Logger LOGGER = Logger.getLogger(FishingData.class.getName());
private final Map<Integer, FishingBaitData> _baitData = new HashMap<>();
private int _minPlayerLevel;
private int _baitDistanceMin;
private int _baitDistanceMax;
private int _fishingTimeMin;
private int _fishingTimeMax;
private int _fishingTimeWaitMin;
private int _fishingTimeWaitMax;
private int _expRateMin;
private int _expRateMax;
private int _spRateMin;
@@ -75,29 +70,12 @@ public final class FishingData implements IGameXmlReader
{
switch (listItem.getNodeName())
{
case "playerLevel":
{
_minPlayerLevel = parseInteger(listItem.getAttributes(), "min");
break;
}
case "baitDistance":
{
_baitDistanceMin = parseInteger(listItem.getAttributes(), "min");
_baitDistanceMax = parseInteger(listItem.getAttributes(), "max");
break;
}
case "fishingTime":
{
_fishingTimeMin = parseInteger(listItem.getAttributes(), "min");
_fishingTimeMax = parseInteger(listItem.getAttributes(), "max");
break;
}
case "fishingTimeWait":
{
_fishingTimeWaitMin = parseInteger(listItem.getAttributes(), "min");
_fishingTimeWaitMax = parseInteger(listItem.getAttributes(), "max");
break;
}
case "experienceRate":
{
_expRateMin = parseInteger(listItem.getAttributes(), "min");
@@ -119,8 +97,13 @@ public final class FishingData implements IGameXmlReader
final NamedNodeMap attrs = bait.getAttributes();
final int itemId = parseInteger(attrs, "itemId");
final int level = parseInteger(attrs, "level");
final int minPlayerLevel = parseInteger(attrs, "minPlayerLevel");
final double chance = parseDouble(attrs, "chance");
final FishingBaitData baitData = new FishingBaitData(itemId, level, chance);
final int timeMin = parseInteger(attrs, "timeMin");
final int timeMax = parseInteger(attrs, "timeMax");
final int waitMin = parseInteger(attrs, "waitMin");
final int waitMax = parseInteger(attrs, "waitMax");
final FishingBaitData baitData = new FishingBaitData(itemId, level, minPlayerLevel, chance, timeMin, timeMax, waitMin, waitMax);
for (Node c = bait.getFirstChild(); c != null; c = c.getNextSibling())
{
@@ -150,11 +133,6 @@ public final class FishingData implements IGameXmlReader
return _baitData.get(baitItemId);
}
public int getMinPlayerLevel()
{
return _minPlayerLevel;
}
public int getBaitDistanceMin()
{
return _baitDistanceMin;
@@ -165,26 +143,6 @@ public final class FishingData implements IGameXmlReader
return _baitDistanceMax;
}
public int getFishingTimeMin()
{
return _fishingTimeMin;
}
public int getFishingTimeMax()
{
return _fishingTimeMax;
}
public int getFishingTimeWaitMin()
{
return _fishingTimeWaitMin;
}
public int getFishingTimeWaitMax()
{
return _fishingTimeWaitMax;
}
public int getExpRateMin()
{
return _expRateMin;

11
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/Fishing.java
View File

@@ -140,15 +140,15 @@ public class Fishing
return;
}
final int minPlayerLevel = FishingData.getInstance().getMinPlayerLevel();
final FishingBaitData baitData = getCurrentBaitData();
final int minPlayerLevel = baitData == null ? 85 : baitData.getMinPlayerLevel();
if (_player.getLevel() < minPlayerLevel)
{
if (minPlayerLevel == 85)
{
_player.sendPacket(SystemMessageId.FISHING_IS_AVAILABLE_TO_CHARACTERS_LV_85_OR_ABOVE);
}
else
// In case of custom fishing level requirement set in config.
else // In case of custom fishing level.
{
_player.sendPacket(SystemMessageId.YOU_DO_NOT_MEET_THE_FISHING_LEVEL_REQUIREMENTS);
}
@@ -166,7 +166,6 @@ public class Fishing
return;
}
final FishingBaitData baitData = getCurrentBaitData();
if (baitData == null)
{
_player.sendPacket(SystemMessageId.YOU_MUST_PUT_BAIT_ON_YOUR_HOOK_BEFORE_YOU_CAN_FISH);
@@ -224,8 +223,8 @@ public class Fishing
_reelInTask = ThreadPoolManager.getInstance().scheduleGeneral(() ->
{
_player.getFishing().reelInWithReward();
_startFishingTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> _player.getFishing().castLine(), Rnd.get(FishingData.getInstance().getFishingTimeWaitMin(), FishingData.getInstance().getFishingTimeWaitMax()));
}, Rnd.get(FishingData.getInstance().getFishingTimeMin(), FishingData.getInstance().getFishingTimeMax()));
_startFishingTask = ThreadPoolManager.getInstance().scheduleGeneral(() -> _player.getFishing().castLine(), Rnd.get(baitData.getWaitMin(), baitData.getWaitMax()));
}, Rnd.get(baitData.getTimeMin(), baitData.getTimeMax()));
_player.stopMove(null);
_player.broadcastPacket(new ExFishingStart(_player, -1, baitData.getLevel(), _baitLocation));
_player.sendPacket(new ExUserInfoFishing(_player, true, _baitLocation));

37
L2J_Mobius_Underground/java/com/l2jmobius/gameserver/model/FishingBaitData.java
View File

@@ -26,14 +26,24 @@ public class FishingBaitData
{
private final int _itemId;
private final int _level;
private final int _minPlayerLevel;
private final double _chance;
private final int _timeMin;
private final int _timeMax;
private final int _waitMin;
private final int _waitMax;
private final List<Integer> _rewards = new ArrayList<>();
public FishingBaitData(int itemId, int level, double chance)
public FishingBaitData(int itemId, int level, int minPlayerLevel, double chance, int timeMin, int timeMax, int waitMin, int waitMax)
{
_itemId = itemId;
_level = level;
_minPlayerLevel = minPlayerLevel;
_chance = chance;
_timeMin = timeMin;
_timeMax = timeMax;
_waitMin = waitMin;
_waitMax = waitMax;
}
public int getItemId()
@@ -46,11 +56,36 @@ public class FishingBaitData
return _level;
}
public int getMinPlayerLevel()
{
return _minPlayerLevel;
}
public double getChance()
{
return _chance;
}
public int getTimeMin()
{
return _timeMin;
}
public int getTimeMax()
{
return _timeMax;
}
public int getWaitMin()
{
return _waitMin;
}
public int getWaitMax()
{
return _waitMax;
}
public List<Integer> getRewards()
{
return _rewards;