From 0d14c0eb30814bac94d6def19a9808ef02c71006 Mon Sep 17 00:00:00 2001
From: Nos <NosBit@users.noreply.github.com>
Date: Tue, 4 Mar 2014 03:17:09 +0000
Subject: [PATCH] BETA: DP-Part for [L6457].
---
.../dist/game/data/scripts/ai/individual/QueenAnt.java | 6 +++---
.../scripts/handlers/bypasshandlers/SupportBlessing.java | 4 ++--
.../data/scripts/handlers/effecthandlers/SummonCubic.java | 6 +++---
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java b/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
index 3140fec831..f36a689b97 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/ai/individual/QueenAnt.java
+++ b/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();
}
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java
index 2b09fbb94c..f90d14f7d3 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java
+++ b/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;
}
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
index e1b07ca6ba..741f84384d 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/SummonCubic.java
+++ b/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;
--
GitLab