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

Support for long SP value learn requirements.

Browse Source
This commit is contained in:
MobiusDev
2019-03-11 09:38:55 +00:00
parent 00634e89a5
commit a3b838200b
55 changed files with 99 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_2.5_Underground/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_3.0_Helios/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_4.0_GrandCrusade/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_5.0_Salvation/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_5.0_Salvation/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_5.5_EtinasFate/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_6.0_Fafurion/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -104,7 +104,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_6.0_Fafurion/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_Classic_2.1_Zaken/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_Classic_2.2_Antharas/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/skillTrees.xsd vendored
View File

@@ -107,7 +107,7 @@
</xs:attribute> </xs:attribute>
<xs:attribute name="learnedByFS" type="xs:boolean" /> <xs:attribute name="learnedByFS" type="xs:boolean" />
<xs:attribute name="learnedByNpc" type="xs:boolean" /> <xs:attribute name="learnedByNpc" type="xs:boolean" />
<xs:attribute name="levelUpSp" type="xs:positiveInteger" /> <xs:attribute name="levelUpSp" type="xs:long" />
<xs:attribute name="residenceSkill" type="xs:boolean" /> <xs:attribute name="residenceSkill" type="xs:boolean" />
<xs:attribute name="skillId" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillId" type="xs:positiveInteger" use="required" />
<xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" /> <xs:attribute name="skillLvl" type="xs:positiveInteger" use="required" />

6
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/model/L2SkillLearn.java
View File

@@ -39,7 +39,7 @@ public final class L2SkillLearn
private final int _getLevel; private final int _getLevel;
private final int _getDualClassLevel; private final int _getDualClassLevel;
private final boolean _autoGet; private final boolean _autoGet;
private final int _levelUpSp; private final long _levelUpSp;
private final List<ItemHolder> _requiredItems = new ArrayList<>(); private final List<ItemHolder> _requiredItems = new ArrayList<>();
private final List<Race> _races = new ArrayList<>(); private final List<Race> _races = new ArrayList<>();
private final List<SkillHolder> _preReqSkills = new ArrayList<>(); private final List<SkillHolder> _preReqSkills = new ArrayList<>();
@@ -66,7 +66,7 @@ public final class L2SkillLearn
_getLevel = set.getInt("getLevel"); _getLevel = set.getInt("getLevel");
_getDualClassLevel = set.getInt("getDualClassLevel", 0); _getDualClassLevel = set.getInt("getDualClassLevel", 0);
_autoGet = set.getBoolean("autoGet", false); _autoGet = set.getBoolean("autoGet", false);
_levelUpSp = set.getInt("levelUpSp", 0); _levelUpSp = set.getLong("levelUpSp", 0);
_residenceSkill = set.getBoolean("residenceSkill", false); _residenceSkill = set.getBoolean("residenceSkill", false);
_learnedByNpc = set.getBoolean("learnedByNpc", false); _learnedByNpc = set.getBoolean("learnedByNpc", false);
_learnedByFS = set.getBoolean("learnedByFS", false); _learnedByFS = set.getBoolean("learnedByFS", false);
@@ -119,7 +119,7 @@ public final class L2SkillLearn
/** /**
* @return the amount of SP/Clan Reputation to acquire this skill. * @return the amount of SP/Clan Reputation to acquire this skill.
*/ */
public int getLevelUpSp() public long getLevelUpSp()
{ {
return _levelUpSp; return _levelUpSp;
} }

6
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -190,7 +190,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
final L2Clan clan = activeChar.getClan(); final L2Clan clan = activeChar.getClan();
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() >= repCost) if (clan.getReputationScore() >= repCost)
{ {
if (Config.LIFE_CRYSTAL_NEEDED) if (Config.LIFE_CRYSTAL_NEEDED)
@@ -254,7 +254,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
return; return;
} }
final int repCost = s.getLevelUpSp(); final int repCost = (int) s.getLevelUpSp(); // Hopefully not greater that max int.
if (clan.getReputationScore() < repCost) if (clan.getReputationScore() < repCost)
{ {
activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION); activeChar.sendPacket(SystemMessageId.THE_ATTEMPT_TO_ACQUIRE_THE_SKILL_HAS_FAILED_BECAUSE_OF_AN_INSUFFICIENT_CLAN_REPUTATION);
@@ -590,7 +590,7 @@ public final class RequestAcquireSkill implements IClientIncomingPacket
} }
// First it checks that the skill require SP and the player has enough SP to learn it. // First it checks that the skill require SP and the player has enough SP to learn it.
final int levelUpSp = skillLearn.getLevelUpSp(); final long levelUpSp = skillLearn.getLevelUpSp();
if ((levelUpSp > 0) && (levelUpSp > player.getSp())) if ((levelUpSp > 0) && (levelUpSp > player.getSp()))
{ {
player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL); player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_SP_TO_LEARN_THIS_SKILL);

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/AcquireSkillInfo.java
View File

@@ -36,7 +36,7 @@ public class AcquireSkillInfo implements IClientOutgoingPacket
private final AcquireSkillType _type; private final AcquireSkillType _type;
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _spCost; private final long _spCost;
private final List<Req> _reqs; private final List<Req> _reqs;
/** /**

2
L2J_Mobius_Classic_2.3_SevenSigns/java/com/l2jmobius/gameserver/network/serverpackets/ExAcquireSkillInfo.java
View File

@@ -35,7 +35,7 @@ public class ExAcquireSkillInfo implements IClientOutgoingPacket
private final int _id; private final int _id;
private final int _level; private final int _level;
private final int _dualClassLevel; private final int _dualClassLevel;
private final int _spCost; private final long _spCost;
private final int _minLevel; private final int _minLevel;
private final List<ItemHolder> _itemReq; private final List<ItemHolder> _itemReq;
private final List<Skill> _skillRem; private final List<Skill> _skillRem;