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

Combination system float chance support and data update.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-04-02 11:24:52 +00:00
parent e5c2858b0a
commit 8734a31f33
12 changed files with 9956 additions and 10032 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8390
L2J_Mobius_10.1_MasterClass/dist/game/data/CombinationItems.xml vendored
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_10.1_MasterClass/dist/game/data/xsd/CombinationItems.xsd vendored
View File

@@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" /> <xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" /> <xs:attribute type="xs:int" name="two" use="required" />
<xs:attribute type="xs:long" name="commission" use="optional" /> <xs:attribute type="xs:long" name="commission" use="optional" />
<xs:attribute type="xs:byte" name="chance" use="optional" /> <xs:attribute type="xs:float" name="chance" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>

6
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java
View File

@@ -30,7 +30,7 @@ public class CombinationItem
private final int _enchant; private final int _enchant;
private final int _itemTwo; private final int _itemTwo;
private final long _commission; private final long _commission;
private final int _chance; private final float _chance;
private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class); private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class);
public CombinationItem(StatSet set) public CombinationItem(StatSet set)
@@ -39,7 +39,7 @@ public class CombinationItem
_enchant = set.getInt("enchant", 0); _enchant = set.getInt("enchant", 0);
_itemTwo = set.getInt("two"); _itemTwo = set.getInt("two");
_commission = set.getLong("commission", 0); _commission = set.getLong("commission", 0);
_chance = set.getInt("chance", 33); _chance = set.getFloat("chance", 33);
} }
public int getItemOne() public int getItemOne()
@@ -62,7 +62,7 @@ public class CombinationItem
return _commission; return _commission;
} }
public int getChance() public float getChance()
{ {
return _chance; return _chance;
} }

8902
L2J_Mobius_10.2_MasterClass/dist/game/data/CombinationItems.xml vendored
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_10.2_MasterClass/dist/game/data/xsd/CombinationItems.xsd vendored
View File

@@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" /> <xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" /> <xs:attribute type="xs:int" name="two" use="required" />
<xs:attribute type="xs:long" name="commission" use="optional" /> <xs:attribute type="xs:long" name="commission" use="optional" />
<xs:attribute type="xs:byte" name="chance" use="optional" /> <xs:attribute type="xs:float" name="chance" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>

6
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java
View File

@@ -30,7 +30,7 @@ public class CombinationItem
private final int _enchant; private final int _enchant;
private final int _itemTwo; private final int _itemTwo;
private final long _commission; private final long _commission;
private final int _chance; private final float _chance;
private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class); private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class);
public CombinationItem(StatSet set) public CombinationItem(StatSet set)
@@ -39,7 +39,7 @@ public class CombinationItem
_enchant = set.getInt("enchant", 0); _enchant = set.getInt("enchant", 0);
_itemTwo = set.getInt("two"); _itemTwo = set.getInt("two");
_commission = set.getLong("commission", 0); _commission = set.getLong("commission", 0);
_chance = set.getInt("chance", 33); _chance = set.getFloat("chance", 33);
} }
public int getItemOne() public int getItemOne()
@@ -62,7 +62,7 @@ public class CombinationItem
return _commission; return _commission;
} }
public int getChance() public float getChance()
{ {
return _chance; return _chance;
} }

1212
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/CombinationItems.xml vendored
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_Essence_6.1_BattleChronicle/dist/game/data/xsd/CombinationItems.xsd vendored
View File

@@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" /> <xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" /> <xs:attribute type="xs:int" name="two" use="required" />
<xs:attribute type="xs:long" name="commission" use="optional" /> <xs:attribute type="xs:long" name="commission" use="optional" />
<xs:attribute type="xs:byte" name="chance" use="optional" /> <xs:attribute type="xs:float" name="chance" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>

6
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java
View File

@@ -30,7 +30,7 @@ public class CombinationItem
private final int _enchant; private final int _enchant;
private final int _itemTwo; private final int _itemTwo;
private final long _commission; private final long _commission;
private final int _chance; private final float _chance;
private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class); private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class);
public CombinationItem(StatSet set) public CombinationItem(StatSet set)
@@ -39,7 +39,7 @@ public class CombinationItem
_enchant = set.getInt("enchant", 0); _enchant = set.getInt("enchant", 0);
_itemTwo = set.getInt("two"); _itemTwo = set.getInt("two");
_commission = set.getLong("commission", 0); _commission = set.getLong("commission", 0);
_chance = set.getInt("chance", 33); _chance = set.getFloat("chance", 33);
} }
public int getItemOne() public int getItemOne()
@@ -62,7 +62,7 @@ public class CombinationItem
return _commission; return _commission;
} }
public int getChance() public float getChance()
{ {
return _chance; return _chance;
} }

1452
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/CombinationItems.xml vendored
View File

File diff suppressed because it is too large Load Diff

2
L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/xsd/CombinationItems.xsd vendored
View File

@@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" /> <xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" /> <xs:attribute type="xs:int" name="two" use="required" />
<xs:attribute type="xs:long" name="commission" use="optional" /> <xs:attribute type="xs:long" name="commission" use="optional" />
<xs:attribute type="xs:byte" name="chance" use="optional" /> <xs:attribute type="xs:float" name="chance" use="optional" />
</xs:complexType> </xs:complexType>
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>

6
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/item/combination/CombinationItem.java
View File

@@ -30,7 +30,7 @@ public class CombinationItem
private final int _enchant; private final int _enchant;
private final int _itemTwo; private final int _itemTwo;
private final long _commission; private final long _commission;
private final int _chance; private final float _chance;
private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class); private final Map<CombinationItemType, CombinationItemReward> _rewards = new EnumMap<>(CombinationItemType.class);
public CombinationItem(StatSet set) public CombinationItem(StatSet set)
@@ -39,7 +39,7 @@ public class CombinationItem
_enchant = set.getInt("enchant", 0); _enchant = set.getInt("enchant", 0);
_itemTwo = set.getInt("two"); _itemTwo = set.getInt("two");
_commission = set.getLong("commission", 0); _commission = set.getLong("commission", 0);
_chance = set.getInt("chance", 33); _chance = set.getFloat("chance", 33);
} }
public int getItemOne() public int getItemOne()
@@ -62,7 +62,7 @@ public class CombinationItem
return _commission; return _commission;
} }
public int getChance() public float getChance()
{ {
return _chance; return _chance;
} }