refactor: remove this. from the Spinal and Turret models

This commit is contained in:
cswimr 2024-12-31 12:40:59 -05:00
parent 759e49a64f
commit 405032a6e3
Signed by: cswimr
GPG key ID: 0EC431A8DA8F8087
2 changed files with 12 additions and 12 deletions

View file

@ -18,29 +18,29 @@ namespace ZenithInfo.Models
public DamageStats Dps(int range = 0, int barrelCount = 1) public DamageStats Dps(int range = 0, int barrelCount = 1)
{ {
if (range > this.Range) if (range > Range)
{ {
return new DamageStats(0, 0, 0, 0, 0, 0); return new DamageStats(0, 0, 0, 0, 0, 0);
} }
double baseAlpha = this.Damage * barrelCount; double baseAlpha = Damage * barrelCount;
double shieldAlpha = 0; double shieldAlpha = 0;
double hullAlpha = 0; double hullAlpha = 0;
double intervalTime = this.Interval * (barrelCount - 1); double intervalTime = Interval * (barrelCount - 1);
double totalDelay = this.Reload + intervalTime; double totalDelay = Reload + intervalTime;
double baseDps = baseAlpha / (totalDelay != 0 ? totalDelay : 1); // prevent divide by zero double baseDps = baseAlpha / (totalDelay != 0 ? totalDelay : 1); // prevent divide by zero
double shieldDps = 0; double shieldDps = 0;
double hullDps = 0; double hullDps = 0;
if (this.DamageType == Enums.DamageTypes.Shield) if (DamageType == Enums.DamageTypes.Shield)
{ {
shieldAlpha = baseAlpha; shieldAlpha = baseAlpha;
hullAlpha = baseAlpha * 0.5; hullAlpha = baseAlpha * 0.5;
shieldDps = baseDps; shieldDps = baseDps;
hullDps = baseDps * 0.5; hullDps = baseDps * 0.5;
} }
else if (this.DamageType == Enums.DamageTypes.Hull) else if (DamageType == Enums.DamageTypes.Hull)
{ {
shieldAlpha = baseAlpha * 0.5; shieldAlpha = baseAlpha * 0.5;
hullAlpha = baseAlpha; hullAlpha = baseAlpha;

View file

@ -20,32 +20,32 @@ namespace ZenithInfo.Models
public Enums.DamageTypes DamageType() public Enums.DamageTypes DamageType()
{ {
return Enums.TurretDamageTypes[this.Type]; return Enums.TurretDamageTypes[Type];
} }
public DamageStats Dps(int range = 0) public DamageStats Dps(int range = 0)
{ {
if (range > this.Range) if (range > Range)
{ {
return new DamageStats(0, 0, 0, 0, 0, 0); return new DamageStats(0, 0, 0, 0, 0, 0);
} }
double baseAlpha = this.Damage; double baseAlpha = Damage;
double shieldAlpha = 0; double shieldAlpha = 0;
double hullAlpha = 0; double hullAlpha = 0;
double baseDps = baseAlpha / (this.Reload != 0 ? this.Reload : 1); // prevent divide by zero double baseDps = baseAlpha / (Reload != 0 ? Reload : 1); // prevent divide by zero
double shieldDps = 0; double shieldDps = 0;
double hullDps = 0; double hullDps = 0;
if (this.DamageType() == Enums.DamageTypes.Shield) if (DamageType() == Enums.DamageTypes.Shield)
{ {
shieldAlpha = baseAlpha; shieldAlpha = baseAlpha;
hullAlpha = baseAlpha * 0.5; hullAlpha = baseAlpha * 0.5;
shieldDps = baseDps; shieldDps = baseDps;
hullDps = baseDps * 0.5; hullDps = baseDps * 0.5;
} }
else if (this.DamageType() == Enums.DamageTypes.Hull) else if (DamageType() == Enums.DamageTypes.Hull)
{ {
shieldAlpha = baseAlpha * 0.5; shieldAlpha = baseAlpha * 0.5;
hullAlpha = baseAlpha; hullAlpha = baseAlpha;