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

Addition of AutoLearnSkillsWithoutItems configuration.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-11-05 08:22:05 +00:00
parent 851a4cbd88
commit 460d69f89c
153 changed files with 860 additions and 349 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -77,6 +77,10 @@ SkillReuseList =
# Default: False
AutoLearnSkills = False
# Auto learn skills that need items to be learned.
# Default: False
AutoLearnSkillsWithoutItems = False
# If it's true skills from forgotten scrolls will be delivered upon level up and login, require AutoLearnSkills.
# Default: False
AutoLearnForgottenScrollSkills = False

6
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/ai/others/ClassMaster/ClassMaster.java vendored
View File

@@ -431,7 +431,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
if (Config.AUTO_LEARN_SKILLS)
{
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true, Config.AUTO_LEARN_SKILLS_WITHOUT_ITEMS);
}
player.store(false); // Save player cause if server crashes before this char is saved, he will lose class and the money payed for class change.
@@ -456,7 +456,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
}
else
{
player.giveAvailableSkills(true, true, true);
player.giveAvailableSkills(true, true, true, true);
}
break;
}
@@ -873,7 +873,7 @@ public class ClassMaster extends AbstractNpcAI implements IXmlReader
if (Config.AUTO_LEARN_SKILLS)
{
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true, Config.AUTO_LEARN_SKILLS_WITHOUT_ITEMS);
}
player.store(false); // Save player cause if server crashes before this char is saved, he will lose class and the money payed for class change.

13
L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/admincommandhandlers/AdminSkill.java vendored
View File

@@ -156,11 +156,11 @@ public class AdminSkill implements IAdminCommandHandler
}
else if (command.equals("admin_give_all_skills"))
{
adminGiveAllSkills(activeChar, false, false);
adminGiveAllSkills(activeChar, false, false, false);
}
else if (command.equals("admin_give_all_skills_fs"))
{
adminGiveAllSkills(activeChar, true, true);
adminGiveAllSkills(activeChar, true, true, true);
}
else if (command.equals("admin_give_clan_skills"))
{
@@ -277,10 +277,11 @@ public class AdminSkill implements IAdminCommandHandler
/**
* This function will give all the skills that the target can learn at his/her level
* @param activeChar the player
* @param includedByFs if {@code true} Forgotten Scroll skills will be delivered.
* @param includedByFp if {@code true} Forgotten Power skills will be delivered.
* @param includeByFs if {@code true} Forgotten Scroll skills will be delivered.
* @param includeByFp if {@code true} Forgotten Power skills will be delivered.
* @param includeRequiredItems if {@code true} skills that have required items will be added
*/
private void adminGiveAllSkills(PlayerInstance activeChar, boolean includedByFs, boolean includedByFp)
private void adminGiveAllSkills(PlayerInstance activeChar, boolean includeByFs, boolean includeByFp, boolean includeRequiredItems)
{
final WorldObject target = activeChar.getTarget();
if ((target == null) || !target.isPlayer())
@@ -290,7 +291,7 @@ public class AdminSkill implements IAdminCommandHandler
}
final PlayerInstance player = target.getActingPlayer();
// Notify player and admin
BuilderUtil.sendSysMessage(activeChar, "You gave " + player.giveAvailableSkills(includedByFs, includedByFp, true) + " skills to " + player.getName());
BuilderUtil.sendSysMessage(activeChar, "You gave " + player.giveAvailableSkills(includeByFs, includeByFp, true, includeRequiredItems) + " skills to " + player.getName());
player.sendSkillList();
player.sendPacket(new AcquireSkillList(player));
}

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/Config.java
View File

