BETA: Reworked `EnergyAttack` to be retail like.

Reported by: !FinalDestination, janiko, Tavo22

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

@@ -21,28 +21,41 @@ package handlers.effecthandlers;
 import com.l2jserver.gameserver.enums.ShotType;
 import com.l2jserver.gameserver.model.StatsSet;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.conditions.Condition;
 import com.l2jserver.gameserver.model.effects.AbstractEffect;
 import com.l2jserver.gameserver.model.effects.L2EffectType;
+import com.l2jserver.gameserver.model.items.L2Weapon;
+import com.l2jserver.gameserver.model.items.type.L2WeaponType;
 import com.l2jserver.gameserver.model.skills.BuffInfo;
+import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.stats.BaseStats;
 import com.l2jserver.gameserver.model.stats.Formulas;
-import com.l2jserver.gameserver.network.SystemMessageId;
+import com.l2jserver.gameserver.model.stats.Stats;
+import com.l2jserver.util.Rnd;
 
 /**
  * Energy Attack effect implementation.
- * @author Adry_85
+ * @author Nos
  */
 public final class EnergyAttack extends AbstractEffect
 {
+	private final double _power;
+	private final int _criticalChance;
+	private final boolean _ignoreShieldDefence;
+	
 	public EnergyAttack(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_power = params.getDouble("power", 0);
+		_criticalChance = params.getInt("criticalChance", 0);
+		_ignoreShieldDefence = params.getBoolean("ignoreShieldDefence", false);
 	}
 	
 	@Override
 	public boolean calcSuccess(BuffInfo info)
 	{
+		// TODO: Verify this on retail
 		return !Formulas.calcPhysicalSkillEvasion(info.getEffector(), info.getEffected(), info.getSkill());
 	}
 	
@@ -61,46 +74,94 @@ public final class EnergyAttack extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
-		L2Character target = info.getEffected();
-		L2Character activeChar = info.getEffector();
-		if (activeChar.isAlikeDead())
+		final L2PcInstance attacker = info.getEffector() instanceof L2PcInstance ? (L2PcInstance) info.getEffector() : null;
+		if (attacker == null)
 		{
 			return;
 		}
 		
-		boolean ss = info.getSkill().isPhysical() && activeChar.isChargedShot(ShotType.SOULSHOTS);
-		byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
-		boolean crit = false;
-		if (info.getSkill().getBaseCritRate() > 0)
-		{
-			crit = Formulas.calcCrit(info.getSkill().getBaseCritRate() * 10 * BaseStats.STR.calcBonus(activeChar), true, target);
-		}
-		// damage calculation
-		double damage = Formulas.calcPhysDam(activeChar, target, info.getSkill(), shld, false, ss);
+		final L2Character target = info.getEffected();
+		final L2Skill skill = info.getSkill();
+		
+		double attack = attacker.getPAtk(target);
+		int defence = target.getPDef(attacker);
 		
-		double modifier = 0;
-		if (activeChar.isPlayer())
+		if (!_ignoreShieldDefence)
 		{
-			// Charges Formula (each charge increase +25%)
-			modifier = ((activeChar.getActingPlayer().getCharges() * 0.25) + 1);
+			byte shield = Formulas.calcShldUse(attacker, target, skill, true);
+			switch (shield)
+			{
+				case Formulas.SHIELD_DEFENSE_FAILED:
+				{
+					break;
+				}
+				case Formulas.SHIELD_DEFENSE_SUCCEED:
+				{
+					defence += target.getShldDef();
+					break;
+				}
+				case Formulas.SHIELD_DEFENSE_PERFECT_BLOCK:
+				{
+					defence = -1;
+					break;
+				}
+			}
 		}
-		if (crit)
+		
+		double damage = 1;
+		boolean critical = false;
+		
+		if (defence != -1)
 		{
-			damage *= 2;
+			double damageMultiplier = Formulas.calcWeaponTraitBonus(attacker, target) * Formulas.calcAttributeBonus(attacker, target, skill) * Formulas.calcGeneralTraitBonus(attacker, target, skill.getTraitType(), true);
+			
+			boolean ss = info.getSkill().useSoulShot() && attacker.isChargedShot(ShotType.SOULSHOTS);
+			double ssBoost = ss ? 1.5 : 1.0;
+			
+			double weaponTypeBoost;
+			L2Weapon weapon = attacker.getActiveWeaponItem();
+			if ((weapon != null) && ((weapon.getItemType() == L2WeaponType.BOW) || (weapon.getItemType() == L2WeaponType.CROSSBOW)))
+			{
+				weaponTypeBoost = 70;
+			}
+			else
+			{
+				weaponTypeBoost = 77;
+			}
+			
+			// charge count should be the count before casting the skill but since its reduced before calling effects
+			// we add skill consume charges to current charges
+			double energyChargesBoost = (((attacker.getCharges() + skill.getChargeConsume()) - 1) * 0.2) + 1;
+			
+			attack += _power;
+			attack *= ssBoost;
+			attack *= energyChargesBoost;
+			attack *= weaponTypeBoost;
+			
+			damage = attack / defence;
+			damage *= damageMultiplier;
+			if (target instanceof L2PcInstance)
+			{
+				damage *= attacker.getStat().calcStat(Stats.PVP_PHYS_SKILL_DMG, 1.0);
+				damage *= target.getStat().calcStat(Stats.PVP_PHYS_SKILL_DEF, 1.0);
+				damage *= attacker.getStat().calcStat(Stats.PHYSICAL_SKILL_POWER, 1.0);
+			}
+			
+			critical = (BaseStats.STR.calcBonus(attacker) * _criticalChance) > (Rnd.nextDouble() * 100);
+			if (critical)
+			{
+				damage *= 2;
+			}
 		}
 		
 		if (damage > 0)
 		{
-			double finalDamage = damage * modifier;
-			target.reduceCurrentHp(finalDamage, activeChar, info.getSkill());
-			target.notifyDamageReceived(damage, activeChar, info.getSkill(), crit);
-			activeChar.sendDamageMessage(target, (int) finalDamage, false, crit, false);
+			attacker.sendDamageMessage(target, (int) damage, false, critical, false);
+			target.reduceCurrentHp(damage, attacker, skill);
+			target.notifyDamageReceived(damage, attacker, skill, critical);
+			
 			// Check if damage should be reflected
-			Formulas.calcDamageReflected(activeChar, target, info.getSkill(), crit);
-		}
-		else
-		{
-			activeChar.sendPacket(SystemMessageId.ATTACK_FAILED);
+			Formulas.calcDamageReflected(attacker, target, skill, critical);
 		}
 	}
 }

