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

Support for extractable item long quantity.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-04 02:19:11 +00:00
parent e9430b97dd
commit 35db563e3c
74 changed files with 317 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

4
L2J_Mobius_06.0_Fafurion/dist/game/data/stats/items/80400-80499.xml vendored
View File

@@ -248,6 +248,10 @@
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<capsuled_items>
<item id="57" min="10000000000" max="10000000000" chance="100" /> <!-- Adena -->
</capsuled_items>
</item> </item>
<item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem"> <item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem">
<!-- Use it to obtain 10,000 Mammon's Keys. --> <!-- Use it to obtain 10,000 Mammon's Keys. -->

10
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

4
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/stats/items/80400-80499.xml vendored
View File

@@ -248,6 +248,10 @@
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<capsuled_items>
<item id="57" min="10000000000" max="10000000000" chance="100" /> <!-- Adena -->
</capsuled_items>
</item> </item>
<item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem"> <item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem">
<!-- Use it to obtain 10,000 Mammon's Keys. --> <!-- Use it to obtain 10,000 Mammon's Keys. -->

10
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_08.2_Homunculus/dist/game/data/stats/items/80400-80499.xml vendored
View File

@@ -248,6 +248,10 @@
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<capsuled_items>
<item id="57" min="10000000000" max="10000000000" chance="100" /> <!-- Adena -->
</capsuled_items>
</item> </item>
<item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem"> <item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem">
<!-- Use it to obtain 10,000 Mammon's Keys. --> <!-- Use it to obtain 10,000 Mammon's Keys. -->

4
L2J_Mobius_08.2_Homunculus/dist/game/data/xsd/items.xsd vendored
View File

@@ -80,8 +80,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/stats/items/80400-80499.xml vendored
View File

@@ -248,6 +248,10 @@
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<capsuled_items>
<item id="57" min="10000000000" max="10000000000" chance="100" /> <!-- Adena -->
</capsuled_items>
</item> </item>
<item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem"> <item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem">
<!-- Use it to obtain 10,000 Mammon's Keys. --> <!-- Use it to obtain 10,000 Mammon's Keys. -->

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/xsd/items.xsd vendored
View File

@@ -80,8 +80,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_10.0_MasterClass/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_10.0_MasterClass/dist/game/data/stats/items/80400-80499.xml vendored
View File

@@ -248,6 +248,10 @@
<set name="is_dropable" val="false" /> <set name="is_dropable" val="false" />
<set name="is_sellable" val="false" /> <set name="is_sellable" val="false" />
<set name="is_stackable" val="true" /> <set name="is_stackable" val="true" />
<set name="handler" val="ExtractableItems" />
<capsuled_items>
<item id="57" min="10000000000" max="10000000000" chance="100" /> <!-- Adena -->
</capsuled_items>
</item> </item>
<item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem"> <item id="80417" name="Box of 10,000 Mammon's Keys" type="EtcItem">
<!-- Use it to obtain 10,000 Mammon's Keys. --> <!-- Use it to obtain 10,000 Mammon's Keys. -->

4
L2J_Mobius_10.0_MasterClass/dist/game/data/xsd/items.xsd vendored
View File

@@ -80,8 +80,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -86,9 +86,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -148,9 +148,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

12
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -149,9 +149,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;

10
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/xsd/items.xsd vendored
View File

@@ -85,8 +85,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/xsd/items.xsd vendored
View File

@@ -85,8 +85,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);

16
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/scripts/handlers/itemhandlers/ExtractableItems.java vendored
View File

