Proper name for SkillTable skill getter.
This commit is contained in:
@@ -1220,7 +1220,7 @@ public class AdminCommands extends Thread
|
||||
final String level = st.nextToken();
|
||||
final int idval = Integer.parseInt(id);
|
||||
final int levelval = Integer.parseInt(level);
|
||||
final Skill skill = SkillTable.getInstance().getInfo(idval, levelval);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(idval, levelval);
|
||||
if (skill != null)
|
||||
{
|
||||
player.sendMessage("Admin gave you the skill " + skill.getName() + ".");
|
||||
@@ -1239,7 +1239,7 @@ public class AdminCommands extends Thread
|
||||
{
|
||||
final PlayerInstance activeChar = client.getActiveChar();
|
||||
final PlayerInstance player = World.getInstance().getPlayer(_characterToManipulate);
|
||||
final Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval));
|
||||
final Skill skill = SkillTable.getInstance().getSkill(idval, player.getSkillLevel(idval));
|
||||
if (skill != null)
|
||||
{
|
||||
player.sendMessage("Admin removed the skill " + skill.getName() + ".");
|
||||
@@ -1257,7 +1257,7 @@ public class AdminCommands extends Thread
|
||||
{
|
||||
final PlayerInstance activeChar = client.getActiveChar();
|
||||
final int skillid = Integer.parseInt(value);
|
||||
final Skill skill = SkillTable.getInstance().getInfo(skillid, 1);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(skillid, 1);
|
||||
if ((skill != null) && (skill.getTargetType() == 0))
|
||||
{
|
||||
activeChar.setTarget(activeChar);
|
||||
|
@@ -167,7 +167,7 @@ public class SkillTable
|
||||
return skill;
|
||||
}
|
||||
|
||||
public Skill getInfo(int magicId, int level)
|
||||
public Skill getSkill(int magicId, int level)
|
||||
{
|
||||
return _skills.get((magicId * 100) + level);
|
||||
}
|
||||
|
@@ -44,7 +44,7 @@ public class ScrollOfEscape implements IItemHandler
|
||||
|
||||
activeChar.disableAllSkills();
|
||||
activeChar.setTarget(activeChar);
|
||||
final Skill skill = SkillTable.getInstance().getInfo(1050, 1);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(1050, 1);
|
||||
final MagicSkillUser msk = new MagicSkillUser(activeChar, 1050, 1, 20000, 0);
|
||||
activeChar.sendPacket(msk);
|
||||
activeChar.broadcastPacket(msk);
|
||||
|
@@ -363,22 +363,22 @@ public class PlayerInstance extends Creature
|
||||
final int lvl = getLevel();
|
||||
if (lvl == 5)
|
||||
{
|
||||
final Skill skill = SkillTable.getInstance().getInfo(194, 1);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(194, 1);
|
||||
removeSkill(skill);
|
||||
}
|
||||
else if (lvl == 20)
|
||||
{
|
||||
final Skill skill = SkillTable.getInstance().getInfo(239, 1);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(239, 1);
|
||||
addSkill(skill);
|
||||
}
|
||||
else if (lvl == 40)
|
||||
{
|
||||
final Skill skill = SkillTable.getInstance().getInfo(239, 2);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(239, 2);
|
||||
addSkill(skill);
|
||||
}
|
||||
else if (lvl == 52)
|
||||
{
|
||||
final Skill skill = SkillTable.getInstance().getInfo(239, 3);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(239, 3);
|
||||
addSkill(skill);
|
||||
}
|
||||
}
|
||||
|
@@ -524,7 +524,7 @@ public class ClientThread extends Thread
|
||||
final int id = Integer.parseInt(st.nextToken());
|
||||
final int level = Integer.parseInt(st.nextToken());
|
||||
st.nextToken();
|
||||
final Skill skill = SkillTable.getInstance().getInfo(id, level);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(id, level);
|
||||
cha.addSkill(skill);
|
||||
}
|
||||
lnr.close();
|
||||
|
@@ -149,7 +149,7 @@ public class CharacterCreate extends ClientBasePacket
|
||||
newChar.setClanId(0);
|
||||
for (SkillLearn startSkill : SkillTreeTable.getInstance().getAvailableSkills(newChar))
|
||||
{
|
||||
newChar.addSkill(SkillTable.getInstance().getInfo(startSkill.getId(), startSkill.getLevel()));
|
||||
newChar.addSkill(SkillTable.getInstance().getSkill(startSkill.getId(), startSkill.getLevel()));
|
||||
}
|
||||
client.saveCharToDisk(newChar);
|
||||
client.getConnection().sendPacket(new CharSelectInfo(client.getLoginName(), client.getSessionId()));
|
||||
|
@@ -62,7 +62,7 @@ public class RequestAquireSkill extends ClientBasePacket
|
||||
return;
|
||||
}
|
||||
|
||||
final Skill skill = SkillTable.getInstance().getInfo(id, level);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(id, level);
|
||||
Collection<SkillLearn> skills = SkillTreeTable.getInstance().getAvailableSkills(player);
|
||||
|
||||
int requiredSp = 0;
|
||||
|
@@ -34,7 +34,7 @@ public class RequestAquireSkillInfo extends ClientBasePacket
|
||||
final int level = readD();
|
||||
|
||||
final PlayerInstance activeChar = client.getActiveChar();
|
||||
final Skill skill = SkillTable.getInstance().getInfo(id, level);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(id, level);
|
||||
int requiredSp = 0;
|
||||
for (SkillLearn skill2 : SkillTreeTable.getInstance().getAvailableSkills(activeChar))
|
||||
{
|
||||
|
@@ -39,7 +39,7 @@ public class RequestMagicSkillUse extends ClientBasePacket
|
||||
|
||||
final PlayerInstance activeChar = client.getActiveChar();
|
||||
final int level = activeChar.getSkillLevel(magicId);
|
||||
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
|
||||
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
|
||||
if (skill != null)
|
||||
{
|
||||
activeChar.stopMove();
|
||||
|
Reference in New Issue
Block a user