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

Renamed EnchantSkillGroupsTable to EnchantSkillTreesTable.

Browse Source
This commit is contained in:
MobiusDevelopment
2022-08-06 10:15:01 +00:00
parent b7576edf8f
commit 6bac84a605
5 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/GameServer.java
View File

@@ -46,7 +46,7 @@ import org.l2jmobius.gameserver.data.sql.CharSummonTable;
import org.l2jmobius.gameserver.data.sql.ClanHallTable; import org.l2jmobius.gameserver.data.sql.ClanHallTable;
import org.l2jmobius.gameserver.data.sql.ClanTable; import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.data.sql.CrestTable; import org.l2jmobius.gameserver.data.sql.CrestTable;
import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable;
import org.l2jmobius.gameserver.data.sql.OfflineTraderTable; import org.l2jmobius.gameserver.data.sql.OfflineTraderTable;
import org.l2jmobius.gameserver.data.sql.TeleportLocationTable; import org.l2jmobius.gameserver.data.sql.TeleportLocationTable;
import org.l2jmobius.gameserver.data.xml.AdminData; import org.l2jmobius.gameserver.data.xml.AdminData;
@@ -225,7 +225,7 @@ public class GameServer
printSection("Skills"); printSection("Skills");
EffectHandler.getInstance().executeScript(); EffectHandler.getInstance().executeScript();
EnchantSkillGroupsTable.getInstance(); EnchantSkillTreesTable.getInstance();
SkillTreeData.getInstance(); SkillTreeData.getInstance();
SkillData.getInstance(); SkillData.getInstance();
PetSkillData.getInstance(); PetSkillData.getInstance();

14
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillGroupsTable.java → L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/data/sql/EnchantSkillTreesTable.java
View File

@@ -34,13 +34,13 @@ import org.l2jmobius.gameserver.model.skill.Skill;
* @author Mobius * @author Mobius
* @implNote Adapted from old C6 project * @implNote Adapted from old C6 project
*/ */
public class EnchantSkillGroupsTable public class EnchantSkillTreesTable
{ {
private static final Logger LOGGER = Logger.getLogger(EnchantSkillGroupsTable.class.getName()); private static final Logger LOGGER = Logger.getLogger(EnchantSkillTreesTable.class.getName());
private final List<EnchantSkillLearn> _enchantSkillTrees = new ArrayList<>(); private final List<EnchantSkillLearn> _enchantSkillTrees = new ArrayList<>();
protected EnchantSkillGroupsTable() protected EnchantSkillTreesTable()
{ {
load(); load();
} }
@@ -77,10 +77,10 @@ public class EnchantSkillGroupsTable
} }
catch (Exception e) catch (Exception e)
{ {
LOGGER.warning("EnchantSkillGroupsTable: Error while creating enchant skill table " + e); LOGGER.warning("EnchantSkillTreesTable: Error while creating enchant skill table " + e);
} }
LOGGER.info("EnchantSkillGroupsTable: Loaded " + _enchantSkillTrees.size() + " enchant skills."); LOGGER.info("EnchantSkillTreesTable: Loaded " + _enchantSkillTrees.size() + " enchant skills.");
} }
public List<EnchantSkillLearn> getAvailableEnchantSkills(Player player) public List<EnchantSkillLearn> getAvailableEnchantSkills(Player player)
@@ -182,13 +182,13 @@ public class EnchantSkillGroupsTable
return 0; return 0;
} }
public static EnchantSkillGroupsTable getInstance() public static EnchantSkillTreesTable getInstance()
{ {
return SingletonHolder.INSTANCE; return SingletonHolder.INSTANCE;
} }
private static class SingletonHolder private static class SingletonHolder
{ {
protected static final EnchantSkillGroupsTable INSTANCE = new EnchantSkillGroupsTable(); protected static final EnchantSkillTreesTable INSTANCE = new EnchantSkillTreesTable();
} }
} }

