Effect trait bonus calculation should ignore resistances.
This commit is contained in:
		| @@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(attacker, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); | ||||
| 			 | ||||
|   | ||||
| @@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(effector, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); | ||||
| 			final double randomMod = effector.getRandomDamageMultiplier(); | ||||
|   | ||||
| @@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(effector, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); | ||||
| 			final double randomMod = effector.getRandomDamageMultiplier(); | ||||
|   | ||||
| @@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(effector, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); | ||||
| 			final double randomMod = effector.getRandomDamageMultiplier(); | ||||
|   | ||||
| @@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(effector, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); | ||||
| 			final double randomMod = effector.getRandomDamageMultiplier(); | ||||
|   | ||||
| @@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect | ||||
| 		{ | ||||
| 			// Trait, elements | ||||
| 			final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), false); | ||||
| 			final double generalTraitMod = Formulas.calcGeneralTraitBonus(effector, effected, skill.getTraitType(), true); | ||||
| 			final double attributeMod = Formulas.calcAttributeBonus(effector, effected, skill); | ||||
| 			final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); | ||||
| 			final double randomMod = effector.getRandomDamageMultiplier(); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user
	 MobiusDev
					MobiusDev