Fix #537 - cap battery causing remote cap transfers to apply incorrect values.

Bump to stable 1.20.1

config.py

@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.19.2"
-tag = "git"
-expansionName = "Singularity"
-expansionVersion = "1015913"
+version = "1.20.1"
+tag = "Stable"
+expansionName = "March 2016"
+expansionVersion = "1.3"
 evemonMinVersion = "4081"
 
 pyfaPath = None
@@ -60,7 +60,7 @@ def __createDirs(path):
     if not os.path.exists(path):
         os.makedirs(path)
 
-def defPaths():
+def defPaths(customSavePath):
     global debug
     global pyfaPath
     global savePath
@@ -87,8 +87,11 @@ def defPaths():
     else:
         savePath = getattr(configforced, "savePath", None)
         if savePath is None:
-            savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
+            if customSavePath is None: # customSavePath is not overriden
+                savePath = unicode(os.path.expanduser(os.path.join("~", ".pyfa")),
                                sys.getfilesystemencoding())
+            else:
+                savePath = customSavePath
 
     __createDirs(savePath)
 

eos/db/migration.py

@@ -37,4 +37,4 @@ def update(saveddata_engine):
                 func(saveddata_engine)
 
         # when all is said and done, set version to current
-        # saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))
+        saveddata_engine.execute("PRAGMA user_version = {}".format(appVersion))

eos/effectHandlerHelpers.py

@@ -131,6 +131,10 @@ class HandledModuleList(HandledList):
                 self.remove(mod)
             return
 
+        # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
+        if not mod.isValidState(mod.state):
+            mod.state = eos.types.State.ONLINE
+
         mod.position = len(self)
         HandledList.append(self, mod)
         if mod.isInvalid:

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (458 of 833)
+# Items from category: Charge (458 of 851)
 type = "passive"
 def handler(fit, module, context):
     # Dirty hack to work around cap charges setting cap booster

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (559 of 833)
+# Items from category: Charge (559 of 851)
 type = "passive"
 def handler(fit, module, context):
     module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier"))

eos/effects/armorallrepairsystemsamountbonuspassive.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Implants named like: Exile Booster (4 of 4)
+# Implant: Antipharmakon Kosybo
 type = "passive"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"),

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 42)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty"))

eos/effects/boosterarmorrepairamountpenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorRepairAmountPenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 42)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit",

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 42)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty"))

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 37)
+# Implants from group: Booster (12 of 42)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty"))

eos/effects/boosterturretoptimalrangepenalty.py

@@ -1,7 +1,7 @@
 # boosterTurretOptimalRangePenalty
 #
 # Used by:
-# Implants from group: Booster (9 of 37)
+# Implants from group: Booster (9 of 42)
 type = "boosterSideEffect"
 def handler(fit, booster, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),

eos/effects/capacitorcapacitybonus.py

@@ -1,7 +1,7 @@
 # capacitorCapacityBonus
 #
 # Used by:
-# Modules from group: Capacitor Battery (27 of 27)
+# Modules from group: Capacitor Battery (22 of 22)
 type = "passive"
 def handler(fit, ship, context):
     fit.ship.increaseItemAttr("capacitorCapacity", ship.getModifiedItemAttr("capacitorBonus"))

eos/effects/capitallauncherskillcitadelemdamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "emDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelexplosivedamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "explosiveDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelkineticdamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "kineticDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcitadelthermaldamage.py

@@ -2,9 +2,9 @@
 #
 # Used by:
 # Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6)
-# Skill: Citadel Torpedoes
+# Skill: XL Torpedoes
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes"),
                                     "thermalDamage", container.getModifiedItemAttr("damageMultiplierBonus") * level)

eos/effects/capitallauncherskillcruisecitadelemdamage1.py

@@ -1,8 +1,8 @@
 # 	capitalLauncherSkillCruiseCitadelEmDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "emDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelexplosivedamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelExplosiveDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "explosiveDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelkineticdamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelKineticDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "kineticDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/capitallauncherskillcruisecitadelthermaldamage1.py

@@ -1,8 +1,8 @@
 # capitalLauncherSkillCruiseCitadelThermalDamage1
 #
 # Used by:
-# Skill: Citadel Cruise Missiles
+# Skill: XL Cruise Missiles
 type = "passive"
 def handler(fit, skill, context):
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "thermalDamage", skill.getModifiedItemAttr("damageMultiplierBonus") * skill.level)