4
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/Folk.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.model.actor.instance;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable;
import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.data.xml.SkillTreeData; import org.l2jmobius.gameserver.data.xml.SkillTreeData;
import org.l2jmobius.gameserver.enums.AcquireSkillType; import org.l2jmobius.gameserver.enums.AcquireSkillType;
@@ -160,7 +160,7 @@ public class Folk extends Npc
final ExEnchantSkillList esl = new ExEnchantSkillList(); final ExEnchantSkillList esl = new ExEnchantSkillList();
int count = 0; int count = 0;
for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player))
{ {
final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel()); final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel());
if (sk == null) if (sk == null)

4
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -19,7 +19,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.commons.util.Rnd; import org.l2jmobius.commons.util.Rnd;
import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable;
import org.l2jmobius.gameserver.data.xml.ExperienceData; import org.l2jmobius.gameserver.data.xml.ExperienceData;
import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType; import org.l2jmobius.gameserver.enums.IllegalActionPunishmentType;
@@ -103,7 +103,7 @@ public class RequestExEnchantSkill implements IClientIncomingPacket
byte rate = 0; byte rate = 0;
int baseLevel = 1; int baseLevel = 1;
for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player))
{ {
final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel()); final Skill sk = SkillData.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill) || !trainer.getTemplate().canTeach(player.getClassId())) if ((sk == null) || (sk != skill) || !trainer.getTemplate().canTeach(player.getClassId()))

10
L2J_Mobius_CT_0_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@@ -18,7 +18,7 @@ package org.l2jmobius.gameserver.network.clientpackets;
import org.l2jmobius.Config; import org.l2jmobius.Config;
import org.l2jmobius.commons.network.PacketReader; import org.l2jmobius.commons.network.PacketReader;
import org.l2jmobius.gameserver.data.sql.EnchantSkillGroupsTable; import org.l2jmobius.gameserver.data.sql.EnchantSkillTreesTable;
import org.l2jmobius.gameserver.data.xml.SkillData; import org.l2jmobius.gameserver.data.xml.SkillData;
import org.l2jmobius.gameserver.model.EnchantSkillLearn; import org.l2jmobius.gameserver.model.EnchantSkillLearn;
import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.actor.Npc;
@@ -87,7 +87,7 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket
} }
boolean canTeach = false; boolean canTeach = false;
for (EnchantSkillLearn s : EnchantSkillGroupsTable.getInstance().getAvailableEnchantSkills(player)) for (EnchantSkillLearn s : EnchantSkillTreesTable.getInstance().getAvailableEnchantSkills(player))
{ {
if ((s.getId() == _skillId) && (s.getLevel() == _skillLevel)) if ((s.getId() == _skillId) && (s.getLevel() == _skillLevel))
{ {
@@ -101,9 +101,9 @@ public class RequestExEnchantSkillInfo implements IClientIncomingPacket
return; // cheater return; // cheater
} }
final int requiredSp = EnchantSkillGroupsTable.getInstance().getSkillSpCost(player, skill); final int requiredSp = EnchantSkillTreesTable.getInstance().getSkillSpCost(player, skill);
final int requiredExp = EnchantSkillGroupsTable.getInstance().getSkillExpCost(player, skill); final int requiredExp = EnchantSkillTreesTable.getInstance().getSkillExpCost(player, skill);
final byte rate = EnchantSkillGroupsTable.getInstance().getSkillRate(player, skill); final byte rate = EnchantSkillTreesTable.getInstance().getSkillRate(player, skill);
final ExEnchantSkillInfo asi = new ExEnchantSkillInfo(_skillId, _skillLevel, requiredSp, requiredExp, rate); final ExEnchantSkillInfo asi = new ExEnchantSkillInfo(_skillId, _skillLevel, requiredSp, requiredExp, rate);
if (Config.ES_SP_BOOK_NEEDED && ((_skillLevel == 101) || (_skillLevel == 141))) // only first level requires book if (Config.ES_SP_BOOK_NEEDED && ((_skillLevel == 101) || (_skillLevel == 141))) // only first level requires book
{ {