dave/pyfa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 5 Wiki Activity

Minor lint and EFS export maxRange bug fix.

Browse Source
This commit is contained in:
MaruMaruOO
2018-09-28 23:36:18 -04:00
parent edfbf71958
commit 3e249ec155
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
service/efsPort.py
View File

@@ -91,12 +91,10 @@ class EfsPort():
oldPropState = propWithBloom.state
propWithBloom.state = State.ONLINE
sFit.recalc(fit)
fit = eos.db.getFit(fitID)
sp = fit.maxSpeed
sig = fit.ship.getModifiedItemAttr("signatureRadius")
propWithBloom.state = oldPropState
sFit.recalc(fit)
fit = eos.db.getFit(fitID)
return {"usingMWD": True, "unpropedSpeed": sp, "unpropedSig": sig}
return {
"usingMWD": False,
@@ -323,10 +321,13 @@ class EfsPort():
explosionRadius = 0
explosionVelocity = 0
aoeFieldRange = 0
if stats.charge:
name = stats.item.name + ", " + stats.charge.name
else:
name = stats.item.name
if stats.hardpoint == Hardpoint.TURRET:
tracking = stats.getModifiedItemAttr("trackingSpeed")
typeing = "Turret"
name = stats.item.name + ", " + stats.charge.name
# Bombs share most attributes with missiles despite not needing the hardpoint
elif stats.hardpoint == Hardpoint.MISSILE or "Bomb Launcher" in stats.item.name:
maxVelocity = stats.getModifiedChargeAttr("maxVelocity")
@@ -335,15 +336,18 @@ class EfsPort():
explosionRadius = stats.getModifiedChargeAttr("aoeCloudSize")
explosionVelocity = stats.getModifiedChargeAttr("aoeVelocity")
typeing = "Missile"
name = stats.item.name + ", " + stats.charge.name
elif stats.hardpoint == Hardpoint.NONE:
aoeFieldRange = stats.getModifiedItemAttr("empFieldRange")
# This also covers non-bomb weapons with dps values and no hardpoints, most notably targeted doomsdays.
typeing = "SmartBomb"
name = stats.item.name
# Targeted DDs are the only non drone/fighter weapon without an explict max range
if stats.item.group.name == 'Super Weapon' and stats.maxRange == None:
maxRange = 300000
else:
maxRange = stats.maxRange
statDict = {
"dps": stats.dps * n, "capUse": stats.capUse * n, "falloff": stats.falloff,
"type": typeing, "name": name, "optimal": stats.maxRange,
"type": typeing, "name": name, "optimal": maxRange,
"numCharges": stats.numCharges, "numShots": stats.numShots, "reloadTime": stats.reloadTime,
"cycleTime": stats.cycleTime, "volley": stats.volley * n, "tracking": tracking,
"maxVelocity": maxVelocity, "explosionDelay": explosionDelay, "damageReductionFactor": damageReductionFactor,