eos/effects/damagecontrol.py

@@ -1,7 +1,7 @@
 # damageControl
 #
 # Used by:
-# Modules from group: Damage Control (14 of 14)
+# Modules from group: Damage Control (17 of 17)
 type = "passive"
 def handler(fit, module, context):
     for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):

eos/effects/decreasetargetspeed.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Drones from group: Stasis Webifying Drone (3 of 3)
-# Modules from group: Stasis Web (19 of 19)
 type = "active", "projected"
 def handler(fit, module, context):
     if "projected" not in context:

eos/effects/dronedamagebonusonline.py

@@ -1,7 +1,7 @@
 # droneDamageBonusOnline
 #
 # Used by:
-# Modules from group: Drone Damage Modules (10 of 10)
+# Modules from group: Drone Damage Modules (11 of 11)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronetrackingcomputerbonus.py

@@ -1,7 +1,7 @@
 # droneTrackingComputerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Modules (8 of 8)
+# Modules from group: Drone Tracking Modules (10 of 10)
 type = "active"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/dronetrackingenhancerbonus.py

@@ -1,7 +1,7 @@
 # droneTrackingEnhancerBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Enhancer (9 of 9)
+# Modules from group: Drone Tracking Enhancer (10 of 10)
 type = "passive"
 def handler(fit, module, context):
     fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"),

eos/effects/ecmburst.py

@@ -1,7 +1,7 @@
 # ecmBurst
 #
 # Used by:
-# Modules from group: ECM Burst (7 of 7)
+# Modules from group: Burst Jammer (11 of 11)
 type = "active"
 def handler(fit, module, context):
     pass

eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py

@@ -4,6 +4,7 @@
 # Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6)
 # Implants named like: Mindflood Booster (4 of 4)
 # Modules named like: Semiconductor Memory Cell (8 of 8)
+# Implant: Antipharmakon Aeolis
 # Implant: Genolution Core Augmentation CA-1
 # Skill: Capacitor Management
 type = "passive"

eos/effects/energyweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # energyWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (25 of 25)
+# Modules from group: Heat Sink (18 of 18)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"

eos/effects/energyweaponspeedmultiply.py

@@ -1,7 +1,7 @@
 # energyWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (25 of 25)
+# Modules from group: Heat Sink (18 of 18)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon",

eos/effects/ewskillecmburstfalloffbonus.py

@@ -1,8 +0,0 @@
-# ewSkillEcmBurstFalloffBonus
-#
-# Used by:
-# Skill: Frequency Modulation
-type = "passive"
-def handler(fit, skill, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Burst Jammer",
-                                  "falloffEffectiveness", skill.getModifiedItemAttr("falloffBonus") * skill.level)

eos/effects/ewtargetpaint.py

@@ -1,7 +1,6 @@
 # ewTargetPaint
 #
 # Used by:
-# Modules from group: Target Painter (9 of 9)
 # Drones named like: TP (3 of 3)
 type = "projected", "active"
 def handler(fit, container, context):

eos/effects/ewtesteffectjam.py

@@ -1,7 +1,6 @@
 # ewTestEffectJam
 #
 # Used by:
-# Modules from group: ECM (44 of 44)
 # Drones named like: EC (3 of 3)
 type = "projected", "active"
 def handler(fit, module, context):

eos/effects/gunneryfalloffbonusonline.py

@@ -1,7 +1,7 @@
 # gunneryFalloffBonusOnline
 #
 # Used by:
-# Modules from group: Tracking Enhancer (17 of 17)
+# Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):

eos/effects/gunnerymaxrangebonusonline.py

@@ -1,7 +1,7 @@
 # gunneryMaxRangeBonusOnline
 #
 # Used by:
-# Modules from group: Tracking Enhancer (17 of 17)
+# Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):

eos/effects/gunnerymaxrangefallofftrackingspeedbonus.py

@@ -1,7 +1,7 @@
 # gunneryMaxRangeFalloffTrackingSpeedBonus
 #
 # Used by:
-# Modules from group: Tracking Computer (14 of 14)
+# Modules from group: Tracking Computer (11 of 11)
 type = "active"
 def handler(fit, module, context):
     for attr in ("maxRange", "falloff", "trackingSpeed"):

eos/effects/gunnerytrackingspeedbonusonline.py

