Fixed reflecting elemental damage.

Author: JoeAlisson
Source: 452465723b

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -4541,9 +4541,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
+			if (!reflect)
+			{
 				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
 				value += elementalDamage;
 			}
+		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)

L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1684,12 +1684,12 @@ public class Formulas
 	
 	private static double calcSpiritElementalPvPDamage(double attack, double critDamage, boolean isCrit, double baseDamage)
 	{
-		double base = Math.abs(attack * 1.3);
+		double damage = Math.min(Math.max(0, ((attack * 1.3) + (baseDamage * 0.03 * attack)) / Math.log(Math.max(attack, 5))), 2295);
 		if (isCrit)
 		{
-			base += Math.abs((attack * 1.223) + (((attack * 0.03) + 24) * critDamage) + Rnd.get(-5, 15));
+			damage *= 1 + ((Rnd.get(13, 20) + critDamage) / 100);
 		}
-		return ((base * attack) + (baseDamage * 0.3)) / Math.log(Math.max(baseDamage, 20));
+		return damage;
 	}
 	
 	private static double calcSpiritElementalPvEDamage(ElementalType attackerType, ElementalType targetType, double attack, double critDamage, boolean isCrit, double baseDamage)

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -4541,9 +4541,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
+			if (!reflect)
+			{
 				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
 				value += elementalDamage;
 			}
+		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)

L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1684,12 +1684,12 @@ public class Formulas
 	
 	private static double calcSpiritElementalPvPDamage(double attack, double critDamage, boolean isCrit, double baseDamage)
 	{
-		double base = Math.abs(attack * 1.3);
+		double damage = Math.min(Math.max(0, ((attack * 1.3) + (baseDamage * 0.03 * attack)) / Math.log(Math.max(attack, 5))), 2295);
 		if (isCrit)
 		{
-			base += Math.abs((attack * 1.223) + (((attack * 0.03) + 24) * critDamage) + Rnd.get(-5, 15));
+			damage *= 1 + ((Rnd.get(13, 20) + critDamage) / 100);
 		}
-		return ((base * attack) + (baseDamage * 0.3)) / Math.log(Math.max(baseDamage, 20));
+		return damage;
 	}
 	
 	private static double calcSpiritElementalPvEDamage(ElementalType attackerType, ElementalType targetType, double attack, double critDamage, boolean isCrit, double baseDamage)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java

@@ -4540,9 +4540,12 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe
 				value *= (100 + Math.max(_stat.getValue(Stat.PVE_DAMAGE_TAKEN_MONSTER), -80)) / 100;
 			}
 			
+			if (!reflect)
+			{
 				elementalDamage = Formulas.calcSpiritElementalDamage(attacker, this, value);
 				value += elementalDamage;
 			}
+		}
 		
 		final double damageCap = _stat.getValue(Stat.DAMAGE_LIMIT);
 		if (damageCap > 0)

L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/stats/Formulas.java

@@ -1684,12 +1684,12 @@ public class Formulas
 	
 	private static double calcSpiritElementalPvPDamage(double attack, double critDamage, boolean isCrit, double baseDamage)
 	{
-		double base = Math.abs(attack * 1.3);
+		double damage = Math.min(Math.max(0, ((attack * 1.3) + (baseDamage * 0.03 * attack)) / Math.log(Math.max(attack, 5))), 2295);
 		if (isCrit)
 		{
-			base += Math.abs((attack * 1.223) + (((attack * 0.03) + 24) * critDamage) + Rnd.get(-5, 15));
+			damage *= 1 + ((Rnd.get(13, 20) + critDamage) / 100);
 		}
-		return ((base * attack) + (baseDamage * 0.3)) / Math.log(Math.max(baseDamage, 20));
+		return damage;
 	}
 	
 	private static double calcSpiritElementalPvEDamage(ElementalType attackerType, ElementalType targetType, double attack, double critDamage, boolean isCrit, double baseDamage)