Removed usage of steam to check abnormals on effects.

This commit is contained in:
MobiusDevelopment
2021-07-27 23:53:10 +00:00
parent 878c127047
commit c0d6a5e579
42 changed files with 588 additions and 84 deletions

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }

View File

@@ -100,10 +100,17 @@ public class FatalBlow extends AbstractEffect
double power = _power; double power = _power;
// Check if we apply an abnormal modifier // Check if we apply an abnormal modifier.
if (_abnormals.stream().anyMatch(effected::hasAbnormalType)) if (!_abnormals.isEmpty())
{ {
power += _abnormalPower; for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
power += _abnormalPower;
break;
}
}
} }
final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS)); final boolean ss = skill.useSoulShot() && (effector.isChargedShot(ShotType.SOULSHOTS) || effector.isChargedShot(ShotType.BLESSED_SOULSHOTS));

View File

@@ -74,7 +74,24 @@ public class MagicalAttackByAbnormalSlot extends AbstractEffect
@Override @Override
public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item) public void instant(Creature effector, Creature effected, Skill skill, ItemInstance item)
{ {
if (effector.isAlikeDead() || _abnormals.stream().noneMatch(effected::hasAbnormalType)) if (effector.isAlikeDead())
{
return;
}
boolean hasAbnormalType = false;
if (!_abnormals.isEmpty())
{
for (AbnormalType abnormal : _abnormals)
{
if (effected.hasAbnormalType(abnormal))
{
hasAbnormalType = true;
break;
}
}
}
if (!hasAbnormalType)
{ {
return; return;
} }