From 77640efa50cd04f88df204e883fbd73d32601f7a Mon Sep 17 00:00:00 2001
From: Adry85 <adrya85@hotmail.it>
Date: Wed, 6 Sep 2017 19:42:35 +0200
Subject: [PATCH] Removed power from skills that have PhysicalSoulAttack effect
handler.
- Splitted calcPhysDam formula in two parts, one for normal hit and one
for skills (calcSkillPhysDam).
Reviewed by: Zoey76
DP part for:
https://bitbucket.org/l2jserver/l2j_server/commits/0d6eda511e63f3fd7e53b0f70e80eae8699fa97f
---
.../effecthandlers/PhysicalSoulAttack.java | 11 ++-
dist/game/data/stats/skills/00400-00499.xml | 80 ++++++++++++-------
dist/game/data/stats/skills/00500-00599.xml | 70 +++++++++++-----
dist/game/data/stats/skills/00600-00699.xml | 9 +--
dist/game/data/stats/skills/00700-00799.xml | 17 ++--
dist/game/data/stats/skills/00800-00899.xml | 5 +-
dist/game/data/stats/skills/00900-00999.xml | 15 ++--
dist/game/data/stats/skills/01400-01499.xml | 5 +-
dist/game/data/xsd/skills.xsd | 1 -
9 files changed, 141 insertions(+), 72 deletions(-)
diff --git a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
index ffe3fc5119..d29b2358de 100644
--- a/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
+++ b/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java
@@ -36,6 +36,8 @@ 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;
@@ -43,6 +45,8 @@ 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);
}
@@ -71,6 +75,7 @@ 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())
{
@@ -90,7 +95,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
target.stopFakeDeath(true);
}
- int damage = 0;
+ double damage = 0;
boolean ss = skill.isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS);
byte shield = 0;
@@ -106,7 +111,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
crit = Formulas.calcSkillCrit(activeChar, target, _criticalChance);
}
- damage = (int) Formulas.calcPhysDam(activeChar, target, skill, shield, false, ss);
+ damage = Formulas.calcSkillPhysDam(activeChar, target, shield, false, ss, power);
if ((skill.getMaxSoulConsumeCount() > 0) && activeChar.isPlayer())
{
@@ -120,7 +125,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
if (damage > 0)
{
- activeChar.sendDamageMessage(target, damage, false, crit, false);
+ activeChar.sendDamageMessage(target, (int) damage, false, crit, false);
target.reduceCurrentHp(damage, activeChar, skill);
target.notifyDamageReceived(damage, activeChar, skill, crit, false, false);
diff --git a/dist/game/data/stats/skills/00400-00499.xml b/dist/game/data/stats/skills/00400-00499.xml
index 104eabd2ef..7eec873ee2 100644
--- a/dist/game/data/stats/skills/00400-00499.xml
+++ b/dist/game/data/stats/skills/00400-00499.xml
@@ -2593,7 +2593,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -2602,7 +2601,9 @@
<using kind="SWORD,BLUNT,ANCIENTSWORD" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="477" levels="37" name="Dark Smash" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
@@ -2629,7 +2630,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -2649,7 +2649,9 @@
<using kind="ANCIENTSWORD" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="478" levels="15" name="Double Thrust">
@@ -2669,7 +2671,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -2678,7 +2679,9 @@
<using kind="RAPIER" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="479" levels="1" name="Hard March">
@@ -2891,7 +2894,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -2901,6 +2903,7 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param criticalChance="20" />
</effect>
</for>
@@ -3009,7 +3012,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AURA" />
@@ -3020,7 +3022,9 @@
<enchant2 name="mpConsume" val="#ench2MpConsume" />
<enchant2 name="power" val="#ench2Power" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="493" levels="28" name="Storm Assault" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
@@ -3051,7 +3055,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="AREA" />
@@ -3081,7 +3084,9 @@
</and>
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="494" levels="37" name="Shoulder Charge" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
@@ -3116,7 +3121,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA2" />
<set name="overHit" val="true" />
- <set name="power" val="1" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -3139,7 +3143,6 @@
<enchant6 name="elementPower" val="#enchElementPower" />
<enchant6 name="magicLvl" val="#enchMagicLvl" />
<enchant7 name="magicLvl" val="#enchMagicLvl" />
- <enchant7 name="pvpPower" val="#ench7Duel" />
<cond msgId="113" addName="1">
<and>
<using kind="ANCIENTSWORD" />
@@ -3147,15 +3150,27 @@
</and>
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="Stun" />
<effect name="EnemyCharge" />
</for>
<enchant2for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="Stun" />
<effect name="EnemyCharge" />
</enchant2for>
+ <enchant7for>
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ <param pvpPower="#ench7Duel" />
+ </effect>
+ <effect name="Stun" />
+ <effect name="EnemyCharge" />
+ </enchant7for>
</skill>
<skill id="495" levels="10" name="Blade Rush" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
<!-- Confirmed CT2.5 -->
@@ -3194,7 +3209,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA2" />
<set name="overHit" val="true" />
- <set name="power" val="1" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -3206,7 +3220,6 @@
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="mpInitialConsume" val="#ench3Cost" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<cond msgId="113" addName="1">
<and>
<using kind="ANCIENTSWORD" />
@@ -3214,23 +3227,30 @@
</and>
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="#dot" />
</effect>
</for>
<enchant1for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="#ench1Power" />
</effect>
</enchant1for>
- <enchant2for>
- <effect name="PhysicalSoulAttack" />
+ <enchant4for>
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ <param pvpPower="#ench4Duel" />
+ </effect>
<effect name="DamOverTime" ticks="5">
<param power="134" />
</effect>
- </enchant2for>
+ </enchant4for>
</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 -->
@@ -3254,7 +3274,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -3277,13 +3296,20 @@
<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>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant7for>
+ <effect name="PhysicalSoulAttack">
+ <param power="2740" />
+ <param pvpPower="#enchDuel" />
+ </effect>
+ </enchant7for>
</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 -->
@@ -3308,7 +3334,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="7000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -3337,6 +3362,7 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param ignoreShieldDefence="true" />
</effect>
</for>
@@ -3363,7 +3389,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="7000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -3382,6 +3407,7 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param ignoreShieldDefence="true" />
</effect>
</for>
diff --git a/dist/game/data/stats/skills/00500-00599.xml b/dist/game/data/stats/skills/00500-00599.xml
index e428dfbb58..adb7df72c6 100644
--- a/dist/game/data/stats/skills/00500-00599.xml
+++ b/dist/game/data/stats/skills/00500-00599.xml
@@ -166,7 +166,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -189,13 +188,20 @@
<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="RAPIER" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant7for>
+ <effect name="PhysicalSoulAttack">
+ <param power="3069" />
+ <param pvpPower="#enchDuel" />
+ </effect>
+ </enchant7for>
</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 -->
@@ -275,7 +281,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -289,7 +294,6 @@
<enchant3 name="elementPower" val="#enchElementPower" />
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#enchDuel" />
<cond msgId="113" addName="1">
<and>
<using kind="RAPIER" />
@@ -298,10 +302,19 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param criticalChance="5" />
<param ignoreShieldDefence="true" />
</effect>
</for>
+ <enchant4for>
+ <effect name="PhysicalSoulAttack">
+ <param power="5180" />
+ <param power="#enchDuel" />
+ <param criticalChance="5" />
+ <param ignoreShieldDefence="true" />
+ </effect>
+ </enchant4for>
</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 -->
@@ -324,7 +337,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -346,15 +358,22 @@
<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="CROSSBOW" />
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param criticalChance="25" />
</effect>
</for>
+ <enchant7for>
+ <effect name="PhysicalSoulAttack">
+ <param power="4870" />
+ <param pvpPower="#enchDuel" />
+ <param criticalChance="25" />
+ </effect>
+ </enchant7for>
</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 -->
@@ -379,7 +398,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="6000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -401,13 +419,20 @@
<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="CROSSBOW" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
+ <enchant7for>
+ <effect name="PhysicalSoulAttack">
+ <param power="1218" />
+ <param pvpPower="#enchDuel" />
+ </effect>
+ </enchant7for>
</skill>
<skill id="509" levels="34" name="Bleeding Shot" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2">
<!-- Confirmed CT2.5 -->
@@ -440,7 +465,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="8000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -457,6 +481,7 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="#power" />
<param ignoreShieldDefence="true" />
</effect>
<effect name="DamOverTime" ticks="5">
@@ -465,6 +490,7 @@
</for>
<enchant3for>
<effect name="PhysicalSoulAttack">
+ <param power="2192" />
<param ignoreShieldDefence="true" />
</effect>
<effect name="DamOverTime" ticks="5">
@@ -1108,7 +1134,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="6060" />
<set name="reuseDelay" val="75000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -1123,10 +1148,17 @@
<enchant3 name="magicLvl" val="#enchMagicLvl" />
<enchant3 name="mpConsume" val="#enchmpConsume" />
<enchant4 name="magicLvl" val="#enchMagicLvl" />
- <enchant4 name="pvpPower" val="#ench4Duel" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="6060" />
+ </effect>
</for>
+ <enchant4for>
+ <effect name="PhysicalSoulAttack">
+ <param power="6060" />
+ <param pvpPower="#ench4Duel" />
+ </effect>
+ </enchant4for>
</skill>
<skill id="527" levels="1" name="Iron Shield">
<!-- Confirmed CT2.5 -->
@@ -1446,12 +1478,13 @@
<set name="mpConsume" val="71" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
- <set name="power" val="2583" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="2583" />
+ </effect>
</for>
</skill>
<skill id="540" levels="1" name="Wing Assault">
@@ -1470,14 +1503,15 @@
<set name="mpConsume" val="71" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA1" />
- <set name="power" val="2067" />
<set name="rideState" val="NONE" />
<set name="targetType" val="AREA" />
<cond msgId="113" addName="1">
<target mindistance="200" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="2067" />
+ </effect>
</for>
</skill>
<skill id="541" levels="1" name="Transform Grail Apostle">
diff --git a/dist/game/data/stats/skills/00600-00699.xml b/dist/game/data/stats/skills/00600-00699.xml
index 914de4380d..10b469c6fa 100644
--- a/dist/game/data/stats/skills/00600-00699.xml
+++ b/dist/game/data/stats/skills/00600-00699.xml
@@ -509,7 +509,6 @@
<set name="mpConsume" val="#mpConsume" />
<set name="operateType" val="A2" />
<set name="overHit" val="true" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -527,13 +526,11 @@
<using kind="CROSSBOW" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
<effect name="Fear" />
</for>
- <enchant4for>
- <effect name="PhysicalSoulAttack" />
- <effect name="Fear" />
- </enchant4for>
</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 bf3546ca76..71a431f157 100644
--- a/dist/game/data/stats/skills/00700-00799.xml
+++ b/dist/game/data/stats/skills/00700-00799.xml
@@ -2413,7 +2413,6 @@
<set name="mpConsume" val="120" />
<set name="operateType" val="A1" />
<set name="overHit" val="true" />
- <set name="power" val="7475" />
<set name="reuseDelay" val="75000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
@@ -2423,6 +2422,7 @@
</cond>
<for>
<effect name="PhysicalSoulAttack">
+ <param power="7475" />
<param criticalChance="15" />
</effect>
</for>
@@ -2526,7 +2526,6 @@
<set name="mpInitialConsume" val="83" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA2" />
- <set name="power" val="4040" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="FRONT_AREA" />
@@ -2550,7 +2549,6 @@
<enchant7 name="elementPower" val="#enchElementAttack" />
<enchant7 name="magicLvl" val="#enchMagicLvl" />
<enchant8 name="magicLvl" val="#enchMagicLvl" />
- <enchant8 name="pvpPower" val="#ench8Duel" />
<cond msgId="113" addName="1">
<and>
<using kind="ANCIENTSWORD" />
@@ -2558,13 +2556,18 @@
</and>
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="4040" />
+ </effect>
<effect name="Stun" />
</for>
- <enchant3for>
- <effect name="PhysicalSoulAttack" />
+ <enchant8for>
+ <effect name="PhysicalSoulAttack">
+ <param power="4040" />
+ <param pvpPower="#ench8Duel" />
+ </effect>
<effect name="Stun" />
- </enchant3for>
+ </enchant8for>
</skill>
<skill id="794" levels="1" name="Mass Disarm" enchantGroup1="6" enchantGroup2="6">
<!-- Confirmed CT2.5 -->
diff --git a/dist/game/data/stats/skills/00800-00899.xml b/dist/game/data/stats/skills/00800-00899.xml
index a1464e7a52..06d42caa01 100644
--- a/dist/game/data/stats/skills/00800-00899.xml
+++ b/dist/game/data/stats/skills/00800-00899.xml
@@ -1675,13 +1675,14 @@
<set name="mpConsume" val="25" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="75000" />
<set name="rideState" val="NONE" />
<set name="soulMaxConsumeCount" val="5" />
<set name="targetType" val="FRONT_AREA" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="877" levels="8" name="Kamael Captain Mercenary Disarm">
diff --git a/dist/game/data/stats/skills/00900-00999.xml b/dist/game/data/stats/skills/00900-00999.xml
index 89adfa74b7..73681ebdb0 100644
--- a/dist/game/data/stats/skills/00900-00999.xml
+++ b/dist/game/data/stats/skills/00900-00999.xml
@@ -1214,12 +1214,13 @@
<set name="mpConsume" val="#mpConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="A1" />
- <set name="power" val="#power" />
<set name="reuseDelay" val="3000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="951" levels="7" name="Wing Assault">
@@ -1241,14 +1242,15 @@
<set name="mpConsume" val="#mpConsume" />
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA1" />
- <set name="power" val="#power" />
<set name="rideState" val="NONE" />
<set name="targetType" val="FRONT_AREA" />
<cond msgId="113" addName="1">
<target mindistance="200" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="#power" />
+ </effect>
</for>
</skill>
<skill id="952" levels="5" name="Collector's Experience">
@@ -1902,7 +1904,6 @@
<set name="nextActionAttack" val="true" />
<set name="operateType" val="DA2" />
<set name="overHit" val="true" />
- <set name="power" val="1" />
<set name="reuseDelay" val="4000" />
<set name="rideState" val="NONE" />
<set name="targetType" val="ONE" />
@@ -1911,7 +1912,9 @@
<target mindistance="200" />
</cond>
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="Stun" />
<effect name="EnemyCharge" />
</for>
diff --git a/dist/game/data/stats/skills/01400-01499.xml b/dist/game/data/stats/skills/01400-01499.xml
index e578297e86..c7efb29006 100644
--- a/dist/game/data/stats/skills/01400-01499.xml
+++ b/dist/game/data/stats/skills/01400-01499.xml
@@ -1763,7 +1763,6 @@
<set name="mpConsume" val="50" />
<set name="mpInitialConsume" val="50" />
<set name="operateType" val="A2" />
- <set name="power" val="1" />
<set name="reuseDelay" val="15000" />
<set name="rideState" val="NONE;STRIDER;WYVERN;WOLF" />
<set name="soulMaxConsumeCount" val="5" />
@@ -1775,7 +1774,9 @@
<enchant2 name="flyRadius" val="#ench2Radius" />
<enchant2 name="magicLvl" val="#enchMagicLvl" />
<for>
- <effect name="PhysicalSoulAttack" />
+ <effect name="PhysicalSoulAttack">
+ <param power="1" />
+ </effect>
<effect name="Stun" />
</for>
<selfEffects>
diff --git a/dist/game/data/xsd/skills.xsd b/dist/game/data/xsd/skills.xsd
index 4b2a1cdd50..c13f664a46 100644
--- a/dist/game/data/xsd/skills.xsd
+++ b/dist/game/data/xsd/skills.xsd
@@ -25,7 +25,6 @@
<xs:enumeration value="afterEffectId" />
<xs:enumeration value="attribute" />
<xs:enumeration value="attributePower" />
- <xs:enumeration value="baseCritRate" />
<xs:enumeration value="basicProperty" />
<xs:enumeration value="blockedInOlympiad" />
<xs:enumeration value="canBeDispeled" />
--
GitLab