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

Proper name for SkillTable skill getter.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-06-16 23:02:33 +00:00
parent c6058f29cb
commit c0261a2539
217 changed files with 668 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java
View File

@@ -36,11 +36,11 @@ public class HeroSkillTable
private HeroSkillTable()
{
HERO_SKILLS = new Skill[5];
HERO_SKILLS[0] = SkillTable.getInstance().getInfo(395, 1);
HERO_SKILLS[1] = SkillTable.getInstance().getInfo(396, 1);
HERO_SKILLS[2] = SkillTable.getInstance().getInfo(1374, 1);
HERO_SKILLS[3] = SkillTable.getInstance().getInfo(1375, 1);
HERO_SKILLS[4] = SkillTable.getInstance().getInfo(1376, 1);
HERO_SKILLS[0] = SkillTable.getInstance().getSkill(395, 1);
HERO_SKILLS[1] = SkillTable.getInstance().getSkill(396, 1);
HERO_SKILLS[2] = SkillTable.getInstance().getSkill(1374, 1);
HERO_SKILLS[3] = SkillTable.getInstance().getSkill(1375, 1);
HERO_SKILLS[4] = SkillTable.getInstance().getSkill(1376, 1);
}
public static Skill[] getHeroSkills()

16
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java
View File

@@ -28,14 +28,14 @@ public class NobleSkillTable
private NobleSkillTable()
{
_nobleSkills = new Skill[8];
_nobleSkills[0] = SkillTable.getInstance().getInfo(1323, 1);
_nobleSkills[1] = SkillTable.getInstance().getInfo(325, 1);
_nobleSkills[2] = SkillTable.getInstance().getInfo(326, 1);
_nobleSkills[3] = SkillTable.getInstance().getInfo(327, 1);
_nobleSkills[4] = SkillTable.getInstance().getInfo(1324, 1);
_nobleSkills[5] = SkillTable.getInstance().getInfo(1325, 1);
_nobleSkills[6] = SkillTable.getInstance().getInfo(1326, 1);
_nobleSkills[7] = SkillTable.getInstance().getInfo(1327, 1);
_nobleSkills[0] = SkillTable.getInstance().getSkill(1323, 1);
_nobleSkills[1] = SkillTable.getInstance().getSkill(325, 1);
_nobleSkills[2] = SkillTable.getInstance().getSkill(326, 1);
_nobleSkills[3] = SkillTable.getInstance().getSkill(327, 1);
_nobleSkills[4] = SkillTable.getInstance().getSkill(1324, 1);
_nobleSkills[5] = SkillTable.getInstance().getSkill(1325, 1);
_nobleSkills[6] = SkillTable.getInstance().getSkill(1326, 1);
_nobleSkills[7] = SkillTable.getInstance().getSkill(1327, 1);
}
public Skill[] GetNobleSkills()

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SkillTable.java
View File

