diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java index 7a69f3a53a..8ccd07d359 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java @@ -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); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java index 3cf1a3e34a..79d65dbec8 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java index 9191ce25d8..f663c1dcd1 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java index 75736d0195..7e0726d884 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java index 4201b25e31..f8e5197587 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java @@ -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(); diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java index 24d31fb577..85a5aada6d 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java @@ -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();