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

Support for RealDamage percent mode.

Browse Source 
Thanks to nasseka.
This commit is contained in:
MobiusDevelopment 2021-06-04 11:44:12 +00:00
parent 2617f6f6b1
commit d3a9e56474
19 changed files with 418 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
L2J_Mobius_1.0_Ertheia/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_2.5_Underground/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_3.0_Helios/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_4.0_GrandCrusade/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_5.0_Salvation/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_5.5_EtinasFate/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_6.0_Fafurion/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_7.0_PreludeOfWar/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_8.0_Homunculus/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_2.1_Zaken/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

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

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}

26
L2J_Mobius_Essence_5.0_Sylph/dist/game/data/scripts/handlers/effecthandlers/RealDamage.java vendored
View File

@ -17,6 +17,7 @@
package handlers.effecthandlers;
import org.l2jmobius.Config;
import org.l2jmobius.gameserver.enums.StatModifierType;
import org.l2jmobius.gameserver.model.StatSet;
import org.l2jmobius.gameserver.model.actor.Creature;
import org.l2jmobius.gameserver.model.effects.AbstractEffect;
@ -30,10 +31,12 @@ import org.l2jmobius.gameserver.model.stats.Stat;
public class RealDamage extends AbstractEffect
{
private final double _power;
private final StatModifierType _mode;
public RealDamage(StatSet params)
{
_power = params.getDouble("power", 0);
_mode = params.getEnum("mode", StatModifierType.class, StatModifierType.DIFF);
}
@Override
@ -45,8 +48,7 @@ public class RealDamage extends AbstractEffect
@Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{
// Check if effected is dead.
if (effected.isDead())
if (effected.isDead() || effected.isDoor() || effected.isRaid())
{
return;
}
@ -64,13 +66,29 @@ public class RealDamage extends AbstractEffect
}
// Calculate resistance.
final double damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
final double damage;
if (_mode == StatModifierType.DIFF)
{
damage = _power - (_power * (Math.min(effected.getStat().getMul(Stat.REAL_DAMAGE_RESIST, 1), 1.8) - 1));
}
else // PER
{
// Percent does not ignore HP block.
if (effected.isHpBlocked())
{
return;
}
damage = (effected.getCurrentHp() * _power) / 100;
}
// Do damage.
if (damage > 0)
{
effected.setCurrentHp(Math.max(effected.getCurrentHp() - damage, effected.isUndying() ? 1 : 0));
if ((effected.getCurrentHp() < 0.5)) // Die.
// Die.
if (effected.getCurrentHp() < 0.5)
{
effected.doDie(effector);
}