lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Effect trait bonus calculation should ignore resistances.

Browse Source
This commit is contained in:
MobiusDev 2019-01-08 18:35:17 +00:00
parent 27322e4e87
commit e5446917e7
60 changed files with 60 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.2_Antharas/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/EnergyAttack.java vendored
View File

@ -124,7 +124,7 @@ public final class EnergyAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(attacker, effected); 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 attributeMod = Formulas.calcAttributeBonus(attacker, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(attacker, effected, skill, true);

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttack.java vendored
View File

@ -139,7 +139,7 @@ public final class PhysicalAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackHpLink.java vendored
View File

@ -101,7 +101,7 @@ public final class PhysicalAttackHpLink extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackSaveHp.java vendored
View File

@ -112,7 +112,7 @@ public final class PhysicalAttackSaveHp extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalAttackWeaponBonus.java vendored
View File

@ -132,7 +132,7 @@ public final class PhysicalAttackWeaponBonus extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();

2
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/PhysicalSoulAttack.java vendored
View File

@ -126,7 +126,7 @@ public final class PhysicalSoulAttack extends AbstractEffect
{ {
// Trait, elements // Trait, elements
final double weaponTraitMod = Formulas.calcWeaponTraitBonus(effector, effected); 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 attributeMod = Formulas.calcAttributeBonus(effector, effected, skill);
final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true); final double pvpPveMod = Formulas.calculatePvpPveBonus(effector, effected, skill, true);
final double randomMod = effector.getRandomDamageMultiplier(); final double randomMod = effector.getRandomDamageMultiplier();