@@ -1,7 +1,7 @@
 # gunneryTrackingSpeedBonusOnline
 #
 # Used by:
-# Modules from group: Tracking Enhancer (17 of 17)
+# Modules from group: Tracking Enhancer (10 of 10)
 # Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):

eos/effects/hybridweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # hybridWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (20 of 20)
+# Modules from group: Magnetic Field Stabilizer (12 of 12)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"

eos/effects/hybridweaponspeedmultiply.py

@@ -1,7 +1,7 @@
 # hybridWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (20 of 20)
+# Modules from group: Magnetic Field Stabilizer (12 of 12)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon",

eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py

@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6)
 # Modules named like: Rocket Fuel Cache Partition (8 of 8)
+# Implant: Antipharmakon Toxot
 # Skill: Missile Bombardment
 type = "passive"
 def handler(fit, container, context):

eos/effects/missiledmgbonus.py

@@ -1,7 +1,7 @@
 # missileDMGBonus
 #
 # Used by:
-# Modules from group: Ballistic Control system (21 of 21)
+# Modules from group: Ballistic Control system (17 of 17)
 # Modules named like: QA Multiship Module Players (4 of 4)
 type = "passive"
 def handler(fit, container, context):

eos/effects/missilelauncherspeedmultiplier.py

@@ -1,7 +1,7 @@
 # missileLauncherSpeedMultiplier
 #
 # Used by:
-# Modules from group: Ballistic Control system (21 of 21)
+# Modules from group: Ballistic Control system (17 of 17)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"),

eos/effects/modifyenergywarfareresistance.py

@@ -1,3 +1,7 @@
+# modifyEnergyWarfareResistance
+#
+# Used by:
+# Modules from group: Capacitor Battery (22 of 22)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("energyWarfareResistance",

eos/effects/neutattackreflect.py

@@ -1,8 +0,0 @@
-# neutAttackReflect
-#
-# Used by:
-# Modules from group: Capacitor Battery (27 of 27)
-type = "passive"
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("neutReflector", module.getModifiedItemAttr("capAttackReflector"),
-                           stackingPenalties = True)

eos/effects/neutreflectamount.py

@@ -1,7 +0,0 @@
-# neutReflectAmount
-#
-# Used by:
-# Modules from group: Capacitor Battery (27 of 27)
-type = "passive"
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("neutReflectAmount", module.getModifiedItemAttr("neutReflectAmountBonus"))

eos/effects/nosattackreflect.py

@@ -1,8 +0,0 @@
-# nosAttackReflect
-#
-# Used by:
-# Modules from group: Capacitor Battery (27 of 27)
-type = "passive"
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("nosReflector", module.getModifiedItemAttr("capAttackReflector"),
-                           stackingPenalties = True)

eos/effects/nosreflectamount.py

@@ -1,7 +0,0 @@
-# nosReflectAmount
-#
-# Used by:
-# Modules from group: Capacitor Battery (27 of 27)
-type = "passive"
-def handler(fit, module, context):
-    fit.ship.boostItemAttr("nosReflectAmount", module.getModifiedItemAttr("nosReflectAmountBonus"))

eos/effects/overloadrofbonus.py

@@ -1,13 +1,9 @@
 # overloadRofBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (100 of 187)
-# Modules from group: Hybrid Weapon (110 of 202)
-# Modules from group: Missile Launcher Citadel (4 of 4)
-# Modules from group: Missile Launcher Heavy (12 of 12)
-# Modules from group: Missile Launcher Rocket (15 of 15)
-# Modules from group: Projectile Weapon (60 of 146)
-# Modules named like: Launcher (125 of 138)
+# Modules from group: Missile Launcher Torpedo (22 of 22)
+# Items from market group: Ship Equipment > Turrets & Bays (397 of 767)
+# Module: Interdiction Sphere Launcher I
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus"))

eos/effects/overloadselfeccmstrenghtbonus.py

@@ -1,10 +0,0 @@
-# overloadSelfECCMStrenghtBonus
-#
-# Used by:
-# Modules from group: ECCM (44 of 44)
-# Modules from group: Projected ECCM (7 of 7)
-type = "overheat"
-def handler(fit, module, context):
-    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        module.boostItemAttr("scan%sStrengthPercent" % scanType,
-                             module.getModifiedItemAttr("overloadECCMStrenghtBonus"))

eos/effects/overloadselfecmstrenghtbonus.py

@@ -1,8 +1,8 @@
 # overloadSelfECMStrenghtBonus
 #
 # Used by:
-# Modules from group: ECM (44 of 44)
-# Modules from group: ECM Burst (7 of 7)
+# Modules from group: Burst Jammer (11 of 11)
+# Modules from group: ECM (39 of 39)
 type = "overheat"
 def handler(fit, module, context):
     if "projected" not in context:

eos/effects/overloadselfpainterbonus.py

@@ -1,7 +1,7 @@
 # overloadSelfPainterBonus
 #
 # Used by:
-# Modules from group: Target Painter (9 of 9)
+# Modules from group: Target Painter (8 of 8)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("signatureRadiusBonus", module.getModifiedItemAttr("overloadPainterStrengthBonus") or 0)

eos/effects/overloadselfrangebonus.py

@@ -1,7 +1,8 @@
 # overloadSelfRangeBonus
 #
 # Used by:
-# Modules from group: Stasis Web (19 of 19)
+# Modules from group: Stasis Grappler (7 of 7)
+# Modules from group: Stasis Web (18 of 18)
 # Modules from group: Warp Scrambler (38 of 39)
 type = "overheat"
 def handler(fit, module, context):

eos/effects/overloadselfsensormodulebonus.py

@@ -2,8 +2,8 @@
 #
 # Used by:
 # Modules from group: Remote Sensor Booster (8 of 8)
-# Modules from group: Remote Sensor Damper (8 of 8)
-# Modules from group: Sensor Booster (12 of 12)
+# Modules from group: Sensor Booster (16 of 16)
+# Modules from group: Sensor Dampener (6 of 6)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("maxTargetRangeBonus", module.getModifiedItemAttr("overloadSensorModuleStrengthBonus"))

eos/effects/overloadselftrackingmodulebonus.py

@@ -1,9 +1,8 @@
 # overloadSelfTrackingModuleBonus
 #
 # Used by:
-# Modules from group: Drone Tracking Modules (8 of 8)
-# Modules from group: Remote Tracking Computer (10 of 10)
-# Modules from group: Tracking Computer (14 of 14)
+# Modules from group: Drone Tracking Modules (10 of 10)
+# Modules named like: Tracking Computer (19 of 19)
 # Variations of module: Tracking Disruptor I (6 of 6)
 type = "overheat"
 def handler(fit, module, context):

eos/effects/projectileweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # projectileWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (20 of 20)
+# Modules from group: Gyrostabilizer (12 of 12)
 # Modules named like: QA Multiship Module Players (4 of 4)
 # Module: QA Damage Module
 type = "passive"

eos/effects/projectileweaponspeedmultiply.py

@@ -1,7 +1,7 @@
 # projectileWeaponSpeedMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (20 of 20)
+# Modules from group: Gyrostabilizer (12 of 12)
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon",

eos/effects/remoteecmfalloff.py

@@ -1,3 +1,7 @@
+# remoteECMFalloff
+#
+# Used by:
+# Modules from group: ECM (39 of 39)
 type = "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:

eos/effects/remoteguidancedisruptfalloff.py

@@ -1,4 +1,4 @@
-# targetMissileDisruptorHostile
+# remoteGuidanceDisruptFalloff
 #
 # Used by:
 # Variations of module: Guidance Disruptor I (6 of 6)

eos/effects/remotesensorboostfalloff.py

@@ -1,3 +1,7 @@
+# remoteSensorBoostFalloff
+#
+# Used by:
+# Modules from group: Remote Sensor Booster (8 of 8)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" not in context:

eos/effects/remotesensordampfalloff.py

@@ -1,3 +1,7 @@
+# remoteSensorDampFalloff
+#
+# Used by:
+# Modules from group: Sensor Dampener (6 of 6)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" not in context:

eos/effects/remotetargetpaintfalloff.py

@@ -1,3 +1,7 @@
+# remoteTargetPaintFalloff
+#
+# Used by:
+# Modules from group: Target Painter (8 of 8)
 type = "projected", "active"
 def handler(fit, container, context):
     if "projected" in context:

eos/effects/remotetrackingassistfalloff.py

@@ -1,3 +1,7 @@
+# remoteTrackingAssistFalloff
+#
+# Used by:
+# Modules from group: Remote Tracking Computer (8 of 8)
 type= "projected", "active"
 def handler(fit, module, context):
     if "projected" in context:

