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

Clean up logic and generally make purdier

Browse Source
This commit is contained in:
Ebag333
2017-01-29 00:16:32 -08:00
parent 1a0ac7bb35
commit c567ee2c08
1 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gui/builtinViewColumns/misc.py
View File

@@ -459,28 +459,23 @@ class Miscellanea(ViewColumn):
): ):
if "Armor" in itemGroup or "Shield" in itemGroup: if "Armor" in itemGroup or "Shield" in itemGroup:
boosted_attribute = "HP" boosted_attribute = "HP"
reload_time = item.getAttribute("reloadTime", 0) / 1000
elif "Capacitor" in itemGroup: elif "Capacitor" in itemGroup:
boosted_attribute = "Cap" boosted_attribute = "Cap"
reload_time = 10
else: else:
boosted_attribute = None boosted_attribute = ""
reload_time = 0
hp = stuff.hpBeforeReload
cycles = stuff.numShots cycles = stuff.numShots
cycleTime = stuff.rawCycleTime cycleTime = stuff.rawCycleTime
if boosted_attribute == "Cap": # Get HP or boosted amount
if hp is None: stuff_hp = stuff.hpBeforeReload
local_booster = stuff.charge.getAttribute("capacitorBonus", 0) armor_hp = stuff.getModifiedItemAttr("armorDamageAmount", 0)
hp = max(local_booster, 0) * cycles capacitor_hp = stuff.charge.getModifiedChargeAttr("capacitorBonus", 0)
reload_time = 10 shield_hp = stuff.getModifiedItemAttr("shieldBonus", 0)
elif boosted_attribute == "HP": hp = max(stuff_hp, armor_hp * cycles, capacitor_hp * cycles, shield_hp * cycles, 0)
if hp is None:
armor_repairer = item.getAttribute("armorDamageAmount", None)
shield_booster = item.getAttribute("shieldBonus", None)
hp = max(armor_repairer, shield_booster, 0)
reload_time = item.getAttribute("reloadTime", 0) / 1000
else:
reload_time = 0
if not hp or not cycleTime or not cycles: if not hp or not cycleTime or not cycles:
return "", None return "", None