L2J_DataPack_BETA/dist/game/data/stats/skills/00000-00099.xml

@@ -130,10 +130,9 @@
 		<table name="#power"> 918 971 1025 1081 1140 1200 1262 1327 1393 1461 1531 1603 1677 1753 1830 1908 1988 2070 2153 2237 2322 2408 2494 2581 2669 2757 2846 2934 3022 3109 3196 </table>
 		<table name="#ench1Power"> 3225 3254 3283 3312 3340 3369 3398 3427 3456 3484 3513 3542 3571 3600 3628 3657 3686 3715 3744 3772 3801 3830 3859 3888 3916 3945 3974 4003 4032 4061 </table>
 		<table name="#ench2MpConsume"> 104 102 100 98 96 95 93 91 89 87 86 84 82 80 78 77 75 73 71 69 68 66 64 62 60 59 57 55 53 52 </table>
-		<table name="#enchDuel"> 3252 3308 3364 3420 3476 3532 3587 3643 3699 3755 3811 3867 3923 3979 4034 4090 4146 4202 4258 4314 4370 4426 4481 4537 4593 4649 4705 4761 4817 4872 </table>
+		<table name="#ench7pvpPower"> 3252 3308 3364 3420 3476 3532 3587 3643 3699 3755 3811 3867 3923 3979 4034 4090 4146 4202 4258 4314 4370 4426 4481 4537 4593 4649 4705 4761 4817 4872 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="3" />
 		<set name="coolTime" val="167" />
@@ -146,11 +145,9 @@
 		<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="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 -->
@@ -166,7 +163,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="Dual Sword" /> <!-- Requires a dualsword weapon -->
@@ -174,8 +170,31 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="3196" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="6" levels="37" name="Sonic Blaster" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
 		<table name="#effectPoints"> -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
@@ -183,11 +202,10 @@
 		<table name="#mpConsume"> 25 26 27 27 28 29 30 30 31 32 33 34 35 35 36 37 38 38 39 40 41 42 43 43 44 45 45 46 47 48 48 49 50 51 51 52 53 </table>
 		<table name="#power"> 369 392 417 442 469 496 525 555 586 618 651 686 722 758 796 835 875 916 959 1002 1046 1091 1136 1183 1230 1278 1327 1376 1425 1475 1525 1576 1626 1677 1727 1777 1827 </table>
 		<table name="#ench1Power"> 1843 1860 1876 1893 1909 1925 1942 1958 1975 1991 2008 2024 2041 2057 2074 2090 2107 2123 2139 2156 2172 2189 2205 2222 2238 2255 2271 2288 2304 2321 </table>
-		<table name="#ench2Pve"> 1858 1890 1922 1954 1986 2018 2050 2082 2114 2146 2178 2210 2242 2274 2306 2338 2369 2401 2433 2465 2497 2529 2561 2593 2625 2657 2689 2721 2753 2785 </table>
-		<table name="#enchDuel"> 1874 1921 1969 2016 2064 2111 2158 2206 2253 2301 2348 2395 2443 2490 2538 2585 2632 2680 2727 2775 2822 2869 2917 2964 3012 3059 3106 3154 3201 3248 </table>
+		<table name="#ench2pvePower"> 1858 1890 1922 1954 1986 2018 2050 2082 2114 2146 2178 2210 2242 2274 2306 2338 2369 2401 2433 2465 2497 2529 2561 2593 2625 2657 2689 2721 2753 2785 </table>
+		<table name="#ench7pvpPower"> 1874 1921 1969 2016 2064 2111 2158 2206 2253 2301 2348 2395 2443 2490 2538 2585 2632 2680 2727 2775 2822 2869 2917 2964 3012 3059 3106 3154 3201 3248 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="600" />
 		<set name="chargeConsume" val="2" />
 		<set name="effectPoint" val="#effectPoints" />
@@ -198,14 +216,10 @@
 		<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="targetType" val="ONE" />
 		<enchant1 name="magicLvl" val="#enchMagicLvl" />
-		<enchant1 name="power" val="#ench1Power" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
-		<enchant2 name="power" val="#ench2Pve" />
-		<enchant2 name="pvpPower" val="1827" />
 		<enchant3 name="element" val="0" /> <!-- Fire -->
 		<enchant3 name="elementPower" val="#enchElementPower" />
 		<enchant3 name="magicLvl" val="#enchMagicLvl" />
@@ -219,7 +233,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="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> <!-- Requires a dualsword, sword or blunt weapon weapon -->
@@ -227,8 +240,45 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant2for>
+		</enchant2for>
+		<enchant2pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="1827" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant2pvpEffects>
+		<enchant2pveEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench2pvePower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant2pveEffects>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="1827" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="7" levels="28" name="Sonic Storm" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
 		<table name="#effectPoints"> -114 -117 -119 -121 -124 -126 -129 -131 -133 -136 -138 -140 -142 -144 -146 -148 -150 -152 -154 -156 -157 -159 -160 -162 -163 -164 -166 -167 </table>