@@ -179,6 +179,7 @@ public class Config
public static boolean ENABLE_MODIFY_SKILL_REUSE;
public static Map<Integer, Integer> SKILL_REUSE_LIST;
public static boolean AUTO_LEARN_SKILLS;
public static boolean AUTO_LEARN_SKILLS_WITHOUT_ITEMS;
public static boolean AUTO_LEARN_FS_SKILLS;
public static boolean AUTO_LEARN_FP_SKILLS;
public static boolean AUTO_LOOT_HERBS;
@@ -1777,6 +1778,7 @@ public class Config
}
}
AUTO_LEARN_SKILLS = Character.getBoolean("AutoLearnSkills", false);
AUTO_LEARN_SKILLS_WITHOUT_ITEMS = Character.getBoolean("AutoLearnSkillsWithoutItems", false);
AUTO_LEARN_FS_SKILLS = Character.getBoolean("AutoLearnForgottenScrollSkills", false);
AUTO_LEARN_FP_SKILLS = Character.getBoolean("AutoLearnForgottenPowerSkills", false);
AUTO_LOOT_HERBS = Character.getBoolean("AutoLootHerbs", false);

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

@@ -731,7 +731,17 @@ public class SkillTreeData implements IXmlReader
return result;
}
public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet)
/**
* Used by auto learn configuration.
* @param player
* @param classId
* @param includeByFs if {@code true} forgotten scroll skills present in the skill tree will be added
* @param includeByFp if {@code true} forgotten power skills present in the skill tree will be added
* @param includeAutoGet if {@code true} auto-get skills present in the skill tree will be added
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @return a list of auto learnable skills for the player.
*/
public Collection<Skill> getAllAvailableSkills(PlayerInstance player, ClassId classId, boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
{
// Get available skills
final PlayerSkillHolder holder = new PlayerSkillHolder(player);
@@ -751,8 +761,13 @@ public class SkillTreeData implements IXmlReader
break;
}
for (SkillLearn skillLearn : learnable)
SEARCH: 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())

11
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -2527,7 +2527,7 @@ public class PlayerInstance extends Playable
// Give all normal skills if activated Auto-Learn is activated, included AutoGet skills.
if (Config.AUTO_LEARN_SKILLS)
{
giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true, Config.AUTO_LEARN_SKILLS_WITHOUT_ITEMS);
}
else
{
@@ -2587,16 +2587,17 @@ public class PlayerInstance extends Playable
/**
* Give all available skills to the player.
* @param includedByFs if {@code true} forgotten scroll skills present in the skill tree will be added
* @param includedByFp if {@code true} forgotten power skills present in the skill tree will be added
* @param includeByFs if {@code true} forgotten scroll skills present in the skill tree will be added
* @param includeByFp if {@code true} forgotten power skills present in the skill tree will be added
* @param includeAutoGet if {@code true} auto-get skills present in the skill tree will be added
* @param includeRequiredItems if {@code true} skills that have required items will be added
* @return the amount of new skills earned
*/
public int giveAvailableSkills(boolean includedByFs, boolean includedByFp, boolean includeAutoGet)
public int giveAvailableSkills(boolean includeByFs, boolean includeByFp, boolean includeAutoGet, boolean includeRequiredItems)
{
int skillCounter = 0;
// Get available skills
final Collection<Skill> skills = SkillTreeData.getInstance().getAllAvailableSkills(this, getTemplate().getClassId(), includedByFs, includedByFp, includeAutoGet);
final Collection<Skill> skills = SkillTreeData.getInstance().getAllAvailableSkills(this, getTemplate().getClassId(), includeByFs, includeByFp, includeAutoGet, includeRequiredItems);
final List<Skill> skillsForStore = new ArrayList<>();
for (Skill skill : skills)
{

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -287,7 +287,7 @@ public class CharacterCreate implements IClientIncomingPacket
newChar.getStat().setLevel((byte) Config.BALTHUS_KNIGHTS_LEVEL);
if (Config.BALTHUS_KNIGHTS_REWARD_SKILLS)
{
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
newChar.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true, Config.AUTO_LEARN_SKILLS_WITHOUT_ITEMS);
}
}

2
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/clientpackets/classchange/ExRequestClassChange.java
View File

@@ -114,7 +114,7 @@ public class ExRequestClassChange implements IClientIncomingPacket
if (Config.AUTO_LEARN_SKILLS)
{
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true);
player.giveAvailableSkills(Config.AUTO_LEARN_FS_SKILLS, Config.AUTO_LEARN_FP_SKILLS, true, Config.AUTO_LEARN_SKILLS_WITHOUT_ITEMS);
}
player.store(false); // Save player cause if server crashes before this char is saved, he will lose class.