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

Sync with L2jServer HighFive Nov 14th 2015.

Browse Source
This commit is contained in:
MobiusDev
2015-11-14 16:31:37 +00:00
parent 887fbcc6b5
commit e38353e409
125 changed files with 1998 additions and 1419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
trunk/java/com/l2jserver/gameserver/model/stats/Formulas.java
View File

@ -1337,12 +1337,9 @@ public final class Formulas
double attack = 2 * actor.getMAtk(target, skill) * calcGeneralTraitBonus(actor, target, skill.getTraitType(), false);
double d = (attack - defence) / (attack + defence);
if (skill.isDebuff())
if (skill.isDebuff() && target.isDebuffBlocked())
{
if (target.calcStat(Stats.DEBUFF_IMMUNITY, 0, null, skill) > 0)
{
return false;
}
return false;
}
d += 0.5 * Rnd.nextGaussian();
@ -1372,7 +1369,7 @@ public final class Formulas
return false;
}
if (skill.isDebuff() && (target.calcStat(Stats.DEBUFF_IMMUNITY, 0, attacker, skill) > 0))
if (skill.isDebuff() && target.isDebuffBlocked())
{
final SystemMessage sm = SystemMessage.getSystemMessage(SystemMessageId.C1_HAS_RESISTED_YOUR_S2);
sm.addCharName(target);
@ -1470,7 +1467,7 @@ public final class Formulas
{
return true;
}
else if (target.calcStat(Stats.DEBUFF_IMMUNITY, 0, null, skill) > 0)
else if (target.isDebuffBlocked())
{
return false;
}
@ -2024,6 +2021,7 @@ public final class Formulas
int cancelMagicLvl = skill.getMagicLevel();
final double vuln = target.calcStat(Stats.CANCEL_VULN, 0, target, null);
final double prof = activeChar.calcStat(Stats.CANCEL_PROF, 0, target, null);
double resMod = 1 + (((vuln + prof) * -1) / 100);
double finalRate = rate / resMod;

2
trunk/java/com/l2jserver/gameserver/model/stats/Stats.java
View File

@ -136,8 +136,6 @@ public enum Stats
HOLY_RES("holyRes"),
DARK_RES("darkRes"),
MAGIC_SUCCESS_RES("magicSuccRes"),
// BUFF_IMMUNITY("buffImmunity"), //TODO: Implement me
DEBUFF_IMMUNITY("debuffImmunity"),
// ELEMENT POWER
FIRE_POWER("firePower"),