@@ -237,12 +287,11 @@
 		<table name="#power"> 155 163 172 181 190 199 209 219 229 240 251 262 273 284 296 308 320 332 344 357 369 382 394 407 420 432 445 457 </table>
 		<table name="#ench1Power"> 461 465 469 474 478 482 486 490 494 498 502 506 511 515 519 523 527 531 535 539 543 548 552 556 560 564 568 572 576 581 </table>
 		<table name="#ench2MpConsume"> 88 87 85 84 82 81 79 78 76 75 73 72 70 69 67 66 64 63 61 60 58 57 55 54 52 51 49 48 46 45 </table>
-		<table name="#enchDuel"> 465 473 481 489 497 505 513 521 529 537 545 553 561 569 577 585 593 601 609 617 625 633 641 649 657 665 673 681 689 696 </table>
+		<table name="#ench7pvpPower"> 465 473 481 489 497 505 513 521 529 537 545 553 561 569 577 585 593 601 609 617 625 633 641 649 657 665 673 681 689 696 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="affectLimit" val="5-12" />
 		<set name="affectRange" val="150" />
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="effectRange" val="1000" />
@@ -254,11 +303,9 @@
 		<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="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 -->
@@ -274,7 +321,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="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> <!-- Requires a sword, blunt weapon or dualsword weapon -->
@@ -282,8 +328,31 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="457" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="8" levels="8" name="Sonic Focus">
 		<!-- Confirmed CT2.5 -->
@@ -316,12 +385,11 @@
 		<table name="#power"> 111 111 124 132 139 147 155 163 172 181 190 199 209 219 229 240 251 262 273 284 296 308 320 332 344 357 369 382 394 407 420 432 445 457 </table>
 		<table name="#ench1Power"> 461 465 469 474 478 482 486 490 494 498 502 506 511 515 519 523 527 531 535 539 543 548 552 556 560 564 568 572 576 581 </table>
 		<table name="#ench2MpConsume"> 88 87 85 84 82 81 79 78 76 75 73 72 70 69 67 66 64 63 61 60 58 57 55 54 52 51 49 48 46 45 </table>
-		<table name="#enchDuel"> 465 473 481 489 497 505 513 521 529 537 545 553 561 569 577 585 593 601 609 617 625 633 641 649 657 665 673 681 689 696 </table>
+		<table name="#ench7pvpPower"> 465 473 481 489 497 505 513 521 529 537 545 553 561 569 577 585 593 601 609 617 625 633 641 649 657 665 673 681 689 696 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="affectLimit" val="5-12" />
 		<set name="affectRange" val="200" />
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="280" />
 		<set name="effectPoint" val="#effectPoints" />
@@ -334,14 +402,12 @@
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="overHit" val="true" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="FRONT_AREA" />
 		<!-- charge values -->
 		<set name="itemConsumeCount" val="3" />
 		<set name="itemConsumeId" val="5589" />
 		<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 -->
@@ -357,7 +423,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="Dual Sword,Sword,Big Sword,Blunt,Big Blunt" /> <!-- Requires a sword, blunt weapon or dualsword weapon -->
@@ -365,8 +430,31 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="457" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="10" levels="8" name="Summon Storm Cubic" enchantGroup1="2">
 		<!-- Confirmed CT2.5 -->
@@ -535,12 +623,11 @@
 		<table name="#power"> 129 137 145 153 162 171 181 190 200 211 222 233 244 256 268 280 293 305 318 332 345 359 373 387 402 416 431 445 460 475 489 504 519 533 </table>
 		<table name="#ench1Power"> 539 543 548 553 558 563 567 572 577 582 587 591 596 601 606 611 615 620 625 630 635 639 644 649 654 659 664 668 673 678 </table>
 		<table name="#ench2MpConsume"> 103 101 99 97 96 94 92 90 89 87 85 83 81 80 78 76 74 73 71 69 67 66 64 62 60 59 57 55 53 52 </table>
