From 8177e3f1234727c11089c44454ad456241f724d1 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 16 May 2021 12:25:59 +0000 Subject: [PATCH] Skills already have a method to check if they are hero skills. --- .../gameserver/data/HeroSkillTable.java | 28 ++++++------------- .../org/l2jmobius/gameserver/model/Skill.java | 4 +-- .../gameserver/model/actor/Creature.java | 3 +- .../gameserver/data/HeroSkillTable.java | 28 ++++++------------- .../org/l2jmobius/gameserver/model/Skill.java | 4 +-- .../gameserver/model/actor/Creature.java | 3 +- 6 files changed, 22 insertions(+), 48 deletions(-) diff --git a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java index d9c556a2c4..4d3c62e048 100644 --- a/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java +++ b/L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/data/HeroSkillTable.java @@ -16,10 +16,6 @@ */ package org.l2jmobius.gameserver.data; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - import org.l2jmobius.gameserver.model.Skill; /** @@ -27,23 +23,17 @@ import org.l2jmobius.gameserver.model.Skill; */ public class HeroSkillTable { - private static final Map HERO_SKILLS = new HashMap<>(); - static + private static final Skill[] HERO_SKILLS = new Skill[] { - HERO_SKILLS.put(395, SkillTable.getInstance().getSkill(395, 1)); - HERO_SKILLS.put(396, SkillTable.getInstance().getSkill(396, 1)); - HERO_SKILLS.put(1374, SkillTable.getInstance().getSkill(1374, 1)); - HERO_SKILLS.put(1375, SkillTable.getInstance().getSkill(1375, 1)); - HERO_SKILLS.put(1376, SkillTable.getInstance().getSkill(1376, 1)); - } + SkillTable.getInstance().getSkill(395, 1), + SkillTable.getInstance().getSkill(396, 1), + SkillTable.getInstance().getSkill(1374, 1), + SkillTable.getInstance().getSkill(1375, 1), + SkillTable.getInstance().getSkill(1376, 1) + }; - public static Collection getHeroSkills() + public static Skill[] getHeroSkills() { - return HERO_SKILLS.values(); - } - - public static boolean isHeroSkill(int skillId) - { - return HERO_SKILLS.containsKey(skillId); + return HERO_SKILLS; } } 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 a48fb73b99..0a8ecd6548 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 @@ -25,7 +25,6 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.data.HeroSkillTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.enums.ClassId; @@ -580,8 +579,7 @@ public abstract class Skill { _chanceCondition = ChanceCondition.parse(set); } - - _isHeroSkill = HeroSkillTable.isHeroSkill(_id); + _isHeroSkill = (_id == 395) || (_id == 396) || (_id == 1374) || (_id == 1375) || (_id == 1376); // TODO: Move to XML? _baseCritRate = set.getInt("baseCritRate", (_skillType == SkillType.PDAM) || (_skillType == SkillType.BLOW) ? 0 : -1); _lethalEffect1 = set.getInt("lethal1", 0); _lethalEffect2 = set.getInt("lethal2", 0); 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 b0068a30f9..bd76fd1756 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 @@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.HeroSkillTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.data.xml.MapRegionData; @@ -7532,7 +7531,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return true; } - if (activeChar.isHero() && HeroSkillTable.isHeroSkill(skill.getId()) && activeChar.isInOlympiadMode() && activeChar.isOlympiadStart()) + if (activeChar.isHero() && skill.isHeroSkill() && activeChar.isInOlympiadMode() && activeChar.isOlympiadStart()) { activeChar.sendMessage("You can't use Hero skills during Olympiad match."); return true; diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java index d9c556a2c4..4d3c62e048 100644 --- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java +++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/data/HeroSkillTable.java @@ -16,10 +16,6 @@ */ package org.l2jmobius.gameserver.data; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; - import org.l2jmobius.gameserver.model.Skill; /** @@ -27,23 +23,17 @@ import org.l2jmobius.gameserver.model.Skill; */ public class HeroSkillTable { - private static final Map HERO_SKILLS = new HashMap<>(); - static + private static final Skill[] HERO_SKILLS = new Skill[] { - HERO_SKILLS.put(395, SkillTable.getInstance().getSkill(395, 1)); - HERO_SKILLS.put(396, SkillTable.getInstance().getSkill(396, 1)); - HERO_SKILLS.put(1374, SkillTable.getInstance().getSkill(1374, 1)); - HERO_SKILLS.put(1375, SkillTable.getInstance().getSkill(1375, 1)); - HERO_SKILLS.put(1376, SkillTable.getInstance().getSkill(1376, 1)); - } + SkillTable.getInstance().getSkill(395, 1), + SkillTable.getInstance().getSkill(396, 1), + SkillTable.getInstance().getSkill(1374, 1), + SkillTable.getInstance().getSkill(1375, 1), + SkillTable.getInstance().getSkill(1376, 1) + }; - public static Collection getHeroSkills() + public static Skill[] getHeroSkills() { - return HERO_SKILLS.values(); - } - - public static boolean isHeroSkill(int skillId) - { - return HERO_SKILLS.containsKey(skillId); + return HERO_SKILLS; } } 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 5390ad251c..f26689d689 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 @@ -25,7 +25,6 @@ import java.util.StringTokenizer; import java.util.logging.Logger; import org.l2jmobius.Config; -import org.l2jmobius.gameserver.data.HeroSkillTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.SkillTreeTable; import org.l2jmobius.gameserver.enums.ClassId; @@ -581,8 +580,7 @@ public abstract class Skill { _chanceCondition = ChanceCondition.parse(set); } - - _isHeroSkill = HeroSkillTable.isHeroSkill(_id); + _isHeroSkill = (_id == 395) || (_id == 396) || (_id == 1374) || (_id == 1375) || (_id == 1376); // TODO: Move to XML? _baseCritRate = set.getInt("baseCritRate", (_skillType == SkillType.PDAM) || (_skillType == SkillType.BLOW) ? 0 : -1); _lethalEffect1 = set.getInt("lethal1", 0); _lethalEffect2 = set.getInt("lethal2", 0); 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 13e24cb12e..fa4c0b1d0d 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 @@ -36,7 +36,6 @@ import org.l2jmobius.gameserver.ai.AttackableAI; import org.l2jmobius.gameserver.ai.CreatureAI; import org.l2jmobius.gameserver.ai.CtrlEvent; import org.l2jmobius.gameserver.ai.CtrlIntention; -import org.l2jmobius.gameserver.data.HeroSkillTable; import org.l2jmobius.gameserver.data.SkillTable; import org.l2jmobius.gameserver.data.sql.NpcTable; import org.l2jmobius.gameserver.data.xml.MapRegionData; @@ -7579,7 +7578,7 @@ public abstract class Creature extends WorldObject implements ISkillsHolder return true; } - if (activeChar.isHero() && HeroSkillTable.isHeroSkill(skill.getId()) && activeChar.isInOlympiadMode() && activeChar.isOlympiadStart()) + if (activeChar.isHero() && skill.isHeroSkill() && activeChar.isInOlympiadMode() && activeChar.isOlympiadStart()) { activeChar.sendMessage("You can't use Hero skills during Olympiad match."); return true;