eos/effects/remotetrackingdisruptfalloff.py

@@ -1,4 +1,4 @@
-# targetGunneryMaxRangeAndTrackingSpeedAndFalloffBonusHostile
+# remoteTrackingDisruptFalloff
 #
 # Used by:
 # Variations of module: Tracking Disruptor I (6 of 6)

eos/effects/remotewebifierfalloff.py

@@ -1,3 +1,8 @@
+# remoteWebifierFalloff
+#
+# Used by:
+# Modules from group: Stasis Grappler (7 of 7)
+# Modules from group: Stasis Web (18 of 18)
 type = "active", "projected"
 def handler(fit, module, context):
     if "projected" not in context: return

eos/effects/scanstrengthbonuspercentactivate.py

@@ -1,7 +1,6 @@
 # scanStrengthBonusPercentActivate
 #
 # Used by:
-# Modules from group: ECCM (44 of 44)
 # Module: QA ECCM
 type = "active"
 def handler(fit, module, context):

eos/effects/scanstrengthbonuspercentonline.py

@@ -1,7 +1,7 @@
 # scanStrengthBonusPercentOnline
 #
 # Used by:
-# Modules from group: Sensor Backup Array (72 of 72)
+# Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
 def handler(fit, module, context):
     for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

eos/effects/scanstrengthtargetpercentbonus.py

@@ -1,11 +0,0 @@
-# scanStrengthTargetPercentBonus
-#
-# Used by:
-# Modules from group: Projected ECCM (7 of 7)
-type = "projected", "active"
-def handler(fit, module, context):
-    if "projected" not in context: return
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr("scan%sStrength" % type,
-                               module.getModifiedItemAttr("scan%sStrengthPercent" % type),
-                               stackingPenalties = True)

eos/effects/scriptsensorboostermaxtargetrangebonusbonus.py

@@ -1,7 +1,7 @@
 # scriptSensorBoosterMaxTargetRangeBonusBonus
 #
 # Used by:
-# Charges from group: Sensor Booster Script (2 of 2)
+# Charges from group: Sensor Booster Script (3 of 3)
 # Charges from group: Sensor Dampener Script (2 of 2)
 type = "passive"
 def handler(fit, module, context):

eos/effects/scriptsensorboosterscanresolutionbonusbonus.py

@@ -1,7 +1,7 @@
 # scriptSensorBoosterScanResolutionBonusBonus
 #
 # Used by:
-# Charges from group: Sensor Booster Script (2 of 2)
+# Charges from group: Sensor Booster Script (3 of 3)
 # Charges from group: Sensor Dampener Script (2 of 2)
 type = "passive"
 def handler(fit, module, context):

eos/effects/scriptsensorboostersensorstrengthbonusbonus.py

@@ -1,3 +1,7 @@
+# scriptSensorBoosterSensorStrengthBonusBonus
+#
+# Used by:
+# Charges from group: Sensor Booster Script (3 of 3)
 type = "active"
 def handler(fit, module, context):
     for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):

eos/effects/sensorboosteractivepercentage.py

@@ -1,7 +1,7 @@
 # sensorBoosterActivePercentage
 #
 # Used by:
-# Modules from group: Sensor Booster (12 of 12)
+# Modules from group: Sensor Booster (16 of 16)
 type = "active"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),

eos/effects/shieldboostamplifierpassivebooster.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Implants named like: Blue Pill Booster (5 of 5)
+# Implant: Antipharmakon Thureo
 type = "passive"
 def handler(fit, container, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"),

eos/effects/shipbonusdreadcitadelcruiserofc1.py

@@ -4,5 +4,5 @@
 # Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Cruise Missiles"),
                                   "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought")

eos/effects/shipbonusdreadcitadeltorprofc1.py

@@ -4,5 +4,5 @@
 # Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
-    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Citadel Torpedoes"),
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("XL Torpedoes"),
                                   "speed", ship.getModifiedItemAttr("dreadnoughtShipBonusC1"), skill="Caldari Dreadnought")

eos/effects/shipbonusremotetrackingcomputerfalloffgc2.py

@@ -1,3 +1,7 @@
+# shipBonusRemoteTrackingComputerFalloffGC2
+#
+# Used by:
+# Ship: Oneiros
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",

eos/effects/shipbonusremotetrackingcomputerfalloffmc.py

