Support for R110 grade.

This commit is contained in:
MobiusDev 2019-03-04 20:41:40 +00:00
parent ed880be457
commit 41e5750084
9 changed files with 28 additions and 7 deletions

View File

@ -12,6 +12,7 @@
<skill skillName="Expertise R" skillId="239" skillLvl="8" getLevel="85" autoGet="true" />
<skill skillName="Expertise R95" skillId="239" skillLvl="9" getLevel="95" autoGet="true" />
<skill skillName="Expertise R99" skillId="239" skillLvl="10" getLevel="99" autoGet="true" />
<skill skillName="Expertise R110" skillId="239" skillLvl="11" getLevel="110" autoGet="true" />
<skill skillName="Common Craft" skillId="1322" skillLvl="1" getLevel="1" autoGet="true" />
<skill skillName="Create Common Item" skillId="1320" skillLvl="1" getLevel="5" autoGet="true" />
<skill skillName="Create Common Item" skillId="1320" skillLvl="2" getLevel="20" autoGet="true" />

View File

@ -2419,7 +2419,7 @@
</effect>
</effects>
</skill>
<skill id="239" toLevel="10" name="Expertise">
<skill id="239" toLevel="11" name="Expertise">
<!-- Increases expertise in using $s1 grade or lower equipment. -->
<icon>
<value level="1">icon.skill0239</value>
@ -2445,6 +2445,7 @@
<value level="8">90</value>
<value level="9">95</value>
<value level="10">99</value>
<value level="11">110</value>
</magicLvl>
<operateType>P</operateType>
<magicCriticalRate>5</magicCriticalRate>
@ -2461,6 +2462,7 @@
<value level="8">R</value>
<value level="9">R95</value>
<value level="10">R99</value>
<value level="11">R110</value>
</grade>
</effect>
</effects>

View File

@ -23,7 +23,6 @@
<xs:simpleType>
<xs:restriction base="xs:positiveInteger">
<xs:minInclusive value="1" />
<xs:maxInclusive value="105" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
@ -93,7 +92,6 @@
<xs:simpleType>
<xs:restriction base="xs:positiveInteger">
<xs:minInclusive value="1" />
<xs:maxInclusive value="105" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
@ -101,7 +99,6 @@
<xs:simpleType>
<xs:restriction base="xs:positiveInteger">
<xs:minInclusive value="1" />
<xs:maxInclusive value="105" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>

View File

@ -64,6 +64,7 @@ public enum ItemGrade
case R:
case R95:
case R99:
case R110:
{
return R;
}

View File

@ -381,6 +381,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
}
case R95:
case R99:
case R110:
{
return CrystalType.R;
}

View File

@ -33,7 +33,8 @@ public enum CrystalType
R(8, 17371, 30, 500),
R95(9, 17371, 30, 500),
R99(10, 17371, 30, 500),
EVENT(11, 0, 0, 0);
R110(11, 17371, 30, 500),
EVENT(12, 0, 0, 0);
private final int _level;
private final int _crystalId;
@ -90,9 +91,9 @@ public enum CrystalType
{
level += _level;
if (level >= CrystalType.R99.getLevel())
if (level >= CrystalType.R110.getLevel())
{
return CrystalType.R99;
return CrystalType.R110;
}
if (level <= CrystalType.NONE.getLevel())

View File

@ -311,6 +311,7 @@ public class RequestExEnchantItemAttribute implements IClientIncomingPacket
}
case R95:
case R99:
case R110:
{
success = true;
break;

View File

@ -202,6 +202,18 @@ public class RequestExRemoveItemAttribute implements IClientIncomingPacket
}
break;
}
case R110:
{
if (item.getItem() instanceof L2Weapon)
{
_price = 6400000;
}
else
{
_price = 5120000;
}
break;
}
}
return _price;

View File

@ -155,6 +155,11 @@ public class RequestCommissionList implements IClientIncomingPacket
filter = filter.and(i -> i.getCrystalType() == CrystalType.R99);
break;
}
case 10:
{
filter = filter.and(i -> i.getCrystalType() == CrystalType.R110);
break;
}
}
filter = filter.and(i -> _query.isEmpty() || i.getName().toLowerCase().contains(_query.toLowerCase()));