From 8ed485df0e068d5f596f148a5f411c032b927133 Mon Sep 17 00:00:00 2001 From: blitzmann Date: Wed, 6 Apr 2016 00:22:19 -0400 Subject: [PATCH] Group renames --- .../advanceddroneinterfacingmaxgroupdcuskilllevel.py | 2 +- eos/effects/ewgroupecmburstmaxrangebonus.py | 2 +- eos/effects/skillremoteecmdurationbonus.py | 2 +- eos/effects/titancaldarimissilekineticdmg2.py | 2 +- eos/effects/triagemodeeffect3.py | 2 +- eos/effects/triagemodeeffect7.py | 2 +- eos/saveddata/fit.py | 8 ++++---- gui/builtinViewColumns/misc.py | 8 ++++---- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py b/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py index 59d80cabd..be2201717 100644 --- a/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py +++ b/eos/effects/advanceddroneinterfacingmaxgroupdcuskilllevel.py @@ -4,5 +4,5 @@ # Skill: Advanced Drone Interfacing type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Drone Control Unit", + fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Fighter Support Unit", "maxGroupActive", skill.level) diff --git a/eos/effects/ewgroupecmburstmaxrangebonus.py b/eos/effects/ewgroupecmburstmaxrangebonus.py index 745485285..b41497d46 100644 --- a/eos/effects/ewgroupecmburstmaxrangebonus.py +++ b/eos/effects/ewgroupecmburstmaxrangebonus.py @@ -4,5 +4,5 @@ # Implants named like: grade Centurion (10 of 12) type = "passive" def handler(fit, implant, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors", "maxRange", implant.getModifiedItemAttr("rangeSkillBonus")) \ No newline at end of file diff --git a/eos/effects/skillremoteecmdurationbonus.py b/eos/effects/skillremoteecmdurationbonus.py index f37c82dbc..6f48b8369 100644 --- a/eos/effects/skillremoteecmdurationbonus.py +++ b/eos/effects/skillremoteecmdurationbonus.py @@ -4,5 +4,5 @@ # Skill: Burst Projector Operation type = "passive" def handler(fit, skill, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote ECM Burst", + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Projectors", "duration", skill.getModifiedItemAttr("projECMDurationBonus") * skill.level) diff --git a/eos/effects/titancaldarimissilekineticdmg2.py b/eos/effects/titancaldarimissilekineticdmg2.py index 0f5732b82..af9079da1 100644 --- a/eos/effects/titancaldarimissilekineticdmg2.py +++ b/eos/effects/titancaldarimissilekineticdmg2.py @@ -4,6 +4,6 @@ # Ship: Leviathan type = "passive" def handler(fit, ship, context): - groups = ("Capital Torpedo", "Capital Cruise") + groups = ("XL Torpedo", "XL Cruise Missile") fit.modules.filteredChargeBoost(lambda mod: mod.charge.group.name in groups, "kineticDamage", ship.getModifiedItemAttr("shipBonusCT1"), skill="Caldari Titan") diff --git a/eos/effects/triagemodeeffect3.py b/eos/effects/triagemodeeffect3.py index d53d475d3..763f8ca73 100644 --- a/eos/effects/triagemodeeffect3.py +++ b/eos/effects/triagemodeeffect3.py @@ -70,7 +70,7 @@ def handler(fit, module, context): # EW cap need increase groups = [ 'Burst Jammer', - 'Remote ECM Burst', + 'Burst Projectors', 'Weapon Disruptor', 'ECM', 'Remote Sensor Damper', diff --git a/eos/effects/triagemodeeffect7.py b/eos/effects/triagemodeeffect7.py index 92d19d2ff..07f3d45c6 100644 --- a/eos/effects/triagemodeeffect7.py +++ b/eos/effects/triagemodeeffect7.py @@ -80,7 +80,7 @@ def handler(fit, module, context): # EW cap need increase groups = [ 'ECM Burst', - 'Remote ECM Burst', + 'Burst Projectors', 'Weapon Disruptor', 'ECM', 'Remote Sensor Damper', diff --git a/eos/saveddata/fit.py b/eos/saveddata/fit.py index 50d7d8934..1bda5ee17 100644 --- a/eos/saveddata/fit.py +++ b/eos/saveddata/fit.py @@ -754,20 +754,20 @@ class Fit(object): repairers = [] #Map a repairer type to the attribute it uses groupAttrMap = {"Armor Repair Unit": "armorDamageAmount", - "Fueled Armor Repairer": "armorDamageAmount", + "Ancillary Armor Repairer": "armorDamageAmount", "Hull Repair Unit": "structureDamageAmount", "Shield Booster": "shieldBonus", - "Fueled Shield Booster": "shieldBonus", + "Ancillary Shield Booster": "shieldBonus", "Remote Armor Repairer": "armorDamageAmount", "Remote Shield Booster": "shieldBonus"} #Map repairer type to attribute groupStoreMap = {"Armor Repair Unit": "armorRepair", "Hull Repair Unit": "hullRepair", "Shield Booster": "shieldRepair", - "Fueled Shield Booster": "shieldRepair", + "Ancillary Shield Booster": "shieldRepair", "Remote Armor Repairer": "armorRepair", "Remote Shield Booster": "shieldRepair", - "Fueled Armor Repairer": "armorRepair",} + "Ancillary Armor Repairer": "armorRepair",} capUsed = self.capUsed for attr in ("shieldRepair", "armorRepair", "hullRepair"): diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index c2f617deb..05c7f9020 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -205,7 +205,7 @@ class Miscellanea(ViewColumn): tooltip = "{0} disruption".format(formatList(ttEntries)).capitalize() return text, tooltip - elif itemGroup in ("ECM", "Burst Jammer", "Remote ECM Burst"): + elif itemGroup in ("ECM", "Burst Jammer", "Burst Projectors"): grav = stuff.getModifiedItemAttr("scanGravimetricStrengthBonus") ladar = stuff.getModifiedItemAttr("scanLadarStrengthBonus") radar = stuff.getModifiedItemAttr("scanRadarStrengthBonus") @@ -458,7 +458,7 @@ class Miscellanea(ViewColumn): return text, item.name else: return "", None - elif itemGroup in ("Fueled Armor Repairer", "Fueled Shield Booster"): + elif itemGroup in ("Ancillary Armor Repairer", "Ancillary Shield Booster"): hp = stuff.hpBeforeReload cycles = stuff.numShots cycleTime = stuff.rawCycleTime @@ -470,7 +470,7 @@ class Miscellanea(ViewColumn): useEhp = self.mainFrame.statsPane.nameViewMap["resistancesViewFull"].showEffective tooltip = "HP restored over duration using charges" if useEhp: - if itemGroup == "Fueled Armor Repairer": + if itemGroup == "Ancillary Armor Repairer": hpRatio = ehpTotal["armor"] / hpTotal["armor"] else: hpRatio = ehpTotal["shield"] / hpTotal["shield"] @@ -487,7 +487,7 @@ class Miscellanea(ViewColumn): if chargeGroup in ("Rocket", "Advanced Rocket", "Light Missile", "Advanced Light Missile", "FoF Light Missile", "Heavy Assault Missile", "Advanced Heavy Assault Missile", "Heavy Missile", "Advanced Heavy Missile", "FoF Heavy Missile", "Torpedo", "Advanced Torpedo", "Cruise Missile", "Advanced Cruise Missile", "FoF Cruise Missile", - "Capital Torpedo", "Capital Cruise"): + "XL Torpedo", "XL Cruise Missile"): cloudSize = stuff.getModifiedChargeAttr("aoeCloudSize") aoeVelocity = stuff.getModifiedChargeAttr("aoeVelocity") if not cloudSize or not aoeVelocity: