Ensoul improvements.
Contributed by Mathael.
This commit is contained in:
parent
03495b3ed6
commit
6a3aa5744b
10
trunk/dist/game/data/stats/ensoul/ensoulFees.xml
vendored
10
trunk/dist/game/data/stats/ensoul/ensoulFees.xml
vendored
@ -5,7 +5,7 @@
|
||||
<secondary itemId="19440" count="5266" /> <!-- Gemstone (R-grade) -->
|
||||
<third itemId="19440" count="16" /> <!-- Gemstone (R-grade) -->
|
||||
<reNormal itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSeconday itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSecondary itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reThird itemId="19440" count="8" /> <!-- Gemstone (R-grade) -->
|
||||
</fee>
|
||||
<fee crystalType="C">
|
||||
@ -43,7 +43,7 @@
|
||||
<secondary itemId="19440" count="40" /> <!-- Gemstone (R-grade) -->
|
||||
<third itemId="19440" count="7" /> <!-- Gemstone (R-grade) -->
|
||||
<reNormal itemId="19440" count="10" /> <!-- Gemstone (R-grade) -->
|
||||
<reSeconday itemId="19440" count="10" /> <!-- Gemstone (R-grade) -->
|
||||
<reSecondary itemId="19440" count="10" /> <!-- Gemstone (R-grade) -->
|
||||
<reThird itemId="19440" count="4" /> <!-- Gemstone (R-grade) -->
|
||||
</fee>
|
||||
<fee crystalType="R95">
|
||||
@ -51,7 +51,7 @@
|
||||
<secondary itemId="19440" count="1249" /> <!-- Gemstone (R-grade) -->
|
||||
<third itemId="19440" count="11" /> <!-- Gemstone (R-grade) -->
|
||||
<reNormal itemId="19440" count="65" /> <!-- Gemstone (R-grade) -->
|
||||
<reSeconday itemId="19440" count="65" /> <!-- Gemstone (R-grade) -->
|
||||
<reSecondary itemId="19440" count="65" /> <!-- Gemstone (R-grade) -->
|
||||
<reThird itemId="19440" count="6" /> <!-- Gemstone (R-grade) -->
|
||||
</fee>
|
||||
<fee crystalType="R99">
|
||||
@ -59,7 +59,7 @@
|
||||
<secondary itemId="19440" count="5266" /> <!-- Gemstone (R-grade) -->
|
||||
<third itemId="19440" count="16" /> <!-- Gemstone (R-grade) -->
|
||||
<reNormal itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSeconday itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSecondary itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reThird itemId="19440" count="8" /> <!-- Gemstone (R-grade) -->
|
||||
</fee>
|
||||
<fee crystalType="EVENT">
|
||||
@ -67,7 +67,7 @@
|
||||
<secondary itemId="19440" count="5266" /> <!-- Gemstone (R-grade) -->
|
||||
<third itemId="19440" count="16" /> <!-- Gemstone (R-grade) -->
|
||||
<reNormal itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSeconday itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reSecondary itemId="19440" count="168" /> <!-- Gemstone (R-grade) -->
|
||||
<reThird itemId="19440" count="8" /> <!-- Gemstone (R-grade) -->
|
||||
</fee>
|
||||
</list>
|
||||
|
2
trunk/dist/game/data/xsd/ensoulFees.xsd
vendored
2
trunk/dist/game/data/xsd/ensoulFees.xsd
vendored
@ -32,7 +32,7 @@
|
||||
<xs:element name="secondary" minOccurs="0" type="fee" />
|
||||
<xs:element name="third" minOccurs="0" type="fee" />
|
||||
<xs:element name="reNormal" minOccurs="0" type="fee" />
|
||||
<xs:element name="reSeconday" minOccurs="0" type="fee" />
|
||||
<xs:element name="reSecondary" minOccurs="0" type="fee" />
|
||||
<xs:element name="reThird" minOccurs="0" type="fee" />
|
||||
</xs:sequence>
|
||||
<xs:attribute type="crystalType" name="crystalType" use="required" />
|
||||
|
@ -107,7 +107,7 @@ public class EnsoulData implements IGameXmlReader
|
||||
parseFee(feeNode, fee, 2);
|
||||
break;
|
||||
}
|
||||
case "reFirst":
|
||||
case "reNormal":
|
||||
{
|
||||
parseReFee(feeNode, fee, 0);
|
||||
break;
|
||||
|
@ -185,7 +185,7 @@ public class RequestItemEnsoul implements IClientIncomingPacket
|
||||
continue;
|
||||
}
|
||||
|
||||
final ItemHolder fee;
|
||||
ItemHolder fee;
|
||||
if (itemOption.getType() == 1)
|
||||
{
|
||||
fee = EnsoulData.getInstance().getEnsoulFee(item.getItem().getCrystalType(), position);
|
||||
@ -193,8 +193,8 @@ public class RequestItemEnsoul implements IClientIncomingPacket
|
||||
{
|
||||
if (item.getSpecialAbility(position) != null)
|
||||
{
|
||||
LOGGER.warning("Player: " + player + " attempting to ensoul item option add but he's actually trying to replace!");
|
||||
continue;
|
||||
//LOGGER.warning("Player: " + player + " attempting to ensoul item option add but he's actually trying to replace!");
|
||||
fee = EnsoulData.getInstance().getResoulFee(item.getItem().getCrystalType(), position);
|
||||
}
|
||||
}
|
||||
else if (itemOption.getPosition() == 3)
|
||||
|
Loading…
Reference in New Issue
Block a user