-		<table name="#enchDuel"> 645 651 657 663 668 674 680 686 692 697 703 709 715 720 726 732 738 743 749 755 761 766 772 778 784 789 795 801 807 812 </table>
+		<table name="#ench7pvpPower"> 645 651 657 663 668 674 680 686 692 697 703 709 715 720 726 732 738 743 749 755 761 766 772 778 784 789 795 801 807 812 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="affectLimit" val="5-12" />
 		<set name="affectRange" val="200" />
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="40" />
 		<set name="coolTime" val="217" />
 		<set name="effectPoint" val="#effectPoints" />
@@ -553,14 +640,12 @@
 		<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="targetType" val="FRONT_AREA" />
 		<!-- charge values -->
 		<set name="itemConsumeCount" val="2" />
 		<set name="itemConsumeId" val="5589" />
 		<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 -->
@@ -576,7 +661,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="Dual Fist" /> <!-- Requires a hand-to-hand weapon -->
@@ -584,8 +668,31 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="533" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="18" levels="37" name="Aura of Hate" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1">
 		<!-- Confirmed CT2.5 -->
@@ -1015,12 +1122,11 @@
 		<table name="#power"> 181 190 200 211 222 233 244 256 268 280 293 305 318 332 345 359 373 387 402 416 431 445 460 475 489 504 519 533 </table>
 		<table name="#ench1Power"> 538 542 547 552 557 562 566 571 576 581 586 590 595 600 605 610 614 619 624 629 634 638 643 648 653 658 663 667 672 677 </table>
 		<table name="#ench2MpConsume"> 104 103 102 102 101 101 100 99 99 98 97 97 96 95 95 94 93 93 92 91 91 90 90 89 88 88 87 86 86 85 </table>
-		<table name="#enchDuel"> 540 547 554 561 567 574 581 588 595 602 609 615 622 629 636 643 650 656 663 670 677 684 691 698 704 711 718 725 732 739 </table>
+		<table name="#ench7pvpPower"> 540 547 554 561 567 574 581 588 595 602 609 615 622 629 636 643 650 656 663 670 677 684 691 698 704 711 718 725 732 739 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
 		<set name="affectLimit" val="5-12" />
 		<set name="affectRange" val="150" />
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="500" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="effectRange" val="1000" />
@@ -1030,14 +1136,12 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" />
 		<set name="overHit" val="true" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="AREA" />
 		<!-- charge values -->
 		<set name="itemConsumeCount" val="2" />
 		<set name="itemConsumeId" val="5589" />
 		<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 -->
@@ -1053,7 +1157,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="Dual Fist" /> <!-- Requires a hand-to-hand weapon -->
@@ -1061,8 +1164,31 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="533" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="36" levels="37" name="Whirlwind" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2" enchantGroup5="2" enchantGroup6="2" enchantGroup7="2">
 		<table name="#effectPoints"> -183 -188 -193 -198 -203 -208 -213 -218 -223 -228 -233 -237 -242 -247 -252 -257 -261 -266 -271 -275 -279 -284 -288 -292 -296 -300 -304 -307 -311 -314 -317 -320 -323 -326 -328 -331 -333 </table>
@@ -1372,10 +1498,9 @@
 		<table name="#power"> 143 154 166 193 207 222 256 274 293 334 357 380 431 458 486 516 547 579 612 647 683 721 760 800 842 885 929 974 1021 1069 1118 1169 1220 1272 1326 1380 1435 1491 1548 1605 1663 1721 1780 1838 1897 1956 2015 2073 2131 </table>
 		<table name="#ench1Power"> 2151 2170 2189 2209 2228 2247 2266 2285 2305 2324 2343 2362 2381 2401 2420 2439 2458 2477 2497 2516 2535 2554 2573 2593 2612 2631 2650 2670 2689 2708 </table>
 		<table name="#ench2MpConsume"> 59 58 57 56 55 54 53 52 51 50 49 48 47 46 45 44 43 42 41 40 39 38 37 36 35 34 33 32 31 30 </table>
