Addition of SkillPowerAdd effect.

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -301,6 +301,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/documentation.txt

@@ -167,7 +167,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -208,7 +208,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -269,6 +269,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -301,6 +301,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/documentation.txt

@@ -167,7 +167,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -208,7 +208,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -269,6 +269,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -301,6 +301,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/documentation.txt

@@ -167,7 +167,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -208,7 +208,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -269,6 +269,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -306,6 +306,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_4.0_GrandCrusade/dist/game/data/stats/skills/documentation.txt

@@ -171,7 +171,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -212,7 +212,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -274,6 +274,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -310,6 +310,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_5.0_Salvation/dist/game/data/stats/skills/documentation.txt

@@ -175,7 +175,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -216,7 +216,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -278,6 +278,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -311,6 +311,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_5.5_EtinasFate/dist/game/data/stats/skills/documentation.txt

@@ -176,7 +176,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -217,7 +217,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -279,6 +279,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -311,6 +311,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/13200-13299.xml

@@ -1176,7 +1176,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1194,7 +1194,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1212,7 +1212,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1230,7 +1230,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1248,7 +1248,7 @@
 				<amount>54</amount>
 				<mode>DIFF</mode>
 			</effect>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>118</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1512,7 +1512,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1526,7 +1526,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1540,7 +1540,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1554,7 +1554,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1568,7 +1568,7 @@
 		<magicLvl>1</magicLvl>
 		<isDebuff>false</isDebuff>
 		<effects>
-			<effect name="PhysicalSkillPower">
+			<effect name="SkillPowerAdd">
 				<amount>338</amount>
 				<mode>DIFF</mode>
 			</effect>

L2J_Mobius_6.0_Fafurion/dist/game/data/stats/skills/documentation.txt

@@ -176,7 +176,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -217,7 +217,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -279,6 +279,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -299,6 +299,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java

@@ -131,9 +131,6 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -162,9 +159,8 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponBonus * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java

@@ -125,9 +125,6 @@ public final class PhysicalSoulAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -156,9 +153,8 @@ public final class PhysicalSoulAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * soulsMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/SkillPowerAdd.java

@@ -0,0 +1,31 @@
+/*
+ * This file is part of the L2J Mobius project.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package handlers.effecthandlers;
+
+import org.l2jmobius.gameserver.model.StatsSet;
+import org.l2jmobius.gameserver.model.stats.Stats;
+
+/**
+ * @author Mobius
+ */
+public class SkillPowerAdd extends AbstractStatEffect
+{
+	public SkillPowerAdd(StatsSet params)
+	{
+		super(params, Stats.SKILL_POWER_ADD);
+	}
+}

L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/skills/documentation.txt

@@ -166,7 +166,7 @@ MagicalAttackSpeed: Casting Spd. stat
 MagicalDamOverTime: Magical attack over time.
 MagicalDefence: M. Def stat.
 MagicalEvasion: M. Evasion stat.
-MagicalSkillPower: Magical Skill Power stat. (l2jmobius)
+MagicalSkillPower: Magical Skill Power stat (use only MUL). (l2jmobius)
 MagicalSoulAttack: Magical attack based on souls formula.
 MagicCriticalDamage: Magical Critical Damage stat
 MagicCriticalRate: Magical Critical Rate stat.
@@ -207,7 +207,7 @@ PhysicalDefence: P. Def stat.
 PhysicalEvasion: P. Evasion stat.
 PhysicalMute: Prevents the usage of physical skills. Shield Slam.
 PhysicalShieldAngleAll: Causes the shield to block at 360 degree angle.
-PhysicalSkillPower: Physical Skill Power stat.
+PhysicalSkillPower: Physical Skill Power stat (use only MUL).
 PhysicalSoulAttack: Physical attack depending on souls.
 PkCount: Increases PK kills.
 Plunder: Takes bonus item from monster. Sweep effect.
@@ -267,6 +267,7 @@ SkillCritical: Activates double debuff or cooldown reset critical based on the s
 SkillCriticalDamage: Skill critical damage stat.
 SkillCriticalProbability: Skill critical rate stat.
 SkillEvasion: Skill evasion stat.
+SkillPowerAdd: Adds set ammount of power to skills (use only DIFF). (l2jmobius)
 SkillTurning: Stops target's casting.
 SkillTurningOverTime: Stops target's casting at a fixed rate.
 SoulBlow: Physical attack based on blow formula with bonus damage from souls.

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -92,8 +92,6 @@ public final class Formulas
 				return 1;
 			}
 		}
-		// TODO: Find proper defence formula.
-		defence = target.getLevel() > 99 ? defence / 10 : defence;
 		
 		// Critical
 		final double criticalMod = (attacker.getStat().getValue(Stats.CRITICAL_DAMAGE, 1));
@@ -143,9 +141,7 @@ public final class Formulas
 		final double pvpPveMod = calculatePvpPveBonus(attacker, target, skill, mcrit);
 		
 		// MDAM Formula.
