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

Merge branch 'master' into price_optimize

Browse Source
This commit is contained in:
DarkPhoenix
2019-02-19 13:47:49 +03:00
parent 2b16a8ed76 509849fbf5
commit 21dd9bb6e4
18 changed files with 292 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
service/network.py
View File

@@ -83,8 +83,7 @@ class Network(object):
raise Error("Access not enabled - please enable in Preferences > Network")
# Set up some things for the request
versionString = "{0} {1} - {2} {3}".format(config.version, config.tag, config.expansionName,
config.expansionVersion)
versionString = "{0}".format(config.version)
headers = {"User-Agent": "pyfa {0} (python-requests {1})".format(versionString, requests.__version__)}
# user-agent: pyfa 2.0.0b4 git -YC120.2 1.2 (python-requests 2.18.4)

6
service/port/efs.py
View File

@@ -109,7 +109,7 @@ class EfsPort:
"Burst Projectors", "Warp Disrupt Field Generator", "Armor Resistance Shift Hardener",
"Target Breaker", "Micro Jump Drive", "Ship Modifiers", "Stasis Grappler",
"Ancillary Remote Shield Booster", "Ancillary Remote Armor Repairer",
"Titan Phenomena Generator", "Non-Repeating Hardeners"
"Titan Phenomena Generator", "Non-Repeating Hardeners", "Mutadaptive Remote Armor Repairer"
]
projectedMods = list(filter(lambda mod: mod.item and mod.item.group.name in modGroupNames, fit.modules))
# Sort projections to prevent the order needlessly changing as pyfa updates.
@@ -145,7 +145,9 @@ class EfsPort:
elif mod.item.group.name in ["Remote Shield Booster", "Ancillary Remote Shield Booster"]:
stats["type"] = "Remote Shield Booster"
EfsPort.attrDirectMap(["shieldBonus"], stats, mod)
elif mod.item.group.name in ["Remote Armor Repairer", "Ancillary Remote Armor Repairer"]:
elif mod.item.group.name in [
"Remote Armor Repairer", "Ancillary Remote Armor Repairer", "Mutadaptive Remote Armor Repairer"
]:
stats["type"] = "Remote Armor Repairer"
EfsPort.attrDirectMap(["armorDamageAmount"], stats, mod)
elif mod.item.group.name == "Warp Scrambler":