From c0261a25390b23c75e41b2d64662dcdde12dfc44 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 16 Jun 2020 23:02:33 +0000 Subject: [PATCH] Proper name for SkillTable skill getter. --- .../l2jmobius/gameserver/AdminCommands.java | 6 +- .../l2jmobius/gameserver/data/SkillTable.java | 2 +- .../handler/itemhandlers/ScrollOfEscape.java | 2 +- .../model/actor/instance/PlayerInstance.java | 8 +- .../gameserver/network/ClientThread.java | 2 +- .../clientpackets/CharacterCreate.java | 2 +- .../clientpackets/RequestAquireSkill.java | 2 +- .../clientpackets/RequestAquireSkillInfo.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../ai/areas/HotSprings/HotSprings.java | 2 +- .../game/data/scripts/ai/bosses/Antharas.java | 8 +- .../game/data/scripts/ai/bosses/Baium.java | 8 +- .../game/data/scripts/ai/bosses/Orfen.java | 2 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 8 +- .../game/data/scripts/ai/bosses/Valakas.java | 92 +++++++++---------- .../game/data/scripts/ai/bosses/Zaken.java | 42 ++++----- .../data/scripts/ai/others/AncientEgg.java | 2 +- .../data/scripts/ai/others/Monastery.java | 4 +- .../KetraOrcSupport/KetraOrcSupport.java | 4 +- .../VarkaSilenosSupport.java | 4 +- .../Q230_TestOfTheSummoner.java | 12 +-- .../Q365_DevilsLegacy/Q365_DevilsLegacy.java | 2 +- .../Q421_LittleWingsBigAdventure.java | 4 +- .../Q501_ProofOfClanAlliance.java | 4 +- .../gameserver/datatables/HeroSkillTable.java | 10 +- .../datatables/NobleSkillTable.java | 16 ++-- .../gameserver/datatables/SkillTable.java | 2 +- .../gameserver/datatables/sql/NpcTable.java | 2 +- .../datatables/sql/SkillTreeTable.java | 2 +- .../gameserver/engines/DocumentBase.java | 2 +- .../admincommandhandlers/AdminEditNpc.java | 8 +- .../admincommandhandlers/AdminGmSpeed.java | 2 +- .../admincommandhandlers/AdminRideWyvern.java | 2 +- .../admincommandhandlers/AdminSkill.java | 8 +- .../admincommandhandlers/AdminSuperHaste.java | 2 +- .../admincommandhandlers/AdminTest.java | 2 +- .../handler/itemhandlers/BeastSpice.java | 4 +- .../handler/itemhandlers/ChestKey.java | 2 +- .../handler/itemhandlers/Crystals.java | 24 ++--- .../handler/itemhandlers/CustomPotions.java | 2 +- .../handler/itemhandlers/EnergyStone.java | 2 +- .../handler/itemhandlers/Firework.java | 2 +- .../handler/itemhandlers/Harvester.java | 2 +- .../handler/itemhandlers/Nectar.java | 2 +- .../handler/itemhandlers/Potions.java | 4 +- .../handler/itemhandlers/ScrollOfEscape.java | 2 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/Scrolls.java | 2 +- .../gameserver/handler/itemhandlers/Seed.java | 2 +- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../handler/itemhandlers/SummonItems.java | 2 +- .../handler/skillhandlers/Continuous.java | 4 +- .../handler/skillhandlers/Pdam.java | 4 +- .../usercommandhandlers/OfflineShop.java | 2 +- .../voicedcommandhandlers/OfflineShop.java | 2 +- .../voicedcommandhandlers/Wedding.java | 2 +- .../instancemanager/DayNightSpawnManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 8 +- .../instancemanager/SiegeManager.java | 8 +- .../gameserver/model/CombatFlag.java | 8 +- .../l2jmobius/gameserver/model/ForceBuff.java | 2 +- .../org/l2jmobius/gameserver/model/Skill.java | 2 +- .../gameserver/model/actor/Creature.java | 10 +- .../gameserver/model/actor/Summon.java | 2 +- .../actor/instance/CabaleBufferInstance.java | 2 +- .../model/actor/instance/ChestInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 44 ++++----- .../model/actor/instance/DoormanInstance.java | 2 +- .../actor/instance/FishermanInstance.java | 2 +- .../model/actor/instance/FolkInstance.java | 4 +- .../instance/FortWyvernManagerInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 4 +- .../model/actor/instance/PlayerInstance.java | 52 +++++------ .../actor/instance/ProtectorInstance.java | 4 +- .../actor/instance/SchemeBufferInstance.java | 14 +-- .../instance/SepulcherMonsterInstance.java | 2 +- .../actor/instance/TamedBeastInstance.java | 2 +- .../instance/WeddingManagerInstance.java | 2 +- .../actor/instance/WyvernManagerInstance.java | 2 +- .../actor/instance/XmassTreeInstance.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/entity/Rebirth.java | 4 +- .../gameserver/model/entity/event/CTF.java | 2 +- .../gameserver/model/entity/event/DM.java | 2 +- .../gameserver/model/entity/event/TvT.java | 2 +- .../model/entity/olympiad/OlympiadGame.java | 6 +- .../model/itemcontainer/Inventory.java | 18 ++-- .../gameserver/model/items/Armor.java | 2 +- .../gameserver/model/items/Weapon.java | 8 +- .../skills/effects/EffectBestowSkill.java | 2 +- .../model/skills/effects/EffectForce.java | 2 +- .../model/skills/effects/EffectFusion.java | 2 +- .../model/skills/effects/EffectSignet.java | 4 +- .../model/skills/holders/SkillHolder.java | 2 +- .../model/zone/type/EffectZone.java | 2 +- .../model/zone/type/PoisonZone.java | 2 +- .../gameserver/network/GameClient.java | 4 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 4 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestAquireSkill.java | 8 +- .../clientpackets/RequestAquireSkillInfo.java | 4 +- .../clientpackets/RequestExEnchantSkill.java | 6 +- .../RequestExEnchantSkillInfo.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../network/clientpackets/UseItem.java | 12 +-- .../ai/areas/HotSprings/HotSprings.java | 2 +- .../game/data/scripts/ai/bosses/Antharas.java | 8 +- .../game/data/scripts/ai/bosses/Baium.java | 8 +- .../data/scripts/ai/bosses/Frintezza.java | 14 +-- .../game/data/scripts/ai/bosses/Orfen.java | 2 +- .../game/data/scripts/ai/bosses/QueenAnt.java | 8 +- .../game/data/scripts/ai/bosses/Valakas.java | 92 +++++++++---------- .../data/scripts/ai/bosses/VanHalter.java | 4 +- .../game/data/scripts/ai/bosses/Zaken.java | 42 ++++----- .../data/scripts/ai/others/AncientEgg.java | 2 +- .../data/scripts/ai/others/Monastery.java | 4 +- .../KetraOrcSupport/KetraOrcSupport.java | 4 +- .../VarkaSilenosSupport.java | 4 +- .../Q125_TheNameOfEvil_1.java | 6 +- .../Q230_TestOfTheSummoner.java | 12 +-- .../Q365_DevilsLegacy/Q365_DevilsLegacy.java | 2 +- .../Q421_LittleWingsBigAdventure.java | 4 +- .../Q501_ProofOfClanAlliance.java | 4 +- .../gameserver/datatables/HeroSkillTable.java | 10 +- .../datatables/NobleSkillTable.java | 16 ++-- .../gameserver/datatables/SkillTable.java | 2 +- .../gameserver/datatables/sql/NpcTable.java | 2 +- .../datatables/sql/SkillTreeTable.java | 2 +- .../datatables/xml/AugmentationData.java | 4 +- .../gameserver/engines/DocumentBase.java | 2 +- .../admincommandhandlers/AdminEditNpc.java | 8 +- .../admincommandhandlers/AdminGmSpeed.java | 2 +- .../admincommandhandlers/AdminRideWyvern.java | 2 +- .../admincommandhandlers/AdminSkill.java | 8 +- .../admincommandhandlers/AdminSuperHaste.java | 2 +- .../admincommandhandlers/AdminTest.java | 2 +- .../handler/itemhandlers/BeastSpice.java | 4 +- .../handler/itemhandlers/ChestKey.java | 2 +- .../handler/itemhandlers/Crystals.java | 24 ++--- .../handler/itemhandlers/CustomPotions.java | 2 +- .../handler/itemhandlers/EnergyStone.java | 2 +- .../handler/itemhandlers/Firework.java | 2 +- .../handler/itemhandlers/Harvester.java | 2 +- .../handler/itemhandlers/Nectar.java | 2 +- .../handler/itemhandlers/Potions.java | 4 +- .../handler/itemhandlers/ScrollOfEscape.java | 2 +- .../itemhandlers/ScrollOfResurrection.java | 2 +- .../handler/itemhandlers/Scrolls.java | 2 +- .../gameserver/handler/itemhandlers/Seed.java | 2 +- .../handler/itemhandlers/SoulCrystals.java | 2 +- .../handler/itemhandlers/SummonItems.java | 2 +- .../handler/skillhandlers/Continuous.java | 4 +- .../handler/skillhandlers/Pdam.java | 4 +- .../usercommandhandlers/OfflineShop.java | 2 +- .../voicedcommandhandlers/OfflineShop.java | 2 +- .../voicedcommandhandlers/Wedding.java | 2 +- .../instancemanager/DayNightSpawnManager.java | 2 +- .../instancemanager/FortSiegeManager.java | 8 +- .../instancemanager/SiegeManager.java | 8 +- .../gameserver/model/Augmentation.java | 2 +- .../gameserver/model/CombatFlag.java | 8 +- .../gameserver/model/CursedWeapon.java | 12 +-- .../l2jmobius/gameserver/model/ForceBuff.java | 2 +- .../org/l2jmobius/gameserver/model/Skill.java | 2 +- .../gameserver/model/actor/Creature.java | 10 +- .../gameserver/model/actor/Summon.java | 2 +- .../actor/instance/CabaleBufferInstance.java | 2 +- .../model/actor/instance/ChestInstance.java | 2 +- .../instance/ClanHallManagerInstance.java | 2 +- .../model/actor/instance/CubicInstance.java | 44 ++++----- .../model/actor/instance/DoormanInstance.java | 2 +- .../actor/instance/FishermanInstance.java | 2 +- .../model/actor/instance/FolkInstance.java | 4 +- .../instance/FortWyvernManagerInstance.java | 2 +- .../model/actor/instance/NpcInstance.java | 6 +- .../model/actor/instance/PlayerInstance.java | 52 +++++------ .../actor/instance/ProtectorInstance.java | 4 +- .../actor/instance/SchemeBufferInstance.java | 14 +-- .../instance/SepulcherMonsterInstance.java | 2 +- .../actor/instance/TamedBeastInstance.java | 2 +- .../instance/WeddingManagerInstance.java | 2 +- .../actor/instance/WyvernManagerInstance.java | 2 +- .../actor/instance/XmassTreeInstance.java | 2 +- .../l2jmobius/gameserver/model/clan/Clan.java | 2 +- .../gameserver/model/entity/Rebirth.java | 4 +- .../gameserver/model/entity/event/CTF.java | 2 +- .../gameserver/model/entity/event/DM.java | 2 +- .../gameserver/model/entity/event/TvT.java | 2 +- .../model/entity/olympiad/OlympiadGame.java | 6 +- .../model/itemcontainer/Inventory.java | 18 ++-- .../gameserver/model/items/Armor.java | 2 +- .../gameserver/model/items/Weapon.java | 8 +- .../skills/effects/EffectBestowSkill.java | 2 +- .../model/skills/effects/EffectForce.java | 2 +- .../model/skills/effects/EffectFusion.java | 2 +- .../model/skills/effects/EffectSignet.java | 4 +- .../model/skills/holders/SkillHolder.java | 2 +- .../model/zone/type/EffectZone.java | 2 +- .../model/zone/type/PoisonZone.java | 2 +- .../gameserver/network/GameClient.java | 4 +- .../clientpackets/CharacterCreate.java | 2 +- .../network/clientpackets/EnterWorld.java | 10 +- .../network/clientpackets/Logout.java | 2 +- .../clientpackets/RequestActionUse.java | 2 +- .../clientpackets/RequestAquireSkill.java | 8 +- .../clientpackets/RequestAquireSkillInfo.java | 4 +- .../clientpackets/RequestExEnchantSkill.java | 6 +- .../RequestExEnchantSkillInfo.java | 2 +- .../RequestExMagicSkillUseGround.java | 2 +- .../clientpackets/RequestMagicSkillUse.java | 2 +- .../network/clientpackets/RequestRestart.java | 2 +- .../network/clientpackets/UseItem.java | 18 ++-- 217 files changed, 668 insertions(+), 668 deletions(-) diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java index f0dcba141d..865e07005a 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/AdminCommands.java @@ -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); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTable.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTable.java index 1ebf1dccf0..4efbdb6ef7 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTable.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/data/SkillTable.java @@ -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); } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java index e6047bb752..2fab9a7dbd 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java @@ -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); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 346b6de47b..459bbe5c56 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -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); } } diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java index 3f123602ed..91b3b070fe 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/ClientThread.java @@ -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(); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index ea08f8ed32..58db00abf9 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -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())); diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index ceabd12f09..c0535bc3ce 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -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 skills = SkillTreeTable.getInstance().getAvailableSkills(player); int requiredSp = 0; diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index 9914a02562..67b6ac1c85 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -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)) { diff --git a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 1226330b4a..e0285e695b 100644 --- a/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C1_HarbingersOfWar/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -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(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java index cef740bc95..b9faf4664d 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java @@ -92,7 +92,7 @@ public class HotSprings extends Quest { final Effect info = creature.getFirstEffect(diseaseId); final int skillLevel = (info == null) ? 1 : (info.getSkill().getLevel() < 10) ? info.getSkill().getLevel() + 1 : 10; - final Skill skill = SkillTable.getInstance().getInfo(diseaseId, skillLevel); + final Skill skill = SkillTable.getInstance().getSkill(diseaseId, skillLevel); if ((skill != null) && !npc.isCastingNow() && !npc.isSkillDisabled(skill)) { npc.setTarget(creature); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java index 47f30b6cef..3735880811 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Antharas.java @@ -690,12 +690,12 @@ public class Antharas extends Quest case 29074: case 29075: { - skill = SkillTable.getInstance().getInfo(5097, 1); + skill = SkillTable.getInstance().getSkill(5097, 1); break; } case 29076: { - skill = SkillTable.getInstance().getInfo(5094, 1); + skill = SkillTable.getInstance().getSkill(5094, 1); break; } } @@ -932,12 +932,12 @@ public class Antharas extends Quest case 29074: case 29075: { - skill = SkillTable.getInstance().getInfo(5097, 1); + skill = SkillTable.getInstance().getSkill(5097, 1); break; } case 29076: { - skill = SkillTable.getInstance().getInfo(5094, 1); + skill = SkillTable.getInstance().getSkill(5094, 1); break; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java index 7a34d324c0..20aa8d13e5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Baium.java @@ -270,7 +270,7 @@ public class Baium extends Quest else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4135, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4135, 1)); if (GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM) != AWAKE) { cancelQuestTimer("baium_despawn", npc, null); @@ -398,7 +398,7 @@ public class Baium extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } // update a variable with the last action against baium @@ -500,7 +500,7 @@ public class Baium extends Quest _target = getRandomTarget(npc); if (_target != null) { - _skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1); + _skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1); } } @@ -508,7 +508,7 @@ public class Baium extends Quest Skill skill = _skill; if (skill == null) { - skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1); + skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1); } if ((target == null) || target.isDead() || !(_zone.isInsideZone(target))) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java index b894907cbf..3c88520dfc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Orfen.java @@ -217,7 +217,7 @@ public class Orfen extends Quest { attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ()); npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4064, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4064, 1)); } } else diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java index 27b503d83c..4d61438250 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -304,8 +304,8 @@ public class QueenAnt extends Quest { getIntoPosition(nurse, _larva); nurse.setTarget(_larva); - nurse.doCast(SkillTable.getInstance().getInfo(4020, 1)); - nurse.doCast(SkillTable.getInstance().getInfo(4024, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4020, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4024, 1)); } continue; } @@ -315,7 +315,7 @@ public class QueenAnt extends Quest { getIntoPosition(nurse, _queen); nurse.setTarget(_queen); - nurse.doCast(SkillTable.getInstance().getInfo(4020, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4020, 1)); } continue; } @@ -325,7 +325,7 @@ public class QueenAnt extends Quest { getIntoPosition(_nurses.get(k), nurse); _nurses.get(k).setTarget(nurse); - _nurses.get(k).doCast(SkillTable.getInstance().getInfo(4020, 1)); + _nurses.get(k).doCast(SkillTable.getInstance().getSkill(4020, 1)); } } if (notCasting && (nurse.getTarget() != null)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java index c0b1d0d385..76102388fd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Valakas.java @@ -193,7 +193,7 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 4))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 4)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 4)); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4.0)) @@ -201,7 +201,7 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 3))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 3)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 3)); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) @@ -209,13 +209,13 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 2))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 2)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 2)); } } else if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 1))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 1)); } } else if (event.equals("launch_random_skill")) @@ -389,7 +389,7 @@ public class Valakas extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } if (attacker.getZ() < (npc.getZ() + 200)) @@ -415,7 +415,7 @@ public class Valakas extends Quest i_ai3 = 0; i_ai4 = 0; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4687, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4687, 1)); i_quest0 = 1; } } @@ -687,45 +687,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 15) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 35) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4)) @@ -741,45 +741,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 10) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) @@ -795,45 +795,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else @@ -849,45 +849,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java index 157152d380..0b7a697d0a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/bosses/Zaken.java @@ -231,7 +231,7 @@ public class Zaken extends Quest if (sk4223 == 1) // use night face if zaken have day face { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4224, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4224, 1)); _ai1 = npc.getX(); _ai2 = npc.getY(); _ai3 = npc.getZ(); @@ -239,7 +239,7 @@ public class Zaken extends Quest if (sk4227 == 0) // use zaken regeneration { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4227, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4227, 1)); } if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) && (_ai0 == 0)) { @@ -362,7 +362,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } } @@ -411,13 +411,13 @@ public class Zaken extends Quest else if (sk4223 == 0) // use day face if not night time { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4223, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4223, 1)); _quest2 = 3; } if (sk4227 == 1) // when switching to day time, cancel zaken night regen { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4242, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4242, 1)); } if (Rnd.get(40) < 1) { @@ -426,7 +426,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } startQuestTimer("1001", 30000, npc, null); break; @@ -434,7 +434,7 @@ public class Zaken extends Quest case "1002": { _quest0 = 0; - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); _ai0 = 0; break; } @@ -767,7 +767,7 @@ public class Zaken extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } final Creature originalAttacker = isPet ? attacker.getPet() : attacker; @@ -779,22 +779,22 @@ public class Zaken extends Quest if (i0 < 1) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4216, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4216, 1)); } else if (i0 < 2) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4217, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4217, 1)); } else if (i0 < 4) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4219, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4219, 1)); } else if (i0 < 8) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4218, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4218, 1)); } else if (i0 < 15) { @@ -807,14 +807,14 @@ public class Zaken extends Quest if (attacker != ((Attackable) npc).getMostHated()) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4221, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4221, 1)); } } } if (Rnd.nextBoolean() && (attacker == ((Attackable) npc).getMostHated())) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4220, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); } } if ((getTimeHour() >= 5) && (npc.getCurrentHp() < ((npc.getMaxHp() * _quest2) / 4.0))) @@ -825,7 +825,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } return super.onAttack(npc, attacker, damage, isPet); @@ -900,22 +900,22 @@ public class Zaken extends Quest if (i0 < 1) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4216, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4216, 1)); } else if (i0 < 2) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4217, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4217, 1)); } else if (i0 < 4) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4219, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4219, 1)); } else if (i0 < 8) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4218, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4218, 1)); } else if (i0 < 15) { @@ -928,14 +928,14 @@ public class Zaken extends Quest if (player != ((Attackable) npc).getMostHated()) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4221, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4221, 1)); } } } if (Rnd.nextBoolean() && (player == ((Attackable) npc).getMostHated())) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4220, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); } } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/AncientEgg.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/AncientEgg.java index 037326971c..9633415d06 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/AncientEgg.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/AncientEgg.java @@ -42,7 +42,7 @@ public class AncientEgg extends Quest public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet) { attacker.setTarget(attacker); - attacker.doCast(SkillTable.getInstance().getInfo(SIGNAL, 1)); + attacker.doCast(SkillTable.getInstance().getSkill(SIGNAL, 1)); return null; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java index 4623d07bbf..aadc93b6bb 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/ai/others/Monastery.java @@ -83,7 +83,7 @@ public class Monastery extends Quest case 22124: case 22126: { - final Skill skill = SkillTable.getInstance().getInfo(4589, 8); + final Skill skill = SkillTable.getInstance().getSkill(4589, 8); npc.doCast(skill); break; } @@ -139,7 +139,7 @@ public class Monastery extends Quest case 22126: case 22127: { - final Skill skill = SkillTable.getInstance().getInfo(4589, 8); + final Skill skill = SkillTable.getInstance().getSkill(4589, 8); npc.doCast(skill); break; } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 0ef2acface..7cee284904 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -115,7 +115,7 @@ public class KetraOrcSupport extends Quest // Haste: Requires 6 Buffalo Horns }; - private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. @@ -163,7 +163,7 @@ public class KetraOrcSupport extends Quest htmltext = "31372-4.htm"; st.takeItems(HORN, buffInfo[1]); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1)); + npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1)); npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index f8032af55d..bac9fa3d00 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -114,7 +114,7 @@ public class VarkaSilenosSupport extends Quest // Haste: Requires 6 Nepenthese Seeds }; - private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. @@ -162,7 +162,7 @@ public class VarkaSilenosSupport extends Quest htmltext = "31379-4.htm"; st.takeItems(SEED, buffInfo[1]); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1)); + npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1)); npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp()); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index eaac85de1d..3089e79546 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java @@ -247,7 +247,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_1, 1); // give Starting Crystal npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // CAMONIELL else if (event.equals("30636-02.htm")) @@ -267,7 +267,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_2, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BELTHUS else if (event.equals("30637-02.htm")) @@ -287,7 +287,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_3, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BASILLA else if (event.equals("30638-02.htm")) @@ -307,7 +307,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_4, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // CELESTIEL else if (event.equals("30639-02.htm")) @@ -327,7 +327,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_5, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BRYNTHEA else if (event.equals("30640-02.htm")) @@ -347,7 +347,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_6, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } return htmltext; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index 3548f6bf88..13c0c9a7cc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -148,7 +148,7 @@ public class Q365_DevilsLegacy extends Quest htmltext = "30092-06.htm"; // Curse effect ! - final Skill skill = SkillTable.getInstance().getInfo(4082, 1); + final Skill skill = SkillTable.getInstance().getSkill(4082, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { skill.getEffects(npc, player); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index fee5a32232..99fbba75dd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -233,7 +233,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Curse if the registered objectId is the wrong one (switch flutes). htmltext = "30747-18.htm"; - final Skill skill = SkillTable.getInstance().getInfo(4167, 1); + final Skill skill = SkillTable.getInstance().getSkill(4167, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { skill.getEffects(npc, player); @@ -309,7 +309,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Tree curses the killer. if ((Rnd.get(100) < 30) && (originalKiller != null)) { - final Skill skill = SkillTable.getInstance().getInfo(4243, 1); + final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) { skill.getEffects(npc, originalKiller); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 1a23ea6281..72299e8bcc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -169,7 +169,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(SYMBOL_OF_LOYALTY, 1); st.takeItems(SYMBOL_OF_LOYALTY, 1); st.giveItems(ANTIDOTE_RECIPE_LIST, 1); - SkillTable.getInstance().getInfo(4082, 1).getEffects(npc, player); + SkillTable.getInstance().getSkill(4082, 1).getEffects(npc, player); startQuestTimer("poison", 60000, npc, player, true); st.playSound(QuestState.SOUND_MIDDLE); } @@ -521,7 +521,7 @@ public class Q501_ProofOfClanAlliance extends Quest public void castSkill(NpcInstance npc, PlayerInstance player, int skillId) { - final Skill skill = SkillTable.getInstance().getInfo(skillId, 1); + final Skill skill = SkillTable.getInstance().getSkill(skillId, 1); npc.setTarget(player); npc.doCast(skill); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java index a409309f9d..eda01ed80b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java index c063c37817..0f09cdfcc0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SkillTable.java index c0fa5a41bb..a733cdac82 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/SkillTable.java @@ -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)); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java index a9d890a11d..10f04c9ea5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java @@ -111,7 +111,7 @@ public class NpcTable continue; } - npcSkill = SkillTable.getInstance().getInfo(skillId, level); + npcSkill = SkillTable.getInstance().getSkill(skillId, level); if (npcSkill == null) { continue; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java index 57583447e4..2788221635 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java @@ -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++; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java index cc4db33d07..6bfa5dbdd9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -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)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 5db317e340..05793d21dc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -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(""); replyMSG.append(""); replyMSG.append(""); @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java index e57a666b11..caeebb6b6f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java index 7ff4462b58..ec6831b156 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java @@ -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")) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java index 037b169a9f..36d66f6dfe 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java @@ -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(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java index 1cfe32e791..753911de55 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java index bcf1611629..6f67dd2b80 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java @@ -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"); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java index 0e81bacbdc..c1fb79daae 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java index 750c5916fc..0f6b005474 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java @@ -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)) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java index fdffa11544..2078649294 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java @@ -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; } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java index f060765e74..d2fae3d661 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index 3f4009ebc2..9fac29d04b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java index dc2a7844f8..7d0678aa85 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java index f3ca34f4b2..d5710aabff 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java @@ -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); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java index f9f1807ed5..bab3150726 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java index ddf558e7ea..38296d32a6 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java index fed27384c4..6d294f8466 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java @@ -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)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java index c44f21c833..8d697e53e2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java index 5e2e91baa7..089366985c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java index 9dc8cbceb6..b50c991486 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index d83516dc83..fdef811952 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java index ca3a763d02..cb751d517b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index 7d126afc93..867b5e8965 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -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) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index b41c3d098c..26404aaeed 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java index 74024d5b51..734fd54f9e 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java @@ -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)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java index 4e87362eee..b2b9c55635 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java @@ -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)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index 6ed4ae207e..bba7865f04 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java index 4460a1423c..fc37baa8f2 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 65fe944fe4..fad20cefff 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index 6e8b60da21..b27a143cb9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java index 9541b37209..6a91758307 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -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(); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java index baaed3b873..c8d12e2da8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/ForceBuff.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java index ac9d45d399..dd78f07f7f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/Skill.java @@ -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) { diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java index 1da7180068..6f1b27cc65 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java index a6378c1e99..4bbd7f7669 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java index f7c62e4a30..5f10158db0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java index 2d9c3f3389..535cc0cdf3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java index a923c9b0cf..1da2a3fe97 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java index 0e9be35b93..829170b99f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java index 4bcd09e2ee..6a562dc0bd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java @@ -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!"); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index e07020b1bc..ee0726f7f7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java index e81b5200b1..f419db2808 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java index e1ad9b6700..96322cb7cc 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index d7468e7b3f..a592551d2c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index 821ff2989e..93cdf65248 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java index 1373e38e64..2d601678b8 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java @@ -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(); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 13f26c57b2..20f07fd7f1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -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, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } else if (skillId < 1000) { if (schemeSkills.contains(skillId)) { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } else { if (schemeSkills.contains(skillId)) { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java index a7a21c448a..6920401da9 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java index 0ba45e082e..5e0dbe4181 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java index 9f9f34b98f..ba958effdf 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java index 2f9d62fe6d..300512a081 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java @@ -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!"); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java index bedcc22dc7..fd3f5c3460 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java index 8914caf229..3253ebb806 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java index e52efc9171..cf6460ac59 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/Rebirth.java @@ -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++; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index 23e7042a4f..94d8b25d36 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -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)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java index b830ce0ee1..6196a4880a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -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)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index 1ea84936e8..65674a4464 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -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)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java index 2eea92be9d..2a75adcb70 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index e536b7e24a..39d5a7cf7f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java index 565f8244c7..2da39a5f10 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java index 973224f70e..f30e8700d5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -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); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java index a3e6e525d4..dfb500170c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java index fc65a751e7..ae60c9edbd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java index 4efdff05be..40b22a19bd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java @@ -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); } } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java index c43af76bd9..9e5a0c4a24 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java @@ -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(); } diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java index c50ea445e5..af93e4bd0c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java @@ -51,6 +51,6 @@ public class SkillHolder public Skill getSkill() { - return SkillTable.getInstance().getInfo(_skillId, _skillLvl); + return SkillTable.getInstance().getSkill(_skillId, _skillLvl); } } \ No newline at end of file diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index d207792279..d7cc799601 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java index a07caa72a2..1c718d721f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java @@ -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() diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java index f4abfb6368..6d5c53c9fd 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/GameClient.java @@ -608,7 +608,7 @@ public class GameClient extends MMOClient> 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> implements if (player.isFlying()) { - player.removeSkill(SkillTable.getInstance().getInfo(4289, 1)); + player.removeSkill(SkillTable.getInstance().getSkill(4289, 1)); } if (Olympiad.getInstance().isRegistered(player)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index db33be45de..9af167746a 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -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)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index fef07bd936..797d4712b3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index bbc2170d0f..71569c6436 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -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()) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index f915b76d36..14ba3b5f05 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -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)) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index ccedd8c92c..fd4deee17c 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index d14875e408..2036ad469b 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index a6e677750c..2d7f9044f0 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -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); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index 15ea1012cb..3ccde1edf5 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -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; diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 60eb5672e7..5351fed0e3 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -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)); diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 528dfceeda..7c16b4e80f 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -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) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index 5ddaddb3df..1b7e94a7a1 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -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 diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 543bee3d51..6088735fc7 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java index cef740bc95..b9faf4664d 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/areas/HotSprings/HotSprings.java @@ -92,7 +92,7 @@ public class HotSprings extends Quest { final Effect info = creature.getFirstEffect(diseaseId); final int skillLevel = (info == null) ? 1 : (info.getSkill().getLevel() < 10) ? info.getSkill().getLevel() + 1 : 10; - final Skill skill = SkillTable.getInstance().getInfo(diseaseId, skillLevel); + final Skill skill = SkillTable.getInstance().getSkill(diseaseId, skillLevel); if ((skill != null) && !npc.isCastingNow() && !npc.isSkillDisabled(skill)) { npc.setTarget(creature); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java index 47f30b6cef..3735880811 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Antharas.java @@ -690,12 +690,12 @@ public class Antharas extends Quest case 29074: case 29075: { - skill = SkillTable.getInstance().getInfo(5097, 1); + skill = SkillTable.getInstance().getSkill(5097, 1); break; } case 29076: { - skill = SkillTable.getInstance().getInfo(5094, 1); + skill = SkillTable.getInstance().getSkill(5094, 1); break; } } @@ -932,12 +932,12 @@ public class Antharas extends Quest case 29074: case 29075: { - skill = SkillTable.getInstance().getInfo(5097, 1); + skill = SkillTable.getInstance().getSkill(5097, 1); break; } case 29076: { - skill = SkillTable.getInstance().getInfo(5094, 1); + skill = SkillTable.getInstance().getSkill(5094, 1); break; } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java index 7a34d324c0..20aa8d13e5 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Baium.java @@ -270,7 +270,7 @@ public class Baium extends Quest else if (((_lastAttackVsBaiumTime + 300000) < System.currentTimeMillis()) && (npc.getCurrentHp() < ((npc.getMaxHp() * 3) / 4.0))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4135, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4135, 1)); if (GrandBossManager.getInstance().getBossStatus(LIVE_BAIUM) != AWAKE) { cancelQuestTimer("baium_despawn", npc, null); @@ -398,7 +398,7 @@ public class Baium extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } // update a variable with the last action against baium @@ -500,7 +500,7 @@ public class Baium extends Quest _target = getRandomTarget(npc); if (_target != null) { - _skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1); + _skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1); } } @@ -508,7 +508,7 @@ public class Baium extends Quest Skill skill = _skill; if (skill == null) { - skill = SkillTable.getInstance().getInfo(getRandomSkill(npc), 1); + skill = SkillTable.getInstance().getSkill(getRandomSkill(npc), 1); } if ((target == null) || target.isDead() || !(_zone.isInsideZone(target))) { diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java index f4dfa841e8..0d7908ba61 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Frintezza.java @@ -880,7 +880,7 @@ public class Frintezza extends Quest else if (event.equals("morph_04")) { _zone.broadcastPacket(new SocialAction(_weakScarlet.getObjectId(), 4)); - final Skill skill = SkillTable.getInstance().getInfo(5017, 1); + final Skill skill = SkillTable.getInstance().getSkill(5017, 1); if (skill != null) { skill.getEffects(_weakScarlet, _weakScarlet, false, false, false); @@ -972,7 +972,7 @@ public class Frintezza extends Quest else if (event.equals("morph_15")) { _zone.broadcastPacket(new SocialAction(_strongScarlet.getObjectId(), 2)); - final Skill skill = SkillTable.getInstance().getInfo(5017, 1); + final Skill skill = SkillTable.getInstance().getSkill(5017, 1); if (skill != null) { skill.getEffects(_strongScarlet, _strongScarlet, false, false, false); @@ -1097,7 +1097,7 @@ public class Frintezza extends Quest } else if (event.equals("songs_effect")) { - final Skill skill = SkillTable.getInstance().getInfo(5008, _onSong); + final Skill skill = SkillTable.getInstance().getSkill(5008, _onSong); if (skill == null) { return null; @@ -1237,7 +1237,7 @@ public class Frintezza extends Quest if ((_weakScarlet != null) && !_weakScarlet.isDead() && (_secondMorph == 0) && (_thirdMorph == 0) && (_onMorph == 0)) { final int i = Rnd.get(0, 1); - final Skill skill = SkillTable.getInstance().getInfo(_skill[i][0], _skill[i][1]); + final Skill skill = SkillTable.getInstance().getSkill(_skill[i][0], _skill[i][1]); if (skill != null) { _weakScarlet.stopMove(null); @@ -1261,7 +1261,7 @@ public class Frintezza extends Quest i = Rnd.get(2, 4); } - final Skill skill = SkillTable.getInstance().getInfo(_skill[i][0], _skill[i][1]); + final Skill skill = SkillTable.getInstance().getSkill(_skill[i][0], _skill[i][1]); if (skill != null) { _weakScarlet.stopMove(null); @@ -1290,7 +1290,7 @@ public class Frintezza extends Quest i = Rnd.get(6, 9); } - final Skill skill = SkillTable.getInstance().getInfo(_skill[i][0], _skill[i][1]); + final Skill skill = SkillTable.getInstance().getSkill(_skill[i][0], _skill[i][1]); if (skill != null) { _strongScarlet.stopMove(null); @@ -1663,7 +1663,7 @@ public class Frintezza extends Quest _bomber = 1; startQuestTimer("bomber", 3000, npc, null); - final Skill skill = SkillTable.getInstance().getInfo(5011, 1); + final Skill skill = SkillTable.getInstance().getSkill(5011, 1); if (skill != null) { // npc.setCastingNow(true); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java index b894907cbf..3c88520dfc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Orfen.java @@ -217,7 +217,7 @@ public class Orfen extends Quest { attacker.teleToLocation(npc.getX(), npc.getY(), npc.getZ()); npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4064, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4064, 1)); } } else diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java index 27b503d83c..4d61438250 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/QueenAnt.java @@ -304,8 +304,8 @@ public class QueenAnt extends Quest { getIntoPosition(nurse, _larva); nurse.setTarget(_larva); - nurse.doCast(SkillTable.getInstance().getInfo(4020, 1)); - nurse.doCast(SkillTable.getInstance().getInfo(4024, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4020, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4024, 1)); } continue; } @@ -315,7 +315,7 @@ public class QueenAnt extends Quest { getIntoPosition(nurse, _queen); nurse.setTarget(_queen); - nurse.doCast(SkillTable.getInstance().getInfo(4020, 1)); + nurse.doCast(SkillTable.getInstance().getSkill(4020, 1)); } continue; } @@ -325,7 +325,7 @@ public class QueenAnt extends Quest { getIntoPosition(_nurses.get(k), nurse); _nurses.get(k).setTarget(nurse); - _nurses.get(k).doCast(SkillTable.getInstance().getInfo(4020, 1)); + _nurses.get(k).doCast(SkillTable.getInstance().getSkill(4020, 1)); } } if (notCasting && (nurse.getTarget() != null)) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java index c0b1d0d385..76102388fd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Valakas.java @@ -193,7 +193,7 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 4))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 4)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 4)); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4.0)) @@ -201,7 +201,7 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 3))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 3)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 3)); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) @@ -209,13 +209,13 @@ public class Valakas extends Quest if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 2))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 2)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 2)); } } else if ((sk4691 == 0) || ((sk4691 == 1) && (lvl != 1))) { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4691, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4691, 1)); } } else if (event.equals("launch_random_skill")) @@ -389,7 +389,7 @@ public class Valakas extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } if (attacker.getZ() < (npc.getZ() + 200)) @@ -415,7 +415,7 @@ public class Valakas extends Quest i_ai3 = 0; i_ai4 = 0; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4687, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4687, 1)); i_quest0 = 1; } } @@ -687,45 +687,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 15) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 35) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 2) / 4)) @@ -741,45 +741,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 10) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 20) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else if (npc.getCurrentHp() > ((npc.getMaxHp() * 3) / 4.0)) @@ -795,45 +795,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 5) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } else @@ -849,45 +849,45 @@ public class Valakas extends Quest { if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else if ((Rnd.get(100) < 5) && (i0 == 1) && (i_quest0 == 1)) { - skill = SkillTable.getInstance().getInfo(4685, 1); + skill = SkillTable.getInstance().getSkill(4685, 1); i_quest0 = 0; } else if ((Rnd.get(100) < 10) && (i1 == 1)) { - skill = SkillTable.getInstance().getInfo(4688, 1); + skill = SkillTable.getInstance().getSkill(4688, 1); } else if (Rnd.get(100) < 15) { - skill = SkillTable.getInstance().getInfo(4683, 1); + skill = SkillTable.getInstance().getSkill(4683, 1); } else if (Rnd.nextBoolean()) { - skill = SkillTable.getInstance().getInfo(4681, 1); // left hand + skill = SkillTable.getInstance().getSkill(4681, 1); // left hand } else { - skill = SkillTable.getInstance().getInfo(4682, 1); // right hand + skill = SkillTable.getInstance().getSkill(4682, 1); // right hand } } else if (Rnd.get(100) < 0) { - skill = SkillTable.getInstance().getInfo(4690, 1); + skill = SkillTable.getInstance().getSkill(4690, 1); } else if (Rnd.get(100) < 10) { - skill = SkillTable.getInstance().getInfo(4689, 1); + skill = SkillTable.getInstance().getSkill(4689, 1); } else { - skill = SkillTable.getInstance().getInfo(4684, 1); + skill = SkillTable.getInstance().getSkill(4684, 1); } } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java index 21f7694a22..8a2f8c03c8 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/VanHalter.java @@ -1138,7 +1138,7 @@ public class VanHalter extends Quest // Check bleeding player. protected void addBleeding() { - final Skill bleed = SkillTable.getInstance().getInfo(4615, 12); + final Skill bleed = SkillTable.getInstance().getSkill(4615, 12); for (NpcInstance tr : _triolRevelation) { if (!tr.getKnownList().getKnownPlayersInRadius(tr.getAggroRange()).iterator().hasNext() || tr.isDead()) @@ -1643,7 +1643,7 @@ public class VanHalter extends Quest case 13: { // High Priestess van Halter uses the skill to kill Ritual Offering. - final Skill skill = SkillTable.getInstance().getInfo(1168, 7); + final Skill skill = SkillTable.getInstance().getSkill(1168, 7); _ritualOffering.setInvul(false); _vanHalter.setTarget(_ritualOffering); // _vanHalter.setImmobilized(false); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java index 157152d380..0b7a697d0a 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/bosses/Zaken.java @@ -231,7 +231,7 @@ public class Zaken extends Quest if (sk4223 == 1) // use night face if zaken have day face { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4224, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4224, 1)); _ai1 = npc.getX(); _ai2 = npc.getY(); _ai3 = npc.getZ(); @@ -239,7 +239,7 @@ public class Zaken extends Quest if (sk4227 == 0) // use zaken regeneration { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4227, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4227, 1)); } if ((npc.getAI().getIntention() == CtrlIntention.AI_INTENTION_ATTACK) && (_ai0 == 0)) { @@ -362,7 +362,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } } @@ -411,13 +411,13 @@ public class Zaken extends Quest else if (sk4223 == 0) // use day face if not night time { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4223, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4223, 1)); _quest2 = 3; } if (sk4227 == 1) // when switching to day time, cancel zaken night regen { npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4242, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4242, 1)); } if (Rnd.get(40) < 1) { @@ -426,7 +426,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } startQuestTimer("1001", 30000, npc, null); break; @@ -434,7 +434,7 @@ public class Zaken extends Quest case "1002": { _quest0 = 0; - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); _ai0 = 0; break; } @@ -767,7 +767,7 @@ public class Zaken extends Quest if (sk4258 == 0) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4258, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4258, 1)); } } final Creature originalAttacker = isPet ? attacker.getPet() : attacker; @@ -779,22 +779,22 @@ public class Zaken extends Quest if (i0 < 1) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4216, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4216, 1)); } else if (i0 < 2) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4217, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4217, 1)); } else if (i0 < 4) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4219, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4219, 1)); } else if (i0 < 8) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4218, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4218, 1)); } else if (i0 < 15) { @@ -807,14 +807,14 @@ public class Zaken extends Quest if (attacker != ((Attackable) npc).getMostHated()) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4221, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4221, 1)); } } } if (Rnd.nextBoolean() && (attacker == ((Attackable) npc).getMostHated())) { npc.setTarget(attacker); - npc.doCast(SkillTable.getInstance().getInfo(4220, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); } } if ((getTimeHour() >= 5) && (npc.getCurrentHp() < ((npc.getMaxHp() * _quest2) / 4.0))) @@ -825,7 +825,7 @@ public class Zaken extends Quest _ai2 = Y_COORDS[i2] + Rnd.get(650); _ai3 = Z_COORDS[i2]; npc.setTarget(npc); - npc.doCast(SkillTable.getInstance().getInfo(4222, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4222, 1)); } } return super.onAttack(npc, attacker, damage, isPet); @@ -900,22 +900,22 @@ public class Zaken extends Quest if (i0 < 1) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4216, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4216, 1)); } else if (i0 < 2) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4217, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4217, 1)); } else if (i0 < 4) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4219, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4219, 1)); } else if (i0 < 8) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4218, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4218, 1)); } else if (i0 < 15) { @@ -928,14 +928,14 @@ public class Zaken extends Quest if (player != ((Attackable) npc).getMostHated()) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4221, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4221, 1)); } } } if (Rnd.nextBoolean() && (player == ((Attackable) npc).getMostHated())) { npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4220, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4220, 1)); } } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java index 037326971c..9633415d06 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/AncientEgg.java @@ -42,7 +42,7 @@ public class AncientEgg extends Quest public String onAttack(NpcInstance npc, PlayerInstance attacker, int damage, boolean isPet) { attacker.setTarget(attacker); - attacker.doCast(SkillTable.getInstance().getInfo(SIGNAL, 1)); + attacker.doCast(SkillTable.getInstance().getSkill(SIGNAL, 1)); return null; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java index 4623d07bbf..aadc93b6bb 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/ai/others/Monastery.java @@ -83,7 +83,7 @@ public class Monastery extends Quest case 22124: case 22126: { - final Skill skill = SkillTable.getInstance().getInfo(4589, 8); + final Skill skill = SkillTable.getInstance().getSkill(4589, 8); npc.doCast(skill); break; } @@ -139,7 +139,7 @@ public class Monastery extends Quest case 22126: case 22127: { - final Skill skill = SkillTable.getInstance().getInfo(4589, 8); + final Skill skill = SkillTable.getInstance().getSkill(4589, 8); npc.doCast(skill); break; } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java index 0ef2acface..7cee284904 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/KetraOrcSupport/KetraOrcSupport.java @@ -115,7 +115,7 @@ public class KetraOrcSupport extends Quest // Haste: Requires 6 Buffalo Horns }; - private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. @@ -163,7 +163,7 @@ public class KetraOrcSupport extends Quest htmltext = "31372-4.htm"; st.takeItems(HORN, buffInfo[1]); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1)); + npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1)); npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp()); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java index f8032af55d..bac9fa3d00 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/custom/VarkaSilenosSupport/VarkaSilenosSupport.java @@ -114,7 +114,7 @@ public class VarkaSilenosSupport extends Quest // Haste: Requires 6 Nepenthese Seeds }; - private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getInfo(4578, 1); + private static final Skill VARKA_KETRA_PETRIFICATION = SkillTable.getInstance().getSkill(4578, 1); /** * Names of missions which will be automatically dropped if the alliance is broken. @@ -162,7 +162,7 @@ public class VarkaSilenosSupport extends Quest htmltext = "31379-4.htm"; st.takeItems(SEED, buffInfo[1]); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(buffInfo[0], 1)); + npc.doCast(SkillTable.getInstance().getSkill(buffInfo[0], 1)); npc.setCurrentHpMp(npc.getMaxHp(), npc.getMaxMp()); } } diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java index 9ae47bae3d..31dda31c95 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q125_TheNameOfEvil_1/Q125_TheNameOfEvil_1.java @@ -226,7 +226,7 @@ public class Q125_TheNameOfEvil_1 extends Quest case ULU_KAIMU: if (cond == 5) { - npc.doCast(SkillTable.getInstance().getInfo(5089, 1)); + npc.doCast(SkillTable.getInstance().getSkill(5089, 1)); htmltext = "32119-01.htm"; } else if (cond == 6) @@ -238,7 +238,7 @@ public class Q125_TheNameOfEvil_1 extends Quest case BALU_KAIMU: if (cond == 6) { - npc.doCast(SkillTable.getInstance().getInfo(5089, 1)); + npc.doCast(SkillTable.getInstance().getSkill(5089, 1)); htmltext = "32120-01.htm"; } else if (cond == 7) @@ -250,7 +250,7 @@ public class Q125_TheNameOfEvil_1 extends Quest case CHUTA_KAIMU: if (cond == 7) { - npc.doCast(SkillTable.getInstance().getInfo(5089, 1)); + npc.doCast(SkillTable.getInstance().getSkill(5089, 1)); htmltext = "32121-01.htm"; } else if (cond == 8) diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java index eaac85de1d..3089e79546 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q230_TestOfTheSummoner/Q230_TestOfTheSummoner.java @@ -247,7 +247,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_1, 1); // give Starting Crystal npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // CAMONIELL else if (event.equals("30636-02.htm")) @@ -267,7 +267,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_2, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BELTHUS else if (event.equals("30637-02.htm")) @@ -287,7 +287,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_3, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BASILLA else if (event.equals("30638-02.htm")) @@ -307,7 +307,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_4, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // CELESTIEL else if (event.equals("30639-02.htm")) @@ -327,7 +327,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_5, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } // BRYNTHEA else if (event.equals("30640-02.htm")) @@ -347,7 +347,7 @@ public class Q230_TestOfTheSummoner extends Quest st.giveItems(CRYSTAL_OF_PROGRESS_6, 1); npc.setTarget(player); - npc.doCast(SkillTable.getInstance().getInfo(4126, 1)); + npc.doCast(SkillTable.getInstance().getSkill(4126, 1)); } return htmltext; diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java index 3548f6bf88..13c0c9a7cc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q365_DevilsLegacy/Q365_DevilsLegacy.java @@ -148,7 +148,7 @@ public class Q365_DevilsLegacy extends Quest htmltext = "30092-06.htm"; // Curse effect ! - final Skill skill = SkillTable.getInstance().getInfo(4082, 1); + final Skill skill = SkillTable.getInstance().getSkill(4082, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { skill.getEffects(npc, player); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java index fee5a32232..99fbba75dd 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q421_LittleWingsBigAdventure/Q421_LittleWingsBigAdventure.java @@ -233,7 +233,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Curse if the registered objectId is the wrong one (switch flutes). htmltext = "30747-18.htm"; - final Skill skill = SkillTable.getInstance().getInfo(4167, 1); + final Skill skill = SkillTable.getInstance().getSkill(4167, 1); if ((skill != null) && (player.getFirstEffect(skill) == null)) { skill.getEffects(npc, player); @@ -309,7 +309,7 @@ public class Q421_LittleWingsBigAdventure extends Quest // Tree curses the killer. if ((Rnd.get(100) < 30) && (originalKiller != null)) { - final Skill skill = SkillTable.getInstance().getInfo(4243, 1); + final Skill skill = SkillTable.getInstance().getSkill(4243, 1); if ((skill != null) && (originalKiller.getFirstEffect(skill) == null)) { skill.getEffects(npc, originalKiller); diff --git a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java index 1a23ea6281..72299e8bcc 100644 --- a/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java +++ b/L2J_Mobius_C6_Interlude/dist/game/data/scripts/quests/Q501_ProofOfClanAlliance/Q501_ProofOfClanAlliance.java @@ -169,7 +169,7 @@ public class Q501_ProofOfClanAlliance extends Quest st.takeItems(SYMBOL_OF_LOYALTY, 1); st.takeItems(SYMBOL_OF_LOYALTY, 1); st.giveItems(ANTIDOTE_RECIPE_LIST, 1); - SkillTable.getInstance().getInfo(4082, 1).getEffects(npc, player); + SkillTable.getInstance().getSkill(4082, 1).getEffects(npc, player); startQuestTimer("poison", 60000, npc, player, true); st.playSound(QuestState.SOUND_MIDDLE); } @@ -521,7 +521,7 @@ public class Q501_ProofOfClanAlliance extends Quest public void castSkill(NpcInstance npc, PlayerInstance player, int skillId) { - final Skill skill = SkillTable.getInstance().getInfo(skillId, 1); + final Skill skill = SkillTable.getInstance().getSkill(skillId, 1); npc.setTarget(player); npc.doCast(skill); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java index a409309f9d..eda01ed80b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/HeroSkillTable.java @@ -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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java index c063c37817..0f09cdfcc0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/NobleSkillTable.java @@ -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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java index c0fa5a41bb..a733cdac82 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/SkillTable.java @@ -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)); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java index a9d890a11d..10f04c9ea5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/NpcTable.java @@ -111,7 +111,7 @@ public class NpcTable continue; } - npcSkill = SkillTable.getInstance().getInfo(skillId, level); + npcSkill = SkillTable.getInstance().getSkill(skillId, level); if (npcSkill == null) { continue; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java index 57583447e4..2788221635 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/sql/SkillTreeTable.java @@ -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++; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java index eb6b9cf135..c9bdb596fa 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AugmentationData.java @@ -586,9 +586,9 @@ public class AugmentationData { if (level > _maxSkillLevel) { - return SkillTable.getInstance().getInfo(_skillId, _maxSkillLevel); + return SkillTable.getInstance().getSkill(_skillId, _maxSkillLevel); } - return SkillTable.getInstance().getInfo(_skillId, level); + return SkillTable.getInstance().getSkill(_skillId, level); } public int getAugmentationSkillId() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java index cc4db33d07..6bfa5dbdd9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/engines/DocumentBase.java @@ -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)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java index 5db317e340..05793d21dc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminEditNpc.java @@ -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("
NPC" + NpcTable.getInstance().getTemplate(skillData.getInt("npcid")).getName() + "
SKILL" + skill.getName() + "(" + skillData.getInt("skillid") + ")
", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "
"); replyMSG.append(""); replyMSG.append(""); @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java index e57a666b11..caeebb6b6f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminGmSpeed.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java index 7ff4462b58..ec6831b156 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminRideWyvern.java @@ -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")) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java index 037b169a9f..36d66f6dfe 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSkill.java @@ -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(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java index 1cfe32e791..753911de55 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminSuperHaste.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java index bcf1611629..6f67dd2b80 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/admincommandhandlers/AdminTest.java @@ -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"); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java index 0e81bacbdc..c1fb79daae 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/BeastSpice.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java index 750c5916fc..0f6b005474 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ChestKey.java @@ -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)) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java index fdffa11544..2078649294 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Crystals.java @@ -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; } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java index f060765e74..d2fae3d661 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/CustomPotions.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java index 72cc0e57ff..e4415dcf3e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/EnergyStone.java @@ -85,7 +85,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java index dc2a7844f8..7d0678aa85 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Firework.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java index f3ca34f4b2..d5710aabff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Harvester.java @@ -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); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java index f9f1807ed5..bab3150726 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Nectar.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java index b5376a3f94..0367382939 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Potions.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java index 687504b983..0b3b9bf6a2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfEscape.java @@ -189,7 +189,7 @@ public class ScrollOfEscape implements IItemHandler player.disableAllSkills(); // Cast escape animation. - final Skill skill = SkillTable.getInstance().getInfo(escapeSkill, 1); + final Skill skill = SkillTable.getInstance().getSkill(escapeSkill, 1); player.broadcastPacket(new MagicSkillUse(player, player, escapeSkill, 1, skill.getHitTime(), 0)); player.sendPacket(new SetupGauge(0, skill.getHitTime())); player.setTarget(null); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java index c44f21c833..8d697e53e2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/ScrollOfResurrection.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java index 5e2e91baa7..089366985c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Scrolls.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java index 9dc8cbceb6..b50c991486 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/Seed.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java index d83516dc83..fdef811952 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SoulCrystals.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java index ba232a2a57..2a2f7e86ee 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/itemhandlers/SummonItems.java @@ -163,7 +163,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java index f1e21b50e8..cda0021dd0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Continuous.java @@ -86,11 +86,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) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java index 7942d5b0a9..8e5575e431 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/skillhandlers/Pdam.java @@ -315,12 +315,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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java index 74024d5b51..734fd54f9e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/usercommandhandlers/OfflineShop.java @@ -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)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java index 4e87362eee..b2b9c55635 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/OfflineShop.java @@ -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)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java index 1fc99335f5..81cc3027fd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/handler/voicedcommandhandlers/Wedding.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java index 4460a1423c..fc37baa8f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/DayNightSpawnManager.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java index 65fe944fe4..fad20cefff 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/FortSiegeManager.java @@ -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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java index 6e8b60da21..b27a143cb9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/instancemanager/SiegeManager.java @@ -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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java index 00c8fa8efc..7088d3ba0e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Augmentation.java @@ -60,7 +60,7 @@ public class Augmentation public Augmentation(ItemInstance item, int effects, int skill, int skillLevel, boolean save) { - this(item, effects, SkillTable.getInstance().getInfo(skill, skillLevel), save); + this(item, effects, SkillTable.getInstance().getSkill(skill, skillLevel), save); } public class augmentationStatBonus diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java index 9541b37209..6a91758307 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CombatFlag.java @@ -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(); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java index 4fca511b6e..b5d8193b37 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/CursedWeapon.java @@ -283,23 +283,23 @@ public class CursedWeapon level = _skillMaxLevel; } - Skill skill = SkillTable.getInstance().getInfo(_skillId, level); + Skill skill = SkillTable.getInstance().getSkill(_skillId, level); // To properly support subclasses this skill can not be stored. _player.addSkill(skill, false); // Void Burst, Void Flow - skill = SkillTable.getInstance().getInfo(3630, 1); + skill = SkillTable.getInstance().getSkill(3630, 1); _player.addSkill(skill, false); - skill = SkillTable.getInstance().getInfo(3631, 1); + skill = SkillTable.getInstance().getSkill(3631, 1); _player.addSkill(skill, false); _player.sendSkillList(); } public void removeSkill() { - _player.removeSkill(SkillTable.getInstance().getInfo(_skillId, _player.getSkillLevel(_skillId)), false); - _player.removeSkill(SkillTable.getInstance().getInfo(3630, 1), false); - _player.removeSkill(SkillTable.getInstance().getInfo(3631, 1), false); + _player.removeSkill(SkillTable.getInstance().getSkill(_skillId, _player.getSkillLevel(_skillId)), false); + _player.removeSkill(SkillTable.getInstance().getSkill(3630, 1), false); + _player.removeSkill(SkillTable.getInstance().getSkill(3631, 1), false); _player.sendSkillList(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java index baaed3b873..c8d12e2da8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/ForceBuff.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java index 8a533e8097..1c4f42105b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/Skill.java @@ -2910,7 +2910,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) { diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 6d09a710bf..13bfdd86c5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -6252,7 +6252,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(); @@ -6888,13 +6888,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())); } } @@ -8004,7 +8004,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(); @@ -8030,7 +8030,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java index a6378c1e99..4bbd7f7669 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/Summon.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java index f7c62e4a30..5f10158db0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CabaleBufferInstance.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java index 2d9c3f3389..535cc0cdf3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ChestInstance.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java index a923c9b0cf..1da2a3fe97 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ClanHallManagerInstance.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java index ac33779a38..43a2e3324e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/CubicInstance.java @@ -103,64 +103,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 @@ -169,7 +169,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 @@ -178,7 +178,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 @@ -186,10 +186,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 @@ -207,11 +207,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 @@ -220,7 +220,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 @@ -230,7 +230,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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java index 4bcd09e2ee..6a562dc0bd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/DoormanInstance.java @@ -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!"); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java index 1ee1534eba..d1031874f2 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FishermanInstance.java @@ -152,7 +152,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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java index e81b5200b1..f419db2808 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FolkInstance.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java index e1ad9b6700..96322cb7cc 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/FortWyvernManagerInstance.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java index ff79efcccc..cc3a608401 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/NpcInstance.java @@ -1579,7 +1579,7 @@ public class NpcInstance extends Creature insertObjectIdAndShowChatWindow(player, content); return; } - final Skill skill = SkillTable.getInstance().getInfo(5182, 1); + final Skill skill = SkillTable.getInstance().getSkill(5182, 1); broadcastPacket(new MagicSkillUse(this, player, skill.getId(), skill.getLevel(), 0, 0)); skill.getEffects(this, player); } @@ -2151,7 +2151,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)); @@ -2226,7 +2226,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java index f84c55dc85..84fb88f505 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java @@ -2206,7 +2206,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 @@ -2310,7 +2310,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 { @@ -2500,7 +2500,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 { @@ -2571,7 +2571,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 @@ -2698,7 +2698,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); } @@ -2835,7 +2835,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 @@ -2850,21 +2850,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); } @@ -2872,7 +2872,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); } } @@ -9252,7 +9252,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); @@ -9278,7 +9278,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); @@ -9335,7 +9335,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()) { @@ -9350,7 +9350,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; @@ -9379,7 +9379,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; @@ -10690,7 +10690,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; @@ -12233,7 +12233,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; @@ -14902,7 +14902,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); @@ -14911,7 +14911,7 @@ public class PlayerInstance extends Playable _deathPenaltyBuffLevel++; - addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false); + addSkill(SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false); sendPacket(new EtcStatusUpdate(this)); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_DEATH_PENALTY_IS_NOW_LEVEL_S1); sm.addNumber(getDeathPenaltyBuffLevel()); @@ -14929,7 +14929,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); @@ -14940,7 +14940,7 @@ public class PlayerInstance extends Playable if (getDeathPenaltyBuffLevel() > 0) { - addSkill(SkillTable.getInstance().getInfo(5076, getDeathPenaltyBuffLevel()), false); + addSkill(SkillTable.getInstance().getSkill(5076, getDeathPenaltyBuffLevel()), false); sendPacket(new EtcStatusUpdate(this)); final SystemMessage sm = new SystemMessage(SystemMessageId.YOUR_DEATH_PENALTY_IS_NOW_LEVEL_S1); sm.addNumber(getDeathPenaltyBuffLevel()); @@ -14983,7 +14983,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); @@ -14991,7 +14991,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); @@ -15220,7 +15220,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); @@ -15742,7 +15742,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); @@ -15760,7 +15760,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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java index 1373e38e64..2d601678b8 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/ProtectorInstance.java @@ -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(); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java index 13f26c57b2..20f07fd7f1 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SchemeBufferInstance.java @@ -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, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } else if (skillId < 1000) { if (schemeSkills.contains(skillId)) { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } else { if (schemeSkills.contains(skillId)) { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } else { - StringUtil.append(sb, ""); + StringUtil.append(sb, ""); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java index a7a21c448a..6920401da9 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/SepulcherMonsterInstance.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java index 0ba45e082e..5e0dbe4181 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/TamedBeastInstance.java @@ -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 diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java index 9f9f34b98f..ba958effdf 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WeddingManagerInstance.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java index 2f9d62fe6d..300512a081 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/WyvernManagerInstance.java @@ -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!"); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java index bedcc22dc7..fd3f5c3460 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/XmassTreeInstance.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java index 19b494a9b0..e2eb94684c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/clan/Clan.java @@ -969,7 +969,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java index e52efc9171..cf6460ac59 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/Rebirth.java @@ -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++; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java index ebe1ad1c4d..fecf695129 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/CTF.java @@ -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)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java index d84b79a5a1..b5f896c513 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/DM.java @@ -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)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java index 925e399e53..2324867f9c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/event/TvT.java @@ -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)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java index 72d07474a9..a27ecb847e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/entity/olympiad/OlympiadGame.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java index 71fedf656f..0083c8218b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/itemcontainer/Inventory.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java index 565f8244c7..2da39a5f10 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Armor.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java index 973224f70e..f30e8700d5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/items/Weapon.java @@ -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); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java index a3e6e525d4..dfb500170c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectBestowSkill.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java index fc65a751e7..ae60c9edbd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectForce.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java index 4efdff05be..40b22a19bd 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectFusion.java @@ -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); } } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java index c43af76bd9..9e5a0c4a24 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/effects/EffectSignet.java @@ -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(); } diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java index c50ea445e5..af93e4bd0c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/skills/holders/SkillHolder.java @@ -51,6 +51,6 @@ public class SkillHolder public Skill getSkill() { - return SkillTable.getInstance().getInfo(_skillId, _skillLvl); + return SkillTable.getInstance().getSkill(_skillId, _skillLvl); } } \ No newline at end of file diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java index 0988727e3b..df1ddb3d4e 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/EffectZone.java @@ -168,7 +168,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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java index a07caa72a2..1c718d721f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/zone/type/PoisonZone.java @@ -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() diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java index 2208d1a025..faac83d462 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/GameClient.java @@ -597,7 +597,7 @@ public class GameClient extends MMOClient> implements if (player.isFlying()) { - player.removeSkill(SkillTable.getInstance().getInfo(4289, 1)); + player.removeSkill(SkillTable.getInstance().getSkill(4289, 1)); } if (Olympiad.getInstance().isRegistered(player)) @@ -668,7 +668,7 @@ public class GameClient extends MMOClient> implements if (player.isFlying()) { - player.removeSkill(SkillTable.getInstance().getInfo(4289, 1)); + player.removeSkill(SkillTable.getInstance().getSkill(4289, 1)); } if (Olympiad.getInstance().isRegistered(player)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java index db33be45de..9af167746a 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/CharacterCreate.java @@ -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)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java index 9d9a3acf12..c544243089 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/EnterWorld.java @@ -477,7 +477,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()) @@ -499,9 +499,9 @@ public class EnterWorld extends GameClientPacket final ItemInstance rhand = player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND); if ((rhand != null) && (rhand.getItemId() == 8763)) { - player.addSkill(SkillTable.getInstance().getInfo(3626, 1)); - player.addSkill(SkillTable.getInstance().getInfo(3627, 1)); - player.addSkill(SkillTable.getInstance().getInfo(3628, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3626, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3627, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3628, 1)); } else { @@ -613,7 +613,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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java index bbc2170d0f..71569c6436 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/Logout.java @@ -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()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java index c7a0693a2a..b652ce8c54 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestActionUse.java @@ -314,7 +314,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)) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java index ccedd8c92c..fd4deee17c 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkill.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java index d14875e408..2036ad469b 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestAquireSkillInfo.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java index a6e677750c..2d7f9044f0 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkill.java @@ -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); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java index 15ea1012cb..3ccde1edf5 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExEnchantSkillInfo.java @@ -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; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java index 60eb5672e7..5351fed0e3 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestExMagicSkillUseGround.java @@ -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)); diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java index 528dfceeda..7c16b4e80f 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestMagicSkillUse.java @@ -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) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java index c73d914c39..4702395f93 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestRestart.java @@ -154,7 +154,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)); } if ((player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND) != null) && player.getInventory().getPaperdollItem(Inventory.PAPERDOLL_RHAND).isAugmented()) diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java index 48c152c053..266e79dd81 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/UseItem.java @@ -411,9 +411,9 @@ public class UseItem extends GameClientPacket // Elrokian Trap like L2OFF, add skills if ((itemId == 8763) && !item.isEquipped()) { - player.addSkill(SkillTable.getInstance().getInfo(3626, 1)); - player.addSkill(SkillTable.getInstance().getInfo(3627, 1)); - player.addSkill(SkillTable.getInstance().getInfo(3628, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3626, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3627, 1)); + player.addSkill(SkillTable.getInstance().getSkill(3628, 1)); player.sendSkillList(); } @@ -498,12 +498,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)); } } @@ -604,14 +604,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);
NPC" + NpcTable.getInstance().getTemplate(skillData.getInt("npcid")).getName() + "
SKILL" + skill.getName() + "(" + skillData.getInt("skillid") + ")
", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getInfo(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "", SkillTable.getInstance().getSkill(skillId, 1).getName(), "", SchemeBufferTable.getInstance().getAvailableBuff(skillId).getDescription(), "