@@ -65,7 +65,7 @@ public class SkillTable
return (skillId * 256) + skillLevel;
}
public Skill getInfo(int skillId, int level)
public Skill getSkill(int skillId, int level)
{
return _skills.get(getSkillHashCode(skillId, level));
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java
View File

@@ -111,7 +111,7 @@ public class NpcTable
continue;
}
npcSkill = SkillTable.getInstance().getInfo(skillId, level);
npcSkill = SkillTable.getInstance().getSkill(skillId, level);
if (npcSkill == null)
{
continue;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java
View File

@@ -619,7 +619,7 @@ public class SkillTreeTable
{
for (SkillLearn s : learnable)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || ((sk.getId() == Skill.SKILL_DIVINE_INSPIRATION) && !Config.AUTO_LEARN_DIVINE_INSPIRATION && !player.isGM()))
{
unLearnable++;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java
View File

@@ -381,7 +381,7 @@ public abstract class DocumentBase
lvl = Integer.decode(getValue(attrs.getNamedItem("lvl").getNodeValue(), template));
}
final Skill skill = SkillTable.getInstance().getInfo(id, lvl);
final Skill skill = SkillTable.getInstance().getSkill(id, lvl);
if (attrs.getNamedItem("chance") != null)
{
if ((template instanceof Weapon) || (template instanceof Item))

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java
View File

@@ -1463,7 +1463,7 @@ public class AdminEditNpc implements IAdminCommandHandler
if (skillData.next())
{
final Skill skill = SkillTable.getInstance().getInfo(skillData.getInt("skillid"), skillData.getInt("level"));
final Skill skill = SkillTable.getInstance().getSkill(skillData.getInt("skillid"), skillData.getInt("level"));
replyMSG.append("<table>");
replyMSG.append("<tr><td>NPC</td><td>" + NpcTable.getInstance().getTemplate(skillData.getInt("npcid")).getName() + "</td></tr>");
replyMSG.append("<tr><td>SKILL</td><td>" + skill.getName() + "(" + skillData.getInt("skillid") + ")</td></tr>");
@@ -1491,7 +1491,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void updateNpcSkillData(PlayerInstance activeChar, int npcId, int skillId, int level)
{
final Skill skillData = SkillTable.getInstance().getInfo(skillId, level);
final Skill skillData = SkillTable.getInstance().getSkill(skillId, level);
if (skillData == null)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -1560,7 +1560,7 @@ public class AdminEditNpc implements IAdminCommandHandler
private void addNpcSkillData(PlayerInstance activeChar, int npcId, int skillId, int level)
{
// skill check
final Skill skillData = SkillTable.getInstance().getInfo(skillId, level);
final Skill skillData = SkillTable.getInstance().getSkill(skillId, level);
if (skillData == null)
{
final NpcHtmlMessage adminReply = new NpcHtmlMessage(5);
@@ -1648,7 +1648,7 @@ public class AdminEditNpc implements IAdminCommandHandler
{
final int idval = skillDataList.getInt("skillid");
final int levelval = skillDataList.getInt("level");
skillData = SkillTable.getInstance().getInfo(idval, levelval);
skillData = SkillTable.getInstance().getSkill(idval, levelval);
if (skillData != null)
{
npcData.addSkill(skillData);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java
View File

@@ -71,7 +71,7 @@ public class AdminGmSpeed implements IAdminCommandHandler
}
else if ((val >= 1) && (val <= 4))
{
final Skill gmSpeedSkill = SkillTable.getInstance().getInfo(SUPER_HASTE_ID, val);
final Skill gmSpeedSkill = SkillTable.getInstance().getSkill(SUPER_HASTE_ID, val);
player.doCast(gmSpeedSkill);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java
View File

@@ -50,7 +50,7 @@ public class AdminRideWyvern implements IAdminCommandHandler
petRideId = 12621;
// Add skill Wyvern Breath
activeChar.addSkill(SkillTable.getInstance().getInfo(4289, 1));
activeChar.addSkill(SkillTable.getInstance().getSkill(4289, 1));
activeChar.sendSkillList();
}
else if (command.startsWith("admin_ride_strider"))

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java
View File

@@ -197,7 +197,7 @@ public class AdminSkill implements IAdminCommandHandler
{
for (SkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || !sk.getCanLearn(player.getClassId()))
{
if (countUnlearnable)
@@ -460,7 +460,7 @@ public class AdminSkill implements IAdminCommandHandler
final String level = st.nextToken();
final int idval = Integer.parseInt(id);
final int levelval = Integer.parseInt(level);
skill = SkillTable.getInstance().getInfo(idval, levelval);
skill = SkillTable.getInstance().getSkill(idval, levelval);
}
catch (Exception e)
{
@@ -498,7 +498,7 @@ public class AdminSkill implements IAdminCommandHandler
return;
}
final Skill skill = SkillTable.getInstance().getInfo(idval, player.getSkillLevel(idval));
final Skill skill = SkillTable.getInstance().getSkill(idval, player.getSkillLevel(idval));
if (skill != null)
{
final String skillname = skill.getName();
@@ -549,7 +549,7 @@ public class AdminSkill implements IAdminCommandHandler
return;
}
final Skill skill = SkillTable.getInstance().getInfo(id, level);
final Skill skill = SkillTable.getInstance().getSkill(id, level);
if (skill != null)
{
final String skillname = skill.getName();

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java
View File

@@ -63,7 +63,7 @@ public class AdminSuperHaste implements IAdminCommandHandler
}
else if ((val >= 1) && (val <= 4))
{
final Skill gmSpeedSkill = SkillTable.getInstance().getInfo(SUPER_HASTE_ID, val);
final Skill gmSpeedSkill = SkillTable.getInstance().getSkill(SUPER_HASTE_ID, val);
player.doCast(gmSpeedSkill);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java
View File

@@ -72,7 +72,7 @@ public class AdminTest implements IAdminCommandHandler
final Creature target = (Creature) activeChar.getTarget();
BuilderUtil.sendSysMessage(activeChar, "cast");
final Skill skill = SkillTable.getInstance().getInfo(1085, 3);
final Skill skill = SkillTable.getInstance().getSkill(1085, 3);
if (target != null)
{
BuilderUtil.sendSysMessage(activeChar, "target locked");

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java
View File

@@ -55,11 +55,11 @@ public class BeastSpice implements IItemHandler
final int itemId = item.getItemId();
if (itemId == 6643) // Golden Spice
{
player.useMagic(SkillTable.getInstance().getInfo(2188, 1), false, false);
player.useMagic(SkillTable.getInstance().getSkill(2188, 1), false, false);
}
else if (itemId == 6644) // Crystal Spice
{
player.useMagic(SkillTable.getInstance().getInfo(2189, 1), false, false);
player.useMagic(SkillTable.getInstance().getSkill(2189, 1), false, false);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java
View File

@@ -53,7 +53,7 @@ public class ChestKey implements IItemHandler
final PlayerInstance player = (PlayerInstance) playable;
final int itemId = item.getItemId();
final Skill skill = SkillTable.getInstance().getInfo(2229, itemId - 6664); // box key skill
final Skill skill = SkillTable.getInstance().getSkill(2229, itemId - 6664); // box key skill
final WorldObject target = player.getTarget();
if (!(target instanceof ChestInstance))
{

24
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java
View File

@@ -85,62 +85,62 @@ public class Crystals implements IItemHandler
{
case 7906:
{
skill = SkillTable.getInstance().getInfo(2248, 1);
skill = SkillTable.getInstance().getSkill(2248, 1);
break;
}
case 7907:
{
skill = SkillTable.getInstance().getInfo(2249, 1);
skill = SkillTable.getInstance().getSkill(2249, 1);
break;
}
case 7908:
{
skill = SkillTable.getInstance().getInfo(2250, 1);
skill = SkillTable.getInstance().getSkill(2250, 1);
break;
}
case 7909:
{
skill = SkillTable.getInstance().getInfo(2251, 1);
skill = SkillTable.getInstance().getSkill(2251, 1);
break;
}
case 7910:
{
skill = SkillTable.getInstance().getInfo(2252, 1);
skill = SkillTable.getInstance().getSkill(2252, 1);
break;
}
case 7911:
{
skill = SkillTable.getInstance().getInfo(2253, 1);
skill = SkillTable.getInstance().getSkill(2253, 1);
break;
}
case 7912:
{
skill = SkillTable.getInstance().getInfo(2254, 1);
skill = SkillTable.getInstance().getSkill(2254, 1);
break;
}
case 7913:
{
skill = SkillTable.getInstance().getInfo(2255, 1);
skill = SkillTable.getInstance().getSkill(2255, 1);
break;
}
case 7914:
{
skill = SkillTable.getInstance().getInfo(2256, 1);
skill = SkillTable.getInstance().getSkill(2256, 1);
break;
}
case 7915:
{
skill = SkillTable.getInstance().getInfo(2257, 1);
skill = SkillTable.getInstance().getSkill(2257, 1);
break;
}
case 7916:
{
skill = SkillTable.getInstance().getInfo(2258, 1);
skill = SkillTable.getInstance().getSkill(2258, 1);
break;
}
case 7917:
{
skill = SkillTable.getInstance().getInfo(2259, 1);
skill = SkillTable.getInstance().getSkill(2259, 1);
break;
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java
View File

@@ -88,7 +88,7 @@ public class CustomPotions implements IItemHandler
public boolean usePotion(PlayerInstance player, int magicId, int level)
{
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
if (skill != null)
{
player.doCast(skill);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java
View File

@@ -84,7 +84,7 @@ public class EnergyStone implements IItemHandler
final EffectCharge effect = player.getChargeEffect();
if (effect == null)
{
final Skill dummy = SkillTable.getInstance().getInfo(skill.getId(), skill.getLevel());
final Skill dummy = SkillTable.getInstance().getSkill(skill.getId(), skill.getLevel());
if (dummy != null)
{
dummy.getEffects(player, player);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java
View File

@@ -130,7 +130,7 @@ public class Firework implements IItemHandler
public void useFw(PlayerInstance player, int magicId, int level)
{
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
if (skill != null)
{
player.useMagic(skill, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java
View File

@@ -65,7 +65,7 @@ public class Harvester implements IItemHandler
return;
}
final Skill skill = SkillTable.getInstance().getInfo(2098, 1); // harvesting skill
final Skill skill = SkillTable.getInstance().getSkill(2098, 1); // harvesting skill
player.useMagic(skill, false, false);
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java
View File

@@ -59,7 +59,7 @@ public class Nectar implements IItemHandler
final int itemId = item.getItemId();
if (itemId == 6391)
{
player.useMagic(SkillTable.getInstance().getInfo(9998, 1), false, false);
player.useMagic(SkillTable.getInstance().getSkill(9998, 1), false, false);
}
}

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java
View File

@@ -782,7 +782,7 @@ public class Potions implements IItemHandler
{
_herbstask -= 100;
}
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
if (skill != null)
{
// Return false if potion is in reuse
@@ -828,7 +828,7 @@ public class Potions implements IItemHandler
else if (player instanceof PetInstance)
{
final PetInstance activeChar = (PetInstance) player;
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
if (skill != null)
{
// Return false if potion is in reuse so is not destroyed from inventory

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java
View File

@@ -186,7 +186,7 @@ public class ScrollOfEscape implements IItemHandler
player.abortCast(true);
player.disableAllSkills();
final Skill skill = SkillTable.getInstance().getInfo(escapeSkill, 1);
final Skill skill = SkillTable.getInstance().getSkill(escapeSkill, 1);
int hitTime = skill.getHitTime();
// C4 adjustment.
if ((escapeSkill == 2036) || (escapeSkill == 2177) || (escapeSkill == 2178))

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java
View File

@@ -186,7 +186,7 @@ public class ScrollOfResurrection implements IItemHandler
if (skillId != 0)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
player.useMagic(skill, true, true);
// Consume the scroll

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java
View File

@@ -392,7 +392,7 @@ public class Scrolls implements IItemHandler
public void useScroll(PlayerInstance player, int magicId, int level)
{
final Skill skill = SkillTable.getInstance().getInfo(magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(magicId, level);
if (skill != null)
{
player.doCast(skill);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java
View File

@@ -349,7 +349,7 @@ public class Seed implements IItemHandler
{
// TODO: get right skill level
monster.setSeeded(_seedId, player);
final Skill skill = SkillTable.getInstance().getInfo(2097, 3); // sowing skill
final Skill skill = SkillTable.getInstance().getSkill(2097, 3); // sowing skill
player.useMagic(skill, false, false);
}
else

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java
View File

@@ -118,7 +118,7 @@ public class SoulCrystals implements IItemHandler
final int crystalId = item.getItemId();
// Soul Crystal Casting section
final Skill skill = SkillTable.getInstance().getInfo(2096, 1);
final Skill skill = SkillTable.getInstance().getSkill(2096, 1);
player.useMagic(skill, false, true);
// End Soul Crystal Casting section

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java
View File

@@ -157,7 +157,7 @@ public class SummonItems implements IItemHandler
{
player.setTarget(player);
// Skill 2046 used only for animation
final Skill skill = SkillTable.getInstance().getInfo(2046, 1);
final Skill skill = SkillTable.getInstance().getSkill(2046, 1);
player.useMagic(skill, true, true);
player.sendPacket(SystemMessageId.SUMMONING_YOUR_PET);
ThreadPool.schedule(new PetSummonFinalizer(player, npcTemplate, item), 4800);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java
View File

@@ -85,11 +85,11 @@ public class Continuous implements ISkillHandler
Skill skill;
if (skillLevel == 0)
{
skill = SkillTable.getInstance().getInfo(skillEffectId, 1);
skill = SkillTable.getInstance().getSkill(skillEffectId, 1);
}
else
{
skill = SkillTable.getInstance().getInfo(skillEffectId, skillLevel);
skill = SkillTable.getInstance().getSkill(skillEffectId, skillLevel);
}
if (skill != null)

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java
View File

@@ -306,12 +306,12 @@ public class Pdam implements ISkillHandler
}
else if (skill.getId() == 345) // Sonic Rage
{
final Skill dummy = SkillTable.getInstance().getInfo(8, 7); // Lv7 Sonic Focus
final Skill dummy = SkillTable.getInstance().getSkill(8, 7); // Lv7 Sonic Focus
dummy.getEffects(creature, creature, ss, sps, bss);
}
else if (skill.getId() == 346) // Raging Force
{
final Skill dummy = SkillTable.getInstance().getInfo(50, 7); // Lv7 Focused Force
final Skill dummy = SkillTable.getInstance().getSkill(50, 7); // Lv7 Focused Force
dummy.getEffects(creature, creature, ss, sps, bss);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java
View File

@@ -135,7 +135,7 @@ public class OfflineShop implements IUserCommandHandler
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE))

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java
View File

@@ -136,7 +136,7 @@ public class OfflineShop implements IVoicedCommandHandler
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
if ((player.isInStoreMode() && Config.OFFLINE_TRADE_ENABLE) || (player.isCrafting() && Config.OFFLINE_CRAFT_ENABLE))

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java
View File

@@ -165,7 +165,7 @@ public class Wedding implements IVoicedCommandHandler
skillId = 4362;
}
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (activeChar.getFirstEffect(skill) == null)
{
skill.getEffects(activeChar, activeChar, false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java
View File

@@ -254,7 +254,7 @@ public class DayNightSpawnManager
private void ShadowSenseMsg(int mode)
{
final Skill skill = SkillTable.getInstance().getInfo(294, 1);
final Skill skill = SkillTable.getInstance().getSkill(294, 1);
if (skill == null)
{
return;

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java
View File

@@ -73,8 +73,8 @@ public class FortSiegeManager
public void addSiegeSkills(PlayerInstance character)
{
character.addSkill(SkillTable.getInstance().getInfo(246, 1), false);
character.addSkill(SkillTable.getInstance().getInfo(247, 1), false);
character.addSkill(SkillTable.getInstance().getSkill(246, 1), false);
character.addSkill(SkillTable.getInstance().getSkill(247, 1), false);
}
/**
@@ -162,8 +162,8 @@ public class FortSiegeManager
public void removeSiegeSkills(PlayerInstance character)
{
character.removeSkill(SkillTable.getInstance().getInfo(246, 1));
character.removeSkill(SkillTable.getInstance().getInfo(247, 1));
character.removeSkill(SkillTable.getInstance().getSkill(246, 1));
character.removeSkill(SkillTable.getInstance().getSkill(247, 1));
}
private final void load()

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java
View File

@@ -75,8 +75,8 @@ public class SiegeManager
public void addSiegeSkills(PlayerInstance character)
{
character.addSkill(SkillTable.getInstance().getInfo(246, 1), false);
character.addSkill(SkillTable.getInstance().getInfo(247, 1), false);
character.addSkill(SkillTable.getInstance().getSkill(246, 1), false);
character.addSkill(SkillTable.getInstance().getSkill(247, 1), false);
}
/**
@@ -177,8 +177,8 @@ public class SiegeManager
public void removeSiegeSkills(PlayerInstance character)
{
character.removeSkill(SkillTable.getInstance().getInfo(246, 1));
character.removeSkill(SkillTable.getInstance().getInfo(247, 1));
character.removeSkill(SkillTable.getInstance().getSkill(246, 1));
character.removeSkill(SkillTable.getInstance().getSkill(247, 1));
}
private final void load()

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java
View File

@@ -124,15 +124,15 @@ public class CombatFlag
public void giveSkill()
{
_player.addSkill(SkillTable.getInstance().getInfo(3318, 1), false);
_player.addSkill(SkillTable.getInstance().getInfo(3358, 1), false);
_player.addSkill(SkillTable.getInstance().getSkill(3318, 1), false);
_player.addSkill(SkillTable.getInstance().getSkill(3358, 1), false);
_player.sendSkillList();
}
public void removeSkill()
{
_player.removeSkill(SkillTable.getInstance().getInfo(3318, 1), false);
_player.removeSkill(SkillTable.getInstance().getInfo(3358, 1), false);
_player.removeSkill(SkillTable.getInstance().getSkill(3318, 1), false);
_player.removeSkill(SkillTable.getInstance().getSkill(3358, 1), false);
_player.sendSkillList();
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java
View File

@@ -58,7 +58,7 @@ public class ForceBuff
}
else
{
final Skill force = SkillTable.getInstance().getInfo(_forceId, _forceLevel);
final Skill force = SkillTable.getInstance().getSkill(_forceId, _forceLevel);
if (force != null)
{
force.getEffects(_caster, _target, false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java
View File

@@ -2906,7 +2906,7 @@ public abstract class Skill
// Implements effect charge
if (e.getEffectType() == Effect.EffectType.CHARGE)
{
env.skill = SkillTable.getInstance().getInfo(8, effector.getSkillLevel(8));
env.skill = SkillTable.getInstance().getSkill(8, effector.getSkillLevel(8));
final EffectCharge effect = (EffectCharge) env.target.getFirstEffect(Effect.EffectType.CHARGE);
if (effect != null)
{

10
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java
View File

@@ -6203,7 +6203,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (toBeCursed)
{
final Skill skill = SkillTable.getInstance().getInfo(4515, 1);
final Skill skill = SkillTable.getInstance().getSkill(4515, 1);
if (skill != null)
{
abortAttack();
@@ -6839,13 +6839,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
if (newSkill.isChance() && newSkill.triggerAnotherSkill())
{
final Skill triggeredSkill = SkillTable.getInstance().getInfo(newSkill.getTriggeredId(), newSkill.getTriggeredLevel());
final Skill triggeredSkill = SkillTable.getInstance().getSkill(newSkill.getTriggeredId(), newSkill.getTriggeredLevel());
addSkill(triggeredSkill);
}
if (newSkill.triggerAnotherSkill())
{
_triggeredSkills.put(newSkill.getTriggeredId(), SkillTable.getInstance().getInfo(newSkill.getTriggeredId(), newSkill.getTriggeredLevel()));
_triggeredSkills.put(newSkill.getTriggeredId(), SkillTable.getInstance().getSkill(newSkill.getTriggeredId(), newSkill.getTriggeredLevel()));
}
}
@@ -7955,7 +7955,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
{
if (skill.isMagic())
{
final Skill tempSkill = SkillTable.getInstance().getInfo(4215, 1);
final Skill tempSkill = SkillTable.getInstance().getSkill(4215, 1);
if (tempSkill != null)
{
abortAttack();
@@ -7981,7 +7981,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder
}
else
{
final Skill tempSkill = SkillTable.getInstance().getInfo(4515, 1);
final Skill tempSkill = SkillTable.getInstance().getSkill(4515, 1);
if (tempSkill != null)
{
tempSkill.getEffects(creature, this, false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java
View File

@@ -807,7 +807,7 @@ public abstract class Summon extends Playable
}
}
final Skill skillToCast = SkillTable.getInstance().getInfo(skill.getId(), skillLevel);
final Skill skillToCast = SkillTable.getInstance().getSkill(skill.getId(), skillLevel);
if (skillToCast != null)
{
super.doCast(skillToCast);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java
View File

@@ -158,7 +158,7 @@ public class CabaleBufferInstance extends NpcInstance
return false;
}
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (player.getFirstEffect(skill) == null)
{
skill.getEffects(_caster, player, false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java
View File

@@ -209,7 +209,7 @@ public class ChestInstance extends MonsterInstance
return false;
}
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (creature.getFirstEffect(skill) == null)
{
skill.getEffects(this, creature, false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java
View File

@@ -849,7 +849,7 @@ public class ClanHallManagerInstance extends FolkInstance
{
skillLevel = Integer.parseInt(st.nextToken());
}
skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (skill.getSkillType() == SkillType.SUMMON)
{
player.doCast(skill);

44
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java
View File

@@ -102,64 +102,64 @@ public class CubicInstance
{
case STORM_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4049, level));
_skills.add(SkillTable.getInstance().getSkill(4049, level));
break;
}
case VAMPIRIC_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4050, level));
_skills.add(SkillTable.getInstance().getSkill(4050, level));
break;
}
case LIFE_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4051, level));
_skills.add(SkillTable.getInstance().getSkill(4051, level));
doAction();
break;
}
case VIPER_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4052, level));
_skills.add(SkillTable.getInstance().getSkill(4052, level));
break;
}
case POLTERGEIST_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4053, level));
_skills.add(SkillTable.getInstance().getInfo(4054, level));
_skills.add(SkillTable.getInstance().getInfo(4055, level));
_skills.add(SkillTable.getInstance().getSkill(4053, level));
_skills.add(SkillTable.getInstance().getSkill(4054, level));
_skills.add(SkillTable.getInstance().getSkill(4055, level));
break;
}
case BINDING_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4164, level));
_skills.add(SkillTable.getInstance().getSkill(4164, level));
break;
}
case AQUA_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4165, level));
_skills.add(SkillTable.getInstance().getSkill(4165, level));
break;
}
case SPARK_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(4166, level));
_skills.add(SkillTable.getInstance().getSkill(4166, level));
break;
}
case ATTRACT_CUBIC:
{
_skills.add(SkillTable.getInstance().getInfo(5115, level));
_skills.add(SkillTable.getInstance().getInfo(5116, level));
_skills.add(SkillTable.getInstance().getSkill(5115, level));
_skills.add(SkillTable.getInstance().getSkill(5116, level));
break;
}
case SMART_CUBIC_ARCANALORD:
{
// _skills.add(SkillTable.getInstance().getInfo(4049,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4050,7)); no animation
_skills.add(SkillTable.getInstance().getInfo(4051, 7)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4051, 7)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4052,6)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4053,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4054,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4055,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4164,9)); no animation
_skills.add(SkillTable.getInstance().getInfo(4165, 9)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4165, 9)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4166,9)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5115,4)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5116,4)); no animation
@@ -168,7 +168,7 @@ public class CubicInstance
}
case SMART_CUBIC_ELEMENTALMASTER:
{
_skills.add(SkillTable.getInstance().getInfo(4049, 8)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4049, 8)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4050,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4051,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4052,6)); no animation
@@ -177,7 +177,7 @@ public class CubicInstance
// _skills.add(SkillTable.getInstance().getInfo(4055,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4164,9)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4165,9)); no animation
_skills.add(SkillTable.getInstance().getInfo(4166, 9)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4166, 9)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(5115,4)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5116,4)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5579,4)); no need to add to the cubic skills list
@@ -185,10 +185,10 @@ public class CubicInstance
}
case SMART_CUBIC_SPECTRALMASTER:
{
_skills.add(SkillTable.getInstance().getInfo(4049, 8)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4049, 8)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4050,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4051,7)); no animation
_skills.add(SkillTable.getInstance().getInfo(4052, 6)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4052, 6)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4053,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4054,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4055,8)); no animation
@@ -206,11 +206,11 @@ public class CubicInstance
// _skills.add(SkillTable.getInstance().getInfo(4050,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4051,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4052,6)); no animation
_skills.add(SkillTable.getInstance().getInfo(4053, 8)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4053, 8)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4054,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4055,8)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4164,9)); no animation
_skills.add(SkillTable.getInstance().getInfo(4165, 9)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4165, 9)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4166,9)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5115,4)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5116,4)); no animation
@@ -219,7 +219,7 @@ public class CubicInstance
}
case SMART_CUBIC_SHILLIENTEMPLAR:
{
_skills.add(SkillTable.getInstance().getInfo(4049, 8)); // have animation
_skills.add(SkillTable.getInstance().getSkill(4049, 8)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(4050,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4051,7)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4052,6)); no animation
@@ -229,7 +229,7 @@ public class CubicInstance
// _skills.add(SkillTable.getInstance().getInfo(4164,9)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4165,9)); no animation
// _skills.add(SkillTable.getInstance().getInfo(4166,9)); no animation
_skills.add(SkillTable.getInstance().getInfo(5115, 4)); // have animation
_skills.add(SkillTable.getInstance().getSkill(5115, 4)); // have animation
// _skills.add(SkillTable.getInstance().getInfo(5116,4)); no animation
// _skills.add(SkillTable.getInstance().getInfo(5579,4)); no need to add to the cubic skills list
break;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java
View File

@@ -145,7 +145,7 @@ public class DoormanInstance extends FolkInstance
player.sendPacket(mount);
player.broadcastPacket(mount);
player.setMountType(mount.getMountType());
player.addSkill(SkillTable.getInstance().getInfo(4289, 1));
player.addSkill(SkillTable.getInstance().getSkill(4289, 1));
player.sendMessage("The wyvern has been summoned successfully!");
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java
View File

@@ -121,7 +121,7 @@ public class FishermanInstance extends FolkInstance
int counts = 0;
for (SkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if (sk == null)
{
continue;

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java
View File

@@ -101,7 +101,7 @@ public class FolkInstance extends NpcInstance
int counts = 0;
for (SkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || !sk.getCanLearn(player.getClassId()) || !sk.canTeachBy(npcId))
{
continue;
@@ -189,7 +189,7 @@ public class FolkInstance extends NpcInstance
int counts = 0;
for (EnchantSkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if (sk == null)
{
continue;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java
View File

@@ -111,7 +111,7 @@ public class FortWyvernManagerInstance extends NpcInstance
player.broadcastPacket(mount);
player.setMountType(mount.getMountType());
player.addSkill(SkillTable.getInstance().getInfo(4289, 1));
player.addSkill(SkillTable.getInstance().getSkill(4289, 1));
player.sendMessage("The Wyvern has been summoned successfully!");
}
else

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java
View File

@@ -1954,7 +1954,7 @@ public class NpcInstance extends Creature
}
// Skill's animation
final Skill skill = SkillTable.getInstance().getInfo(4380, 1);
final Skill skill = SkillTable.getInstance().getSkill(4380, 1);
if (skill != null)
{
broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0));
@@ -2023,7 +2023,7 @@ public class NpcInstance extends Creature
{
if ((helperBuffItem.isMagicClassBuff() == player.isMageClass()) && (playerLevel >= helperBuffItem.getLowerLevel()) && (playerLevel <= helperBuffItem.getUpperLevel()))
{
skill = SkillTable.getInstance().getInfo(helperBuffItem.getSkillID(), helperBuffItem.getSkillLevel());
skill = SkillTable.getInstance().getSkill(helperBuffItem.getSkillID(), helperBuffItem.getSkillLevel());
if (skill.getSkillType() == SkillType.SUMMON)
{
player.doCast(skill);

52
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
View File

@@ -2141,7 +2141,7 @@ public class PlayerInstance extends Playable
_curWeightPenalty = newWeightPenalty;
if (newWeightPenalty > 0)
{
super.addSkill(SkillTable.getInstance().getInfo(4270, newWeightPenalty));
super.addSkill(SkillTable.getInstance().getSkill(4270, newWeightPenalty));
sendSkillList(); // Fix visual bug
}
else
@@ -2244,7 +2244,7 @@ public class PlayerInstance extends Playable
final int penalties = _masteryWeapPenalty + _expertisePenalty + newMasteryPenalty;
if (penalties > 0)
{
super.addSkill(SkillTable.getInstance().getInfo(4267, 1)); // level used to be newPenalty
super.addSkill(SkillTable.getInstance().getSkill(4267, 1)); // level used to be newPenalty
}
else
{
@@ -2433,7 +2433,7 @@ public class PlayerInstance extends Playable
final int penalties = _masteryPenalty + _expertisePenalty + newMasteryPenalty;
if (penalties > 0)
{
super.addSkill(SkillTable.getInstance().getInfo(4267, 1)); // level used to be newPenalty
super.addSkill(SkillTable.getInstance().getSkill(4267, 1)); // level used to be newPenalty
}
else
{
@@ -2503,7 +2503,7 @@ public class PlayerInstance extends Playable
_expertisePenalty = intensity;
if (penalties > 0)
{
super.addSkill(SkillTable.getInstance().getInfo(4267, intensity));
super.addSkill(SkillTable.getInstance().getSkill(4267, intensity));
sendSkillList();
}
else
@@ -2630,7 +2630,7 @@ public class PlayerInstance extends Playable
{
getSubClasses().get(_classIndex).setClassId(id);
}
doCast(SkillTable.getInstance().getInfo(5103, 1));
doCast(SkillTable.getInstance().getSkill(5103, 1));
setClassTemplate(id);
}
@@ -2767,7 +2767,7 @@ public class PlayerInstance extends Playable
// Remove beginner Lucky skill
if (lvl == 10)
{
removeSkill(SkillTable.getInstance().getInfo(194, 1));
removeSkill(SkillTable.getInstance().getSkill(194, 1));
}
// Calculate the current higher Expertise of the PlayerInstance
@@ -2782,21 +2782,21 @@ public class PlayerInstance extends Playable
// Add the Expertise skill corresponding to its Expertise level
if (getExpertiseIndex() > 0)
{
final Skill skill = SkillTable.getInstance().getInfo(239, getExpertiseIndex());
final Skill skill = SkillTable.getInstance().getSkill(239, getExpertiseIndex());
addSkill(skill, !restore);
}
// Active skill dwarven craft
if ((getSkillLevel(1321) < 1) && (getRace() == Race.DWARF))
{
final Skill skill = SkillTable.getInstance().getInfo(1321, 1);
final Skill skill = SkillTable.getInstance().getSkill(1321, 1);
addSkill(skill, !restore);
}
// Active skill common craft
if (getSkillLevel(1322) < 1)
{
final Skill skill = SkillTable.getInstance().getInfo(1322, 1);
final Skill skill = SkillTable.getInstance().getSkill(1322, 1);
addSkill(skill, !restore);
}
@@ -2804,7 +2804,7 @@ public class PlayerInstance extends Playable
{
if ((lvl >= COMMON_CRAFT_LEVELS[i]) && (getSkillLevel(1320) < (i + 1)))
{
final Skill skill = SkillTable.getInstance().getInfo(1320, (i + 1));
final Skill skill = SkillTable.getInstance().getSkill(1320, (i + 1));
addSkill(skill, !restore);
}
}
@@ -9095,7 +9095,7 @@ public class PlayerInstance extends Playable
}
// Create a Skill object for each record
final Skill skill = SkillTable.getInstance().getInfo(id, level);
final Skill skill = SkillTable.getInstance().getSkill(id, level);
// Add the Skill object to the Creature _skills and its Func objects to the calculator set of the Creature
super.addSkill(skill);
@@ -9121,7 +9121,7 @@ public class PlayerInstance extends Playable
}
// Create a Skill object for each record
final Skill skill = SkillTable.getInstance().getInfo(id, level);
final Skill skill = SkillTable.getInstance().getSkill(id, level);
// Add the Skill object to the Creature _skills and its Func objects to the calculator set of the Creature
super.addSkill(skill);
@@ -9178,7 +9178,7 @@ public class PlayerInstance extends Playable
if (activateEffects)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
skill.getEffects(this, this, false, false, false);
for (Effect effect : getAllEffects())
{
@@ -9193,7 +9193,7 @@ public class PlayerInstance extends Playable
final long remainingTime = systime - currentTime;
if (remainingTime > 10)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
if (skill == null)
{
continue;
@@ -9222,7 +9222,7 @@ public class PlayerInstance extends Playable
final long remainingTime = systime - currentTime;
if (remainingTime > 0)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLvl);
if (skill == null)
{
continue;
@@ -10518,7 +10518,7 @@ public class PlayerInstance extends Playable
setRiding(true);
if (isNoble())
{
final Skill striderAssaultSkill = SkillTable.getInstance().getInfo(325, 1);
final Skill striderAssaultSkill = SkillTable.getInstance().getSkill(325, 1);
addSkill(striderAssaultSkill, false); // not saved to DB
}
break;
@@ -11933,7 +11933,7 @@ public class PlayerInstance extends Playable
if (skillInfo.getMinLevel() <= 40)
{
final Skill prevSkill = prevSkillList.get(skillInfo.getId());
final Skill newSkill = SkillTable.getInstance().getInfo(skillInfo.getId(), skillInfo.getLevel());
final Skill newSkill = SkillTable.getInstance().getSkill(skillInfo.getId(), skillInfo.getLevel());
if ((newSkill == null) || ((prevSkill != null) && (prevSkill.getLevel() > newSkill.getLevel())))
{
continue;
@@ -14550,7 +14550,7 @@ public class PlayerInstance extends Playable
if (getDeathPenaltyBuffLevel() != 0)
{
final Skill skill = SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel());
final Skill skill = SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel());
if (skill != null)
{
removeSkill(skill, true);
@@ -14559,7 +14559,7 @@ public class PlayerInstance extends Playable
_deathPenaltyBuffLevel++;
addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
addSkill(SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_DEATH_PENALTY_IS_NOW_LEVEL_S1);
sm.addNumber(getDeathPenaltyBuffLevel());
sendPacket(sm);
@@ -14576,7 +14576,7 @@ public class PlayerInstance extends Playable
return;
}
final Skill skill = SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel());
final Skill skill = SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel());
if (skill != null)
{
removeSkill(skill, true);
@@ -14587,7 +14587,7 @@ public class PlayerInstance extends Playable
if (getDeathPenaltyBuffLevel() > 0)
{
addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
addSkill(SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_DEATH_PENALTY_IS_NOW_LEVEL_S1);
sm.addNumber(getDeathPenaltyBuffLevel());
sendPacket(sm);
@@ -14628,7 +14628,7 @@ public class PlayerInstance extends Playable
*/
public void restoreDeathPenaltyBuffLevel()
{
final Skill skill = SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel());
final Skill skill = SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel());
if (skill != null)
{
removeSkill(skill, true);
@@ -14636,7 +14636,7 @@ public class PlayerInstance extends Playable
if (getDeathPenaltyBuffLevel() > 0)
{
addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false);
addSkill(SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false);
final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_DEATH_PENALTY_IS_NOW_LEVEL_S1);
sm.addNumber(getDeathPenaltyBuffLevel());
sendPacket(sm);
@@ -14854,7 +14854,7 @@ public class PlayerInstance extends Playable
setMountType(0);
if (wasFlying)
{
removeSkill(SkillTable.getInstance().getInfo(4289, 1));
removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
broadcastPacket(new Ride(getObjectId(), Ride.ACTION_DISMOUNT, 0));
setMountObjectID(0);
@@ -15376,7 +15376,7 @@ public class PlayerInstance extends Playable
for (Integer skillid : Config.AIO_SKILLS.keySet())
{
final int skilllvl = Config.AIO_SKILLS.get(skillid);
skill = SkillTable.getInstance().getInfo(skillid, skilllvl);
skill = SkillTable.getInstance().getSkill(skillid, skilllvl);
if (skill != null)
{
addSkill(skill, true);
@@ -15394,7 +15394,7 @@ public class PlayerInstance extends Playable
for (Integer skillid : Config.AIO_SKILLS.keySet())
{
final int skilllvl = Config.AIO_SKILLS.get(skillid);
skill = SkillTable.getInstance().getInfo(skillid, skilllvl);
skill = SkillTable.getInstance().getSkill(skillid, skilllvl);
removeSkill(skill);
}
}

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java
View File

@@ -80,7 +80,7 @@ public class ProtectorInstance extends NpcInstance
return false;
}
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (player.getFirstEffect(skill) == null)
{
final int objId = _caster.getObjectId();
@@ -101,7 +101,7 @@ public class ProtectorInstance extends NpcInstance
return false;
}
final Skill skill = SkillTable.getInstance().getInfo(skillId, skillLevel);
final Skill skill = SkillTable.getInstance().getSkill(skillId, skillLevel);
if (player.getFirstEffect(skill) == null)
{
final int objId = _caster.getObjectId();

14
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java
View File

@@ -116,7 +116,7 @@ public class SchemeBufferInstance extends FolkInstance
{
for (int skillId : SchemeBufferTable.getInstance().getScheme(player.getObjectId(), schemeName))
{
SkillTable.getInstance().getInfo(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target);
SkillTable.getInstance().getSkill(skillId, SkillTable.getInstance().getMaxLevel(skillId, 1)).getEffects(this, target);
}
}
}
@@ -316,33 +316,33 @@ public class SchemeBufferInstance extends FolkInstance
{
if (schemeSkills.contains(skillId))
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
}
else
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill00", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
}
}
else if (skillId < 1000)
{
if (schemeSkills.contains(skillId))
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
}
else
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill0", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
}
}
else
{
if (schemeSkills.contains(skillId))
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillunselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomout2\" fore=\"L2UI_CH3.mapbutton_zoomout1\"></td>");
}
else
{
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getInfo(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
StringUtil.append(sb, "<td height=40 width=40><img src=\"icon.skill", skillId, "\" width=32 height=32></td><td width=190>", SkillTable.getInstance().getSkill(skillId, 1).getName(), "<br1><font color=\"B09878\">", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "</font></td><td><button action=\"bypass -h npc_%objectId%_skillselect;", groupType, ";", schemeName, ";", skillId, ";", page, "\" width=32 height=32 back=\"L2UI_CH3.mapbutton_zoomin2\" fore=\"L2UI_CH3.mapbutton_zoomin1\"></td>");
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java
View File

@@ -524,7 +524,7 @@ public class SepulcherMonsterInstance extends MonsterInstance
@Override
public void run()
{
final Skill fp = SkillTable.getInstance().getInfo(4616, 1); // Invulnerable by petrification
final Skill fp = SkillTable.getInstance().getSkill(4616, 1); // Invulnerable by petrification
fp.getEffects(activeChar, activeChar, false, false, false);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java
View File

@@ -431,7 +431,7 @@ public class TamedBeastInstance extends FeedableBeastInstance
// emulate a call to the owner using food, but bypass all checks for range, etc
// this also causes a call to the AI tasks handling feeding, which may call onReceiveFood as required.
owner.callSkill(SkillTable.getInstance().getInfo(foodTypeSkillId, 1), targets);
owner.callSkill(SkillTable.getInstance().getSkill(foodTypeSkillId, 1), targets);
owner.setTarget(oldTarget);
}
else if (_tamedBeast.getRemainingTime() < (MAX_DURATION - 300000)) // if the owner has no food, the beast immediately despawns, except when it was only newly spawned. Newly spawned beasts can last up to 5 minutes

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java
View File

@@ -187,7 +187,7 @@ public class WeddingManagerInstance extends NpcInstance
ptarget.broadcastPacket(msu);
// fireworks
final Skill skill = SkillTable.getInstance().getInfo(2025, 1);
final Skill skill = SkillTable.getInstance().getSkill(2025, 1);
if (skill != null)
{
msu = new MagicSkillUse(player, player, 2025, 1, 1, 0);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java
View File

@@ -84,7 +84,7 @@ public class WyvernManagerInstance extends CastleChamberlainInstance
player.sendPacket(mount);
player.broadcastPacket(mount);
player.setMountType(mount.getMountType());
player.addSkill(SkillTable.getInstance().getInfo(4289, 1));
player.addSkill(SkillTable.getInstance().getSkill(4289, 1));
player.sendMessage("The wyvern has been summoned successfully!");
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java
View File

@@ -55,7 +55,7 @@ public class XmassTreeInstance extends NpcInstance
private boolean handleCast(PlayerInstance player, int skillId)
{
final Skill skill = SkillTable.getInstance().getInfo(skillId, 1);
final Skill skill = SkillTable.getInstance().getSkill(skillId, 1);
if (player.getFirstEffect(skill) == null)
{
setTarget(player);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java
View File

@@ -968,7 +968,7 @@ public class Clan
final int level = rset.getInt("skill_level");
// Create a Skill object for each record
final Skill skill = SkillTable.getInstance().getInfo(id, level);
final Skill skill = SkillTable.getInstance().getSkill(id, level);
// Add the Skill object to the Clan _skills
_skills.put(skill.getId(), skill);

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java
View File

@@ -353,7 +353,7 @@ public class Rebirth
final String[] currSkill = readSkill.split(",");
if (loopBirth == (rebirthLevel - 1))
{
skill = SkillTable.getInstance().getInfo(Integer.parseInt(currSkill[0]), Integer.parseInt(currSkill[1]));
skill = SkillTable.getInstance().getSkill(Integer.parseInt(currSkill[0]), Integer.parseInt(currSkill[1]));
break;
}
loopBirth++;
@@ -367,7 +367,7 @@ public class Rebirth
final String[] currSkill = readSkill.split(",");
if (loopBirth == (rebirthLevel - 1))
{
skill = SkillTable.getInstance().getInfo(Integer.parseInt(currSkill[0]), Integer.parseInt(currSkill[1]));
skill = SkillTable.getInstance().getSkill(Integer.parseInt(currSkill[0]), Integer.parseInt(currSkill[1]));
break;
}
loopBirth++;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java
View File

@@ -1574,7 +1574,7 @@ public class CTF implements EventTask
{
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java
View File

@@ -1422,7 +1422,7 @@ public class DM implements EventTask
{
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java
View File

@@ -1503,7 +1503,7 @@ public class TvT implements EventTask
{
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
player.broadcastPacket(new Ride(player.getObjectId(), Ride.ACTION_DISMOUNT, 0));

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java
View File

@@ -428,7 +428,7 @@ class OlympiadGame
// Wind Walk Buff for Both
Skill skill;
SystemMessage sm;
skill = SkillTable.getInstance().getInfo(1204, 2);
skill = SkillTable.getInstance().getSkill(1204, 2);
skill.getEffects(player, player);
player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 2, skill.getHitTime(), 0));
sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
@@ -437,7 +437,7 @@ class OlympiadGame
if (!player.isMageClass())
{
// Haste Buff to Fighters
skill = SkillTable.getInstance().getInfo(1086, 1);
skill = SkillTable.getInstance().getSkill(1086, 1);
skill.getEffects(player, player);
player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0));
sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);
@@ -447,7 +447,7 @@ class OlympiadGame
else
{
// Acumen Buff to Mages
skill = SkillTable.getInstance().getInfo(1085, 1);
skill = SkillTable.getInstance().getSkill(1085, 1);
skill.getEffects(player, player);
player.broadcastPacket(new MagicSkillUse(player, player, skill.getId(), 1, skill.getHitTime(), 0));
sm = new SystemMessage(SystemMessageId.THE_EFFECTS_OF_S1_FLOW_THROUGH_YOU);

18
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java
View File

@@ -212,7 +212,7 @@ public abstract class Inventory extends ItemContainer
if ((item.getItemId() == 9140) && (getOwner() instanceof PlayerInstance))
{
player = (PlayerInstance) getOwner();
skill = SkillTable.getInstance().getInfo(3261, 1);
skill = SkillTable.getInstance().getSkill(3261, 1);
player.removeSkill(skill);
player.sendSkillList();
}
@@ -241,7 +241,7 @@ public abstract class Inventory extends ItemContainer
if ((item.getItemId() == 9140) && (getOwner() instanceof PlayerInstance))
{
player = (PlayerInstance) getOwner();
skill = SkillTable.getInstance().getInfo(3261, 1);
skill = SkillTable.getInstance().getSkill(3261, 1);
player.addSkill(skill, false);
player.sendSkillList();
}
@@ -407,7 +407,7 @@ public abstract class Inventory extends ItemContainer
{
if (armorSet.containAll(player))
{
final Skill skill = SkillTable.getInstance().getInfo(armorSet.getSkillId(), 1);
final Skill skill = SkillTable.getInstance().getSkill(armorSet.getSkillId(), 1);
if (skill != null)
{
player.addSkill(skill, false);
@@ -420,7 +420,7 @@ public abstract class Inventory extends ItemContainer
if (armorSet.containShield(player)) // has shield from set
{
final Skill skills = SkillTable.getInstance().getInfo(armorSet.getShieldSkillId(), 1);
final Skill skills = SkillTable.getInstance().getSkill(armorSet.getShieldSkillId(), 1);
if (skills != null)
{
player.addSkill(skills, false);
@@ -437,7 +437,7 @@ public abstract class Inventory extends ItemContainer
final int skillId = armorSet.getEnchant6skillId();
if (skillId > 0)
{
final Skill skille = SkillTable.getInstance().getInfo(skillId, 1);
final Skill skille = SkillTable.getInstance().getSkill(skillId, 1);
if (skille != null)
{
player.addSkill(skille, false);
@@ -455,7 +455,7 @@ public abstract class Inventory extends ItemContainer
{
if (armorSet.containAll(player))
{
final Skill skills = SkillTable.getInstance().getInfo(armorSet.getShieldSkillId(), 1);
final Skill skills = SkillTable.getInstance().getSkill(armorSet.getShieldSkillId(), 1);
if (skills != null)
{
player.addSkill(skills, false);
@@ -527,7 +527,7 @@ public abstract class Inventory extends ItemContainer
{
if (removeSkillId1 != 0)
{
final Skill skill = SkillTable.getInstance().getInfo(removeSkillId1, 1);
final Skill skill = SkillTable.getInstance().getSkill(removeSkillId1, 1);
if (skill != null)
{
player.removeSkill(skill);
@@ -540,7 +540,7 @@ public abstract class Inventory extends ItemContainer
if (removeSkillId2 != 0)
{
final Skill skill = SkillTable.getInstance().getInfo(removeSkillId2, 1);
final Skill skill = SkillTable.getInstance().getSkill(removeSkillId2, 1);
if (skill != null)
{
player.removeSkill(skill);
@@ -553,7 +553,7 @@ public abstract class Inventory extends ItemContainer
if (removeSkillId3 != 0)
{
final Skill skill = SkillTable.getInstance().getInfo(removeSkillId3, 1);
final Skill skill = SkillTable.getInstance().getSkill(removeSkillId3, 1);
if (skill != null)
{
player.removeSkill(skill);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java
View File

@@ -65,7 +65,7 @@ public class Armor extends Item
final int sLv = set.getInt("item_skill_lvl", 0);
if ((sId > 0) && (sLv > 0))
{
_itemSkill = SkillTable.getInstance().getInfo(sId, sLv);
_itemSkill = SkillTable.getInstance().getSkill(sId, sLv);
}
}

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java
View File

@@ -101,14 +101,14 @@ public class Weapon extends Item
int sLv = set.getInt("item_skill_lvl", 0);
if ((sId > 0) && (sLv > 0))
{
_itemSkill = SkillTable.getInstance().getInfo(sId, sLv);
_itemSkill = SkillTable.getInstance().getSkill(sId, sLv);
}
sId = set.getInt("enchant4_skill_id", 0);
sLv = set.getInt("enchant4_skill_lvl", 0);
if ((sId > 0) && (sLv > 0))
{
_enchant4Skill = SkillTable.getInstance().getInfo(sId, sLv);
_enchant4Skill = SkillTable.getInstance().getSkill(sId, sLv);
}
sId = set.getInt("onCast_skill_id", 0);
@@ -116,7 +116,7 @@ public class Weapon extends Item
int sCh = set.getInt("onCast_skill_chance", 0);
if ((sId > 0) && (sLv > 0) && (sCh > 0))
{
final Skill skill = SkillTable.getInstance().getInfo(sId, sLv);
final Skill skill = SkillTable.getInstance().getSkill(sId, sLv);
skill.attach(new ConditionGameChance(sCh), true);
attachOnCast(skill);
}
@@ -126,7 +126,7 @@ public class Weapon extends Item
sCh = set.getInt("onCrit_skill_chance", 0);
if ((sId > 0) && (sLv > 0) && (sCh > 0))
{
final Skill skill = SkillTable.getInstance().getInfo(sId, sLv);
final Skill skill = SkillTable.getInstance().getSkill(sId, sLv);
skill.attach(new ConditionGameChance(sCh), true);
attachOnCrit(skill);
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java
View File

@@ -40,7 +40,7 @@ final class EffectBestowSkill extends Effect
@Override
public void onStart()
{
final Skill tempSkill = SkillTable.getInstance().getInfo(getSkill().getTriggeredId(), getSkill().getTriggeredLevel());
final Skill tempSkill = SkillTable.getInstance().getSkill(getSkill().getTriggeredId(), getSkill().getTriggeredLevel());
if (tempSkill != null)
{
getEffected().addSkill(tempSkill);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java
View File

@@ -75,7 +75,7 @@ public class EffectForce extends Effect
public void updateBuff()
{
exit(false);
final Skill newSkill = SkillTable.getInstance().getInfo(getSkill().getId(), forces);
final Skill newSkill = SkillTable.getInstance().getSkill(getSkill().getId(), forces);
if (newSkill != null)
{
newSkill.getEffects(getEffector(), getEffected(), false, false, false);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java
View File

@@ -72,6 +72,6 @@ public class EffectFusion extends Effect
private void updateBuff()
{
exit(false);
SkillTable.getInstance().getInfo(getSkill().getId(), _effect).getEffects(getEffector(), getEffected(), false, false, false);
SkillTable.getInstance().getSkill(getSkill().getId(), _effect).getEffects(getEffector(), getEffected(), false, false, false);
}
}

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java
View File

@@ -49,11 +49,11 @@ public class EffectSignet extends Effect
{
if (getSkill() instanceof SkillSignet)
{
_skill = SkillTable.getInstance().getInfo(((SkillSignet) getSkill()).effectId, getLevel());
_skill = SkillTable.getInstance().getSkill(((SkillSignet) getSkill()).effectId, getLevel());
}
else if (getSkill() instanceof SkillSignetCasttime)
{
_skill = SkillTable.getInstance().getInfo(((SkillSignetCasttime) getSkill()).effectId, getLevel());
_skill = SkillTable.getInstance().getSkill(((SkillSignetCasttime) getSkill()).effectId, getLevel());
}
_actor = (EffectPointInstance) getEffected();
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java
View File

@@ -51,6 +51,6 @@ public class SkillHolder
public Skill getSkill()
{
return SkillTable.getInstance().getInfo(_skillId, _skillLvl);
return SkillTable.getInstance().getSkill(_skillId, _skillLvl);
}
}

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java
View File

@@ -162,7 +162,7 @@ public class EffectZone extends ZoneType
protected Skill getSkill(int skillId, int skillLvl)
{
return SkillTable.getInstance().getInfo(skillId, skillLvl);
return SkillTable.getInstance().getSkill(skillId, skillLvl);
}
public int getChance()

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java
View File

@@ -122,7 +122,7 @@ public class PoisonZone extends ZoneType
public Skill getSkill()
{
return SkillTable.getInstance().getInfo(_skillId, _skillLvl);
return SkillTable.getInstance().getSkill(_skillId, _skillLvl);
}
public String getTargetType()

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java
View File

@@ -608,7 +608,7 @@ public class GameClient extends MMOClient<MMOConnection<GameClient>> implements
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
if (Olympiad.getInstance().isRegistered(player))
@@ -679,7 +679,7 @@ public class GameClient extends MMOClient<MMOConnection<GameClient>> implements
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
if (Olympiad.getInstance().isRegistered(player))

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java
View File

@@ -263,7 +263,7 @@ public class CharacterCreate extends GameClientPacket
for (SkillLearn startSkill : SkillTreeTable.getInstance().getAvailableSkills(newChar, newChar.getClassId()))
{
newChar.addSkill(SkillTable.getInstance().getInfo(startSkill.getId(), startSkill.getLevel()), true);
newChar.addSkill(SkillTable.getInstance().getSkill(startSkill.getId(), startSkill.getLevel()), true);
if ((startSkill.getId() == 1001) || (startSkill.getId() == 1177))
{
newChar.registerShortCut(new ShortCut(1, 0, 2, startSkill.getId(), 1));

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java
View File

@@ -451,7 +451,7 @@ public class EnterWorld extends GameClientPacket
// Apply night/day bonus on skill Shadow Sense
if (player.getRace().ordinal() == 2)
{
final Skill skill = SkillTable.getInstance().getInfo(294, 1);
final Skill skill = SkillTable.getInstance().getSkill(294, 1);
if ((skill != null) && (player.getSkillLevel(294) == 1))
{
if (GameTimeController.getInstance().isNowNight())
@@ -572,7 +572,7 @@ public class EnterWorld extends GameClientPacket
if (player.getFirstLog() && Config.NEW_PLAYER_EFFECT)
{
final Skill skill = SkillTable.getInstance().getInfo(2025, 1);
final Skill skill = SkillTable.getInstance().getSkill(2025, 1);
if (skill != null)
{
final MagicSkillUse msu = new MagicSkillUse(player, player, 2025, 1, 1, 0);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java
View File

@@ -116,7 +116,7 @@ public class Logout extends GameClientPacket
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
if (Config.OFFLINE_LOGOUT && player.isSitting())

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java
View File

@@ -309,7 +309,7 @@ public class RequestActionUse extends GameClientPacket
if (player.isFlying())
{
// Remove skill Wyvern Breath
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
player.sendSkillList();
}
if (player.setMountType(0))

8
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java
View File

@@ -91,7 +91,7 @@ public class RequestAquireSkill extends GameClientPacket
return;
}
final Skill skill = SkillTable.getInstance().getInfo(_id, _level);
final Skill skill = SkillTable.getInstance().getSkill(_id, _level);
int counts = 0;
int requiredSp = 10000000;
if (_skillType == 0)
@@ -99,7 +99,7 @@ public class RequestAquireSkill extends GameClientPacket
final SkillLearn[] skills = SkillTreeTable.getInstance().getAvailableSkills(player, player.getSkillLearningClassId());
for (SkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill) || !sk.getCanLearn(player.getSkillLearningClassId()) || !sk.canTeachBy(npcid))
{
continue;
@@ -157,7 +157,7 @@ public class RequestAquireSkill extends GameClientPacket
final SkillLearn[] skillsc = SkillTreeTable.getInstance().getAvailableSkills(player);
for (SkillLearn s : skillsc)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))
{
continue;
@@ -211,7 +211,7 @@ public class RequestAquireSkill extends GameClientPacket
final PledgeSkillLearn[] skills = SkillTreeTable.getInstance().getAvailablePledgeSkills(player);
for (PledgeSkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))
{
continue;

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java
View File

@@ -63,7 +63,7 @@ public class RequestAquireSkillInfo extends GameClientPacket
}
boolean canteach = false;
final Skill skill = SkillTable.getInstance().getInfo(_id, _level);
final Skill skill = SkillTable.getInstance().getSkill(_id, _level);
if (skill == null)
{
return;
@@ -148,7 +148,7 @@ public class RequestAquireSkillInfo extends GameClientPacket
final SkillLearn[] skillsc = SkillTreeTable.getInstance().getAvailableSkills(player);
for (SkillLearn s : skillsc)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill))
{
continue;

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java
View File

@@ -88,7 +88,7 @@ public class RequestExEnchantSkill extends GameClientPacket
return;
}
final Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLvl);
int counts = 0;
int requiredSp = 10000000;
int requiredExp = 100000;
@@ -98,7 +98,7 @@ public class RequestExEnchantSkill extends GameClientPacket
final EnchantSkillLearn[] skills = SkillTreeTable.getInstance().getAvailableEnchantSkills(player);
for (EnchantSkillLearn s : skills)
{
final Skill sk = SkillTable.getInstance().getInfo(s.getId(), s.getLevel());
final Skill sk = SkillTable.getInstance().getSkill(s.getId(), s.getLevel());
if ((sk == null) || (sk != skill) || !sk.getCanLearn(player.getClassId()) || !sk.canTeachBy(npcid))
{
continue;
@@ -174,7 +174,7 @@ public class RequestExEnchantSkill extends GameClientPacket
if (skill.getLevel() > 100)
{
_skillLvl = baseLvl;
player.addSkill(SkillTable.getInstance().getInfo(_skillId, _skillLvl), true);
player.addSkill(SkillTable.getInstance().getSkill(_skillId, _skillLvl), true);
player.sendSkillList();
}
final SystemMessage sm = new SystemMessage(SystemMessageId.SKILL_ENCHANT_FAILED_THE_SKILL_WILL_BE_INITIALIZED);

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java
View File

@@ -74,7 +74,7 @@ public class RequestExEnchantSkillInfo extends GameClientPacket
boolean canteach = false;
final Skill skill = SkillTable.getInstance().getInfo(_skillId, _skillLvl);
final Skill skill = SkillTable.getInstance().getSkill(_skillId, _skillLvl);
if ((skill == null) || (skill.getId() != _skillId))
{
return;

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java
View File

@@ -64,7 +64,7 @@ public class RequestExMagicSkillUseGround extends GameClientPacket
}
// Get the Skill template corresponding to the skillID received from the client
final Skill skill = SkillTable.getInstance().getInfo(_skillId, level);
final Skill skill = SkillTable.getInstance().getSkill(_skillId, level);
if (skill != null)
{
player.setCurrentSkillWorldPosition(new Location(_x, _y, _z));

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java
View File

@@ -69,7 +69,7 @@ public class RequestMagicSkillUse extends GameClientPacket
}
// Get the Skill template corresponding to the skillID received from the client
final Skill skill = SkillTable.getInstance().getInfo(_magicId, level);
final Skill skill = SkillTable.getInstance().getSkill(_magicId, level);
// Check the validity of the skill
if (skill != null)

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java
View File

@@ -153,7 +153,7 @@ public class RequestRestart extends GameClientPacket
// Check if player are flying
if (player.isFlying())
{
player.removeSkill(SkillTable.getInstance().getInfo(4289, 1));
player.removeSkill(SkillTable.getInstance().getSkill(4289, 1));
}
// delete box from the world

12
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java
View File

@@ -461,12 +461,12 @@ public class UseItem extends GameClientPacket
{
if (item.getItemId() == 9140)
{
player.removeSkill(SkillTable.getInstance().getInfo(3261, 1));
player.removeSkill(SkillTable.getInstance().getSkill(3261, 1));
}
else
{
player.removeSkill(SkillTable.getInstance().getInfo(3260, 0));
player.removeSkill(SkillTable.getInstance().getInfo(3262, 0));
player.removeSkill(SkillTable.getInstance().getSkill(3260, 0));
player.removeSkill(SkillTable.getInstance().getSkill(3262, 0));
}
}
@@ -547,14 +547,14 @@ public class UseItem extends GameClientPacket
{
if (item.getItemId() == 9140)
{
player.addSkill(SkillTable.getInstance().getInfo(3261, 1));
player.addSkill(SkillTable.getInstance().getSkill(3261, 1));
}
else
{
player.addSkill(SkillTable.getInstance().getInfo(3260, 0));
player.addSkill(SkillTable.getInstance().getSkill(3260, 0));
}
player.addSkill(SkillTable.getInstance().getInfo(3262, 0));
player.addSkill(SkillTable.getInstance().getSkill(3262, 0));
}
items = player.getInventory().equipItemAndRecord(item);