From 1ea7a30fa326193805dfdffbca42a3914c7d256a Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Thu, 7 Sep 2017 19:59:09 +0200
Subject: [PATCH] More cleanup after the last commits.
---
.../effecthandlers/PhysicalAttackHpLink.java | 6 +-
.../effecthandlers/PhysicalSoulAttack.java | 5 +-
dist/game/data/stats/skills/00300-00399.xml | 16 +-
dist/game/data/stats/skills/00400-00499.xml | 160 +++++++++++++++---
dist/game/data/stats/skills/00500-00599.xml | 113 ++++++++++---
dist/game/data/stats/skills/00600-00699.xml | 7 +-
dist/game/data/stats/skills/00700-00799.xml | 18 +-
7 files changed, 253 insertions(+), 72 deletions(-)
diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
index a89853c95e..4850d7f107 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java
@@ -37,14 +37,12 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public final class PhysicalAttackHpLink extends AbstractEffect
{
private final double _power;
- private final double _pvpPower;
public PhysicalAttackHpLink(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
{
super(attachCond, applyCond, set, params);
_power = params.getDouble("power", 0);
- _pvpPower = params.getDouble("pvpPower", _power);
}
@Override
@@ -71,8 +69,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
L2Character target = info.getEffected();
L2Character activeChar = info.getEffector();
Skill skill = info.getSkill();
- double power = activeChar.isPlayable() && target.isPlayable() ? _pvpPower : _power;
- power *= (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2);
+
+ double power = _power * (-((target.getCurrentHp() * 2) / target.getMaxHp()) + 2);
if (activeChar.isAlikeDead())
{
diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
index d29b2358de..6480db982a 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
@@ -37,7 +37,6 @@ import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
public final class PhysicalSoulAttack extends AbstractEffect
{
private final double _power;
- private final double _pvpPower;
private final int _criticalChance;
private final boolean _ignoreShieldDefence;
@@ -46,7 +45,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
super(attachCond, applyCond, set, params);
_power = params.getDouble("power", 0);
- _pvpPower = params.getDouble("pvpPower", _power);
_criticalChance = params.getInt("criticalChance", 0);
_ignoreShieldDefence = params.getBoolean("ignoreShieldDefence", false);
}
@@ -75,7 +73,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
L2Character target = info.getEffected();
L2Character activeChar = info.getEffector();
Skill skill = info.getSkill();
- double power = activeChar.isPlayable() && target.isPlayable() ? _pvpPower : _power;
if (activeChar.isAlikeDead())
{
@@ -111,7 +108,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
crit = Formulas.calcSkillCrit(activeChar, target, _criticalChance);
}
- damage = Formulas.calcSkillPhysDam(activeChar, target, shield, false, ss, power);
+ damage = Formulas.calcSkillPhysDam(activeChar, target, shield, false, ss, _power);
if ((skill.getMaxSoulConsumeCount() > 0) && activeChar.isPlayer())
{
diff --git a/dist/game/data/stats/skills/00300-00399.xml b/dist/game/data/stats/skills/00300-00399.xml
index 70042cc773..ae8e3e5563 100644
--- a/dist/game/data/stats/skills/00300-00399.xml
+++ b/dist/game/data/stats/skills/00300-00399.xml
@@ -546,7 +546,6 @@
<set name="rideState" val="NONE" />
<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" />
<enchant3 name="element" val="0" /> <!-- Fire -->
@@ -570,12 +569,21 @@
<param power="#power" />
</effect>
</for>
- <enchant7for>
+ <enchant1for>
+ <effect name="PhysicalAttackHpLink">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalAttackHpLink">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalAttackHpLink">
<param power="4870" />
- <param pvpPower="#enchDuel" />
</effect>
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="315" levels="16" name="Crush of Doom" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<table name="#effectPoints"> -425 -431 -438 -444 -449 -455 -460 -466 -471 -475 -480 -484 -488 -492 -496 -499 </table>
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index 83d743a154..751c30c42b 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -2661,7 +2661,6 @@
<set name="targetType" val="ONE" />
<enchant1 name="effectPoint" val="#ench1EffectPoints" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant3 name="element" val="5" /> <!-- Dark -->
@@ -2669,7 +2668,6 @@
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="effectPoint" val="#ench4EffectPoints" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#enchDuel" />
<cond msgId="113" addName="1">
<using kind="ANCIENTSWORD" />
</cond>
@@ -2678,6 +2676,21 @@
<param power="#power" />
</effect>
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant4pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="3653" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="478" levels="15" name="Double Thrust">
<!-- Confirmed CT2.5 -->
@@ -3042,15 +3055,23 @@
<set name="targetType" val="AURA" />
<enchant1 name="effectPoint" val="#ench1EffectPoints" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
- <enchant2 name="power" val="#ench2Power" />
<for>
<effect name="PhysicalSoulAttack">
<param power="#power" />
</effect>
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
</skill>
<skill id="493" levels="28" name="Storm Assault" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -3084,10 +3105,8 @@
<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="mpInitialConsume" val="#ench2mpInitialConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="element" val="0" /> <!-- Fire -->
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -3101,7 +3120,6 @@
<enchant6 name="elementPower" val="#enchElementPower" />
<enchant6 name="magicLvl" val="#enchMagicLvl" />
<enchant7 name="magicLvl" val="#enchMagicLvl" />
- <enchant7 name="pvpPower" val="#enchDuel" />
<cond msgId="113" addName="1">
<and>
<using kind="ANCIENTSWORD" />
@@ -3113,6 +3131,26 @@
<param power="#power" />
</effect>
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="2192" />
+ </effect>
+ </enchant7pveEffects>
</skill>
<skill id="494" levels="37" name="Shoulder Charge" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -3152,7 +3190,6 @@
<set name="targetType" val="ONE" />
<set name="trait" val="SHOCK" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="activateRate" val="#ench2ActivateRates" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="element" val="0" /> <!-- Fire -->
@@ -3181,21 +3218,27 @@
<effect name="Stun" />
<effect name="EnemyCharge" />
</for>
- <enchant2for>
+ <enchant1for>
<effect name="PhysicalSoulAttack">
- <param power="1" />
+ <param power="#ench1Power" />
</effect>
<effect name="Stun" />
<effect name="EnemyCharge" />
- </enchant2for>
- <enchant7for>
+ </enchant1for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench7Duel" />
+ </effect>
+ <effect name="Stun" />
+ <effect name="EnemyCharge" />
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="1" />
- <param pvpPower="#ench7Duel" />
</effect>
<effect name="Stun" />
<effect name="EnemyCharge" />
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="495" levels="10" name="Blade Rush" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
<!-- Confirmed CT2.5 -->
@@ -3267,15 +3310,22 @@
<param power="#ench1Power" />
</effect>
</enchant1for>
- <enchant4for>
+ <enchant4pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ <effect name="DamOverTime" ticks="5">
+ <param power="134" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
<effect name="PhysicalSoulAttack">
<param power="1" />
- <param pvpPower="#ench4Duel" />
</effect>
<effect name="DamOverTime" ticks="5">
<param power="134" />
</effect>
- </enchant4for>
+ </enchant4pveEffects>
</skill>
<skill id="496" levels="31" name="Slashing Blade" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -3304,10 +3354,8 @@
<set name="soulMaxConsumeCount" val="5" />
<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="power" val="#ench2Power" />
<enchant3 name="element" val="0" /> <!-- Fire -->
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -3329,12 +3377,26 @@
<param power="#power" />
</effect>
</for>
- <enchant7for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="2740" />
- <param pvpPower="#enchDuel" />
</effect>
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="497" levels="16" name="Crushing Pain" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -3364,10 +3426,8 @@
<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="power" val="#ench2Power" />
<enchant3 name="element" val="0" /> <!-- Fire -->
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -3381,7 +3441,6 @@
<enchant6 name="elementPower" val="#enchElementPower" />
<enchant6 name="magicLvl" val="#enchMagicLvl" />
<enchant7 name="magicLvl" val="#enchMagicLvl" />
- <enchant7 name="pvpPower" val="#enchDuel" />
<cond msgId="113" addName="1">
<using kind="ANCIENTSWORD" />
</cond>
@@ -3391,6 +3450,30 @@
<param ignoreShieldDefence="true" />
</effect>
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant2for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="7635" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant7pveEffects>
</skill>
<skill id="498" levels="12" name="Contagion" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<!-- Confirmed CT2.5 -->
@@ -3419,11 +3502,8 @@
<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="power" val="#ench2Power" />
- <enchant3 name="pvpPower" val="#enchDuel" />
<cond msgId="113" addName="1">
<and>
<using kind="ANCIENTSWORD" />
@@ -3436,6 +3516,30 @@
<param ignoreShieldDefence="true" />
</effect>
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant2for>
+ <enchant3pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant3pvpEffects>
+ <enchant3pveEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="7635" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant3pveEffects>
</skill>
<skill id="499" levels="3" name="Courage">
<!-- Confirmed CT2.5 -->
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index f57b69acaf..df08c09052 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -171,10 +171,8 @@
<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="power" val="#ench2Power" />
<enchant3 name="element" val="0" /> <!-- Fire -->
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -196,12 +194,26 @@
<param power="#power" />
</effect>
</for>
- <enchant7for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="3069" />
- <param pvpPower="#enchDuel" />
</effect>
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="505" levels="28" name="Shining Edge" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -286,10 +298,8 @@
<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="power" val="#ench2Power" />
<enchant3 name="element" val="5" /> <!-- Dark -->
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -307,14 +317,34 @@
<param ignoreShieldDefence="true" />
</effect>
</for>
- <enchant4for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ <param criticalChance="5" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ <param criticalChance="5" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant2for>
+ <enchant4pvpEffects>
<effect name="PhysicalSoulAttack">
- <param power="5180" />
<param power="#enchDuel" />
<param criticalChance="5" />
<param ignoreShieldDefence="true" />
</effect>
- </enchant4for>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="5180" />
+ <param criticalChance="5" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant4pveEffects>
</skill>
<skill id="507" levels="37" name="Twin Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -342,7 +372,6 @@
<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" />
<enchant3 name="element" val="0" /> <!-- Fire -->
@@ -367,13 +396,24 @@
<param criticalChance="25" />
</effect>
</for>
- <enchant7for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ <param criticalChance="25" />
+ </effect>
+ </enchant1for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ <param criticalChance="25" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="4870" />
- <param pvpPower="#enchDuel" />
<param criticalChance="25" />
</effect>
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="508" levels="31" name="Rising Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
<!-- Confirmed CT2.5 -->
@@ -403,7 +443,6 @@
<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" />
<enchant3 name="element" val="0" /> <!-- Fire -->
@@ -427,12 +466,21 @@
<param power="#power" />
</effect>
</for>
- <enchant7for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant7pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#enchDuel" />
+ </effect>
+ </enchant7pvpEffects>
+ <enchant7pveEffects>
<effect name="PhysicalSoulAttack">
<param power="1218" />
- <param pvpPower="#enchDuel" />
</effect>
- </enchant7for>
+ </enchant7pveEffects>
</skill>
<skill id="509" levels="34" name="Bleeding Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<!-- Confirmed CT2.5 -->
@@ -471,7 +519,6 @@
<set name="targetType" val="ONE" />
<set name="trait" val="BLEED" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
@@ -488,15 +535,15 @@
<param power="#dot" />
</effect>
</for>
- <enchant3for>
+ <enchant1for>
<effect name="PhysicalSoulAttack">
- <param power="2192" />
+ <param power="#ench1Power" />
<param ignoreShieldDefence="true" />
</effect>
<effect name="DamOverTime" ticks="5">
<param power="67" />
</effect>
- </enchant3for>
+ </enchant1for>
</skill>
<skill id="510" levels="5" name="Deadly Roulette" enchantGroup1="2" enchantGroup2="2">
<!-- Confirmed CT2.5 -->
@@ -1139,10 +1186,8 @@
<set name="soulMaxConsumeCount" val="5" />
<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="#enchmpConsume" />
- <enchant2 name="power" val="#ench2Power" />
<enchant3 name="element" val="4" /> <!-- Holy -->
<enchant3 name="elementPower" val="#ench3elementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -1153,12 +1198,26 @@
<param power="6060" />
</effect>
</for>
- <enchant4for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ </enchant1for>
+ <enchant2for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench2Power" />
+ </effect>
+ </enchant2for>
+ <enchant4pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench4Duel" />
+ </effect>
+ </enchant4pvpEffects>
+ <enchant4pveEffects>
<effect name="PhysicalSoulAttack">
<param power="6060" />
- <param pvpPower="#ench4Duel" />
</effect>
- </enchant4for>
+ </enchant4pveEffects>
</skill>
<skill id="527" levels="1" name="Iron Shield">
<!-- Confirmed CT2.5 -->
diff --git a/dist/game/data/stats/skills/00600-00699.xml b/dist/game/data/stats/skills/00600-00699.xml
index 740802f66f..c5f0de836c 100644
--- a/dist/game/data/stats/skills/00600-00699.xml
+++ b/dist/game/data/stats/skills/00600-00699.xml
@@ -515,7 +515,6 @@
<set name="targetType" val="ONE" />
<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" />
<enchant3 name="abnormalTime" val="#ench3AbnormalTimes" />
@@ -531,6 +530,12 @@
</effect>
<effect name="Fear" />
</for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Fear" />
+ </enchant1for>
</skill>
<skill id="628" levels="1" name="Warp">
<!-- Confirmed CT2.5 -->
diff --git a/dist/game/data/stats/skills/00700-00799.xml b/dist/game/data/stats/skills/00700-00799.xml
index a2d0ae9628..20bd199012 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -2547,7 +2547,6 @@
<set name="targetType" val="FRONT_AREA" />
<set name="trait" val="SHOCK" />
<enchant1 name="magicLvl" val="#enchMagicLvl" />
- <enchant1 name="power" val="#ench1Power" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<enchant2 name="mpInitialConsume" val="#ench2Cost" />
<enchant3 name="activateRate" val="#ench3ActivateRates" />
@@ -2577,13 +2576,24 @@
</effect>
<effect name="Stun" />
</for>
- <enchant8for>
+ <enchant1for>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench1Power" />
+ </effect>
+ <effect name="Stun" />
+ </enchant1for>
+ <enchant8pvpEffects>
+ <effect name="PhysicalSoulAttack">
+ <param power="#ench8Duel" />
+ </effect>
+ <effect name="Stun" />
+ </enchant8pvpEffects>
+ <enchant8pveEffects>
<effect name="PhysicalSoulAttack">
<param power="4040" />
- <param pvpPower="#ench8Duel" />
</effect>
<effect name="Stun" />
- </enchant8for>
+ </enchant8pveEffects>
</skill>
<skill id="794" levels="1" name="Mass Disarm" enchantGroup1="6" enchantGroup2="6">
<!-- Confirmed CT2.5 -->
--
GitLab