@@ -87,9 +87,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -112,7 +112,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;
@@ -157,9 +157,9 @@ public class ExtractableItems implements IItemHandler
if (Rnd.get(100000) <= expi.getChance()) if (Rnd.get(100000) <= expi.getChance())
{ {
final int min = (int) (expi.getMin() * Config.RATE_EXTRACTABLE); final long min = (long) (expi.getMin() * Config.RATE_EXTRACTABLE);
final int max = (int) (expi.getMax() * Config.RATE_EXTRACTABLE); final long max = (long) (expi.getMax() * Config.RATE_EXTRACTABLE);
int createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min); long createItemAmount = (max == min) ? min : (Rnd.get((max - min) + 1) + min);
if (createItemAmount == 0) if (createItemAmount == 0)
{ {
continue; continue;
@@ -167,7 +167,7 @@ public class ExtractableItems implements IItemHandler
if (expi.getId() == -1) // Prime points if (expi.getId() == -1) // Prime points
{ {
player.setPrimePoints(player.getPrimePoints() + createItemAmount); player.setPrimePoints(player.getPrimePoints() + (int) createItemAmount);
player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!"); player.sendMessage("You have obtained " + (createItemAmount / 100) + " Euro!");
primeReward = true; primeReward = true;
continue; continue;

4
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/xsd/items.xsd vendored
View File

@@ -85,8 +85,8 @@
<xs:element maxOccurs="unbounded" name="item"> <xs:element maxOccurs="unbounded" name="item">
<xs:complexType> <xs:complexType>
<xs:attribute name="id" type="xs:unsignedInt" use="required" /> <xs:attribute name="id" type="xs:unsignedInt" use="required" />
<xs:attribute name="min" type="xs:unsignedInt" use="required" /> <xs:attribute name="min" type="xs:unsignedLong" use="required" />
<xs:attribute name="max" type="xs:unsignedInt" use="required" /> <xs:attribute name="max" type="xs:unsignedLong" use="required" />
<xs:attribute name="chance" type="xs:decimal" use="required" /> <xs:attribute name="chance" type="xs:decimal" use="required" />
<xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="minEnchant" type="xs:unsignedByte" use="optional" />
<xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" /> <xs:attribute name="maxEnchant" type="xs:unsignedByte" use="optional" />

10
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/model/ExtractableProduct.java
View File

@@ -22,8 +22,8 @@ package org.l2jmobius.gameserver.model;
public class ExtractableProduct public class ExtractableProduct
{ {
private final int _id; private final int _id;
private final int _min; private final long _min;
private final int _max; private final long _max;
private final int _chance; private final int _chance;
private final int _minEnchant; private final int _minEnchant;
private final int _maxEnchant; private final int _maxEnchant;
@@ -37,7 +37,7 @@ public class ExtractableProduct
* @param minEnchant item min enchant * @param minEnchant item min enchant
* @param maxEnchant item max enchant * @param maxEnchant item max enchant
*/ */
public ExtractableProduct(int id, int min, int max, double chance, int minEnchant, int maxEnchant) public ExtractableProduct(int id, long min, long max, double chance, int minEnchant, int maxEnchant)
{ {
_id = id; _id = id;
_min = min; _min = min;
@@ -52,12 +52,12 @@ public class ExtractableProduct
return _id; return _id;
} }
public int getMin() public long getMin()
{ {
return _min; return _min;
} }
public int getMax() public long getMax()
{ {
return _max; return _max;
} }

4
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/util/DocumentItem.java
View File

@@ -181,8 +181,8 @@ public class DocumentItem extends DocumentBase implements IXmlReader
if ("item".equals(b.getNodeName())) if ("item".equals(b.getNodeName()))
{ {
final int id = parseInteger(b.getAttributes(), "id"); final int id = parseInteger(b.getAttributes(), "id");
final int min = parseInteger(b.getAttributes(), "min"); final long min = parseInteger(b.getAttributes(), "min");
final int max = parseInteger(b.getAttributes(), "max"); final long max = parseInteger(b.getAttributes(), "max");
final double chance = parseDouble(b.getAttributes(), "chance"); final double chance = parseDouble(b.getAttributes(), "chance");
final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0); final int minEnchant = parseInteger(b.getAttributes(), "minEnchant", 0);
final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0); final int maxEnchant = parseInteger(b.getAttributes(), "maxEnchant", 0);