-		<table name="#enchDuel"> 2168 2206 2243 2280 2317 2355 2392 2429 2466 2504 2541 2578 2615 2653 2690 2727 2764 2802 2839 2876 2913 2951 2988 3025 3062 3100 3137 3174 3211 3248 </table>
+		<table name="#ench7pvpPower"> 2168 2206 2243 2280 2317 2355 2392 2429 2466 2504 2541 2578 2615 2653 2690 2727 2764 2802 2839 2876 2913 2951 2988 3025 3062 3100 3137 3174 3211 3248 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="600" />
 		<set name="effectPoint" val="#effectPoints" />
 		<set name="effectRange" val="1100" />
@@ -1385,13 +1510,11 @@
 		<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="targetType" val="ONE" />
 		<!-- charge values -->
 		<set name="chargeConsume" val="1" />
 		<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 -->
@@ -1407,13 +1530,35 @@
 		<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="Dual Fist" />
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="2131" />
+				<param criticalChance="15" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="56" levels="24" name="Power Shot">
 		<table name="#effectPoints"> -103 -108 -113 -128 -134 -140 -158 -165 -171 -192 -199 -207 -222 -230 -238 -255 -264 -272 -290 -299 -308 -327 -337 -346 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml

@@ -1568,10 +1568,9 @@
 		<table name="#power"> 1948 2042 2138 2236 2337 2439 2544 2651 2760 2870 2982 3095 3210 3325 3442 3559 3676 3794 3911 4029 4146 4262 </table>
 		<table name="#ench1Power"> 4299 4338 4376 4415 4453 4491 4530 4568 4607 4645 4683 4722 4760 4799 4837 4875 4914 4952 4991 5029 5067 5106 5144 5183 5221 5259 5298 5336 5375 5413 </table>
 		<table name="#ench2MpConsume"> 147 145 142 140 137 135 133 130 128 125 123 120 118 115 113 111 108 106 103 101 98 96 94 91 89 86 84 81 79 76 </table>
-		<table name="#enchDuel"> 4336 4410 4485 4559 4634 4708 4783 4857 4932 5006 5081 5155 5230 5304 5379 5453 5527 5602 5676 5751 5825 5900 5974 6049 6123 6198 6272 6347 6347 6496 </table>
+		<table name="#ench7pvpPower"> 4336 4410 4485 4559 4634 4708 4783 4857 4932 5006 5081 5155 5230 5304 5379 5453 5527 5602 5676 5751 5825 5900 5974 6049 6123 6198 6272 6347 6347 6496 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="4" />
 		<set name="coolTime" val="133" />
@@ -1585,11 +1584,9 @@
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="overHit" val="true" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="5000" />
 		<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 -->
@@ -1605,7 +1602,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="Dual Sword" />
@@ -1613,8 +1609,35 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="4262" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="262" levels="37" name="Holy Blessing" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
 		<table name="#amount"> 236 245 254 262 271 281 290 299 308 318 327 337 346 356 365 375 384 393 403 412 421 430 439 448 457 466 474 482 490 498 506 513 520 527 534 540 546 </table>
@@ -2410,10 +2433,9 @@
 		<table name="#power"> 501 535 570 607 646 729 773 820 868 918 971 1025 1081 1140 1200 1262 1327 1393 1461 1531 1603 1677 1753 1830 1908 1988 2070 2153 2237 2322 2408 2494 2581 2669 2757 2846 2934 3022 3109 3196 </table>
 		<table name="#ench1Power"> 3225 3254 3283 3312 3340 3369 3398 3427 3456 3484 3513 3542 3571 3600 3628 3657 3686 3715 3744 3772 3801 3830 3859 3888 3916 3945 3974 4003 4032 4061 </table>
 		<table name="#ench2MpConsume"> 104 103 102 102 101 101 100 99 99 98 97 97 96 95 95 94 93 93 92 91 91 90 90 89 88 88 87 86 86 85 </table>
