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

Forgotten Scroll skills have their own configuration.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-11-05 09:17:44 +00:00
parent 460d69f89c
commit 76d68ba35b
46 changed files with 302 additions and 229 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
L2J_Mobius_01.0_Ertheia/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_02.5_Underground/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_03.0_Helios/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_04.0_GrandCrusade/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_05.0_Salvation/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_05.5_EtinasFate/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_06.0_Fafurion/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll and Forgotten Power skills have their own configurations.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -668,7 +668,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, true, player);
}
/**
@ -678,10 +678,11 @@ public class SkillTreeData implements IXmlReader
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeByFp if {@code true} skills from Forgotten Power books will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -701,6 +702,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll and Forgotten Power requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS() && ((skill.getSkillId() < 11400) || (skill.getSkillId() > 11404)))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -748,7 +755,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -761,13 +768,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_07.0_PreludeOfWar/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll and Forgotten Power skills have their own configurations.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -668,7 +668,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, true, player);
}
/**
@ -678,10 +678,11 @@ public class SkillTreeData implements IXmlReader
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeByFp if {@code true} skills from Forgotten Power books will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -701,6 +702,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll and Forgotten Power requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS() && ((skill.getSkillId() < 11400) || (skill.getSkillId() > 11404)))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -748,7 +755,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -761,13 +768,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_08.2_Homunculus/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll and Forgotten Power skills have their own configurations.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -668,7 +668,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, true, player);
}
/**
@ -678,10 +678,11 @@ public class SkillTreeData implements IXmlReader
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeByFp if {@code true} skills from Forgotten Power books will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -701,6 +702,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll and Forgotten Power requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS() && ((skill.getSkillId() < 11400) || (skill.getSkillId() > 11404)))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -748,7 +755,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -761,13 +768,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll and Forgotten Power skills have their own configurations.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -668,7 +668,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, true, player);
}
/**
@ -678,10 +678,11 @@ public class SkillTreeData implements IXmlReader
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeByFp if {@code true} skills from Forgotten Power books will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -701,6 +702,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll and Forgotten Power requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS() && ((skill.getSkillId() < 11400) || (skill.getSkillId() > 11404)))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -748,7 +755,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -761,13 +768,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_10.0_MasterClass/dist/game/config/Character.ini vendored
View File

@ -78,6 +78,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll and Forgotten Power skills have their own configurations.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_10.0_MasterClass/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -668,7 +668,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, true, player);
}
/**
@ -678,10 +678,11 @@ public class SkillTreeData implements IXmlReader
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeByFp if {@code true} skills from Forgotten Power books will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -701,6 +702,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll and Forgotten Power requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS() && ((skill.getSkillId() < 11400) || (skill.getSkillId() > 11404)))
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -748,7 +755,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeByFp, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -761,13 +768,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_CT_2.4_Epilogue/dist/game/config/Character.ini vendored
View File

@ -91,6 +91,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

44
L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -509,7 +509,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -518,10 +518,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new ArrayList<>();
final Map<Integer, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -539,21 +540,29 @@ public class SkillTreeData implements IXmlReader
continue;
}
if (((includeAutoGet && skill.isAutoGet()) || skill.isLearnedByNpc() || (includeByFs && skill.isLearnedByFS())) && (player.getLevel() >= skill.getGetLevel()))
if (((!includeAutoGet || !skill.isAutoGet()) && !skill.isLearnedByNpc() && (!includeByFs || !skill.isLearnedByFS())) || (player.getLevel() < skill.getGetLevel()))
{
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
{
if (oldSkill.getLevel() == (skill.getSkillLevel() - 1))
{
result.add(skill);
}
}
else if (skill.getSkillLevel() == 1)
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
{
if (oldSkill.getLevel() == (skill.getSkillLevel() - 1))
{
result.add(skill);
}
}
else if (skill.getSkillLevel() == 1)
{
result.add(skill);
}
}
return result;
}
@ -571,22 +580,17 @@ public class SkillTreeData implements IXmlReader
{
// Get available skills
final PlayerSkillHolder holder = new PlayerSkillHolder(player);
List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
holder.addSkill(skill);
}
// Get new available skills, some skills depend of previous skills to be available.
learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
}
return holder.getSkills().values();
}

1
L2J_Mobius_CT_2.6_HighFive/dist/game/config/Character.ini vendored
View File

@ -91,6 +91,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

44
L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -509,7 +509,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -518,10 +518,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new ArrayList<>();
final Map<Integer, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -539,21 +540,29 @@ public class SkillTreeData implements IXmlReader
continue;
}
if (((includeAutoGet && skill.isAutoGet()) || skill.isLearnedByNpc() || (includeByFs && skill.isLearnedByFS())) && (player.getLevel() >= skill.getGetLevel()))
if (((!includeAutoGet || !skill.isAutoGet()) && !skill.isLearnedByNpc() && (!includeByFs || !skill.isLearnedByFS())) || (player.getLevel() < skill.getGetLevel()))
{
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
{
if (oldSkill.getLevel() == (skill.getSkillLevel() - 1))
{
result.add(skill);
}
}
else if (skill.getSkillLevel() == 1)
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
final Skill oldSkill = holder.getKnownSkill(skill.getSkillId());
if (oldSkill != null)
{
if (oldSkill.getLevel() == (skill.getSkillLevel() - 1))
{
result.add(skill);
}
}
else if (skill.getSkillLevel() == 1)
{
result.add(skill);
}
}
return result;
}
@ -571,22 +580,17 @@ public class SkillTreeData implements IXmlReader
{
// Get available skills
final PlayerSkillHolder holder = new PlayerSkillHolder(player);
List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
holder.addSkill(skill);
}
// Get new available skills, some skills depend of previous skills to be available.
learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
}
return holder.getSkills().values();
}

1
L2J_Mobius_Classic_2.0_Saviors/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_2.1_Zaken/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_2.2_Antharas/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_3.0_TheKamael/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -666,7 +666,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -675,10 +675,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -698,6 +699,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
// if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
// {
// continue;
@ -743,7 +750,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -756,13 +763,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Classic_Interlude/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -667,7 +667,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -676,10 +676,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -699,6 +700,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
{
continue;
@ -745,7 +752,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -758,13 +765,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -666,7 +666,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -675,10 +675,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -698,6 +699,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
// if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
// {
// continue;
@ -743,7 +750,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -756,13 +763,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Essence_5.2_FrostLord/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -666,7 +666,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -675,10 +675,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -698,6 +699,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
// if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
// {
// continue;
@ -743,7 +750,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -756,13 +763,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())

1
L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/config/Character.ini vendored
View File

@ -74,6 +74,7 @@ SkillReuseList =
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Forgotten Scroll skills have their own configuration.
# Default: False
AutoLearnSkillsWithoutItems = False

20
L2J_Mobius_Essence_6.0_BattleChronicle/java/org/l2jmobius/gameserver/data/xml/SkillTreeData.java
View File

@ -666,7 +666,7 @@ public class SkillTreeData implements IXmlReader
*/
public List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet)
{
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, player);
return getAvailableSkills(player, classId, includeByFs, includeAutoGet, true, player);
}
/**
@ -675,10 +675,11 @@ public class SkillTreeData implements IXmlReader
* @param classId the learning skill class Id
* @param includeByFs if {@code true} skills from Forgotten Scroll will be included
* @param includeAutoGet if {@code true} Auto-Get skills will be included
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @param holder
* @return all available skills for a given {@code player}, {@code classId}, {@code includeByFs} and {@code includeAutoGet}
*/
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, ISkillsHolder holder)
private List<SkillLearn> getAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeAutoGet, boolean includeRequiredItems, ISkillsHolder holder)
{
final List<SkillLearn> result = new LinkedList<>();
final Map<Long, SkillLearn> skills = getCompleteClassSkillTree(classId);
@ -698,6 +699,12 @@ public class SkillTreeData implements IXmlReader
continue;
}
// Forgotten Scroll requirements checked above.
if (!includeRequiredItems && !skill.getRequiredItems().isEmpty() && !skill.isLearnedByFS())
{
continue;
}
// if (isAwaken && !isCurrentClassSkillNoParent(classId, entry.getKey()) && !isAwakenSaveSkill(player.getClassId(), skill.getSkillId()))
// {
// continue;
@ -743,7 +750,7 @@ public class SkillTreeData implements IXmlReader
final Set<Integer> removed = new HashSet<>();
for (int i = 0; i < 1000; i++) // Infinite loop warning
{
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, holder);
final List<SkillLearn> learnable = getAvailableSkills(player, classId, includeByFs, includeAutoGet, includeRequiredItems, holder);
if (learnable.isEmpty())
{
// No more skills to learn
@ -756,13 +763,8 @@ public class SkillTreeData implements IXmlReader
break;
}
SEARCH: for (SkillLearn skillLearn : learnable)
for (SkillLearn skillLearn : learnable)
{
if (!includeRequiredItems && !skillLearn.getRequiredItems().isEmpty())
{
continue SEARCH;
}
final Skill skill = SkillData.getInstance().getSkill(skillLearn.getSkillId(), skillLearn.getSkillLevel());
// Cleanup skills that has to be removed
for (int skillId : skillLearn.getRemoveSkills())