Combination system float chance support and data update.

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

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" />
<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:element>
</xs:sequence>

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" />
<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:element>
</xs:sequence>

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" />
<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:element>
</xs:sequence>

View File

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

File diff suppressed because it is too large Load Diff

View File

@ -17,7 +17,7 @@
<xs:attribute type="xs:byte" name="enchant" use="optional" />
<xs:attribute type="xs:int" name="two" use="required" />
<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:element>
</xs:sequence>

View File

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