Removed subclass change skilltree and skilllearn data.

This commit is contained in:
MobiusDev
2017-12-06 13:23:08 +00:00
parent b36b94b128
commit 1692f55e22
68 changed files with 348 additions and 12220 deletions

View File

@@ -21,6 +21,7 @@ import java.util.List;
import com.l2jmobius.Config;
import com.l2jmobius.gameserver.data.xml.impl.SkillTreesData;
import com.l2jmobius.gameserver.enums.CategoryType;
import com.l2jmobius.gameserver.model.L2SkillLearn;
import com.l2jmobius.gameserver.model.actor.L2Npc;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
@@ -51,7 +52,12 @@ public final class HealerTrainer extends AbstractNpcAI
// @formatter:on
// Misc
private static final int MIN_LEVEL = 76;
private static final int MIN_CLASS_LEVEL = 3;
private static final CategoryType[] ALLOWED_CATEGORIES =
{
CategoryType.FOURTH_CLASS_GROUP,
CategoryType.FIFTH_CLASS_GROUP,
CategoryType.SIXTH_CLASS_GROUP
};
private HealerTrainer()
{
@@ -79,13 +85,13 @@ public final class HealerTrainer extends AbstractNpcAI
}
case "SkillTransferLearn":
{
if (!npc.getTemplate().canTeach(player.getClassId()))
if (!player.isInCategory(CategoryType.HEAL_MASTER))
{
htmltext = npc.getId() + "-noteach.html";
break;
}
if ((player.getLevel() < MIN_LEVEL) || (player.getClassId().level() < MIN_CLASS_LEVEL))
if ((player.getLevel() < MIN_LEVEL) || !player.isInOneOfCategory(ALLOWED_CATEGORIES))
{
htmltext = "learn-lowlevel.html";
break;
@@ -104,13 +110,13 @@ public final class HealerTrainer extends AbstractNpcAI
}
case "SkillTransferCleanse":
{
if (!npc.getTemplate().canTeach(player.getClassId()))
if (!player.isInCategory(CategoryType.HEAL_MASTER))
{
htmltext = "cleanse-no.html";
break;
}
if ((player.getLevel() < MIN_LEVEL) || (player.getClassId().level() < MIN_CLASS_LEVEL))
if ((player.getLevel() < MIN_LEVEL) || !player.isInOneOfCategory(ALLOWED_CATEGORIES))
{
htmltext = "cleanse-no.html";
break;

View File

@@ -277,7 +277,7 @@ public class AdminBuffs implements IAdminCommandHandler
*/
public static void switchSkills(L2PcInstance gmchar, boolean toAuraSkills)
{
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree().values() : SkillTreesData.getInstance().getGMAuraSkillTree().values();
final Collection<Skill> skills = toAuraSkills ? SkillTreesData.getInstance().getGMSkillTree() : SkillTreesData.getInstance().getGMAuraSkillTree();
for (Skill skill : skills)
{
gmchar.removeSkill(skill, false); // Don't Save GM skills to database