From be0cee908dcb53f1dadea0b40cae43bde2de8fa5 Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Fri, 8 Sep 2017 21:18:53 +0200
Subject: [PATCH] Removed power from all magic skills.
---
.../handlers/effecthandlers/DeathLink.java | 38 +-
.../handlers/effecthandlers/HpDrain.java | 14 +-
.../effecthandlers/MagicalAttack.java | 34 +-
.../MagicalAttackByAbnormal.java | 32 +-
.../effecthandlers/MagicalSoulAttack.java | 34 +-
.../effecthandlers/PhysicalAttackHpLink.java | 11 +-
dist/game/data/stats/skills/00000-00099.xml | 33 +-
dist/game/data/stats/skills/00100-00199.xml | 14 +-
dist/game/data/stats/skills/00200-00299.xml | 30 +-
dist/game/data/stats/skills/00300-00399.xml | 6 +-
dist/game/data/stats/skills/00400-00499.xml | 7 -
dist/game/data/stats/skills/00500-00599.xml | 1 -
dist/game/data/stats/skills/00600-00699.xml | 15 +-
dist/game/data/stats/skills/00700-00799.xml | 44 +-
dist/game/data/stats/skills/00800-00899.xml | 57 ++-
dist/game/data/stats/skills/00900-00999.xml | 54 ++-
dist/game/data/stats/skills/01000-01099.xml | 37 +-
dist/game/data/stats/skills/01100-01199.xml | 133 ++++--
dist/game/data/stats/skills/01200-01299.xml | 396 +++++++++++++-----
dist/game/data/stats/skills/01300-01399.xml | 89 ++--
dist/game/data/stats/skills/01400-01499.xml | 289 +++++++++----
dist/game/data/stats/skills/01500-01599.xml | 191 ++++++---
dist/game/data/stats/skills/02200-02299.xml | 1 -
dist/game/data/stats/skills/03000-03099.xml | 21 +-
dist/game/data/stats/skills/03100-03199.xml | 114 ++---
dist/game/data/stats/skills/03300-03399.xml | 4 +-
dist/game/data/stats/skills/03400-03499.xml | 5 +-
dist/game/data/stats/skills/04000-04099.xml | 75 ++--
dist/game/data/stats/skills/04100-04199.xml | 122 +++---
dist/game/data/stats/skills/04200-04299.xml | 80 ++--
dist/game/data/stats/skills/04300-04399.xml | 11 +-
dist/game/data/stats/skills/04400-04499.xml | 16 +-
dist/game/data/stats/skills/04500-04599.xml | 66 +--
dist/game/data/stats/skills/04600-04699.xml | 130 +++---
dist/game/data/stats/skills/04700-04799.xml | 5 +-
dist/game/data/stats/skills/05000-05099.xml | 84 ++--
dist/game/data/stats/skills/05100-05199.xml | 41 +-
dist/game/data/stats/skills/05200-05299.xml | 36 +-
dist/game/data/stats/skills/05300-05399.xml | 130 +++---
dist/game/data/stats/skills/05400-05499.xml | 15 +-
dist/game/data/stats/skills/05500-05599.xml | 19 +-
dist/game/data/stats/skills/05600-05699.xml | 45 +-
dist/game/data/stats/skills/05700-05799.xml | 105 +++--
dist/game/data/stats/skills/05800-05899.xml | 35 +-
dist/game/data/stats/skills/05900-05999.xml | 23 +-
dist/game/data/stats/skills/06000-06099.xml | 15 +-
dist/game/data/stats/skills/06300-06399.xml | 65 +--
dist/game/data/stats/skills/06400-06499.xml | 5 +-
dist/game/data/stats/skills/06600-06699.xml | 15 +-
dist/game/data/stats/skills/06700-06799.xml | 20 +-
dist/game/data/stats/skills/06800-06899.xml | 91 ++--
dist/game/data/xsd/skills.xsd | 1 -
52 files changed, 1903 insertions(+), 1051 deletions(-)
diff --git a/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java b/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
index 95322cb41e..53e5633aec 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/DeathLink.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.util.Rnd;
@@ -35,15 +36,19 @@ import com.l2jserver.util.Rnd;
*/
public final class DeathLink extends AbstractEffect
{
+ private final double _power;
+
public DeathLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
+ _power = params.getDouble("power", 0);
}
@Override
public L2EffectType getEffectType()
{
- return L2EffectType.DEATH_LINK;
+ return L2EffectType.MAGICAL_ATTACK;
}
@Override
@@ -55,25 +60,28 @@ public final class DeathLink extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- L2Character target = info.getEffected();
- L2Character activeChar = info.getEffector();
+ final L2Character target = info.getEffected();
+ final L2Character activeChar = info.getEffector();
+ final Skill skill = info.getSkill();
if (activeChar.isAlikeDead())
{
return;
}
- boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
- boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
+ boolean sps = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
+ boolean bss = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
+
+ double power = _power * (-((activeChar.getCurrentHp() * 2) / activeChar.getMaxHp()) + 2);
if (target.isPlayer() && target.getActingPlayer().isFakeDeath())
{
target.stopFakeDeath(true);
}
- final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
- final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
- int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+ final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill));
+ final byte shld = Formulas.calcShldUse(activeChar, target, skill);
+ double damage = Formulas.calcMagicDam(activeChar, target, skill, shld, sps, bss, mcrit, power);
if (damage > 0)
{
@@ -85,20 +93,20 @@ public final class DeathLink extends AbstractEffect
}
// Shield Deflect Magic: Reflect all damage on caster.
- if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
+ if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, skill) > Rnd.get(100))
{
- activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
+ activeChar.reduceCurrentHp(damage, target, skill);
+ activeChar.notifyDamageReceived(damage, target, skill, mcrit, false, true);
}
else
{
- target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
- activeChar.sendDamageMessage(target, damage, mcrit, false, false);
+ target.reduceCurrentHp(damage, activeChar, skill);
+ target.notifyDamageReceived(damage, activeChar, skill, mcrit, false, false);
+ activeChar.sendDamageMessage(target, (int) damage, mcrit, false, false);
}
}
- if (info.getSkill().isSuicideAttack())
+ if (skill.isSuicideAttack())
{
activeChar.doDie(activeChar);
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java b/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
index c63fccdf2f..0279136c07 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/HpDrain.java
@@ -34,12 +34,14 @@ import com.l2jserver.gameserver.model.stats.Formulas;
public final class HpDrain extends AbstractEffect
{
private final double _power;
+ private final double _drain;
public HpDrain(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
_power = params.getDouble("power", 0);
+ _drain = params.getDouble("drain", 0);
}
@Override
@@ -70,11 +72,11 @@ public final class HpDrain extends AbstractEffect
boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
- int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+ double damage = Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit, _power);
- int drain = 0;
- int cp = (int) target.getCurrentCp();
- int hp = (int) target.getCurrentHp();
+ double drain = 0;
+ double cp = target.getCurrentCp();
+ double hp = target.getCurrentHp();
if (cp > 0)
{
@@ -89,7 +91,7 @@ public final class HpDrain extends AbstractEffect
drain = damage;
}
- final double hpAdd = (_power * drain);
+ final double hpAdd = (_drain * drain);
final double hpFinal = ((activeChar.getCurrentHp() + hpAdd) > activeChar.getMaxHp() ? activeChar.getMaxHp() : (activeChar.getCurrentHp() + hpAdd));
activeChar.setCurrentHp(hpFinal);
@@ -101,7 +103,7 @@ public final class HpDrain extends AbstractEffect
target.breakAttack();
target.breakCast();
}
- activeChar.sendDamageMessage(target, damage, mcrit, false, false);
+ activeChar.sendDamageMessage(target, (int) damage, mcrit, false, false);
target.reduceCurrentHp(damage, activeChar, info.getSkill());
target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
index 140a7a58e6..a2084db290 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.util.Rnd;
@@ -35,9 +36,13 @@ import com.l2jserver.util.Rnd;
*/
public final class MagicalAttack extends AbstractEffect
{
+ private final double _power;
+
public MagicalAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
+ _power = params.getDouble("power", 0);
}
@Override
@@ -55,11 +60,12 @@ public final class MagicalAttack extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- L2Character target = info.getEffected();
- L2Character activeChar = info.getEffector();
+ final L2Character target = info.getEffected();
+ final L2Character activeChar = info.getEffector();
+ final Skill skill = info.getSkill();
// TODO: Unhardcode Cubic Skill to avoid double damage
- if (activeChar.isAlikeDead() || (info.getSkill().getId() == 4049))
+ if (activeChar.isAlikeDead() || (skill.getId() == 4049))
{
return;
}
@@ -69,11 +75,11 @@ public final class MagicalAttack extends AbstractEffect
target.stopFakeDeath(true);
}
- boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
- boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
- final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
- final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
- int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+ boolean sps = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
+ boolean bss = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
+ final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill));
+ final byte shld = Formulas.calcShldUse(activeChar, target, skill);
+ double damage = Formulas.calcMagicDam(activeChar, target, skill, shld, sps, bss, mcrit, _power);
if (damage > 0)
{
@@ -85,16 +91,16 @@ public final class MagicalAttack extends AbstractEffect
}
// Shield Deflect Magic: Reflect all damage on caster.
- if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
+ if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, skill) > Rnd.get(100))
{
- activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
+ activeChar.reduceCurrentHp(damage, target, skill);
+ activeChar.notifyDamageReceived(damage, target, skill, mcrit, false, true);
}
else
{
- target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
- activeChar.sendDamageMessage(target, damage, mcrit, false, false);
+ target.reduceCurrentHp(damage, activeChar, skill);
+ target.notifyDamageReceived(damage, activeChar, skill, mcrit, false, false);
+ activeChar.sendDamageMessage(target, (int) damage, mcrit, false, false);
}
}
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java
index 391cd35fc4..50e99eaa64 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MagicalAttackByAbnormal.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.util.Rnd;
@@ -35,9 +36,13 @@ import com.l2jserver.util.Rnd;
*/
public final class MagicalAttackByAbnormal extends AbstractEffect
{
+ private final double _power;
+
public MagicalAttackByAbnormal(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
+ _power = params.getDouble("power", 0);
}
@Override
@@ -55,8 +60,9 @@ public final class MagicalAttackByAbnormal extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- L2Character target = info.getEffected();
- L2Character activeChar = info.getEffector();
+ final L2Character target = info.getEffected();
+ final L2Character activeChar = info.getEffector();
+ final Skill skill = info.getSkill();
if (activeChar.isAlikeDead())
{
@@ -68,11 +74,11 @@ public final class MagicalAttackByAbnormal extends AbstractEffect
target.stopFakeDeath(true);
}
- boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
- boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
- final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
- final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
- int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+ boolean sps = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
+ boolean bss = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
+ final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill));
+ final byte shld = Formulas.calcShldUse(activeChar, target, skill);
+ double damage = Formulas.calcMagicDam(activeChar, target, skill, shld, sps, bss, mcrit, _power);
// each buff increase +30%
damage *= (((target.getBuffCount() * 0.3) + 1.3) / 4);
@@ -87,16 +93,16 @@ public final class MagicalAttackByAbnormal extends AbstractEffect
}
// Shield Deflect Magic: Reflect all damage on caster.
- if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
+ if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, skill) > Rnd.get(100))
{
- activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
+ activeChar.reduceCurrentHp(damage, target, skill);
+ activeChar.notifyDamageReceived(damage, target, skill, mcrit, false, true);
}
else
{
- target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
- activeChar.sendDamageMessage(target, damage, mcrit, false, false);
+ target.reduceCurrentHp(damage, activeChar, skill);
+ target.notifyDamageReceived(damage, activeChar, skill, mcrit, false, false);
+ activeChar.sendDamageMessage(target, (int) damage, mcrit, false, false);
}
}
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java b/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
index 51a236f283..035918dcce 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/MagicalSoulAttack.java
@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.model.conditions.Condition;
import com.l2jserver.gameserver.model.effects.AbstractEffect;
import com.l2jserver.gameserver.model.effects.L2EffectType;
import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.Skill;
import com.l2jserver.gameserver.model.stats.Formulas;
import com.l2jserver.gameserver.model.stats.Stats;
import com.l2jserver.util.Rnd;
@@ -35,9 +36,13 @@ import com.l2jserver.util.Rnd;
*/
public final class MagicalSoulAttack extends AbstractEffect
{
+ private final double _power;
+
public MagicalSoulAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
+
+ _power = params.getDouble("power", 0);
}
@Override
@@ -55,8 +60,9 @@ public final class MagicalSoulAttack extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- L2Character target = info.getEffected();
- L2Character activeChar = info.getEffector();
+ final L2Character target = info.getEffected();
+ final L2Character activeChar = info.getEffector();
+ final Skill skill = info.getSkill();
if (activeChar.isAlikeDead())
{
@@ -68,13 +74,13 @@ public final class MagicalSoulAttack extends AbstractEffect
target.stopFakeDeath(true);
}
- boolean sps = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
- boolean bss = info.getSkill().useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
- final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, info.getSkill()));
- final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
- int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
+ boolean sps = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.SPIRITSHOTS);
+ boolean bss = skill.useSpiritShot() && activeChar.isChargedShot(ShotType.BLESSED_SPIRITSHOTS);
+ final boolean mcrit = Formulas.calcMCrit(activeChar.getMCriticalHit(target, skill));
+ final byte shld = Formulas.calcShldUse(activeChar, target, skill);
+ double damage = Formulas.calcMagicDam(activeChar, target, skill, shld, sps, bss, mcrit, _power);
- if ((info.getSkill().getMaxSoulConsumeCount() > 0) && activeChar.isPlayer())
+ if ((skill.getMaxSoulConsumeCount() > 0) && activeChar.isPlayer())
{
// Souls Formula (each soul increase +4%)
damage *= 1 + (info.getCharges() * 0.04);
@@ -90,16 +96,16 @@ public final class MagicalSoulAttack extends AbstractEffect
}
// Shield Deflect Magic: Reflect all damage on caster.
- if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
+ if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, skill) > Rnd.get(100))
{
- activeChar.reduceCurrentHp(damage, target, info.getSkill());
- activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false, true);
+ activeChar.reduceCurrentHp(damage, target, skill);
+ activeChar.notifyDamageReceived(damage, target, skill, mcrit, false, true);
}
else
{
- target.reduceCurrentHp(damage, activeChar, info.getSkill());
- target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false, false);
- activeChar.sendDamageMessage(target, damage, mcrit, false, false);
+ target.reduceCurrentHp(damage, activeChar, skill);
+ target.notifyDamageReceived(damage, activeChar, skill, mcrit, false, false);
+ activeChar.sendDamageMessage(target, (int) damage, mcrit, false, false);
}
}
}
diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
index 4850d7f107..cddbbe8fde 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
@@ -66,11 +66,9 @@ public final class PhysicalAttackHpLink extends AbstractEffect
@Override
public void onStart(BuffInfo info)
{
- L2Character target = info.getEffected();
- L2Character activeChar = info.getEffector();
- Skill skill = info.getSkill();
-
- double power = _power * (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2);
+ final L2Character target = info.getEffected();
+ final L2Character activeChar = info.getEffector();
+ final Skill skill = info.getSkill();
if (activeChar.isAlikeDead())
{
@@ -88,6 +86,9 @@ public final class PhysicalAttackHpLink extends AbstractEffect
final byte shld = Formulas.calcShldUse(activeChar, target, skill);
double damage = 0;
boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS);
+
+ double power = _power * (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2);
+
damage = Formulas.calcSkillPhysDam(activeChar, target, shld, false, ss, power);
if (damage > 0)
diff --git a/dist/game/data/stats/skills/00000-00099.xml b/dist/game/data/stats/skills/00000-00099.xml
index b41b63e785..a893b44e6e 100644
--- a/dist/game/data/stats/skills/00000-00099.xml
+++ b/dist/game/data/stats/skills/00000-00099.xml
@@ -1488,7 +1488,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="100" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="CORPSE_MOB" />
@@ -1586,12 +1585,10 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1601,8 +1598,15 @@
<target race="UNDEAD" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="50" levels="8" name="Focused Force">
<!-- Confirmed CT2.5 -->
@@ -1985,25 +1989,36 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
+ <enchant1for>
+ <effect name="HpDrain">
+ <param power="#ench1Power" />
+ <param drain="0.2" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="HpDrain">
+ <param power="#ench2Power" />
+ <param drain="0.2" />
+ </effect>
+ </enchant2for>
<enchant3for>
<effect name="HpDrain">
- <param power="#ench3Sap" />
+ <param power="108" />
+ <param drain="#ench3Sap" />
</effect>
</enchant3for>
</skill>
diff --git a/dist/game/data/stats/skills/00100-00199.xml b/dist/game/data/stats/skills/00100-00199.xml
index 424b45ff4a..2a4795d6be 100644
--- a/dist/game/data/stats/skills/00100-00199.xml
+++ b/dist/game/data/stats/skills/00100-00199.xml
@@ -273,12 +273,10 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpConsume_Init" />
@@ -287,17 +285,21 @@
<enchant4 name="elementPower" val="#enchElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="106" levels="14" name="Veil">
<!-- High Five Confirmed -->
diff --git a/dist/game/data/stats/skills/00200-00299.xml b/dist/game/data/stats/skills/00200-00299.xml
index 878b526596..6dd3295d50 100644
--- a/dist/game/data/stats/skills/00200-00299.xml
+++ b/dist/game/data/stats/skills/00200-00299.xml
@@ -2389,19 +2389,19 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtkSpd" val="0.5" />
<mul stat="runSpd" val="0.5" />
@@ -2413,6 +2413,16 @@
<param skillId="6090" skillLevel="1" />
</effect>
</endEffects>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="pAtkSpd" val="0.5" />
+ <mul stat="runSpd" val="0.5" />
+ <mul stat="mAtkSpd" val="0.5" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="280" levels="37" name="Burning Fist" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#effectPoints"> -213 -219 -225 -231 -237 -242 -248 -254 -260 -265 -271 -277 -283 -288 -294 -299 -305 -310 -316 -321 -326 -331 -336 -340 -345 -350 -354 -358 -362 -366 -370 -373 -377 -380 -383 -386 -388 </table>
@@ -2826,24 +2836,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpConsume_Init" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
+ <enchant1for>
+ <effect name="HpDrain">
+ <param power="#ench1power" />
+ <param drain="0.8" />
+ </effect>
+ </enchant1for>
<enchant3for>
<effect name="HpDrain">
- <param power="#ench3absorbPart" />
+ <param power="54" />
+ <param drain="#ench3absorbPart" />
</effect>
</enchant3for>
</skill>
diff --git a/dist/game/data/stats/skills/00300-00399.xml b/dist/game/data/stats/skills/00300-00399.xml
index 1973edcc9c..673f0fdd64 100644
--- a/dist/game/data/stats/skills/00300-00399.xml
+++ b/dist/game/data/stats/skills/00300-00399.xml
@@ -781,7 +781,6 @@
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<cond msgId="113" addName="1">
@@ -792,6 +791,11 @@
<param power="#power" />
</effect>
</for>
+ <enchant1for>
+ <effect name="CpDamPercent">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="321" levels="10" name="Blinding Blow" enchantGroup1="2" enchantGroup2="2">
<table name="#effectPoints"> -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index 5775f5209c..a4c7582081 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -2072,7 +2072,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
@@ -2094,7 +2093,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="GROUND" />
@@ -2115,7 +2113,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
@@ -2136,7 +2133,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
@@ -2157,7 +2153,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
@@ -2178,7 +2173,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
@@ -2199,7 +2193,6 @@
<set name="mpConsume" val="44" />
<set name="mpInitialConsume" val="36" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index 52a2153308..13ee5b7157 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -584,7 +584,6 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="0" />
<set name="reuseDelay" val="150000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
diff --git a/dist/game/data/stats/skills/00600-00699.xml b/dist/game/data/stats/skills/00600-00699.xml
index f3124f64a9..ef23c96a3f 100644
--- a/dist/game/data/stats/skills/00600-00699.xml
+++ b/dist/game/data/stats/skills/00600-00699.xml
@@ -1929,12 +1929,13 @@
<set name="magicLvl" val="80" />
<set name="mpConsume" val="73" />
<set name="operateType" val="A3" />
- <set name="power" val="102" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="102" />
+ </effect>
</for>
<selfEffects>
<effect name="Buff">
@@ -1955,7 +1956,6 @@
<set name="mpConsume" val="90" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="128" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -1963,7 +1963,9 @@
<target race="UNDEAD" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="128" />
+ </effect>
</for>
</skill>
<skill id="694" levels="1" name="Divine Wizard Holy Curtain">
@@ -1980,12 +1982,13 @@
<set name="magicLvl" val="80" />
<set name="mpConsume" val="109" />
<set name="operateType" val="A1" />
- <set name="power" val="64" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="64" />
+ </effect>
</for>
</skill>
<skill id="695" levels="1" name="Divine Wizard Holy Cloud">
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index 20bd199012..5078006971 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -451,13 +451,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -609,12 +609,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="722" levels="2" name="Anakim Holy Beam">
@@ -635,12 +636,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="723" levels="1" name="Anakim Sunshine">
@@ -835,12 +837,13 @@
<set name="magicLvl" val="80" />
<set name="mpConsume" val="112" />
<set name="operateType" val="A1" />
- <set name="power" val="162" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="162" />
+ </effect>
</for>
</skill>
<skill id="732" levels="1" name="Ranku Stun Attack">
@@ -929,12 +932,13 @@
<set name="mpConsume" val="87" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="162" />
<set name="reuseDelay" val="11000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="162" />
+ </effect>
</for>
</skill>
<skill id="736" levels="1" name="Devil Seed">
@@ -1126,12 +1130,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="743" levels="3" name="Vale Master Dark Explosion">
@@ -1155,12 +1160,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="744" levels="3" name="Vale Master Dark Flare">
@@ -1182,12 +1188,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="745" levels="3" name="Vale Master Dark Cure">
@@ -2460,13 +2467,14 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="52" />
<set name="operateType" val="A2" />
- <set name="power" val="69" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="69" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtkSpd" val="0.5" />
<mul stat="runSpd" val="0.5" />
diff --git a/dist/game/data/stats/skills/00800-00899.xml b/dist/game/data/stats/skills/00800-00899.xml
index 02a6dd0ceb..0c6ddd85fd 100644
--- a/dist/game/data/stats/skills/00800-00899.xml
+++ b/dist/game/data/stats/skills/00800-00899.xml
@@ -1631,12 +1631,13 @@
<set name="mpConsume" val="32" />
<set name="mpInitialConsume" val="8" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="875" levels="1" name="Empower">
@@ -1814,12 +1815,13 @@
<set name="mpConsume" val="56" />
<set name="mpInitialConsume" val="14" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="882" levels="7" name="Commander Mercenary Blaze">
@@ -1839,12 +1841,13 @@
<set name="mpConsume" val="56" />
<set name="mpInitialConsume" val="14" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="883" levels="7" name="Commander Mercenary Seal of Binding">
@@ -1990,13 +1993,14 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="HOLD" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Root" />
</for>
</skill>
@@ -2084,12 +2088,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="892" levels="11" name="Energy Shot">
@@ -2107,12 +2112,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="893" levels="11" name="Concentrated Energy Shot">
@@ -2130,12 +2136,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="894" levels="1" name="Exhilarate">
@@ -2289,14 +2296,14 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<set name="trait" val="DERANGEMENT" />
- <for>
- <effect name="PhysicalAttack" />
+ <pvpEffects>
+ <effect name="PhysicalAttack">
+ <param power="#pvpPower" />
+ </effect>
<effect name="Debuff">
<mul stat="pDef" val="0.6" />
<mul stat="mDef" val="0.6" />
@@ -2304,6 +2311,18 @@
<mul stat="pAtkSpd" val="0.6" />
<mul stat="mAtkSpd" val="0.6" />
</effect>
- </for>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="PhysicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="pDef" val="0.6" />
+ <mul stat="mDef" val="0.6" />
+ <mul stat="runSpd" val="0.6" />
+ <mul stat="pAtkSpd" val="0.6" />
+ <mul stat="mAtkSpd" val="0.6" />
+ </effect>
+ </pveEffects>
</skill>
</list>
diff --git a/dist/game/data/stats/skills/00900-00999.xml b/dist/game/data/stats/skills/00900-00999.xml
index 92017496e2..891a364a71 100644
--- a/dist/game/data/stats/skills/00900-00999.xml
+++ b/dist/game/data/stats/skills/00900-00999.xml
@@ -139,18 +139,26 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA_CORPSE_MOB" />
<set name="trait" val="POISON" />
- <for>
- <effect name="MagicalAttack" />
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="230" />
</effect>
- </for>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ <effect name="DamOverTime" ticks="5">
+ <param power="230" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="905" levels="6" name="Dark Detonation">
<table name="#effectPoints"> -676 -679 -681 -684 -687 -689 </table>
@@ -296,21 +304,32 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<set name="trait" val="POISON" />
- <for>
- <effect name="MagicalAttack" />
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="230" />
<mul stat="runSpd" val="0.3" />
<mul stat="pAtkSpd" val="0.8" />
<mul stat="mAtkSpd" val="0.8" />
</effect>
- </for>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ <effect name="DamOverTime" ticks="5">
+ <param power="230" />
+ <mul stat="runSpd" val="0.3" />
+ <mul stat="pAtkSpd" val="0.8" />
+ <mul stat="mAtkSpd" val="0.8" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="910" levels="6" name="Water Jet">
<table name="#effectPoints"> -676 -679 -681 -684 -687 -689 </table>
@@ -1866,12 +1885,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="976" levels="7" name="Wind Strike">
@@ -1893,12 +1913,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="977" levels="6" name="Ice Bolt">
@@ -1928,12 +1949,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
diff --git a/dist/game/data/stats/skills/01000-01099.xml b/dist/game/data/stats/skills/01000-01099.xml
index 2f7c664065..23f35d9c7d 100644
--- a/dist/game/data/stats/skills/01000-01099.xml
+++ b/dist/game/data/stats/skills/01000-01099.xml
@@ -632,25 +632,34 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1power" />
<enchant2 name="elementPower" val="#ench2ElementPower" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<cond msgId="113" addName="1">
<target race="UNDEAD" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1031" levels="8" name="Disrupt Undead">
<table name="#effectPoints"> -182 -204 -227 -243 -268 -285 -313 -331 </table>
@@ -670,7 +679,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -678,7 +686,9 @@
<target race="UNDEAD" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1032" levels="3" name="Invigor" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
@@ -793,7 +803,6 @@
<set name="targetType" val="AURA" />
<set name="trait" val="DERANGEMENT" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -805,6 +814,11 @@
<param chance="40" />
</effect>
</for>
+ <enchant1for>
+ <effect name="DeleteHate">
+ <param chance="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1035" levels="4" name="Mental Shield" enchantGroup1="1" enchantGroup2="1">
<table name="#abnormalLvls"> 1 2 3 4 </table>
@@ -960,7 +974,6 @@
<enchant3 name="element" val="4" /> <!-- Holy -->
<enchant3 name="elementPower" val="20" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="power" val="#ench3Attack" />
<cond msgId="113" addName="1">
<target race="UNDEAD" />
</cond>
@@ -968,7 +981,9 @@
<effect name="Paralyze" />
</for>
<enchant3for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#ench3Attack" />
+ </effect>
<effect name="Paralyze" />
</enchant3for>
</skill>
@@ -1924,13 +1939,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
diff --git a/dist/game/data/stats/skills/01100-01199.xml b/dist/game/data/stats/skills/01100-01199.xml
index d984f8ed84..5d770c8087 100644
--- a/dist/game/data/stats/skills/01100-01199.xml
+++ b/dist/game/data/stats/skills/01100-01199.xml
@@ -676,13 +676,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -710,21 +710,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1151" levels="16" name="Corpse Life Drain" enchantGroup1="2" enchantGroup2="2">
<table name="#drain"> 260 299 347 384 426 467 509 529 550 571 590 609 628 645 662 678 </table>
@@ -745,7 +754,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="100" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="CORPSE_MOB" />
@@ -832,20 +840,31 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA_CORPSE_MOB" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="ConsumeBody" />
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="ConsumeBody" />
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ <effect name="ConsumeBody" />
+ </enchant2for>
</skill>
<skill id="1156" levels="13" name="Forget">
<table name="#magicLvl"> 44 48 52 56 58 60 62 64 66 68 70 72 74 </table>
@@ -929,19 +948,28 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<for>
- <effect name="DeathLink" />
+ <effect name="DeathLink">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="DeathLink">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="DeathLink">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1160" levels="15" name="Slow" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
<table name="#abnormalLvls"> 2 3 3 3 3 3 3 3 3 3 3 3 3 3 3 </table>
@@ -1292,21 +1320,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1172" levels="8" name="Aura Burn">
<table name="#effectPoints"> -146 -163 -181 -194 -214 -228 -250 -265 </table>
@@ -1324,12 +1361,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1174" levels="22" name="Frost Wall" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -1359,21 +1397,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1175" levels="8" name="Aqua Swirl">
<table name="#effectPoints"> -182 -204 -227 -243 -268 -285 -313 -331 </table>
@@ -1393,12 +1440,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1176" levels="15" name="Tempest" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -1426,20 +1474,25 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1177" levels="5" name="Wind Strike">
<table name="#effectPoints"> -92 -106 -121 -143 -162 </table>
@@ -1459,12 +1512,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1178" levels="8" name="Twister">
@@ -1485,12 +1539,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1181" levels="3" name="Flame Strike">
@@ -1513,12 +1568,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1182" levels="3" name="Resist Aqua" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
@@ -1637,12 +1693,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
diff --git a/dist/game/data/stats/skills/01200-01299.xml b/dist/game/data/stats/skills/01200-01299.xml
index 3acc752ec1..3f9257ada6 100644
--- a/dist/game/data/stats/skills/01200-01299.xml
+++ b/dist/game/data/stats/skills/01200-01299.xml
@@ -456,12 +456,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1222" levels="15" name="Curse Chaos" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
@@ -856,16 +857,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="abnormalLvl" val="1" />
<enchant3 name="abnormalTime" val="60" />
<enchant3 name="abnormalType" val="HOLY_ATTACK" />
@@ -878,10 +876,24 @@
<enchant4 name="elementPower" val="#ench4ElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
<enchant3for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="108" />
+ </effect>
<effect name="Debuff">
<sub stat="firePower" val="#ench3FirePowerVuln" />
</effect>
@@ -912,24 +924,33 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A3" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
<selfEffects>
<effect name="Buff">
<mul stat="pvpMagicalDmg" val="0.5" />
</effect>
</selfEffects>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1232" levels="3" name="Blazing Skin" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1" enchantGroup4="1">
<table name="#abnormalLvls"> 1 2 3 </table>
@@ -1045,12 +1066,10 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1058,19 +1077,22 @@
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
- <enchant3for>
+ <enchant1for>
<effect name="HpDrain">
- <param power="#ench3absorbPart" />
+ <param power="#ench1Power" />
+ <param drain="0.4" />
</effect>
- </enchant3for>
- <enchant4for>
+ </enchant1for>
+ <enchant3for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="108" />
+ <param drain="#ench3absorbPart" />
</effect>
- </enchant4for>
+ </enchant3for>
<enchant4selfEffects>
<effect name="Buff">
<add stat="darkPower" val="#enchElementPower" />
@@ -1104,16 +1126,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="abnormalLvl" val="1" />
<enchant3 name="abnormalTime" val="60" />
<enchant3 name="abnormalType" val="HOLY_ATTACK" />
@@ -1126,10 +1145,24 @@
<enchant4 name="elementPower" val="#ench4ElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
<enchant3for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="108" />
+ </effect>
<effect name="Debuff">
<sub stat="waterPower" val="#ench3WaterPowerVuln" />
</effect>
@@ -1168,32 +1201,41 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="elementPower" val="#enchElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
- </enchant3for>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="runSpd" val="0.8" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1237" levels="17" name="Ice Dagger" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
<table name="#abnormalLvls"> 5 5 5 5 6 6 6 6 6 7 7 7 7 7 8 8 8 </table>
@@ -1230,32 +1272,41 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="elementPower" val="#enchElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="#dot" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="67" />
</effect>
- </enchant3for>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ <effect name="DamOverTime" ticks="5">
+ <param power="67" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1238" levels="3" name="Freezing Skin" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1" enchantGroup4="1">
<!-- Confirmed CT2.5 -->
@@ -1338,12 +1389,10 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="elementPower" val="#ench2elementPower" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="abnormalLvl" val="1" />
@@ -1356,10 +1405,19 @@
<enchant3 name="operateType" val="A2" />
<enchant3 name="isDebuff" val="true" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
<enchant3for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="108" />
+ </effect>
<effect name="Debuff">
<sub stat="windPower" val="#ench3WindPowerVuln" />
</effect>
@@ -1536,24 +1594,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
+ <enchant1for>
+ <effect name="HpDrain">
+ <param power="#ench1Power" />
+ <param drain="0.8" />
+ </effect>
+ </enchant1for>
<enchant3for>
<effect name="HpDrain">
- <param power="#ench3absorbPart" />
+ <param power="108" />
+ <param drain="#ench3absorbPart" />
</effect>
</enchant3for>
</skill>
@@ -2262,7 +2326,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -2273,7 +2336,9 @@
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="mDef" val="0.85" />
<sub stat="waterRes" val="#vuln" />
@@ -2285,7 +2350,9 @@
</effect>
</for>
<enchant1for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="87" />
+ </effect>
<effect name="Debuff">
<mul stat="mDef" val="0.85" />
<sub stat="waterRes" val="#ench1Vuln" />
@@ -2316,12 +2383,13 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1265" levels="14" name="Solar Flare" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -2348,20 +2416,25 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1266" levels="3" name="Shadow Spark">
<table name="#effectPoints"> -303 -357 -414 </table>
@@ -2382,12 +2455,13 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1267" levels="14" name="Shadow Flare" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -2414,20 +2488,25 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1268" levels="4" name="Vampiric Rage" enchantGroup1="1" enchantGroup2="1">
<table name="#abnormalLvls"> 1 2 3 4 </table>
@@ -2627,12 +2706,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1275" levels="14" name="Aura Bolt" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
@@ -2657,21 +2737,39 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="54" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1276" levels="14" name="Summon Kai the Cat" enchantGroup1="1">
<table name="#itemConsumeCount"> 1 1 1 2 2 2 1 1 2 2 1 1 2 2 </table>
@@ -3073,20 +3171,34 @@
<set name="mpConsume" val="200" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A1" />
- <set name="power" val="150" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1289" levels="1" name="Inferno" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 </table>
@@ -3111,23 +3223,31 @@
<set name="mpConsume" val="200" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A2" />
- <set name="power" val="150" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
<effect name="DamOverTime" ticks="1">
<param power="60" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="DamOverTime" ticks="1">
+ <param power="60" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1290" levels="1" name="Blizzard" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 </table>
@@ -3154,23 +3274,31 @@
<set name="mpConsume" val="200" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A2" />
- <set name="power" val="150" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.5" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="runSpd" val="0.5" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1291" levels="1" name="Demon Wind" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 </table>
@@ -3194,23 +3322,31 @@
<set name="mpConsume" val="200" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A2" />
- <set name="power" val="150" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
<effect name="Debuff">
<mul stat="healEffect" val="0.5" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="healEffect" val="0.5" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1292" levels="1" name="Elemental Assault" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 </table>
@@ -3229,20 +3365,34 @@
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="200" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1293" levels="1" name="Elemental Symphony" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 </table>
@@ -3261,20 +3411,34 @@
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="200" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1294" levels="1" name="Elemental Storm" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#ench1Power"> 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 </table>
@@ -3292,20 +3456,34 @@
<set name="mpConsume" val="200" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1295" levels="9" name="Aqua Splash" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#effectPoints"> -275 -283 -291 -299 -306 -312 -318 -323 -328 </table>
@@ -3333,21 +3511,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1296" levels="9" name="Rain of Fire" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<table name="#effectPoints"> -275 -283 -291 -299 -306 -312 -318 -323 -328 </table>
@@ -3375,21 +3562,30 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="1297" levels="6" name="Clear Mind">
<!-- Confirmed CT2.5 -->
diff --git a/dist/game/data/stats/skills/01300-01399.xml b/dist/game/data/stats/skills/01300-01399.xml
index f0d6f998d7..31b5beebde 100644
--- a/dist/game/data/stats/skills/01300-01399.xml
+++ b/dist/game/data/stats/skills/01300-01399.xml
@@ -1117,12 +1117,10 @@
<set name="mpInitialConsume" val="21" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="140" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1131,7 +1129,9 @@
<enchant4 name="elementPower" val="#ench4elementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="140" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.9" />
@@ -1140,8 +1140,10 @@
<sub stat="fireRes" val="20" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.9" />
@@ -1149,7 +1151,7 @@
<mul stat="mAtkSpd" val="0.9" />
<sub stat="fireRes" val="20" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="1340" levels="1" name="Ice Vortex" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
<table name="#ench1Power"> 147 147 148 148 148 149 149 149 150 150 151 151 151 152 152 </table>
@@ -1178,12 +1180,10 @@
<set name="mpInitialConsume" val="21" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="140" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1192,7 +1192,9 @@
<enchant4 name="elementPower" val="#ench4elementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="140" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.7" />
@@ -1201,8 +1203,10 @@
<sub stat="waterRes" val="20" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.7" />
@@ -1210,7 +1214,7 @@
<mul stat="mAtkSpd" val="0.9" />
<sub stat="waterRes" val="20" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="1341" levels="1" name="Wind Vortex" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
<table name="#ench1Power"> 147 147 148 148 148 149 149 149 150 150 151 151 151 152 152 </table>
@@ -1239,12 +1243,10 @@
<set name="mpInitialConsume" val="21" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="140" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1253,7 +1255,9 @@
<enchant4 name="elementPower" val="#ench4elementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="140" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.9" />
@@ -1262,8 +1266,10 @@
<sub stat="windRes" val="20" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.9" />
@@ -1271,7 +1277,7 @@
<mul stat="mAtkSpd" val="0.7" />
<sub stat="windRes" val="20" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="1342" levels="1" name="Light Vortex" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
<table name="#ench1Power"> 147 147 148 148 148 149 149 149 150 150 151 151 151 152 152 </table>
@@ -1299,12 +1305,10 @@
<set name="mpConsume" val="84" />
<set name="mpInitialConsume" val="21" />
<set name="operateType" val="A2" />
- <set name="power" val="139" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1313,21 +1317,25 @@
<enchant4 name="elementPower" val="#ench4elementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="139" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<sub stat="accCombat" val="6" />
<sub stat="holyRes" val="30" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalAttack" />
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<sub stat="accCombat" val="6" />
<sub stat="holyRes" val="30" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="1343" levels="1" name="Dark Vortex" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6">
<table name="#ench1Power"> 147 147 148 148 148 149 149 149 150 150 151 151 151 152 152 </table>
@@ -1355,12 +1363,10 @@
<set name="mpConsume" val="84" />
<set name="mpInitialConsume" val="21" />
<set name="operateType" val="A2" />
- <set name="power" val="139" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1370,7 +1376,8 @@
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="139" />
+ <param drain="0.2" />
</effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
@@ -1378,16 +1385,17 @@
<sub stat="darkRes" val="30" />
</effect>
</for>
- <enchant3for>
+ <enchant1for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#ench1Power" />
+ <param drain="0.2" />
</effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<sub stat="accCombat" val="6" />
<sub stat="darkRes" val="30" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="1344" levels="1" name="Mass Warrior Bane">
<!-- Confirmed CT2.5 -->
@@ -2655,7 +2663,6 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="12000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
@@ -2664,7 +2671,9 @@
<enchant2 name="activateRate" val="#ench2ActivateRates" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="mDef" val="0.85" />
<sub stat="waterRes" val="#vuln" />
@@ -2675,20 +2684,10 @@
<sub stat="darkRes" val="#vuln" />
</effect>
</for>
- <enchant1for>
- <effect name="MagicalAttack" />
- <effect name="Debuff">
- <mul stat="mDef" val="0.85" />
- <sub stat="waterRes" val="25" />
- <sub stat="fireRes" val="25" />
- <sub stat="windRes" val="25" />
- <sub stat="earthRes" val="25" />
- <sub stat="holyRes" val="25" />
- <sub stat="darkRes" val="25" />
- </effect>
- </enchant1for>
<enchant2for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="44" />
+ </effect>
<effect name="Debuff">
<mul stat="mDef" val="0.85" />
<sub stat="waterRes" val="#ench2Vuln" />
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index c7efb29006..838d76096e 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -35,7 +35,6 @@
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="power" val="#ench3Attack" />
<enchant4 name="element" val="4" /> <!-- Holy -->
<enchant4 name="elementPower" val="#ench4HolyAttack" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
@@ -77,7 +76,9 @@
<effect name="Lethal">
<param fullLethal="25" />
</effect>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#ench3Attack" />
+ </effect>
</enchant3for>
</skill>
<skill id="1401" levels="11" name="Major Heal" enchantGroup1="2" enchantGroup2="2">
@@ -664,21 +665,31 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="TargetCancel">
<param chance="#chance" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="TargetCancel">
+ <param chance="40" />
+ </effect>
+ </enchant1for>
<enchant2for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="65" />
+ </effect>
<effect name="TargetCancel">
<param chance="#ench2Chance" />
</effect>
@@ -735,13 +746,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="80" />
<set name="operateType" val="CA1" />
- <set name="power" val="500" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="GROUND" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="500" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1420" levels="1" name="Cyclone">
@@ -764,13 +776,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="80" />
<set name="operateType" val="CA1" />
- <set name="power" val="500" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="GROUND" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="500" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1421" levels="1" name="Raging Waves">
@@ -793,13 +806,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="80" />
<set name="operateType" val="CA1" />
- <set name="power" val="500" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="GROUND" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="500" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1422" levels="1" name="Day of Doom">
@@ -844,13 +858,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="80" />
<set name="operateType" val="CA1" />
- <set name="power" val="500" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="GROUND" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="500" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1424" levels="1" name="Anti-Summoning Field">
@@ -865,7 +880,6 @@
<set name="mpConsume" val="70" />
<set name="mpInitialConsume" val="70" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="1800000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
@@ -1051,13 +1065,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1432" levels="2" name="Increase Power">
@@ -1107,13 +1122,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1434" levels="4" name="Dark Explosion">
@@ -1137,13 +1153,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1435" levels="10" name="Death Mark" enchantGroup1="2" enchantGroup2="2">
@@ -1223,27 +1240,57 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#ench3ElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
<effect name="TargetCancel">
<param chance="30" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="TargetCancel">
+ <param chance="30" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ <effect name="TargetCancel">
+ <param chance="30" />
+ </effect>
+ </enchant2for>
+ <enchant4pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ <effect name="TargetCancel">
+ <param chance="30" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="108" />
+ </effect>
+ <effect name="TargetCancel">
+ <param chance="30" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="1437" levels="26" name="Dark Flame" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2">
<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -1283,35 +1330,44 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="FRONT_AREA" />
<set name="trait" val="DERANGEMENT" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="elementPower" val="#enchElementPower" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
<enchant5 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.7" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalSoulAttack" />
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.7" />
</effect>
- </enchant3for>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="runSpd" val="0.7" />
+ </effect>
+ </enchant2for>
<enchant5for>
<effect name="MagicalSoulAttack" />
<effect name="Debuff">
@@ -1348,24 +1404,42 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="elementPower" val="#ench3ElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant4pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="108" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="1439" levels="5" name="Curse of Divinity">
<!-- Confirmed CT2.5 -->
@@ -1386,12 +1460,13 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttackByAbnormal" />
+ <effect name="MagicalAttackByAbnormal">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1440" levels="5" name="Steal Divinity">
@@ -1830,23 +1905,37 @@
<set name="mpConsume" val="50" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2Cost" />
<enchant2 name="mpInitialConsume" val="#ench2Cost" />
<enchant3 name="elementPower" val="#ench3Wind" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="200" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant4pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="200" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="1451" levels="1" name="Fire Vortex Buster" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
<table name="#ench1Power"> 198 198 199 199 200 201 201 202 202 203 203 204 204 205 206 </table>
@@ -1866,12 +1955,10 @@
<set name="mpConsume" val="80" />
<set name="mpInitialConsume" val="28" />
<set name="operateType" val="A1" />
- <set name="power" val="195" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1881,11 +1968,21 @@
<target active_effect_id="1339" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="195" />
+ </effect>
<effect name="DispelBySlot">
<param dispel="MULTI_DEBUFF_FIRE,9" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_FIRE,9" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1452" levels="1" name="Count of Fire" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
<table name="#ench1Power"> 176 178 180 182 183 185 187 189 190 192 194 196 197 199 201 </table>
@@ -1951,12 +2048,10 @@
<set name="mpConsume" val="80" />
<set name="mpInitialConsume" val="28" />
<set name="operateType" val="A1" />
- <set name="power" val="195" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -1966,11 +2061,21 @@
<target active_effect_id="1340" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="195" />
+ </effect>
<effect name="DispelBySlot">
<param dispel="MULTI_DEBUFF_WATER,9" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_WATER,9" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1454" levels="1" name="Diamond Dust" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
<table name="#ench1Power"> 71 73 74 76 77 79 80 82 83 85 86 88 89 91 92 </table>
@@ -1995,22 +2100,30 @@
<set name="magicLvl" val="79" />
<set name="mpConsume" val="109" />
<set name="operateType" val="A2" />
- <set name="power" val="70" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant3 name="elementPower" val="#ench3elementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="70" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.6" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Debuff">
+ <mul stat="runSpd" val="0.6" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1455" levels="1" name="Throne of Ice" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
<table name="#ench1Power"> 176 178 180 182 183 185 187 189 190 192 194 196 197 199 201 </table>
@@ -2073,12 +2186,10 @@
<set name="mpConsume" val="80" />
<set name="mpInitialConsume" val="28" />
<set name="operateType" val="A1" />
- <set name="power" val="195" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2mpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -2088,11 +2199,21 @@
<target active_effect_id="1341" />
</cond>
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="195" />
+ </effect>
<effect name="DispelBySlot">
<param dispel="MULTI_DEBUFF_WIND,9" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_WIND,9" />
+ </effect>
+ </enchant1for>
</skill>
<skill id="1457" levels="1" name="Empowering Echo" enchantGroup1="5" enchantGroup2="5">
<table name="#ench1AbnormalTimes"> 1240 1280 1320 1360 1400 1440 1480 1520 1560 1600 1640 1680 1720 1760 1800 </table>
@@ -2276,23 +2397,25 @@
<set name="mpConsume" val="87" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A2" />
- <set name="power" val="80" />
<set name="reuseDelay" val="75000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<set name="trait" val="PHYSICAL_BLOCKADE" />
<enchant1 name="activateRate" val="#ench1ActivateRates" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1ActivateRates" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="80" />
+ </effect>
<effect name="PhysicalAttackMute" />
</for>
<enchant1for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#ench1ActivateRates" />
+ </effect>
<effect name="PhysicalAttackMute" />
</enchant1for>
</skill>
@@ -2415,12 +2538,13 @@
<set name="mpConsume" val="116" />
<set name="mpInitialConsume" val="29" />
<set name="operateType" val="A2" />
- <set name="power" val="117" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="117" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="100" />
</effect>
@@ -2447,12 +2571,13 @@
<set name="mpConsume" val="116" />
<set name="mpInitialConsume" val="29" />
<set name="operateType" val="A2" />
- <set name="power" val="117" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="117" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="100" />
</effect>
@@ -2480,23 +2605,37 @@
<set name="mpConsume" val="68" />
<set name="mpInitialConsume" val="17" />
<set name="operateType" val="A1" />
- <set name="power" val="224" />
<set name="reuseDelay" val="45000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AREA" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
<enchant3 name="elementPower" val="#ench3ElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="224" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant4pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="224" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="1470" levels="1" name="Prahnah" enchantGroup1="5" enchantGroup2="5" enchantGroup3="5" enchantGroup4="5">
<!-- Confirmed CT2.5 -->
@@ -2558,12 +2697,13 @@
<set name="mpConsume" val="58" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="138" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="138" />
+ </effect>
</for>
</skill>
<skill id="1472" levels="1" name="Soul Sucking">
@@ -2582,13 +2722,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="30" />
<set name="operateType" val="CA1" />
- <set name="power" val="30" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="30" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1473" levels="1" name="Change Weapon">
@@ -3413,14 +3554,14 @@
<set name="mpConsume" val="116" />
<set name="mpInitialConsume" val="29" />
<set name="operateType" val="A2" />
- <set name="power" val="117" />
<set name="reuseDelay" val="60000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<set name="trait" val="DERANGEMENT" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="117" />
+ <param drain="0.2" />
</effect>
<effect name="Debuff">
<mul stat="pAtk" val="0.5" />
diff --git a/dist/game/data/stats/skills/01500-01599.xml b/dist/game/data/stats/skills/01500-01599.xml
index 624464253a..0272b50fb2 100644
--- a/dist/game/data/stats/skills/01500-01599.xml
+++ b/dist/game/data/stats/skills/01500-01599.xml
@@ -415,22 +415,21 @@
<set name="mpInitialConsume" val="17" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="112" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="112" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.8" />
@@ -438,15 +437,39 @@
<mul stat="mAtkSpd" val="0.7" />
</effect>
</for>
- <enchant3for>
- <effect name="MagicalSoulAttack" />
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
<effect name="ManaDamOverTime" ticks="5">
<param power="12" />
<mul stat="runSpd" val="0.8" />
<mul stat="pAtkSpd" val="0.7" />
<mul stat="mAtkSpd" val="0.7" />
</effect>
- </enchant3for>
+ </enchant1for>
+ <enchant4pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ <effect name="ManaDamOverTime" ticks="5">
+ <param power="12" />
+ <mul stat="runSpd" val="0.8" />
+ <mul stat="pAtkSpd" val="0.7" />
+ <mul stat="mAtkSpd" val="0.7" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="112" />
+ </effect>
+ <effect name="ManaDamOverTime" ticks="5">
+ <param power="12" />
+ <mul stat="runSpd" val="0.8" />
+ <mul stat="pAtkSpd" val="0.7" />
+ <mul stat="mAtkSpd" val="0.7" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="1513" levels="1" name="Soul Vortex Extinction" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -465,27 +488,50 @@
<set name="mpConsume" val="68" />
<set name="mpInitialConsume" val="17" />
<set name="operateType" val="A1" />
- <set name="power" val="195" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="mpInitialConsume" val="#ench2MpInitialConsume" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#ench3Duel" />
<cond msgId="109">
<target active_effect_id="1512" />
</cond>
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="195" />
+ </effect>
<effect name="DispelBySlot">
<param dispel="MULTI_DEBUFF_SOUL,9" />
</effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_SOUL,9" />
+ </effect>
+ </enchant1for>
+ <enchant3pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench3Duel" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_SOUL,9" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="195" />
+ </effect>
+ <effect name="DispelBySlot">
+ <param dispel="MULTI_DEBUFF_SOUL,9" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1514" levels="1" name="Soul Barrier" enchantGroup1="1" enchantGroup2="1">
<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -609,18 +655,32 @@
<set name="mpConsume" val="27" />
<set name="mpInitialConsume" val="7" />
<set name="operateType" val="A1" />
- <set name="power" val="166" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="ONE" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
- <enchant2 name="pvpPower" val="#ench2Duel" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="166" />
+ </effect>
</for>
+ <enchant1for>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2pvpEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="#ench2Duel" />
+ </effect>
+ </enchant2pvpEffects>
+ <enchant2pveEffects>
+ <effect name="MagicalSoulAttack">
+ <param power="166" />
+ </effect>
+ </enchant2pveEffects>
</skill>
<skill id="1517" levels="1" name="Chant of Combat">
<!-- Confirmed CT2.5 -->
@@ -808,14 +868,19 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="1524" levels="42" name="Surrender to the Holy">
<!-- Confirmed CT2.5 -->
@@ -945,14 +1010,19 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="1529" levels="7" name="Soul Web" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
<!-- Confirmed CT2.5 -->
@@ -1021,7 +1091,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpConsume_Init" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -1029,10 +1098,21 @@
<enchant2 name="elementPower" val="#enchElementPower" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant3pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="MagicalAttack">
+ <param power="65" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="1531" levels="7" name="Bless the Blood" enchantGroup1="1" enchantGroup2="1">
<!-- Confirmed CT2.5 -->
@@ -1445,12 +1525,13 @@
<set name="mpConsume" val="58" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalSoulAttack" />
+ <effect name="MagicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="1545" levels="1" name="Soul Sucking">
@@ -1470,13 +1551,14 @@
<set name="mpInitialConsume" val="36" />
<set name="mpPerChanneling" val="30" />
<set name="operateType" val="CA1" />
- <set name="power" val="30" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<channelingEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="30" />
+ </effect>
</channelingEffects>
</skill>
<skill id="1546" levels="1" name="Strider Fear">
@@ -1736,14 +1818,19 @@
<set name="mpConsume" val="116" />
<set name="mpInitialConsume" val="29" />
<set name="operateType" val="A1" />
- <set name="power" val="199" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
- <set name="pvpPower" val="141" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="141" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="199" />
+ </effect>
+ </pveEffects>
<selfEffects>
<effect name="ManaHeal">
<param power="29" />
@@ -1762,14 +1849,19 @@
<set name="mpConsume" val="98" />
<set name="mpInitialConsume" val="25" />
<set name="operateType" val="A1" />
- <set name="power" val="302" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
- <set name="pvpPower" val="178" />
<set name="reuseDelay" val="10000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="178" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="302" />
+ </effect>
+ </pveEffects>
<selfEffects>
<effect name="ManaHeal">
<param power="25" />
@@ -1854,15 +1946,20 @@
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" /> <!-- Inflicts additional non-attribute damage if the target is a monster -->
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="1559" levels="3" name="Potential Ability">
<!-- High Five Confirmed -->
diff --git a/dist/game/data/stats/skills/02200-02299.xml b/dist/game/data/stats/skills/02200-02299.xml
index a546231259..69f60a08fc 100644
--- a/dist/game/data/stats/skills/02200-02299.xml
+++ b/dist/game/data/stats/skills/02200-02299.xml
@@ -788,7 +788,6 @@
<set name="itemConsumeId" val="8273" /> <!-- Anteroom Key -->
<set name="magicLvl" val="1" />
<set name="operateType" val="A1" />
- <set name="power" val="100" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="UNLOCKABLE" />
diff --git a/dist/game/data/stats/skills/03000-03099.xml b/dist/game/data/stats/skills/03000-03099.xml
index e237d9c673..2169ca9639 100644
--- a/dist/game/data/stats/skills/03000-03099.xml
+++ b/dist/game/data/stats/skills/03000-03099.xml
@@ -287,13 +287,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="#absorbPart" />
+ <param power="#power" />
+ <param drain="#absorbPart" />
</effect>
</for>
</skill>
@@ -571,12 +571,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="#absorbPart" />
+ <param power="#power" />
+ <param drain="#absorbPart" />
</effect>
</for>
</skill>
@@ -770,11 +770,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="8.39" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="NONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="8.39" />
+ </effect>
</for>
</skill>
<skill id="3050" levels="2" name="Special Ability: Focus">
@@ -968,12 +969,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.65" />
+ <param power="#power" />
+ <param drain="0.65" />
</effect>
</for>
</skill>
@@ -986,12 +987,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.35" />
+ <param power="#power" />
+ <param drain="0.35" />
</effect>
</for>
</skill>
diff --git a/dist/game/data/stats/skills/03100-03199.xml b/dist/game/data/stats/skills/03100-03199.xml
index 38f4b1849d..14e0267a2b 100644
--- a/dist/game/data/stats/skills/03100-03199.xml
+++ b/dist/game/data/stats/skills/03100-03199.xml
@@ -1449,14 +1449,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="300000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -1751,13 +1751,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3167" levels="10" name="Item Skill: Hydro Blast">
@@ -1779,13 +1780,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3168" levels="10" name="Item Skill: Hurricane">
@@ -1807,13 +1809,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3169" levels="10" name="Item Skill: Stone">
@@ -1835,13 +1838,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3170" levels="10" name="Item Skill: Solar Flare">
@@ -1863,13 +1867,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3171" levels="10" name="Item Skill: Shadow Flare">
@@ -1891,13 +1896,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3172" levels="10" name="Item Skill: Aura Flare">
@@ -1917,13 +1923,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3173" levels="10" name="Item Skill: Prominence">
@@ -1947,13 +1954,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3174" levels="10" name="Item Skill: Hydro Blast">
@@ -1977,13 +1985,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3175" levels="10" name="Item Skill: Hurricane">
@@ -2007,13 +2016,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3176" levels="10" name="Item Skill: Stone">
@@ -2037,13 +2047,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3177" levels="10" name="Item Skill: Solar Flare">
@@ -2067,13 +2078,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3178" levels="10" name="Item Skill: Shadow Flare">
@@ -2097,13 +2109,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3179" levels="10" name="Item Skill: Aura Flare">
@@ -2125,13 +2138,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3180" levels="10" name="Item Skill: Prominence">
@@ -2153,13 +2167,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3181" levels="10" name="Item Skill: Hydro Blast">
@@ -2181,13 +2196,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3182" levels="10" name="Item Skill: Hurricane">
@@ -2209,13 +2225,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3183" levels="10" name="Item Skill: Stone">
@@ -2237,13 +2254,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3184" levels="10" name="Item Skill: Solar Flare">
@@ -2265,13 +2283,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3185" levels="10" name="Item Skill: Shadow Flare">
@@ -2293,13 +2312,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3186" levels="10" name="Item Skill: Aura Flare">
@@ -2319,13 +2339,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="3187" levels="10" name="Item Skill: Slow">
@@ -2418,7 +2439,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -2451,7 +2471,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
@@ -2488,7 +2507,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
@@ -2718,7 +2736,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
@@ -2752,7 +2769,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="staticReuse" val="true" />
diff --git a/dist/game/data/stats/skills/03300-03399.xml b/dist/game/data/stats/skills/03300-03399.xml
index b0e0693f4e..8d39d22687 100644
--- a/dist/game/data/stats/skills/03300-03399.xml
+++ b/dist/game/data/stats/skills/03300-03399.xml
@@ -434,12 +434,12 @@
<set name="magicLvl" val="78" />
<set name="mpConsume" val="200" />
<set name="operateType" val="A1" /> <!-- Should be A2 -->
- <set name="power" val="200" />
<set name="reuseDelay" val="8000" />
<set name="targetType" val="AURA" />
<for>
<effect name="HpDrain">
- <param power="0.05" />
+ <param power="200" />
+ <param drain="0.05" />
</effect>
</for>
</skill>
diff --git a/dist/game/data/stats/skills/03400-03499.xml b/dist/game/data/stats/skills/03400-03499.xml
index ac08fe5067..3ba5c0df7e 100644
--- a/dist/game/data/stats/skills/03400-03499.xml
+++ b/dist/game/data/stats/skills/03400-03499.xml
@@ -605,11 +605,12 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="75" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
</for>
</skill>
<skill id="3437" levels="1" name="Blue Talisman - Magic Explosive Power">
diff --git a/dist/game/data/stats/skills/04000-04099.xml b/dist/game/data/stats/skills/04000-04099.xml
index bd5b4afc57..c35f09a0dd 100644
--- a/dist/game/data/stats/skills/04000-04099.xml
+++ b/dist/game/data/stats/skills/04000-04099.xml
@@ -16,12 +16,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4002" levels="12" name="NPC HP Drain">
@@ -39,13 +40,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
</skill>
@@ -348,12 +349,13 @@
<set name="magicLvl" val="60" />
<set name="mpConsume" val="28" />
<set name="operateType" val="A1" />
- <set name="power" val="43" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="43" />
+ </effect>
</for>
</skill>
<skill id="4027" levels="1" name="Gludio Heal">
@@ -508,12 +510,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4034" levels="12" name="Decrease Speed">
@@ -538,12 +541,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
@@ -737,11 +741,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4042" levels="1" name="Nurka Blaze">
@@ -756,11 +761,12 @@
<set name="magicLvl" val="45" />
<set name="mpConsume" val="40" />
<set name="operateType" val="A1" />
- <set name="power" val="60" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="60" />
+ </effect>
</for>
</skill>
<skill id="4043" levels="1" name="Partisan Flame">
@@ -776,12 +782,13 @@
<set name="magicLvl" val="45" />
<set name="mpConsume" val="60" />
<set name="operateType" val="A1" />
- <set name="power" val="30" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="30" />
+ </effect>
</for>
</skill>
<skill id="4044" levels="1" name="Partisan Heal">
@@ -908,11 +915,12 @@
<set name="effectPoint" val="#effectPoints" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4050" levels="16" name="Cubic DD">
@@ -925,12 +933,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -1223,12 +1231,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4067" levels="12" name="NPC Mortal Blow">
@@ -1289,12 +1298,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4070" levels="1" name="Decrease Atk. Spd.">
@@ -1499,12 +1509,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4078" levels="12" name="NPC Flamestrike">
@@ -1523,12 +1534,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4079" levels="1" name="Siege Hammer">
@@ -1673,12 +1685,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4088" levels="12" name="Bleed">
@@ -1886,7 +1899,6 @@
<table name="#hot"> 7 12 18 27 37 46 55 23 32 42 51 58 </table>
<table name="#magicLvl"> 10 20 30 40 50 60 70 75 80 85 90 95 </table>
<table name="#mpConsume"> 33 59 88 122 159 195 228 242 252 259 262 262 </table>
- <table name="#power"> 1 2 3 4 5 6 7 8 9 10 11 12 </table>
<set name="abnormalLvl" val="#abnormalLvls" />
<set name="abnormalTime" val="15" />
<set name="abnormalType" val="LIFE_FORCE_OTHERS" />
@@ -1899,7 +1911,6 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
diff --git a/dist/game/data/stats/skills/04100-04199.xml b/dist/game/data/stats/skills/04100-04199.xml
index 80460158da..e91eb02162 100644
--- a/dist/game/data/stats/skills/04100-04199.xml
+++ b/dist/game/data/stats/skills/04100-04199.xml
@@ -15,12 +15,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4101" levels="12" name="NPC Spinning Slash">
@@ -147,12 +148,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4106" levels="1" name="Antharas Stun">
@@ -296,11 +298,12 @@
<set name="hitTime" val="4000" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="650" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="650" />
+ </effect>
</for>
</skill>
<skill id="4111" levels="1" name="Antharas Fossilization">
@@ -400,12 +403,13 @@
<set name="magicLvl" val="65" />
<set name="mpConsume" val="90" />
<set name="operateType" val="A1" />
- <set name="power" val="47" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="47" />
+ </effect>
</for>
</skill>
<skill id="4115" levels="1" name="Aden Heal">
@@ -730,11 +734,12 @@
<set name="hitTime" val="6000" />
<set name="magicLvl" val="75" />
<set name="operateType" val="A1" />
- <set name="power" val="367" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="367" />
+ </effect>
</for>
</skill>
<skill id="4131" levels="1" name="Stun">
@@ -856,12 +861,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4138" levels="12" name="NPC AE - Corpse Burst">
@@ -880,12 +886,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA_CORPSE_MOB" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="ConsumeBody" />
</for>
</skill>
@@ -901,12 +908,13 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4140" levels="12" name="Contract Payment">
@@ -979,11 +987,12 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4144" levels="80" name="Mimic Strong Attack">
@@ -1163,11 +1172,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4152" levels="12" name="NPC HP Drain - Magic">
@@ -1187,12 +1197,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
</skill>
@@ -1222,11 +1232,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
@@ -1268,11 +1279,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4156" levels="12" name="NPC Curve Beam Cannon - Magic">
@@ -1288,11 +1300,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4157" levels="12" name="NPC Blaze - Magic">
@@ -1312,11 +1325,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4158" levels="12" name="NPC Prominence - Magic">
@@ -1334,11 +1348,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4159" levels="12" name="NPC Straight Beam Cannon - Magic">
@@ -1354,11 +1369,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4160" levels="12" name="NPC Aura Burn - Magic">
@@ -1374,11 +1390,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4161" levels="1" name="Summon PC">
@@ -1778,11 +1795,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4179" levels="12" name="BOSS Power Strike">
@@ -2115,11 +2133,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4192" levels="12" name="BOSS HP Drain">
@@ -2136,12 +2155,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -2157,12 +2176,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -2178,11 +2197,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4195" levels="12" name="BOSS Twister">
@@ -2199,11 +2219,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4196" levels="12" name="Decreases Speed">
@@ -2228,11 +2249,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
diff --git a/dist/game/data/stats/skills/04200-04299.xml b/dist/game/data/stats/skills/04200-04299.xml
index 23f7c26872..bfa92bc647 100644
--- a/dist/game/data/stats/skills/04200-04299.xml
+++ b/dist/game/data/stats/skills/04200-04299.xml
@@ -157,7 +157,6 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="40" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<set name="trait" val="PARALYZE" />
@@ -391,7 +390,6 @@
<set name="isDebuff" val="true" />
<set name="magicLvl" val="-1" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
@@ -441,12 +439,12 @@
<set name="hitTime" val="2000" />
<set name="magicLvl" val="60" />
<set name="operateType" val="A1" />
- <set name="power" val="57" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="57" />
+ <param drain="0.4" />
</effect>
<effect name="ManaDamOverTime">
<param power="274" />
@@ -672,12 +670,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4232" levels="12" name="NPC AE Strike">
@@ -796,12 +795,13 @@
<set name="isDebuff" val="true" />
<set name="magicLvl" val="70" />
<set name="operateType" val="A2" />
- <set name="power" val="72" />
<set name="reuseDelay" val="75000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="72" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.7" />
</effect>
@@ -906,7 +906,6 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="70" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
@@ -987,11 +986,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4248" levels="12" name="NPC HP Drain - Slow">
@@ -1009,12 +1009,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
</skill>
@@ -1042,11 +1042,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="runSpd" val="0.8" />
</effect>
@@ -1067,11 +1068,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4251" levels="12" name="NPC Curve Beam Cannon - Slow">
@@ -1087,11 +1089,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4252" levels="12" name="NPC Flame - Slow">
@@ -1108,11 +1111,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4253" levels="12" name="NPC Blaze - Slow">
@@ -1130,11 +1134,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4254" levels="12" name="NPC Prominence - Slow">
@@ -1152,11 +1157,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4255" levels="12" name="NPC Straight Beam Cannon - Slow">
@@ -1172,11 +1178,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4256" levels="1" name="100% Stun Resistance.">
@@ -1206,11 +1213,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4258" levels="1" name="Anti Strider Slow">
@@ -1289,13 +1297,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
</skill>
@@ -1315,12 +1323,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4262" levels="2" name="Holiday Wind Walk">
@@ -1684,12 +1693,13 @@
<set name="magicLvl" val="60" />
<set name="mpConsume" val="400" />
<set name="operateType" val="A1" />
- <set name="power" val="379" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="WYVERN" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="379" />
+ </effect>
</for>
</skill>
<skill id="4290" levels="1" name="Race">
diff --git a/dist/game/data/stats/skills/04300-04399.xml b/dist/game/data/stats/skills/04300-04399.xml
index d78987a97c..5466304176 100644
--- a/dist/game/data/stats/skills/04300-04399.xml
+++ b/dist/game/data/stats/skills/04300-04399.xml
@@ -116,11 +116,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4315" levels="12" name="Hold">
@@ -165,12 +166,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="#power" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -232,7 +233,6 @@
<set name="magicLvl" val="60" />
<set name="mpConsume" val="50" />
<set name="operateType" val="A2" />
- <set name="power" val="30" /> <!-- Freya retail 0, no level depend, possibly done differently -->
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="PARALYZE" />
@@ -1528,7 +1528,6 @@
<set name="elementPower" val="20" />
<set name="magicLvl" val="80" />
<set name="operateType" val="A3" />
- <set name="power" val="100" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
diff --git a/dist/game/data/stats/skills/04400-04499.xml b/dist/game/data/stats/skills/04400-04499.xml
index 744d9d8428..20cc50d49e 100644
--- a/dist/game/data/stats/skills/04400-04499.xml
+++ b/dist/game/data/stats/skills/04400-04499.xml
@@ -1299,12 +1299,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4478" levels="1" name="Ice Fairy Aqua Splash">
@@ -1319,11 +1320,12 @@
<set name="magicLvl" val="64" />
<set name="mpConsume" val="23" />
<set name="operateType" val="A1" />
- <set name="power" val="183" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="183" />
+ </effect>
</for>
</skill>
<skill id="4479" levels="1" name="Ice Fairy Resist Cold">
@@ -1341,7 +1343,6 @@
<set name="mpConsume" val="31" />
<set name="mpInitialConsume" val="8" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -1607,12 +1608,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4491" levels="12" name="Holy Weapon">
diff --git a/dist/game/data/stats/skills/04500-04599.xml b/dist/game/data/stats/skills/04500-04599.xml
index 1599189114..6251985376 100644
--- a/dist/game/data/stats/skills/04500-04599.xml
+++ b/dist/game/data/stats/skills/04500-04599.xml
@@ -355,12 +355,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="76" />
<set name="operateType" val="A1" />
- <set name="power" val="56" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="56" />
+ </effect>
</for>
</skill>
<skill id="4530" levels="1" name="Quest - Summoned HP Heal">
@@ -918,12 +919,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4561" levels="12" name="NPC Fire Burn - Magic">
@@ -940,11 +942,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4562" levels="12" name="NPC Solar Flare">
@@ -963,12 +966,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4563" levels="12" name="NPC Solar Flare - Magic">
@@ -987,11 +991,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4564" levels="12" name="NPC Solar Flare - Slow">
@@ -1010,11 +1015,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4565" levels="12" name="NPC Eruption">
@@ -1032,12 +1038,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="20000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4566" levels="12" name="NPC Eruption - Magic">
@@ -1055,11 +1062,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4567" levels="12" name="NPC Eruption - Slow">
@@ -1077,11 +1085,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4568" levels="12" name="NPC AE Solar Flare">
@@ -1101,12 +1110,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="30000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4569" levels="12" name="NPC AE Solar Flare - Magic">
@@ -1126,11 +1136,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4570" levels="12" name="NPC AE Solar Flare - Slow">
@@ -1150,11 +1161,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4571" levels="12" name="NPC Blazing Circle">
@@ -1170,12 +1182,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4572" levels="12" name="NPC Triple Sonic Slash">
@@ -1342,7 +1355,6 @@
<set name="mpConsume" val="58" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
diff --git a/dist/game/data/stats/skills/04600-04699.xml b/dist/game/data/stats/skills/04600-04699.xml
index a3441c9101..e5819e9a63 100644
--- a/dist/game/data/stats/skills/04600-04699.xml
+++ b/dist/game/data/stats/skills/04600-04699.xml
@@ -82,12 +82,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtk" val="#pAtk" />
</effect>
@@ -116,10 +117,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtk" val="#pAtk" />
</effect>
@@ -148,11 +151,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtk" val="#pAtk" />
</effect>
@@ -241,11 +245,12 @@
<set name="magicLvl" val="80" />
<set name="mpConsume" val="78" />
<set name="operateType" val="A1" />
- <set name="power" val="187" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="187" />
+ </effect>
</for>
</skill>
<skill id="4608" levels="2" name="NPC Clan Buff - Berserk">
@@ -409,11 +414,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4615" levels="12" name="Bleed">
@@ -459,7 +465,6 @@
<set name="mpConsume" val="58" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<for>
@@ -570,13 +575,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -595,12 +600,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -618,12 +623,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -744,13 +749,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
</for>
</skill>
@@ -768,12 +773,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4631" levels="3" name="NPC Buff - Acumen Shield WildMagic">
@@ -1342,7 +1348,6 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="100" />
<set name="reuseDelay" val="20000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="CORPSE" />
@@ -1365,12 +1370,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="DeathLink" />
+ <effect name="DeathLink">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4655" levels="12" name="NPC Death Link - Magic">
@@ -1385,11 +1391,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="DeathLink" />
+ <effect name="DeathLink">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4656" levels="12" name="NPC Death Link - Slow">
@@ -1404,11 +1411,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="DeathLink" />
+ <effect name="DeathLink">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4657" levels="12" name="Hold">
@@ -1434,14 +1442,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="HOLD" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Root" />
</for>
@@ -1469,13 +1477,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="HOLD" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Root" />
</for>
@@ -1503,13 +1511,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="HOLD" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Root" />
</for>
@@ -1537,14 +1545,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="SLEEP" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Sleep" />
</for>
@@ -1572,13 +1580,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="SLEEP" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Sleep" />
</for>
@@ -1606,13 +1614,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="SLEEP" />
<for>
<effect name="HpDrain">
- <param power="0.2" />
+ <param power="#power" />
+ <param drain="0.2" />
</effect>
<effect name="Sleep" />
</for>
@@ -1647,13 +1655,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -1673,12 +1681,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -1698,12 +1706,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -1723,13 +1731,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -1749,12 +1757,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -1774,12 +1782,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="1" />
+ <param power="#power" />
+ <param drain="1" />
</effect>
</for>
</skill>
@@ -2062,11 +2070,12 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A2" />
- <set name="power" val="648" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="648" />
+ </effect>
<effect name="DamOverTime" ticks="3">
<param power="216" />
</effect>
@@ -2095,11 +2104,12 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A2" />
- <set name="power" val="648" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="648" />
+ </effect>
<effect name="DamOverTime" ticks="3">
<param power="216" />
</effect>
@@ -2138,11 +2148,12 @@
<set name="fanRange" val="0,180,500,120" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="157" />
<set name="rideState" val="NONE" />
<set name="targetType" val="BEHIND_AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="157" />
+ </effect>
</for>
</skill>
<skill id="4687" levels="1" name="Valakas Tail Stomp">
@@ -2235,11 +2246,12 @@
<set name="hitTime" val="8000" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="1084" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="1084" />
+ </effect>
</for>
</skill>
<skill id="4691" levels="5" name="Valakas Regeneration">
diff --git a/dist/game/data/stats/skills/04700-04799.xml b/dist/game/data/stats/skills/04700-04799.xml
index acee3c1b43..7c14f80beb 100644
--- a/dist/game/data/stats/skills/04700-04799.xml
+++ b/dist/game/data/stats/skills/04700-04799.xml
@@ -369,11 +369,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="4713" levels="12" name="Bright Heal">
diff --git a/dist/game/data/stats/skills/05000-05099.xml b/dist/game/data/stats/skills/05000-05099.xml
index 23548876d5..cf0157e1cb 100644
--- a/dist/game/data/stats/skills/05000-05099.xml
+++ b/dist/game/data/stats/skills/05000-05099.xml
@@ -26,12 +26,12 @@
<set name="magicLvl" val="76" />
<set name="mpConsume" val="181" />
<set name="operateType" val="A1" />
- <set name="power" val="111" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="111" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -66,12 +66,13 @@
<set name="magicLvl" val="76" />
<set name="mpConsume" val="103" />
<set name="operateType" val="A1" />
- <set name="power" val="111" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="111" />
+ </effect>
</for>
</skill>
<skill id="5004" levels="1" name="Dimensional Stun">
@@ -159,7 +160,6 @@
<table name="#isMagic"> 1 0 0 1 1 </table>
<table name="#lvlDepend"> 0 0 0 1 1 </table>
<table name="#maxNegated"> 0 0 0 0 10 </table>
- <table name="#power"> 0 0 0 10 10 </table>
<table name="#time"> 0 0 5 5 5 </table>
<table name="#traits"> NONE NONE NONE DERANGEMENT DERANGEMENT </table>
<set name="abnormalType" val="#abnormalTypes" />
@@ -171,7 +171,6 @@
<set name="lvlBonusRate" val="#lvlDepend" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="SELF" />
<set name="trait" val="#traits" />
@@ -225,11 +224,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="106" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="106" />
+ </effect>
</for>
</skill>
<skill id="5011" levels="1" name="Frintezza's Bomber Ghost">
@@ -243,11 +243,12 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="364" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="364" />
+ </effect>
</for>
</skill>
<skill id="5012" levels="1" name="Breath of Scarlet">
@@ -286,12 +287,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="61" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="61" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -417,11 +418,12 @@
<set name="hitTime" val="7000" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5019" levels="1" name="Frintezza's Daemon Drain">
@@ -435,12 +437,12 @@
<set name="hitTime" val="6000" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="314" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="314" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -697,11 +699,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="DispelByCategory">
<param slot="BUFF" rate="25" max="20" />
</effect>
@@ -852,11 +855,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5052" levels="12" name="Castle Long AE Fire">
@@ -877,11 +881,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5053" levels="12" name="Castle DD Water">
@@ -898,11 +903,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5054" levels="12" name="Castle Self AE Water">
@@ -940,11 +946,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5057" levels="12" name="Castle Self AE Wind">
@@ -1033,11 +1040,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5066" levels="12" name="Castle Self AE Unholy">
@@ -1158,11 +1166,12 @@
<set name="hitTime" val="1500" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5074" levels="1" name="The Victor of War">
@@ -1529,12 +1538,13 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="1084" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="1084" />
+ </effect>
</for>
</skill>
<skill id="5094" levels="1" name="Antharas Subordinate Suicide ">
@@ -1547,11 +1557,12 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="473" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="473" />
+ </effect>
</for>
</skill>
<skill id="5095" levels="1" name="Antharas Subordinate Melee Attack">
@@ -1598,11 +1609,12 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="473" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="473" />
+ </effect>
</for>
</skill>
<skill id="5098" levels="2" name="Capture Penalty">
diff --git a/dist/game/data/stats/skills/05100-05199.xml b/dist/game/data/stats/skills/05100-05199.xml
index 1e62359706..1fb3b21398 100644
--- a/dist/game/data/stats/skills/05100-05199.xml
+++ b/dist/game/data/stats/skills/05100-05199.xml
@@ -401,7 +401,6 @@
<set name="magicLvl" val="85" />
<set name="mpConsume" val="5" />
<set name="operateType" val="A2" />
- <set name="power" val="703" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
@@ -577,13 +576,14 @@
<set name="affectRange" val="300" />
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="power" val="300" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="element" val="0" /> <!-- Fire -->
<set name="elementPower" val="20" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="300" />
+ </effect>
</for>
</skill>
<skill id="5131" levels="1" name="Tsunami">
@@ -591,13 +591,14 @@
<set name="affectRange" val="300" />
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="power" val="300" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="element" val="1" /> <!-- Water -->
<set name="elementPower" val="20" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="300" />
+ </effect>
</for>
</skill>
<skill id="5132" levels="1" name="Cyclone">
@@ -605,13 +606,14 @@
<set name="affectRange" val="300" />
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="power" val="300" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="element" val="2" /> <!-- Wind -->
<set name="elementPower" val="20" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="300" />
+ </effect>
</for>
</skill>
<skill id="5133" levels="1" name="Gehenna">
@@ -619,13 +621,14 @@
<set name="affectRange" val="300" />
<set name="magicLvl" val="80" />
<set name="operateType" val="A1" />
- <set name="power" val="300" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="element" val="5" /> <!-- Dark -->
<set name="elementPower" val="20" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="300" />
+ </effect>
</for>
</skill>
<skill id="5134" levels="1" name="Anti-Summoning Field">
@@ -769,12 +772,13 @@
<set name="mpInitialConsume" val="64" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="228" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="228" />
+ </effect>
</for>
</skill>
<skill id="5140" levels="1" name="Dark Curse">
@@ -842,13 +846,14 @@
<set name="mpConsume" val="258" />
<set name="mpInitialConsume" val="64" />
<set name="operateType" val="A1" />
- <set name="power" val="228" />
<set name="reuseDelay" val="20000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA_CORPSE_MOB" />
<for>
<effect name="ConsumeBody" />
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="228" />
+ </effect>
</for>
</skill>
<skill id="5143" levels="1" name="Sailren Use Blow">
@@ -1676,11 +1681,12 @@
<set name="magicLvl" val="85" />
<set name="mpConsume" val="38" />
<set name="operateType" val="A1" />
- <set name="power" val="116" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="116" />
+ </effect>
</for>
</skill>
<skill id="5179" levels="1" name="Raid Boss - Level 80">
@@ -1762,12 +1768,13 @@
<set name="hitTime" val="4000" />
<set name="magicLvl" val="75" />
<set name="operateType" val="A1" />
- <set name="power" val="54" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="54" />
+ </effect>
</for>
</skill>
<skill id="5186" levels="2" name="Pet Haste">
diff --git a/dist/game/data/stats/skills/05200-05299.xml b/dist/game/data/stats/skills/05200-05299.xml
index 38e52da958..b4e3c5f1dc 100644
--- a/dist/game/data/stats/skills/05200-05299.xml
+++ b/dist/game/data/stats/skills/05200-05299.xml
@@ -821,12 +821,13 @@
<set name="mpConsume" val="89" />
<set name="mpInitialConsume" val="23" />
<set name="operateType" val="A2" />
- <set name="power" val="298" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="298" />
+ </effect>
<effect name="Paralyze" />
</for>
</skill>
@@ -1003,12 +1004,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5247" levels="12" name="Seed of Darkness">
@@ -1065,12 +1067,13 @@
<set name="hitTime" val="3300" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5249" levels="12" name="Boss Dark Circle">
@@ -1089,11 +1092,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5250" levels="1" name="Stun">
@@ -1178,7 +1182,6 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A2" />
- <set name="power" val="100" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
@@ -1465,12 +1468,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="20000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5264" levels="12" name="Death Mark">
@@ -1521,11 +1525,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5266" levels="12" name="Magical Backfire">
@@ -1574,11 +1579,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5268" levels="17" name="Poison">
diff --git a/dist/game/data/stats/skills/05300-05399.xml b/dist/game/data/stats/skills/05300-05399.xml
index 33696b01a4..19e579bf3b 100644
--- a/dist/game/data/stats/skills/05300-05399.xml
+++ b/dist/game/data/stats/skills/05300-05399.xml
@@ -346,11 +346,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5311" levels="9" name="NPC(party) - Magic Close Range DD - less powerful">
@@ -366,11 +367,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5312" levels="9" name="NPC(party) -Magic Single Long Range DD - Fire">
@@ -390,11 +392,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5313" levels="9" name="NPC(party) -Magic Range Long Range DD - Fire">
@@ -414,11 +417,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5314" levels="9" name="NPC(party) -Magic Range Close Range DD - Fire">
@@ -436,11 +440,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5315" levels="9" name="NPC(party) -Magic Range Close Range DD - Fire(Self-Destruction)">
@@ -453,11 +458,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5316" levels="9" name="NPC(party) -Magic Single Long Range DD - Water">
@@ -477,11 +483,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5317" levels="9" name="NPC(party) -Magic Range Long Range DD - Water">
@@ -501,11 +508,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5318" levels="9" name="NPC(party) -Magic Range Close Range DD - Water">
@@ -523,11 +531,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5319" levels="9" name="NPC(party) -Magic Single Long Range DD - Wind">
@@ -628,11 +637,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5329" levels="9" name="NPC(party) -Magic Range Long Range DD - Holy">
@@ -652,11 +662,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5330" levels="9" name="NPC(party) -Magic Range Close Range DD - Holy">
@@ -674,11 +685,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5331" levels="9" name="NPC HP Drain">
@@ -693,11 +705,12 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="250" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="250" />
+ </effect>
</for>
</skill>
<skill id="5332" levels="9" name="NPC MP Burn">
@@ -749,12 +762,13 @@
<set name="mpConsume" val="#mpInitialConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="POISON" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff" />
</for>
</skill>
@@ -1453,11 +1467,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5372" levels="9" name="NPC(party) - Magic Close Range DD - less powerful">
@@ -1473,11 +1488,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5373" levels="9" name="NPC(party) -Magic Single Long Range DD - Fire">
@@ -1506,11 +1522,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5375" levels="9" name="NPC(party) -Magic Range Close Range DD - Fire">
@@ -1534,11 +1551,12 @@
<set name="isSuicideAttack" val="true" />
<set name="magicLvl" val="#magicLvl" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5377" levels="9" name="NPC(party) -Magic Single Long Range DD - Water">
@@ -1588,7 +1606,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5381" levels="9" name="NPC(party) -Magic Range Long Range DD - Wind">
@@ -1618,7 +1638,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5383" levels="9" name="NPC(party) -Magic Single Long Range DD - Earth">
@@ -1641,7 +1663,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5384" levels="9" name="NPC(party) -Magic Range Long Range DD - Earth">
@@ -1709,7 +1733,9 @@
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5390" levels="9" name="NPC(party) -Magic Range Long Range DD - Holy">
@@ -1729,11 +1755,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5391" levels="9" name="NPC(party) -Magic Range Close Range DD - Holy">
@@ -1751,11 +1778,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5392" levels="9" name="NPC HP Drain">
@@ -1774,12 +1802,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.9" />
+ <param power="#power" />
+ <param drain="0.9" />
</effect>
</for>
</skill>
@@ -1835,12 +1863,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="POISON" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Debuff" />
</for>
</skill>
@@ -1908,11 +1937,12 @@
<set name="mpConsume" val="63" />
<set name="mpInitialConsume" val="16" />
<set name="operateType" val="A1" />
- <set name="power" val="657" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="657" />
+ </effect>
</for>
</skill>
<skill id="5399" levels="1" name="Heat of Desert">
diff --git a/dist/game/data/stats/skills/05400-05499.xml b/dist/game/data/stats/skills/05400-05499.xml
index 3f4377b5a2..df71cc4e7b 100644
--- a/dist/game/data/stats/skills/05400-05499.xml
+++ b/dist/game/data/stats/skills/05400-05499.xml
@@ -400,11 +400,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="79" />
<set name="operateType" val="A1" />
- <set name="power" val="115" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="CLAN" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="115" />
+ </effect>
</for>
</skill>
<skill id="5431" levels="1" name="Slow">
@@ -1341,11 +1342,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="607" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="607" />
+ </effect>
</for>
</skill>
<skill id="5497" levels="1" name="Horn of Rising Darkness">
@@ -1410,11 +1412,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="200" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="200" />
+ </effect>
</for>
</skill>
</list>
diff --git a/dist/game/data/stats/skills/05500-05599.xml b/dist/game/data/stats/skills/05500-05599.xml
index ab5dc2ddb4..be1f0d6663 100644
--- a/dist/game/data/stats/skills/05500-05599.xml
+++ b/dist/game/data/stats/skills/05500-05599.xml
@@ -427,11 +427,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="85" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttackByAbnormal" />
+ <effect name="MagicalAttackByAbnormal">
+ <param power="85" />
+ </effect>
</for>
</skill>
<skill id="5523" levels="1" name="Chain Magic - Unholy Castle">
@@ -545,11 +546,12 @@
<set name="mpConsume" val="66" />
<set name="mpInitialConsume" val="17" />
<set name="operateType" val="A1" />
- <set name="power" val="971" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="PARTY_OTHER" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="971" />
+ </effect>
</for>
</skill>
<skill id="5528" levels="1" name="Self-Destruct">
@@ -1247,11 +1249,12 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="47" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="47" />
+ </effect>
</for>
</skill>
<skill id="5568" levels="1" name="Frost Armor">
@@ -1837,13 +1840,13 @@
<set name="mpConsume" val="119" />
<set name="mpInitialConsume" val="29" />
<set name="operateType" val="A1" />
- <set name="power" val="122" />
<set name="reuseDelay" val="10000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="122" />
+ <param drain="0.8" />
</effect>
<effect name="ManaDamOverTime">
<param power="182" />
diff --git a/dist/game/data/stats/skills/05600-05699.xml b/dist/game/data/stats/skills/05600-05699.xml
index bfb29c0eb1..7a32335dd1 100644
--- a/dist/game/data/stats/skills/05600-05699.xml
+++ b/dist/game/data/stats/skills/05600-05699.xml
@@ -9,11 +9,12 @@
<set name="isMagic" val="2" /> <!-- Static Skill -->
<set name="magicLvl" val="81" />
<set name="operateType" val="A1" />
- <set name="power" val="47" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="PARTY" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="47" />
+ </effect>
</for>
</skill>
<skill id="5601" levels="12" name="Short-Range Physical Attack Resistance">
@@ -1006,19 +1007,21 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A3" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<pvpEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
<effect name="Debuff">
<mul stat="pvpMagicalDmg" val="0.5" />
</effect>
</pvpEffects>
<pveEffects>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
<effect name="Debuff">
<mul stat="pvpMagicalDmg" val="0.5" />
</effect>
@@ -1039,14 +1042,19 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5658" levels="85" name="Gatekeeper Flame Strike">
<table name="#effectPoints"> -92 -97 -101 -106 -111 -116 -121 -126 -132 -138 -143 -149 -156 -162 -168 -175 -182 -189 -196 -204 -211 -219 -227 -235 -243 -251 -259 -268 -277 -285 -294 -303 -313 -322 -331 -341 -350 -360 -369 -379 -389 -399 -408 -418 -428 -438 -448 -457 -467 -477 -486 -495 -505 -514 -523 -532 -541 -549 -558 -566 -574 -582 -590 -597 -604 -611 -617 -624 -630 -635 -641 -646 -650 -655 -659 -662 -666 -669 -673 -676 -679 -681 -684 -687 -689 </table>
@@ -1065,14 +1073,19 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="7000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5659" levels="2" name="Gatekeeper Berserker Spirit">
<table name="#abnormalLvls"> 1 2 </table>
diff --git a/dist/game/data/stats/skills/05700-05799.xml b/dist/game/data/stats/skills/05700-05799.xml
index 4e5bfcbc42..0ee1ead651 100644
--- a/dist/game/data/stats/skills/05700-05799.xml
+++ b/dist/game/data/stats/skills/05700-05799.xml
@@ -64,13 +64,14 @@
<set name="magicLvl" val="36" />
<set name="mpConsume" val="5" />
<set name="mpInitialConsume" val="2" />
- <set name="power" val="69" />
<set name="operateType" val="A1" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="#targetType" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="69" />
+ </effect>
</for>
</skill>
<skill id="5703" levels="2" name="Adiantum Water Strike Deflect">
@@ -151,12 +152,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="61" />
<set name="operateType" val="A1" />
- <set name="power" val="160" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="160" />
+ </effect>
</for>
</skill>
<skill id="5709" levels="2" name="Whirlpool">
@@ -271,12 +273,13 @@
<set name="lvlBonusRate" val="1" />
<set name="magicLvl" val="73" />
<set name="operateType" val="A2" />
- <set name="power" val="213" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="213" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="55" />
<mul stat="runSpd" val="0.77" />
@@ -579,12 +582,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5731" levels="6" name="Incense of Death">
@@ -603,11 +607,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5732" levels="6" name="Flame Strike">
@@ -632,12 +637,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5733" levels="6" name="Fear of Steward">
@@ -666,13 +672,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="DERANGEMENT" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Fear" />
</for>
</skill>
@@ -694,12 +701,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5735" levels="6" name="Curse of Steward">
@@ -729,13 +737,14 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="SLEEP" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="Sleep" />
<effect name="DefenceTrait">
<param SLEEP="100" />
@@ -1012,14 +1021,19 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5750" levels="12" name="Flash">
<table name="#effectPoints"> -138 -204 -285 -379 -477 -566 -635 -659 -676 -689 -700 -709 </table>
@@ -1036,14 +1050,19 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5751" levels="12" name="Lightning Wave">
<table name="#effectPoints"> -138 -204 -285 -379 -477 -566 -635 -659 -676 -689 -700 -709 </table>
@@ -1059,14 +1078,19 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5752" levels="12" name="Flare">
<table name="#effectPoints"> -138 -204 -285 -379 -477 -566 -635 -659 -676 -689 -700 -709 </table>
@@ -1084,17 +1108,22 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#pvePower" />
- <set name="pvpPower" val="#pvpPower" />
<set name="reuseDelay" val="20000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<cond msgId="113" addName="1">
<player active_effect_id="5753" />
</cond>
- <for>
- <effect name="MagicalAttack" />
- </for>
+ <pvpEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvpPower" />
+ </effect>
+ </pvpEffects>
+ <pveEffects>
+ <effect name="MagicalAttack">
+ <param power="#pvePower" />
+ </effect>
+ </pveEffects>
</skill>
<skill id="5753" levels="1" name="Awakening">
<set name="abnormalLvl" val="1" />
diff --git a/dist/game/data/stats/skills/05800-05899.xml b/dist/game/data/stats/skills/05800-05899.xml
index 3c13db35cc..b919af9290 100644
--- a/dist/game/data/stats/skills/05800-05899.xml
+++ b/dist/game/data/stats/skills/05800-05899.xml
@@ -295,12 +295,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5827" levels="6" name="Fireball">
@@ -321,12 +322,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5828" levels="6" name="Unholy Flare">
@@ -346,12 +348,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5829" levels="6" name="Fire Flare">
@@ -371,12 +374,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="1000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="5830" levels="1" name="Polearm Thrust">
@@ -581,12 +585,13 @@
<set name="mpConsume" val="60" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="183" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="183" />
+ </effect>
</for>
</skill>
<skill id="5840" levels="1" name="Fire Breath">
@@ -605,12 +610,13 @@
<set name="mpConsume" val="60" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A1" />
- <set name="power" val="244" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="244" />
+ </effect>
</for>
</skill>
<skill id="5841" levels="1" name="Multi Defense">
@@ -698,11 +704,12 @@
<set name="mpConsume" val="239" />
<set name="mpInitialConsume" val="60" />
<set name="operateType" val="A1" />
- <set name="power" val="834" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="834" />
+ </effect>
</for>
</skill>
<skill id="5845" levels="12" name="NPC Trigger Bleed">
diff --git a/dist/game/data/stats/skills/05900-05999.xml b/dist/game/data/stats/skills/05900-05999.xml
index c1c4ef76a5..a6f7a88a9c 100644
--- a/dist/game/data/stats/skills/05900-05999.xml
+++ b/dist/game/data/stats/skills/05900-05999.xml
@@ -118,12 +118,12 @@
<set name="mpConsume" val="#mpConsume" />
<set name="mpInitialConsume" val="#mpInitialConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="#power" />
+ <param drain="0.8" />
</effect>
</for>
</skill>
@@ -373,11 +373,12 @@
<set name="mpConsume" val="239" />
<set name="mpInitialConsume" val="60" />
<set name="operateType" val="A1" />
- <set name="power" val="150" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="150" />
+ </effect>
</for>
</skill>
<skill id="5921" levels="1" name="Inhale">
@@ -404,12 +405,12 @@
<set name="mpConsume" val="179" />
<set name="mpInitialConsume" val="45" />
<set name="operateType" val="A2" />
- <set name="power" val="121" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
<effect name="HpDrain">
- <param power="0.8" />
+ <param power="121" />
+ <param drain="0.8" />
</effect>
<effect name="Debuff">
<mul stat="pAtk" val="0.9" />
@@ -444,11 +445,12 @@
<set name="mpConsume" val="179" />
<set name="mpInitialConsume" val="45" />
<set name="operateType" val="A2" />
- <set name="power" val="121" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="121" />
+ </effect>
<effect name="Debuff">
<sub stat="rEvas" val="3" />
<mul stat="pDef" val="0.5" />
@@ -1486,12 +1488,13 @@
<set name="mpConsume" val="60" />
<set name="mpInitialConsume" val="15" />
<set name="operateType" val="A2" />
- <set name="power" val="171" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<set name="trait" val="DERANGEMENT" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="171" />
+ </effect>
<effect name="TriggerSkillByDamage">
<param attackerType="L2Attackable" minAttackerLevel="1" maxAttackerLevel="100" />
<param minDamage="1" />
diff --git a/dist/game/data/stats/skills/06000-06099.xml b/dist/game/data/stats/skills/06000-06099.xml
index c65caeff37..b6ada17f63 100644
--- a/dist/game/data/stats/skills/06000-06099.xml
+++ b/dist/game/data/stats/skills/06000-06099.xml
@@ -465,12 +465,13 @@
<set name="mpConsume" val="87" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="70" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="70" />
+ </effect>
</for>
</skill>
<skill id="6044" levels="1" name="Phoenix Flame Beak">
@@ -629,12 +630,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="6052" levels="14" name="Shockwave">
@@ -650,12 +652,13 @@
<set name="magicLvl" val="#magicLvl" />
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="6053" levels="4" name="Howl">
diff --git a/dist/game/data/stats/skills/06300-06399.xml b/dist/game/data/stats/skills/06300-06399.xml
index 83f034e6d9..ba8ba7c6e8 100644
--- a/dist/game/data/stats/skills/06300-06399.xml
+++ b/dist/game/data/stats/skills/06300-06399.xml
@@ -189,12 +189,13 @@
<set name="mpConsume" val="30" />
<set name="mpInitialConsume" val="8" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6308" levels="1" name="Opus of the Wave">
@@ -213,12 +214,13 @@
<set name="mpConsume" val="30" />
<set name="mpInitialConsume" val="8" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6309" levels="1" name="Pain of the Ascetic">
@@ -237,12 +239,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6310" levels="1" name="Loss of Quest">
@@ -357,12 +360,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="125" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="125" />
+ </effect>
</for>
</skill>
<skill id="6315" levels="1" name="Sacred Strike">
@@ -424,12 +428,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="128" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="128" />
+ </effect>
</for>
</skill>
<skill id="6318" levels="1" name="Divine Shield Protection">
@@ -524,12 +529,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="121" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="121" />
+ </effect>
</for>
</skill>
<skill id="6322" levels="1" name="Divine Impact">
@@ -548,12 +554,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="121" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="121" />
+ </effect>
</for>
</skill>
<skill id="6323" levels="1" name="Divine Bolt">
@@ -567,11 +574,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="85" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="85" />
+ </effect>
</for>
</skill>
<skill id="6324" levels="1" name="Divine Strike">
@@ -588,12 +596,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="121" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="121" />
+ </effect>
</for>
</skill>
<skill id="6325" levels="1" name="Divine Nova">
@@ -610,12 +619,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="85" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="85" />
+ </effect>
</for>
</skill>
<skill id="6326" levels="1" name="Martyr's Happiness">
@@ -677,12 +687,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="205" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="205" />
+ </effect>
</for>
</skill>
<skill id="6329" levels="1" name="Fighter Strike">
@@ -846,12 +857,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6336" levels="1" name="Electric Rain 2">
@@ -865,12 +877,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="121" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="121" />
+ </effect>
</for>
</skill>
<skill id="6337" levels="1" name="Red Slash 1">
diff --git a/dist/game/data/stats/skills/06400-06499.xml b/dist/game/data/stats/skills/06400-06499.xml
index c21f09253b..8bf59a06ce 100644
--- a/dist/game/data/stats/skills/06400-06499.xml
+++ b/dist/game/data/stats/skills/06400-06499.xml
@@ -595,11 +595,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6427" levels="1" name="Medicinal Mushroom 1">
diff --git a/dist/game/data/stats/skills/06600-06699.xml b/dist/game/data/stats/skills/06600-06699.xml
index bf55356376..9eb10febe6 100644
--- a/dist/game/data/stats/skills/06600-06699.xml
+++ b/dist/game/data/stats/skills/06600-06699.xml
@@ -660,12 +660,13 @@
<set name="mpConsume" val="88" />
<set name="mpInitialConsume" val="22" />
<set name="operateType" val="A1" />
- <set name="power" val="122" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="122" />
+ </effect>
</for>
</skill>
<skill id="6642" levels="1" name="Dash">
@@ -1128,11 +1129,12 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="82" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6677" levels="1" name="Hold">
@@ -1173,11 +1175,12 @@
<set name="magicLvl" val="83" />
<set name="mpConsume" val="82" />
<set name="operateType" val="A1" />
- <set name="power" val="120" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
</for>
</skill>
<skill id="6680" levels="1" name="Faint Plus">
diff --git a/dist/game/data/stats/skills/06700-06799.xml b/dist/game/data/stats/skills/06700-06799.xml
index 94ea8c90f2..ac861a4e59 100644
--- a/dist/game/data/stats/skills/06700-06799.xml
+++ b/dist/game/data/stats/skills/06700-06799.xml
@@ -779,11 +779,12 @@
<set name="mpConsume" val="62" />
<set name="mpInitialConsume" val="16" />
<set name="operateType" val="A1" />
- <set name="power" val="129" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="129" />
+ </effect>
</for>
</skill>
<skill id="6756" levels="1" name="Death Talon">
@@ -798,11 +799,12 @@
<set name="mpConsume" val="124" />
<set name="mpInitialConsume" val="31" />
<set name="operateType" val="A1" />
- <set name="power" val="65" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AURA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="65" />
+ </effect>
</for>
</skill>
<skill id="6757" levels="1" name="Slow">
@@ -1001,11 +1003,12 @@
<set name="mpConsume" val="62" />
<set name="mpInitialConsume" val="16" />
<set name="operateType" val="A1" />
- <set name="power" val="129" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="129" />
+ </effect>
</for>
</skill>
<skill id="6767" levels="1" name="Earthquake">
@@ -1248,12 +1251,13 @@
<set name="mpConsume" val="55" />
<set name="mpInitialConsume" val="14" />
<set name="operateType" val="A2" />
- <set name="power" val="120" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="PARALYZE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="120" />
+ </effect>
<effect name="Paralyze" />
</for>
</skill>
diff --git a/dist/game/data/stats/skills/06800-06899.xml b/dist/game/data/stats/skills/06800-06899.xml
index 79dc330217..137343c338 100644
--- a/dist/game/data/stats/skills/06800-06899.xml
+++ b/dist/game/data/stats/skills/06800-06899.xml
@@ -505,12 +505,13 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="219" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="219" />
+ </effect>
</for>
</skill>
<skill id="6825" levels="2" name="Bleed">
@@ -534,12 +535,13 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="84" />
<set name="operateType" val="A2" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="2000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="#power" />
+ </effect>
<effect name="HealOverTime" ticks="4">
<param power="#hotValue" />
</effect>
@@ -620,11 +622,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="lvlBonusRate" val="2" />
<set name="operateType" val="A2" />
- <set name="power" val="250" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="250" />
+ </effect>
<effect name="Debuff">
<mul stat="pAtkSpd" val="0.5" />
</effect>
@@ -691,11 +694,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="84" />
<set name="operateType" val="A1" />
- <set name="power" val="182" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="182" />
+ </effect>
</for>
</skill>
<skill id="6835" levels="1" name="Summon Skeleton">
@@ -723,12 +727,13 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A2" />
- <set name="power" val="124" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="DERANGEMENT" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="124" />
+ </effect>
<effect name="Mute" />
</for>
</skill>
@@ -742,11 +747,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="182" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="182" />
+ </effect>
</for>
</skill>
<skill id="6838" levels="1" name="Self-destruction">
@@ -880,12 +886,12 @@
<set name="mpConsume" val="98" />
<set name="mpInitialConsume" val="25" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="110" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -963,11 +969,12 @@
<set name="mpConsume" val="63" />
<set name="mpInitialConsume" val="17" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="110" />
+ </effect>
</for>
</skill>
<skill id="6853" levels="1" name="Sleep">
@@ -1036,11 +1043,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="82" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="110" />
+ </effect>
</for>
</skill>
<skill id="6856" levels="1" name="Heal">
@@ -1248,12 +1256,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="110" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -1267,11 +1275,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="118" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="118" />
+ </effect>
</for>
</skill>
<skill id="6868" levels="1" name="Summon">
@@ -1289,11 +1298,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="250" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="250" />
+ </effect>
</for>
</skill>
<skill id="6870" levels="1" name="Vampiric Claw">
@@ -1307,12 +1317,12 @@
<set name="mpConsume" val="98" />
<set name="mpInitialConsume" val="25" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="110" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -1328,11 +1338,12 @@
<set name="mpConsume" val="96" />
<set name="mpInitialConsume" val="26" />
<set name="operateType" val="A1" />
- <set name="power" val="118" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="118" />
+ </effect>
</for>
</skill>
<skill id="6872" levels="1" name="Self-destruction">
@@ -1391,11 +1402,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="118" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="118" />
+ </effect>
</for>
</skill>
<skill id="6875" levels="2" name="Poison">
@@ -1417,11 +1429,12 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="83" />
<set name="operateType" val="A2" />
- <set name="power" val="122" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="AREA" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="122" />
+ </effect>
<effect name="DamOverTime" ticks="4">
<param power="#dmg" />
</effect>
@@ -1503,12 +1516,12 @@
<set name="isMagic" val="1" /> <!-- Magic Skill -->
<set name="magicLvl" val="83" />
<set name="operateType" val="A1" />
- <set name="power" val="110" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<for>
<effect name="HpDrain">
- <param power="0.4" />
+ <param power="110" />
+ <param drain="0.4" />
</effect>
</for>
</skill>
@@ -1529,12 +1542,13 @@
<set name="lvlBonusRate" val="2" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A2" />
- <set name="power" val="124" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="targetType" val="ONE" />
<set name="trait" val="DERANGEMENT" />
<for>
- <effect name="MagicalAttack" />
+ <effect name="MagicalAttack">
+ <param power="124" />
+ </effect>
<effect name="Mute" />
</for>
</skill>
@@ -1571,11 +1585,13 @@
<set name="magicLvl" val="84" />
<set name="mpConsume" val="80" />
<set name="operateType" val="A2" />
- <set name="power" val="6960" />
<set name="reuseDelay" val="5000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
+ <effect name="PhysicalAttack">
+ <param power="6960" />
+ </effect>
<effect name="Stun" />
<effect name="BlockDamage">
<param block="HP" />
@@ -1649,7 +1665,6 @@
<set name="hitTime" val="2500" />
<set name="magicLvl" val="85" />
<set name="operateType" val="A1" />
- <set name="power" val="100" />
<set name="reuseDelay" val="900000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="SELF" />
diff --git a/dist/game/data/xsd/skills.xsd b/dist/game/data/xsd/skills.xsd
index c13f664a46..e123931978 100644
--- a/dist/game/data/xsd/skills.xsd
+++ b/dist/game/data/xsd/skills.xsd
@@ -73,7 +73,6 @@
<xs:enumeration value="operateType" />
<xs:enumeration value="overHit" />
<xs:enumeration value="power" />
- <xs:enumeration value="pvpPower" />
<xs:enumeration value="resetQuest" />
<xs:enumeration value="reuseDelay" />
<xs:enumeration value="rideState" />
--
GitLab