BETA: DP-Part for [L6457].

L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java

@@ -25,7 +25,6 @@ import ai.npc.AbstractNpcAI;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.ai.CtrlIntention;
-import com.l2jserver.gameserver.datatables.SkillData;
 import com.l2jserver.gameserver.enums.QuestEventType;
 import com.l2jserver.gameserver.instancemanager.GrandBossManager;
 import com.l2jserver.gameserver.model.Location;
@@ -37,6 +36,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2GrandBossInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2MonsterInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.holders.SkillHolder;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
 import com.l2jserver.gameserver.model.skills.Skill;
 import com.l2jserver.gameserver.model.zone.type.L2BossZone;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
@@ -300,14 +300,14 @@ public final class QueenAnt extends AbstractNpcAI
 			{
 				if (!character.isMuted() && (getRandom(4) == 0))
 				{
-					curse = SkillData.FrequentSkill.RAID_CURSE.getSkill();
+					curse = CommonSkill.RAID_CURSE.getSkill();
 				}
 			}
 			else
 			{
 				if (!character.isParalyzed() && (getRandom(4) == 0))
 				{
-					curse = SkillData.FrequentSkill.RAID_CURSE2.getSkill();
+					curse = CommonSkill.RAID_CURSE2.getSkill();
 				}
 			}
 			

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java

@@ -18,11 +18,11 @@
  */
 package handlers.bypasshandlers;
 
-import com.l2jserver.gameserver.datatables.SkillData.FrequentSkill;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
 
 public class SupportBlessing implements IBypassHandler
 {
@@ -48,7 +48,7 @@ public class SupportBlessing implements IBypassHandler
 			return true;
 		}
 		npc.setTarget(activeChar);
-		npc.doCast(FrequentSkill.BLESSING_OF_PROTECTION.getSkill());
+		npc.doCast(CommonSkill.BLESSING_OF_PROTECTION.getSkill());
 		return false;
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java

@@ -24,7 +24,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
-import com.l2jserver.gameserver.model.skills.Skill;
+import com.l2jserver.gameserver.model.skills.CommonSkill;
 import com.l2jserver.util.Rnd;
 
 /**
@@ -110,9 +110,9 @@ public final class SummonCubic extends AbstractEffect
 			// Players with no mastery can have only one cubic.
 			int allowedCubicCount = 1;
 			// TODO: Unhardcode skill ID check so effect could work on any skill.
-			if (player.isAffectedBySkill(Skill.SKILL_CUBIC_MASTERY))
+			if (player.isAffectedBySkill(CommonSkill.CUBIC_MASTERY.getId()))
 			{
-				final BuffInfo cubicMastery = player.getEffectList().getBuffInfoBySkillId(Skill.SKILL_CUBIC_MASTERY);
+				final BuffInfo cubicMastery = player.getEffectList().getBuffInfoBySkillId(CommonSkill.CUBIC_MASTERY.getId());
 				for (AbstractEffect effect : cubicMastery.getEffects())
 				{
 					allowedCubicCount = effect != null ? (int) effect.getValue() : 1;