From e4ed809b43e1543382f419c044cd2b10e2cc0569 Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 16 Dec 2018 18:53:39 +0000 Subject: [PATCH] Accept double values for fishing rates. --- .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../l2jmobius/gameserver/model/Fishing.java | 1 - .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- .../dist/game/data/xsd/Fishing.xsd | 8 +++---- .../gameserver/data/xml/impl/FishingData.java | 24 +++++++++---------- 26 files changed, 160 insertions(+), 166 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git 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 index c99bd47e84..15976fb476 100644 --- 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 @@ -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_2.5_Underground/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_2.5_Underground/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java index d7045c8769..58f699c4c9 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/Fishing.java @@ -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_3.0_Helios/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_3.0_Helios/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java index 8556a75cae..62f7cc2af2 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/Fishing.java @@ -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_4.0_GrandCrusade/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java index 8556a75cae..62f7cc2af2 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/Fishing.java @@ -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_5.0_Salvation/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/Fishing.java index 6c11402a26..4bbe92e4ec 100644 --- a/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/Fishing.java @@ -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_5.5_EtinasFate/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/Fishing.java b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/Fishing.java index 6c11402a26..4bbe92e4ec 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/Fishing.java +++ b/L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/Fishing.java @@ -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.0_Saviors/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/Fishing.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/Fishing.xsd index 3487545acb..16e5ed9699 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/Fishing.xsd +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/Fishing.xsd @@ -11,14 +11,14 @@ - - + + - - + + diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java index f8c6723e11..91b5f9c43e 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/data/xml/impl/FishingData.java @@ -38,10 +38,10 @@ public final class FishingData implements IGameXmlReader private final Map _baitData = new HashMap<>(); private int _baitDistanceMin; private int _baitDistanceMax; - private int _expRateMin; - private int _expRateMax; - private int _spRateMin; - private int _spRateMax; + private double _expRateMin; + private double _expRateMax; + private double _spRateMin; + private double _spRateMax; /** * Instantiates a new fishing data. @@ -78,14 +78,14 @@ public final class FishingData implements IGameXmlReader } case "experienceRate": { - _expRateMin = parseInteger(listItem.getAttributes(), "min"); - _expRateMax = parseInteger(listItem.getAttributes(), "max"); + _expRateMin = parseDouble(listItem.getAttributes(), "min"); + _expRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "skillPointsRate": { - _spRateMin = parseInteger(listItem.getAttributes(), "min"); - _spRateMax = parseInteger(listItem.getAttributes(), "max"); + _spRateMin = parseDouble(listItem.getAttributes(), "min"); + _spRateMax = parseDouble(listItem.getAttributes(), "max"); break; } case "baits": @@ -143,22 +143,22 @@ public final class FishingData implements IGameXmlReader return _baitDistanceMax; } - public int getExpRateMin() + public double getExpRateMin() { return _expRateMin; } - public int getExpRateMax() + public double getExpRateMax() { return _expRateMax; } - public int getSpRateMin() + public double getSpRateMin() { return _spRateMin; } - public int getSpRateMax() + public double getSpRateMax() { return _spRateMax; }