Additional refactoring and fixing of equipment data
Add attack data to enemy attacks (might need to rework a little bit for primary/secondary attacks)
This commit is contained in:
@@ -5,15 +5,13 @@ namespace Zennysoft.Ma.Adapter
|
||||
{
|
||||
public static class DamageCalculator
|
||||
{
|
||||
public static int CalculateDamage(Damage damage, double defense, ElementalResistanceSet elementalResistanceSet)
|
||||
public static int CalculateDamage(AttackData damage, double defense, ElementalResistanceSet elementalResistanceSet)
|
||||
{
|
||||
var calculatedDamage = damage.BaseDamage;
|
||||
if (!damage.IgnoreDefense)
|
||||
calculatedDamage = CalculateDefenseResistance(calculatedDamage, defense);
|
||||
if (!damage.IgnoreElementalResistance)
|
||||
calculatedDamage = CalculateElementalResistance(calculatedDamage, elementalResistanceSet.ElementalResistance[damage.ElementType]);
|
||||
if (damage.IsCriticalHit)
|
||||
calculatedDamage *= 2;
|
||||
|
||||
return Mathf.Max(1, calculatedDamage);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user