@@ -1,3 +1,7 @@
+# shipBonusRemoteTrackingComputerFalloffMC
+#
+# Used by:
+# Ship: Scimitar
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Tracking Computer",

eos/effects/shipmaxlockedtargetsbonusaddonline.py

@@ -1,7 +1,7 @@
 # shipMaxLockedTargetsBonusAddOnline
 #
 # Used by:
-# Modules from group: Signal Amplifier (11 of 11)
+# Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("maxLockedTargets", module.getModifiedItemAttr("maxLockedTargetsBonus"))

eos/effects/shipmaxtargetrangebonusonline.py

@@ -1,7 +1,7 @@
 # shipMaxTargetRangeBonusOnline
 #
 # Used by:
-# Modules from group: Signal Amplifier (11 of 11)
+# Modules from group: Signal Amplifier (7 of 7)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),

eos/effects/shipscanresolutionbonusonline.py

@@ -1,7 +1,7 @@
 # shipScanResolutionBonusOnline
 #
 # Used by:
-# Modules from group: Signal Amplifier (11 of 11)
+# Modules from group: Signal Amplifier (7 of 7)
 # Module: QA Damage Module
 type = "passive"
 def handler(fit, module, context):

eos/effects/siegemodeeffect6.py

@@ -18,12 +18,12 @@ def handler(fit, module, context):
 
     #Missiles
     for type in ("kinetic", "thermal", "explosive", "em"):
-        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes") or \
-                                        mod.charge.requiresSkill("Citadel Cruise Missiles"),
+        fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \
+                                        mod.charge.requiresSkill("XL Cruise Missiles"),
                                         "%sDamage" % type, module.getModifiedItemAttr("damageMultiplierBonus"))
 
-    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Citadel Torpedoes") or \
-                                    mod.charge.requiresSkill("Citadel Cruise Missiles"),
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("XL Torpedoes") or \
+                                    mod.charge.requiresSkill("XL Cruise Missiles"),
                                     "aoeVelocity", module.getModifiedItemAttr("aoeVelocityBonus"))
 
     #Shield Boosters

eos/effects/targetgunnerymaxrangefallofftrackingspeedbonusassistance.py

@@ -1,16 +0,0 @@
-# targetGunneryMaxRangeFalloffTrackingSpeedBonusAssistance
-#
-# Used by:
-# Modules from group: Remote Tracking Computer (10 of 10)
-type= "projected", "active"
-def handler(fit, module, context):
-    if "projected" in context:
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "trackingSpeed", module.getModifiedItemAttr("trackingSpeedBonus"),
-                                      stackingPenalties = True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "maxRange", module.getModifiedItemAttr("maxRangeBonus"),
-                                      stackingPenalties = True)
-        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"),
-                                      "falloff", module.getModifiedItemAttr("falloffBonus"),
-                                      stackingPenalties = True)

eos/effects/targetmaxtargetrangeandscanresolutionbonusassistance.py

@@ -1,13 +0,0 @@
-# targetMaxTargetRangeAndScanResolutionBonusAssistance
-#
-# Used by:
-# Modules from group: Remote Sensor Booster (8 of 8)
-type= "projected", "active"
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True)

eos/effects/targetmaxtargetrangeandscanresolutionbonushostile.py

@@ -1,12 +0,0 @@
-# targetMaxTargetRangeAndScanResolutionBonusHostile
-#
-# Used by:
-# Modules from group: Remote Sensor Damper (8 of 8)
-type= "projected", "active"
-def handler(fit, module, context):
-    if "projected" not in context:
-        return
-    fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("maxTargetRangeBonus"),
-                           stackingPenalties = True)
-    fit.ship.boostItemAttr("scanResolution", module.getModifiedItemAttr("scanResolutionBonus"),
-                           stackingPenalties = True)

eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py

@@ -3,6 +3,7 @@
 # Used by:
 # Implants named like: Drop Booster (4 of 4)
 # Implants named like: Eifyr and Co. 'Gunslinger' Motion Prediction MR (6 of 6)
+# Implant: Antipharmakon Iokira
 # Implant: Ogdin's Eye Coordination Enhancer
 # Skill: Motion Prediction
 type = "passive"

eos/effects/usemissiles.py

@@ -1,9 +1,9 @@
 # useMissiles
 #
 # Used by:
-# Modules from group: Missile Launcher Citadel (4 of 4)
 # Modules from group: Missile Launcher Heavy (12 of 12)
 # Modules from group: Missile Launcher Rocket (15 of 15)
