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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
trunk/dist/game/data/scripts/handlers/effecthandlers/MagicalAttack.java vendored
View File

@@ -73,34 +73,36 @@ public final class MagicalAttack extends AbstractEffect
final byte shld = Formulas.calcShldUse(activeChar, target, info.getSkill());
int damage = (int) Formulas.calcMagicDam(activeChar, target, info.getSkill(), shld, sps, bss, mcrit);
if (damage > 0)
if (damage <= 0)
{
// reduce damage if target has maxdamage buff
final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null));
if (maxDamage > 0)
{
damage = (int) maxDamage;
}
// Manage attack or cast break of the target (calculating rate, sending message...)
if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
{
target.breakAttack();
target.breakCast();
}
// Shield Deflect Magic: Reflect all damage on caster.
if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
{
activeChar.reduceCurrentHp(damage, target, info.getSkill());
activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
}
else
{
target.reduceCurrentHp(damage, activeChar, info.getSkill());
target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
}
return;
}
// reduce damage if target has maxdamage buff
final double maxDamage = (target.getStat().calcStat(Stats.MAX_SKILL_DAMAGE, 0, null, null));
if (maxDamage > 0)
{
damage = (int) maxDamage;
}
// Manage attack or cast break of the target (calculating rate, sending message...)
if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
{
target.breakAttack();
target.breakCast();
}
// Shield Deflect Magic: Reflect all damage on caster.
if (target.getStat().calcStat(Stats.VENGEANCE_SKILL_MAGIC_DAMAGE, 0, target, info.getSkill()) > Rnd.get(100))
{
activeChar.reduceCurrentHp(damage, target, info.getSkill());
activeChar.notifyDamageReceived(damage, target, info.getSkill(), mcrit, false);
}
else
{
target.reduceCurrentHp(damage, activeChar, info.getSkill());
target.notifyDamageReceived(damage, activeChar, info.getSkill(), mcrit, false);
activeChar.sendDamageMessage(target, damage, mcrit, false, false);
}
}
}