Organized TriggerSkillByDamage checks.

This commit is contained in:
MobiusDevelopment 2020-03-16 20:17:03 +00:00
parent 8fcddf92cd
commit 7dcd5acb3c
15 changed files with 180 additions and 30 deletions

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}

View File

@ -78,12 +78,22 @@ public class TriggerSkillByDamage extends AbstractEffect
return;
}
if (event.getAttacker().getCurrentHpPercent() > _hpPercent)
if (event.getDamage() < _minDamage)
{
return;
}
if ((event.getDamage() < _minDamage) || ((_chance < 100) && (Rnd.get(100) > _chance)) || !event.getAttacker().getInstanceType().isType(_attackerType))
if ((_chance < 100) && (Rnd.get(100) > _chance))
{
return;
}
if ((_hpPercent < 100) && (event.getAttacker().getCurrentHpPercent() > _hpPercent))
{
return;
}
if (!event.getAttacker().getInstanceType().isType(_attackerType))
{
return;
}