-		<table name="#enchDuel"> 3251 3307 3363 3419 3475 3531 3587 3642 3698 3754 3810 3866 3922 3978 4034 4089 4145 4201 4257 4313 4369 4425 4480 4536 4592 4648 4704 4760 4816 4872 </table>
+		<table name="#ench7pvpPower"> 3251 3307 3363 3419 3475 3531 3587 3642 3698 3754 3810 3866 3922 3978 4034 4089 4145 4201 4257 4313 4369 4425 4480 4536 4592 4648 4704 4760 4816 4872 </table>
 		<table name="#enchElementPower"> 1 3 5 6 8 10 11 13 15 16 18 20 21 23 25 26 28 30 31 33 35 36 38 40 41 43 45 46 48 50 </table>
 		<table name="#enchMagicLvl"> 76 76 76 77 77 77 78 78 78 79 79 79 80 80 80 81 81 81 82 82 82 83 83 83 84 84 84 85 85 85 </table>
-		<set name="baseCritRate" val="15" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="2" />
 		<set name="coolTime" val="440" />
@@ -2427,11 +2449,9 @@
 		<set name="nextActionAttack" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="overHit" val="true" />
-		<set name="power" val="#power" />
 		<set name="reuseDelay" val="4000" />
 		<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 -->
@@ -2447,7 +2467,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="Dual Fist" /> <!-- Requires a hand-to-hand weapon -->
@@ -2455,8 +2474,35 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
 		</for>
+		<enchant1for>
+			<effect name="EnergyAttack">
+				<param power="#ench1Power" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant1for>
+		<enchant7for>
+		</enchant7for>
+		<enchant7pvpEffects>
+			<effect name="EnergyAttack">
+				<param power="#ench7pvpPower" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant7pvpEffects>
+		<enchant7pveEffects>
+			<effect name="EnergyAttack">
+				<param power="3196" />
+				<param criticalChance="15" />
+				<param ignoreShieldDefence="true" />
+			</effect>
+		</enchant7pveEffects>
 	</skill>
 	<skill id="285" levels="27" name="Higher Mana Gain" enchantGroup1="1">
 		<table name="#magicLvl"> 17 20 23 25 28 30 33 35 38 40 42 44 46 48 50 52 54 56 58 60 62 64 66 68 70 72 74 </table>

L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml

@@ -2082,7 +2082,6 @@
 		<table name="#magicLvl"> 60 63 66 69 </table>
 		<table name="#mpConsume"> 61 63 67 70 </table>
 		<table name="#power"> 1250 1406 1568 1733 </table>
-		<set name="baseCritRate" val="10" />
 		<set name="castRange" val="40" />
 		<set name="chargeConsume" val="2" />
 		<set name="coolTime" val="720" />
@@ -2094,14 +2093,16 @@
 		<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="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
 			<player Charges="2" />
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="569" levels="4" name="Attack Storm">
@@ -2112,7 +2113,6 @@
 		<table name="#power"> 625 703 784 867 </table>
 		<set name="affectLimit" val="5-12" />
 		<set name="affectRange" val="150" />
-		<set name="baseCritRate" val="10" />
 		<set name="castRange" val="500" />
 		<set name="chargeConsume" val="3" />
 		<set name="effectPoint" val="#effectPoints" />
@@ -2122,14 +2122,16 @@
 		<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="targetType" val="AREA" />
 		<cond msgId="113" addName="1">
 			<player Charges="3" />
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="#power" />
+				<param criticalChance="10" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="570" levels="4" name="Attack Rage">

L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml

@@ -1925,7 +1925,6 @@
 		<set name="mpConsume" val="37" />
 		<set name="operateType" val="A2" />
 		<set name="overHit" val="true" />
-		<set name="power" val="4500" />
 		<set name="reuseDelay" val="15000" />
 		<set name="targetType" val="ONE" />
 		<cond msgId="113" addName="1">
@@ -1935,7 +1934,10 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnergyAttack" />
+			<effect name="EnergyAttack">
+				<param power="4500" />
+				<param criticalChance="20" />
+			</effect>
 			<effect name="DamOverTime" ticks="1" val="80" />
 		</for>
 	</skill>