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

Ignore invulnerable trait at calcMagicDam.

Browse Source 
Contributed by nasseka.
This commit is contained in:
MobiusDevelopment
2022-05-05 22:15:33 +00:00
parent 0b80d2b80a
commit 4c5d91459f
23 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
// AoE modifiers. // AoE modifiers.

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

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

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

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

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

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

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

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -194,7 +194,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
return damage; return damage;

3
L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/stats/Formulas.java
View File

@@ -195,7 +195,8 @@ public class Formulas
} }
} }
damage = damage * critMod * generalTraitMod * weaknessMod * attributeMod * randomMod * pvpPveMod; // Nasseka rev. 10196: generalTraitMod == 0 ? 1 : generalTraitMod (no invulnerable traits).
damage = damage * critMod * (generalTraitMod == 0 ? 1 : generalTraitMod) * weaknessMod * attributeMod * randomMod * pvpPveMod;
damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1); damage *= attacker.getStat().getValue(Stat.MAGICAL_SKILL_POWER, 1);
// AoE modifiers. // AoE modifiers.