+# Modules from group: XL Missile Launcher  (4 of 4)
 # Modules named like: Launcher (138 of 138)
 type = 'active'
 def handler(fit, module, context):

eos/saveddata/fit.py

@@ -823,7 +823,9 @@ class Fit(object):
         return 10 / rechargeRate * sqrt(percent) * (1 - sqrt(percent)) * capacity
 
     def addDrain(self, cycleTime, capNeed, clipSize=0):
-        self.__extraDrains.append((cycleTime, capNeed, clipSize))
+        """ Used for both cap drains and cap fills (fills have negative capNeed) """
+        resistance = self.ship.getModifiedItemAttr("energyWarfareResistance") or 1 if capNeed > 0 else 1
+        self.__extraDrains.append((cycleTime, capNeed * resistance, clipSize))
 
     def removeDrain(self, i):
         del self.__extraDrains[i]

gui/builtinStatsViews/priceViewFull.py

@@ -23,7 +23,6 @@ from gui import builtinStatsViews
 from gui.bitmapLoader import BitmapLoader
 from gui.utils.numberFormatter import formatAmount
 import service
-import locale
 
 class PriceViewFull(StatsView):
     name = "priceViewFull"
@@ -107,15 +106,15 @@ class PriceViewFull(StatsView):
 
         if self._cachedShip != shipPrice:
             self.labelPriceShip.SetLabel("%s ISK" % formatAmount(shipPrice, 3, 3, 9, currency=True))
-            self.labelPriceShip.SetToolTip(wx.ToolTip(locale.format('%.2f', shipPrice, 1)))
+            self.labelPriceShip.SetToolTip(wx.ToolTip('{:,.2f}'.format(shipPrice)))
             self._cachedShip = shipPrice
         if self._cachedFittings != modPrice:
             self.labelPriceFittings.SetLabel("%s ISK" % formatAmount(modPrice, 3, 3, 9, currency=True))
-            self.labelPriceFittings.SetToolTip(wx.ToolTip(locale.format('%.2f', modPrice, 1)))
+            self.labelPriceFittings.SetToolTip(wx.ToolTip('{:,.2f}'.format(modPrice)))
             self._cachedFittings = modPrice
         if self._cachedTotal != (shipPrice+modPrice):
             self.labelPriceTotal.SetLabel("%s ISK" % formatAmount(shipPrice + modPrice, 3, 3, 9, currency=True))
-            self.labelPriceTotal.SetToolTip(wx.ToolTip(locale.format('%.2f', (shipPrice + modPrice), 1)))
+            self.labelPriceTotal.SetToolTip(wx.ToolTip('{:,.2f}'.format(shipPrice + modPrice)))
             self._cachedTotal = shipPrice + modPrice
         self.panel.Layout()
 

gui/builtinStatsViews/targetingMiscViewFull.py

@@ -22,7 +22,6 @@ from gui.statsView import StatsView
 from gui import builtinStatsViews
 from gui.utils.numberFormatter import formatAmount
 import locale
-
 try:
     from collections import OrderedDict
 except ImportError:
@@ -201,17 +200,15 @@ class TargetingMiscViewFull(StatsView):
                            label.SetToolTip(wx.ToolTip("Type: %s" % (fit.scanType)))
                     elif labelName == "labelFullAlignTime":
                         alignTime = "Align:\t%.3fs"%mainValue
-                        mass = "Mass:\t%skg"%locale.format('%d', fit.ship.getModifiedItemAttr("mass"), 1)
+                        mass = 'Mass:\t{:,.0f}kg'.format(fit.ship.getModifiedItemAttr("mass"))
                         agility = "Agility:\t%.3fx"%fit.ship.getModifiedItemAttr("agility")
                         label.SetToolTip(wx.ToolTip("%s\n%s\n%s" % (alignTime, mass, agility)))
                     elif labelName == "labelFullCargo":
                         tipLines = []
-                        tipLines.append(u"Cargohold: %sm\u00B3 / %sm\u00B3"% (
-                            locale.format('%.2f', fit.cargoBayUsed, 1),
-                            locale.format('%.2f', newValues["main"], 1)))
+                        tipLines.append(u"Cargohold: {:,.2f}m\u00B3 / {:,.2f}m\u00B3".format(fit.cargoBayUsed, newValues["main"]))
                         for attrName, tipAlias in cargoNamesOrder.items():
                             if newValues[attrName] > 0:
-                                tipLines.append(u"%s: %sm\u00B3"% (tipAlias, locale.format('%.2f', newValues[attrName], 1)))
+                                tipLines.append(u"{}: {:,.2f}m\u00B3".format(tipAlias, newValues[attrName]))
                         label.SetToolTip(wx.ToolTip(u"\n".join(tipLines)))
                     else:
                         label.SetToolTip(wx.ToolTip("%.1f" % mainValue))
@@ -237,12 +234,10 @@ class TargetingMiscViewFull(StatsView):
                     # if you add stuff to cargo, the capacity doesn't change and thus it is still cached
                     # This assures us that we force refresh of cargo tooltip
                     tipLines = []
-                    tipLines.append(u"Cargohold: %sm\u00B3 / %sm\u00B3"% (
-                        locale.format('%.2f', fit.cargoBayUsed, 1),
-                        locale.format('%.2f', cachedCargo["main"], 1)))
+                    tipLines.append(u"Cargohold: {:,.2f}m\u00B3 / {:,.2f}m\u00B3".format(fit.cargoBayUsed, cachedCargo["main"]))
                     for attrName, tipAlias in cargoNamesOrder.items():
                         if cachedCargo[attrName] > 0:
-                            tipLines.append(u"%s: %sm\u00B3"% (tipAlias, locale.format('%.2f', cachedCargo[attrName], 1)))
+                            tipLines.append(u"{}: {:,.2f}m\u00B3".format(tipAlias, cachedCargo[attrName]))
                     label.SetToolTip(wx.ToolTip(u"\n".join(tipLines)))
                 else:
                     label.SetToolTip(wx.ToolTip(""))

gui/mainFrame.py

@@ -116,12 +116,10 @@ class MainFrame(wx.Frame):
     def getInstance(cls):
         return cls.__instance if cls.__instance is not None else MainFrame()
 
-    def __init__(self):
-        self.title="pyfa %s%s - Python Fitting Assistant"%(config.version, "" if config.tag.lower() != 'git' else " (git)")
+    def __init__(self, title):
+        self.title=title
         wx.Frame.__init__(self, None, wx.ID_ANY, self.title)
 
-        self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
-
         MainFrame.__instance = self
 
         #Load stored settings (width/height/maximized..)

pyfa.py

@@ -43,6 +43,8 @@ parser = PassThroughOptionParser(usage=usage)
 parser.add_option("-r", "--root", action="store_true", dest="rootsavedata", help="if you want pyfa to store its data in root folder, use this option", default=False)
 parser.add_option("-w", "--wx28", action="store_true", dest="force28", help="Force usage of wxPython 2.8", default=False)
 parser.add_option("-d", "--debug", action="store_true", dest="debug", help="Set logger to debug level.", default=False)
+parser.add_option("-t", "--title", action="store", dest="title", help="Set Window Title", default=None)
+parser.add_option("-s", "--savepath", action="store", dest="savepath", help="Set the folder for savedata", default=None)
 
 (options, args) = parser.parse_args()
 
@@ -99,9 +101,16 @@ if __name__ == "__main__":
     # Configure paths
     if options.rootsavedata is True:
         config.saveInRoot = True
+        
+    # set title if it wasn't supplied by argument
+    if options.title == None:
+        options.title = "pyfa %s%s - Python Fitting Assistant"%(config.version, "" if config.tag.lower() != 'git' else " (git)")
 
     config.debug = options.debug
-    config.defPaths()
+    # convert to unicode if it is set
+    if options.savepath is not None:
+        options.savepath = unicode(options.savepath)
+    config.defPaths(options.savepath)
 
     # Basic logging initialization
     import logging
@@ -123,5 +132,5 @@ if __name__ == "__main__":
     eos.db.saveddata_meta.create_all()
 
     pyfa = wx.App(False)
-    MainFrame()
+    MainFrame(options.title)
     pyfa.MainLoop()

scripts/effectUsedBy.py

@@ -1063,6 +1063,7 @@ inner score: {5:.3})"
             print("Warning: effect file " + effect_name +
               " is not used by any item, removing")
             os.remove(os.path.join(effects_path, effect_file))
+            continue
         else:
             print("Warning: effect file " + effect_name +
               " is not used by any item")