-		// TODO: Find proper mDefence formula.
+		double damage = ((attacker.getINT() * ((power * attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 1)) + attacker.getStat().getValue(Stats.SKILL_POWER_ADD, 0)) * Math.sqrt(mAtk)) / mDef) * shotsBonus;
-		mDef = target.getLevel() > 99 ? mDef / 3.33 : mDef;
-		double damage = ((attacker.getINT() * power * Math.sqrt(mAtk)) / mDef) * shotsBonus;
 		
 		// Failure calculation
 		if (Config.ALT_GAME_MAGICFAILURES && !calcMagicSuccess(attacker, target, skill))
@@ -183,7 +179,6 @@ public final class Formulas
 		}
 		
 		damage = damage * critMod * generalTraitMod * attributeMod * randomMod * pvpPveMod;
-		damage += attacker.getStat().getValue(Stats.MAGICAL_SKILL_POWER, 0);
 		
 		return damage;
 	}

L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/stats/Stats.java

@@ -113,8 +113,8 @@ public enum Stats
 	
 	// ATTACK & DEFENCE RATES
 	MAGIC_CRITICAL_DAMAGE("mCritPower"),
-	PHYSICAL_SKILL_POWER("physicalSkillPower"), // Adding skill power (not multipliers) results in points added directly to final value unmodified by defence, traits, elements, criticals etc.
+	SKILL_POWER_ADD("skillPowerAdd"),
-												// Even when damage is 0 due to general trait immune multiplier, added skill power is active and clearly visible (damage not being 0 but at the value of added skill power).
+	PHYSICAL_SKILL_POWER("physicalSkillPower"),
 	MAGICAL_SKILL_POWER("magicalSkillPower"),
 	CRITICAL_DAMAGE_SKILL("cAtkSkill"),
 	CRITICAL_DAMAGE_SKILL_ADD("cAtkSkillAdd"),

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/EffectMasterHandler.java

@@ -299,6 +299,7 @@ public final class EffectMasterHandler
 		EffectHandler.getInstance().registerHandler("SkillCriticalDamage", SkillCriticalDamage::new);
 		EffectHandler.getInstance().registerHandler("SkillCriticalProbability", SkillCriticalProbability::new);
 		EffectHandler.getInstance().registerHandler("SkillEvasion", SkillEvasion::new);
+		EffectHandler.getInstance().registerHandler("SkillPowerAdd", SkillPowerAdd::new);
 		EffectHandler.getInstance().registerHandler("SkillTurning", SkillTurning::new);
 		EffectHandler.getInstance().registerHandler("SkillTurningOverTime", SkillTurningOverTime::new);
 		EffectHandler.getInstance().registerHandler("SoulBlow", SoulBlow::new);

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java

@@ -122,9 +122,6 @@ public final class EnergyAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true);
@@ -150,9 +147,8 @@ public final class EnergyAttack extends AbstractEffect
 			// ...................________Initial Damage_________...__Charges Additional Damage__...____________________________________
 			// ATTACK CALCULATION ((77 * ((pAtk * lvlMod) + power) * (1 + (0.1 * chargesConsumed)) / pdef) * skillPower) + skillPowerAdd
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^```^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + _power)) / defence;
+			final double baseMod = (77 * ((attacker.getPAtk() * attacker.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0))) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * energyChargesBoost * pvpPveMod;
-			damage += attacker.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		damage = Math.max(0, damage);

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java

@@ -138,9 +138,6 @@ public final class PhysicalAttack extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -169,9 +166,8 @@ public final class PhysicalAttack extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * abnormalMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		effector.doAttack(damage, effected, skill, false, false, critical, false);

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java

@@ -77,7 +77,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		}
 		
 		final double attack = effector.getPAtk();
-		final double power = _power;
 		double defence = effected.getPDef();
 		
 		switch (Formulas.calcShldUse(effector, effected))
@@ -99,9 +98,6 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -129,9 +125,8 @@ public final class PhysicalAttackHpLink extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 			damage *= -((effector.getCurrentHp() * 2) / effector.getMaxHp()) + 2;
 		}
 		

L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java

@@ -111,9 +111,6 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 		
 		if (defence != -1)
 		{
-			// TODO: Find proper defence formula.
-			defence = effector.isPlayable() && (effected.getLevel() > 99) ? defence / 10 : defence;
-			
 			// Trait, elements
 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected);
 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true);
@@ -141,9 +138,8 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
 			// ...................____________Melee Damage_____________......................................___________________Ranged Damage____________________
 			// ATTACK CALCULATION 77 * ((pAtk * lvlMod) + power) / pdef            RANGED ATTACK CALCULATION 70 * ((pAtk * lvlMod) + power + patk + power) / pdef
 			// ```````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^``````````````````````````````````````^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + _power + rangedBonus)) / defence;
+			final double baseMod = (wpnMod * ((attack * effector.getLevelMod()) + (_power * effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 1)) + effector.getStat().getValue(Stats.SKILL_POWER_ADD, 0) + rangedBonus)) / defence;
 			damage = baseMod * ssmod * critMod * weaponTraitMod * generalTraitMod * attributeMod * pvpPveMod * randomMod;
-			damage += effector.getStat().getValue(Stats.PHYSICAL_SKILL_POWER, 0);
 		}
 		
 		final double minHp = (effected.getMaxHp() * _saveHp) / 100;