Minor code refactorings.

This commit is contained in:
MobiusDev
2017-08-18 13:05:15 +00:00
parent 39a6705f3e
commit 74340188a9
2 changed files with 3 additions and 25 deletions

View File

@@ -47,29 +47,14 @@ public final class ExEnchantSkillInfo implements IClientOutgoingPacket
OutgoingPackets.EX_ENCHANT_SKILL_INFO.writeId(packet);
packet.writeD(_skillId);
if (_skillSubLevel > 1000)
{
packet.writeD(SkillEnchantConverter.levelToErtheia(_skillSubLevel));
}
else
{
packet.writeD(_skillLevel);
}
packet.writeD(_skillSubLevel > 1000 ? SkillEnchantConverter.levelToErtheia(_skillSubLevel) : _skillLevel);
packet.writeD((_skillSubLevel % 1000) == EnchantSkillGroupsData.MAX_ENCHANT_LEVEL ? 0 : 1);
packet.writeD(_skillSubLevel > 1000 ? 1 : 0);
packet.writeD(_routes.size());
_routes.forEach(route ->
{
int subLevel = (_currentSubLevel > 0 ? (route + (_currentSubLevel % 1000)) - 1 : route);
if (subLevel > 1000)
{
subLevel = SkillEnchantConverter.levelToErtheia(subLevel);
}
// Skip a level?
// final int routeId = route / 1000;
// final int currentRouteId = _skillSubLevel / 1000;
// packet.writeD(currentRouteId != routeId ? subLevel : subLevel + 1);
packet.writeD(subLevel);
packet.writeD(subLevel > 1000 ? SkillEnchantConverter.levelToErtheia(subLevel) : subLevel);
});
return true;
}

View File

@@ -71,14 +71,7 @@ public final class SkillList implements IClientOutgoingPacket
for (Skill temp : _skills)
{
packet.writeD(temp.passive ? 1 : 0);
if (temp.subLevel > 1000)
{
packet.writeD(SkillEnchantConverter.levelToErtheia(temp.subLevel));
}
else
{
packet.writeD(temp.level);
}
packet.writeD(temp.subLevel > 1000 ? SkillEnchantConverter.levelToErtheia(temp.subLevel) : temp.level);
packet.writeD(temp.id);
packet.writeD(temp.reuseDelayGroup); // GOD ReuseDelayShareGroupID
packet.writeC(temp.disabled ? 1 : 0); // iSkillDisabled