Add latest changes from Singularity

This reverts commit 33a0c10650, reversing
changes made to 2077655694.

Reverting merges fucks up git, but oh well - we probably better merge stuff manually rather than fucking up master with wx3 which is apparently buggy

config.py

@@ -13,15 +13,15 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.8.1"
-tag = "Stable"
-expansionName = "Proteus"
-expansionVersion = "1.0"
+version = "1.11.1"
+tag = "git"
+expansionName = "Singularity"
+expansionVersion = "883859"
 evemonMinVersion = "4081"
 
 # Database version (int ONLY)
 # Increment every time we need to flag for user database upgrade/modification
-dbversion = 4
+dbversion = 7
 
 pyfaPath = None
 savePath = None
@@ -29,6 +29,11 @@ staticPath = None
 saveDB = None
 gameDB = None
 
+# TODO: move back to pyfa.py main loop
+# We moved it here just to avoid rebuilding windows skeleton for now (any change to pyfa.py needs it)
+import logging
+logging.basicConfig()
+
 def defPaths():
     global pyfaPath
     global savePath

eos/capSim.py

@@ -82,18 +82,25 @@ class CapSimulator(object):
             if self.scale:
                 duration, capNeed = self.scale_activation(duration, capNeed)
 
-            if self.stagger:
-                duration = int(duration/amount)
-            else:
-                capNeed *= amount
-
-            period = lcm(period, duration)
-
             # set clipSize to infinite if reloads are disabled unless it's
             # a cap booster module.
             if not self.reload and capNeed > 0:
                 clipSize = 0
 
+            if self.stagger:
+                if clipSize == 0:
+                    duration = int(duration/amount)
+                else:
+                    stagger_amount = (duration*clipSize+10000)/(amount*clipSize)
+                    for i in range(1, amount):
+                        heapq.heappush(self.state,
+                                       [i*stagger_amount, duration,
+                                        capNeed, 0, clipSize])
+            else:
+                capNeed *= amount
+
+            period = lcm(period, duration)
+
             # period optimization doesn't work when reloads are active.
             if clipSize:
                 disable_period = True

eos/config.py

@@ -1,11 +1,11 @@
-import os.path
+from os.path import realpath, join, dirname, abspath
 import sys
 
 debug = False
 gamedataCache = True
 saveddataCache = True
-gamedata_connectionstring = 'sqlite:///' + os.path.expanduser(os.path.join("~", ".pyfa","eve.db"))
+gamedata_connectionstring = 'sqlite:///' + unicode(realpath(join(dirname(abspath(__file__)), "..", "staticdata", "eve.db")), sys.getfilesystemencoding())
 saveddata_connectionstring = 'sqlite:///:memory:'
 
 #Autodetect path, only change if the autodetection bugs out.
-path = os.path.dirname(unicode(__file__, sys.getfilesystemencoding()))
+path = dirname(unicode(__file__, sys.getfilesystemencoding()))

eos/db/migrations/upgrade5.py

@@ -0,0 +1,8 @@
+"""
+Migration 5
+
+Simply deletes damage profiles with a blank name. See GH issue #256
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ?', ("",))

eos/db/migrations/upgrade6.py

@@ -0,0 +1,9 @@
+"""
+Migration 6
+
+Overwrites damage profile 0 to reset bad uniform values (bad values set with bug)
+"""
+
+def upgrade(saveddata_engine):
+    saveddata_engine.execute('DELETE FROM damagePatterns WHERE name LIKE ? OR ID LIKE ?', ("Uniform", "1"))
+    saveddata_engine.execute('INSERT INTO damagePatterns VALUES (?, ?, ?, ?, ?, ?, ?)', (1, "Uniform", 25, 25, 25, 25, None))

eos/db/migrations/upgrade7.py

@@ -0,0 +1,24 @@
+"""
+Migration 7
+
+- Converts Scorpion Ishukone Watch to Scorpion
+
+    Mosaic introduced proper skinning system, and Ishukone Scorp
+    was the only ship which was presented as stand-alone ship in
+    Pyfa.
+"""
+
+
+CONVERSIONS = {
+    640: (  # Scorpion
+        4005,  # Scorpion Ishukone Watch
+    )
+}
+
+def upgrade(saveddata_engine):
+
+    # Convert ships
+    for replacement_item, list in CONVERSIONS.iteritems():
+        for retired_item in list:
+            saveddata_engine.execute('UPDATE "fits" SET "shipID" = ? WHERE "shipID" = ?', (replacement_item, retired_item))
+

eos/effects/addtosignatureradius2.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Bomb (2 of 2)
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusAdd"))

eos/effects/armorhpbonusadd.py

@@ -1,7 +1,7 @@
 # armorHPBonusAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (38 of 38)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("armorHP", module.getModifiedItemAttr("armorHPBonusAdd"))

eos/effects/armorreinforcermassadd.py

@@ -1,7 +1,8 @@
 # armorReinforcerMassAdd
 #
 # Used by:
-# Modules from group: Armor Reinforcer (57 of 57)
+# Modules from group: Armor Reinforcer (38 of 38)
+# Modules from group: Entosis Link (2 of 2)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("mass", module.getModifiedItemAttr("massAddition"))

eos/effects/caldarishipecmburstoptimalrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewfalloffrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewoptimalrangecb3.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/caldarishipewstrengthcb.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Scorpion
-# Ship: Scorpion Ishukone Watch
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/capacitorcapacitymultiply.py

@@ -4,7 +4,7 @@
 # Modules from group: Capacitor Flux Coil (6 of 6)
 # Modules from group: Capacitor Power Relay (20 of 20)
 # Modules from group: Power Diagnostic System (23 of 23)
-# Modules from group: Propulsion Module (107 of 107)
+# Modules from group: Propulsion Module (114 of 114)
 # Modules from group: Reactor Control Unit (22 of 22)
 # Modules from group: Shield Flux Coil (11 of 11)
 # Modules from group: Shield Power Relay (11 of 11)

eos/effects/commandbonustdmultiplywithcommandbonushidden.py

@@ -6,6 +6,7 @@ gangBonus = "commandBonusTD"
 gangBoost = "ewarStrTD"
 type = "active", "gang"
 def handler(fit, module, context):
+    if "gang" not in context: return
     for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"):
-        fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"),
+        fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"),
                                       bonus, module.getModifiedItemAttr("commandBonusTD"))

eos/effects/commandshipmultirelayeffect.py

@@ -1,9 +1,9 @@
 # commandshipMultiRelayEffect
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
 # Ships from group: Command Ship (8 of 8)
-# Ships from group: Industrial Command Ship (2 of 2)
+# Ship: Orca
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemIncrease(lambda mod: mod.item.group.name == "Gang Coordinator",

eos/effects/covertopscloakcpupercentbonuspiratefaction.py

@@ -3,6 +3,7 @@
 # Used by:
 # Ship: Astero
 # Ship: Prospect
+# Ship: Victorieux Luxury Yacht
 type = "passive"
 runTime = "early"
 def handler(fit, ship, context):

eos/effects/drawbackcpuoutput.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Modules from group: Rig Drones (64 of 64)
-# Modules named like: Optimizer (16 of 16)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("cpuOutput", module.getModifiedItemAttr("drawback"))

eos/effects/drawbacksigrad.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules from group: Rig Shield (72 of 72)
+# Modules named like: Optimizer (16 of 16)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("drawback"), stackingPenalties = True)

eos/effects/dreadnoughtmd1projdmgbonus.py

@@ -1,7 +1,7 @@
 # dreadnoughtMD1ProjDmgBonus
 #
 # Used by:
-# Ships named like: Naglfar (2 of 2)
+# Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Dreadnought").level

eos/effects/dreadnoughtmd3projrofbonus.py

@@ -1,7 +1,7 @@
 # dreadnoughtMD3ProjRoFBonus
 #
 # Used by:
-# Ships named like: Naglfar (2 of 2)
+# Ship: Naglfar
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Dreadnought").level

eos/effects/dreadnoughtshipbonushybriddmgg1.py

@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridDmgG1
 #
 # Used by:
-# Ships named like: Moros (2 of 2)
+# Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Dreadnought").level

eos/effects/dreadnoughtshipbonushybridrofg2.py

@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusHybridRoFG2
 #
 # Used by:
-# Ships named like: Moros (2 of 2)
+# Ship: Moros
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Dreadnought").level

eos/effects/dreadnoughtshipbonuslasercapneeda1.py

@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserCapNeedA1
 #
 # Used by:
-# Ships named like: Revelation (2 of 2)
+# Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Dreadnought").level

eos/effects/dreadnoughtshipbonuslaserrofa2.py

@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusLaserRofA2
 #
 # Used by:
-# Ships named like: Revelation (2 of 2)
+# Ship: Revelation
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Dreadnought").level

eos/effects/dreadnoughtshipbonusshieldresistancesc2.py

@@ -1,7 +1,7 @@
 # dreadnoughtShipBonusShieldResistancesC2
 #
 # Used by:
-# Ships named like: Phoenix (2 of 2)
+# Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level

eos/effects/elitebargebonusiceharvestingcycletimebarge3.py

@@ -1,7 +1,7 @@
 # eliteBargeBonusIceHarvestingCycleTimeBarge3
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Exhumers").level

eos/effects/elitebargebonusminingdurationbarge2.py

@@ -1,7 +1,7 @@
 # eliteBargeBonusMiningDurationBarge2
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Exhumers").level

eos/effects/elitebargeshieldresistance1.py

@@ -1,7 +1,7 @@
 # eliteBargeShieldResistance1
 #
 # Used by:
-# Ships from group: Exhumer (4 of 4)
+# Ships from group: Exhumer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Exhumers").level

eos/effects/elitebonusmarauderscruiseandtorpedodamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersCruiseAndTorpedoDamageRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     damageTypes = ("em", "explosive", "kinetic", "thermal")

eos/effects/elitebonusmaraudersheavymissiledamageemrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageEMRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamageexprole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageExpRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamagekinrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageKinRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudersheavymissiledamagethermrole1.py

@@ -1,7 +1,7 @@
 # eliteBonusMaraudersHeavyMissileDamageThermRole1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"),

eos/effects/elitebonusmaraudershieldbonus2a.py

@@ -1,7 +1,8 @@
 # eliteBonusMarauderShieldBonus2a
 #
 # Used by:
-# Ships from group: Marauder (8 of 16)
+# Ship: Golem
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorsewtargetpainting1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsEwTargetPainting1
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeenergyturretdamage1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamage1
 #
 # Used by:
-# Ships named like: Paladin (4 of 4)
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeenergyturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeEnergyTurretDamageRole1
 #
 # Used by:
-# Ships named like: Paladin (4 of 4)
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Energy Turret"),

eos/effects/elitebonusviolatorslargehybridturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretDamageRole1
 #
 # Used by:
-# Ships named like: Kronos (4 of 4)
+# Ship: Kronos
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Hybrid Turret"),

eos/effects/elitebonusviolatorslargehybridturrettracking1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeHybridTurretTracking1
 #
 # Used by:
-# Ships named like: Kronos (4 of 4)
+# Ship: Kronos
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorslargeprojectileturretdamagerole1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretDamageRole1
 #
 # Used by:
-# Ships named like: Vargur (4 of 4)
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"),

eos/effects/elitebonusviolatorslargeprojectileturrettracking1.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsLargeProjectileTurretTracking1
 #
 # Used by:
-# Ships named like: Vargur (4 of 4)
+# Ship: Vargur
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorsrepairsystemsarmordamageamount2.py

@@ -1,7 +1,8 @@
 # eliteBonusViolatorsRepairSystemsArmorDamageAmount2
 #
 # Used by:
-# Ships from group: Marauder (8 of 16)
+# Ship: Kronos
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Marauders").level

eos/effects/elitebonusviolatorstractorbeammaxrangerole2.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxRangeRole2
 #
 # Used by:
-# Ships from group: Marauder (16 of 16)
+# Ships from group: Marauder (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",

eos/effects/elitebonusviolatorstractorbeammaxtractorvelocityrole3.py

@@ -1,7 +1,7 @@
 # eliteBonusViolatorsTractorBeamMaxTractorVelocityRole3
 #
 # Used by:
-# Ships from group: Marauder (16 of 16)
+# Ships from group: Marauder (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tractor Beam",

eos/effects/entosislink.py

@@ -0,0 +1,7 @@
+# entosisLink
+#
+# Used by:
+# Modules from group: Entosis Link (2 of 2)
+type = "active"
+def handler(fit, module, context):
+    pass

eos/effects/iceharvestercapacitorneedmultiplier.py

@@ -1,9 +1,8 @@
 # iceHarvesterCapacitorNeedMultiplier
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
-# Ship: Procurer
-# Ship: Retriever
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/iceharvesterdurationmultiplier.py

@@ -1,9 +1,8 @@
 # iceHarvesterDurationMultiplier
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
-# Ship: Procurer
-# Ship: Retriever
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Ice Harvesting"),

eos/effects/minigamevirusstrengthbonus.py

@@ -4,12 +4,12 @@
 # Ships from group: Covert Ops (5 of 5)
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4)
-# Variations of ship: Heron (3 of 3)
-# Variations of ship: Imicus (3 of 3)
-# Variations of ship: Magnate (4 of 6)
-# Variations of ship: Probe (3 of 3)
 # Ship: Astero
+# Ship: Heron
+# Ship: Imicus
+# Ship: Magnate
 # Ship: Nestor
+# Ship: Probe
 type = "passive"
 def handler(fit, container, context):
     level = container.level if "skill" in context else 1

eos/effects/miningdirectorbonuscommandbonuseffective.py

@@ -1,7 +1,7 @@
 # miningDirectorBonusCommandBonusEffective
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"),

eos/effects/miningyieldmultiplypassive.py

@@ -1,10 +1,9 @@
 # miningYieldMultiplyPassive
 #
 # Used by:
-# Ships from group: Exhumer (3 of 4)
+# Variations of ship: Procurer (2 of 2)
+# Variations of ship: Retriever (2 of 2)
 # Variations of ship: Venture (2 of 2)
-# Ship: Procurer
-# Ship: Retriever
 type = "passive"
 def handler(fit, module, context):
     fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Mining"),

eos/effects/minmatarshipewtargetpaintermc1.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Bellicose
+# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

eos/effects/minmatarshipewtargetpaintermc2.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Huginn
-# Ship: Rapier
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Cruiser").level

eos/effects/modeagilitypostdiv.py

@@ -1,8 +1,12 @@
 # modeAgilityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("agility", 1/module.getModifiedItemAttr("modeAgilityPostDiv"),
-                           stackingPenalties = True, penaltyGroup="postDiv")
+    fit.ship.multiplyItemAttr(
+        "agility",
+        1 / module.getModifiedItemAttr("modeAgilityPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modearmorresonancepostdiv.py

@@ -1,15 +1,19 @@
 # modeArmorResonancePostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Module: Confessor Defense Mode
+# Module: Svipul Defense Mode
 type = "passive"
 def handler(fit, module, context):
-    for resType in ("Em", "Explosive", "Kinetic"):
-        fit.ship.multiplyItemAttr("armor{0}DamageResonance".format(resType),
-                            1/module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(resType)),
-                            stackingPenalties = True, penaltyGroup="postDiv")
-
-    # Thermal != Thermic
-    fit.ship.multiplyItemAttr("armorThermalDamageResonance",
-                            1/module.getModifiedItemAttr("modeThermicResistancePostDiv"),
-                            stackingPenalties = True, penaltyGroup="postDiv")
+    for srcResType, tgtResType in (
+        ("Em", "Em"),
+        ("Explosive", "Explosive"),
+        ("Kinetic", "Kinetic"),
+        ("Thermic", "Thermal")
+    ):
+        fit.ship.multiplyItemAttr(
+            "armor{0}DamageResonance".format(tgtResType),
+            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
+        )

eos/effects/modemwdsigradiuspostdiv.py

@@ -0,0 +1,13 @@
+# modeMWDSigRadiusPostDiv
+#
+# Used by:
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    fit.modules.filteredItemMultiply(
+        lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),
+        "signatureRadiusBonus",
+        1 / module.getModifiedItemAttr("modeMWDSigPenaltyPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/modeshieldresonancepostdiv.py

@@ -0,0 +1,19 @@
+# modeShieldResonancePostDiv
+#
+# Used by:
+# Module: Jackdaw Defense Mode
+# Module: Svipul Defense Mode
+type = "passive"
+def handler(fit, module, context):
+    for srcResType, tgtResType in (
+        ("Em", "Em"),
+        ("Explosive", "Explosive"),
+        ("Kinetic", "Kinetic"),
+        ("Thermic", "Thermal")
+    ):
+        fit.ship.multiplyItemAttr(
+            "shield{0}DamageResonance".format(tgtResType),
+            1 / module.getModifiedItemAttr("mode{0}ResistancePostDiv".format(srcResType)),
+            stackingPenalties=True,
+            penaltyGroup="postDiv"
+        )

eos/effects/modesigradiuspostdiv.py

@@ -1,9 +1,9 @@
 # modeSigRadiusPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Defense Mode
+# Module: Confessor Defense Mode
+# Module: Jackdaw Defense Mode
 type = "passive"
 def handler(fit, module, context):
-    level = fit.character.getSkill("Minmatar Destroyer").level
-    fit.ship.multiplyItemAttr("signatureRadius", 1/module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
-                           stackingPenalties = True, penaltyGroup="postDiv")
+    fit.ship.multiplyItemAttr("signatureRadius", 1 / module.getModifiedItemAttr("modeSignatureRadiusPostDiv"),
+                              stackingPenalties=True, penaltyGroup="postDiv")

eos/effects/modevelocitypostdiv.py

@@ -1,8 +1,12 @@
 # modeVelocityPostDiv
 #
 # Used by:
-# Module: Amarr Tactical Destroyer Propulsion Mode
+# Modules named like: Propulsion Mode (3 of 3)
 type = "passive"
 def handler(fit, module, context):
-    fit.ship.multiplyItemAttr("maxVelocity", 1/module.getModifiedItemAttr("modeVelocityPostDiv"),
-                           stackingPenalties = True, penaltyGroup="postDiv")
+    fit.ship.multiplyItemAttr(
+        "maxVelocity",
+        1 / module.getModifiedItemAttr("modeVelocityPostDiv"),
+        stackingPenalties=True,
+        penaltyGroup="postDiv"
+    )

eos/effects/mwdsignatureradiusrolebonus.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Ships from group: Assault Frigate (8 of 12)
-# Ships from group: Heavy Assault Cruiser (10 of 13)
+# Ships from group: Heavy Assault Cruiser (8 of 11)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"),

eos/effects/orecapitalshipshieldtransferrange.py

@@ -1,7 +1,7 @@
 # oreCapitalShipShieldTransferRange
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Capital Industrial Ships").level

eos/effects/overloadrofbonus.py

@@ -1,7 +1,7 @@
 # overloadRofBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (100 of 186)
+# 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)

eos/effects/overloadselfdamagebonus.py

@@ -1,7 +1,7 @@
 # overloadSelfDamageBonus
 #
 # Used by:
-# Modules from group: Energy Weapon (86 of 186)
+# Modules from group: Energy Weapon (86 of 187)
 # Modules from group: Hybrid Weapon (92 of 202)
 # Modules from group: Projectile Weapon (86 of 146)
 type = "overheat"

eos/effects/overloadselfspeedbonus.py

@@ -1,7 +1,7 @@
 # overloadSelfSpeedBonus
 #
 # Used by:
-# Modules from group: Propulsion Module (107 of 107)
+# Modules from group: Propulsion Module (114 of 114)
 type = "overheat"
 def handler(fit, module, context):
     module.boostItemAttr("speedFactor", module.getModifiedItemAttr("overloadSpeedFactorBonus"),

eos/effects/probelaunchercpupercentbonustacticaldestroyer.py

@@ -1,7 +1,7 @@
 # probeLauncherCPUPercentBonusTacticalDestroyer
 #
 # Used by:
-# Ship: Confessor
+# Ships from group: Tactical Destroyer (3 of 3)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Astrometrics"),

eos/effects/remotecapacitortransmitterpowerneedbonuseffect.py

@@ -1,4 +1,4 @@
-# energyTransferPowerNeedBonusEffect
+# remoteCapacitorTransmitterPowerNeedBonusEffect
 #
 # Used by:
 # Ships from group: Logistics (3 of 5)

eos/effects/rolebonusmaraudermjdrreactivationdelaybonus.py

@@ -1,7 +1,7 @@
 # roleBonusMarauderMJDRReactivationDelayBonus
 #
 # Used by:
-# Ships from group: Marauder (16 of 16)
+# Ships from group: Marauder (4 of 4)
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Micro Jump Drive",

eos/effects/rorqualcargoscanrangebonus.py

@@ -1,7 +1,7 @@
 # rorqualCargoScanRangeBonus
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cargo Scanner",

eos/effects/rorqualsurveyscannerrangebonus.py

@@ -1,7 +1,7 @@
 # rorqualSurveyScannerRangeBonus
 #
 # Used by:
-# Ships from group: Capital Industrial Ship (2 of 2)
+# Ship: Rorqual
 type = "passive"
 def handler(fit, ship, context):
     fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Survey Scanner",

eos/effects/scanstrengthbonuspercentactivate.py

@@ -5,7 +5,9 @@
 # Module: QA ECCM
 type = "active"
 def handler(fit, module, context):
-    for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
-        fit.ship.boostItemAttr("scan%sStrength" % type,
-                               module.getModifiedItemAttr("scan%sStrengthPercent" % type),
-                               stackingPenalties = True)
+    for scanType in ("Gravimetric", "Magnetometric", "Radar", "Ladar"):
+        fit.ship.boostItemAttr(
+            "scan{}Strength".format(scanType),
+            module.getModifiedItemAttr("scan{}StrengthPercent".format(scanType)),
+            stackingPenalties=True
+        )

eos/effects/shieldcapacitybonusonline.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Shield Amplifier (88 of 88)
-# Modules from group: Shield Extender (37 of 37)
+# Modules from group: Shield Extender (25 of 25)
 type = "passive"
 def handler(fit, module, context):
     fit.ship.increaseItemAttr("shieldCapacity", module.getModifiedItemAttr("capacityBonus"))

eos/effects/shipadvancedspaceshipcommandagilitybonus.py

@@ -1,7 +1,7 @@
 # shipAdvancedSpaceshipCommandAgilityBonus
 #
 # Used by:
-# Items from market group: Ships > Capital Ships (32 of 34)
+# Items from market group: Ships > Capital Ships (27 of 28)
 type = "passive"
 def handler(fit, ship, context):
     skill = fit.character.getSkill("Advanced Spaceship Command")

eos/effects/shiparmoremresistance1abc1.py

@@ -3,7 +3,6 @@
 # Used by:
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
-# Ship: Prophecy Blood Raiders Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shiparmoremresistanceaf1.py

@@ -1,9 +1,9 @@
 # shipArmorEMResistanceAF1
 #
 # Used by:
-# Ships named like: Punisher (3 of 3)
 # Ship: Astero
 # Ship: Malice
+# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorexplosiveresistance1abc1.py

@@ -3,7 +3,6 @@
 # Used by:
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
-# Ship: Prophecy Blood Raiders Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shiparmorexresistanceaf1.py

@@ -1,9 +1,9 @@
 # shipArmorEXResistanceAF1
 #
 # Used by:
-# Ships named like: Punisher (3 of 3)
 # Ship: Astero
 # Ship: Malice
+# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorkineticresistance1abc1.py

@@ -3,7 +3,6 @@
 # Used by:
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
-# Ship: Prophecy Blood Raiders Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shiparmorknresistanceaf1.py

@@ -1,9 +1,9 @@
 # shipArmorKNResistanceAF1
 #
 # Used by:
-# Ships named like: Punisher (3 of 3)
 # Ship: Astero
 # Ship: Malice
+# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shiparmorrepairing1gbc2.py

@@ -4,7 +4,6 @@
 # Variations of ship: Myrmidon (2 of 2)
 # Ship: Astarte
 # Ship: Brutix
-# Ship: Brutix Serpentis Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battlecruiser").level

eos/effects/shiparmorrepairinggf2.py

@@ -1,7 +1,7 @@
 # shipArmorRepairingGF2
 #
 # Used by:
-# Ships named like: Incursus (3 of 3)
+# Ship: Incursus
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Frigate").level

eos/effects/shiparmorthermresistance1abc1.py

@@ -3,7 +3,6 @@
 # Used by:
 # Variations of ship: Prophecy (2 of 2)
 # Ship: Absolution
-# Ship: Prophecy Blood Raiders Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shiparmorthresistanceaf1.py

@@ -1,9 +1,9 @@
 # shipArmorTHResistanceAF1
 #
 # Used by:
-# Ships named like: Punisher (3 of 3)
 # Ship: Astero
 # Ship: Malice
+# Ship: Punisher
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Frigate").level

eos/effects/shipbonusaoevelocitycruiseandtorpedocb2.py

@@ -1,7 +1,7 @@
 # shipBonusAoeVelocityCruiseAndTorpedoCB2
 #
 # Used by:
-# Ships named like: Golem (4 of 4)
+# Ship: Golem
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Battleship").level

eos/effects/shipbonusarmorresistab.py

@@ -1,7 +1,7 @@
 # shipBonusArmorResistAB
 #
 # Used by:
-# Ships named like: Abaddon (3 of 3)
+# Ship: Abaddon
 # Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonuscapcapab.py

@@ -1,8 +1,8 @@
 # shipBonusCapCapAB
 #
 # Used by:
-# Ships named like: Paladin (4 of 4)
 # Ship: Apocalypse Imperial Issue
+# Ship: Paladin
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battleship").level

eos/effects/shipbonuscargo2gi.py

@@ -3,7 +3,6 @@
 # Used by:
 # Variations of ship: Miasmos (3 of 4)
 # Variations of ship: Nereus (2 of 2)
-# Ship: Iteron Inner Zone Shipping Edition
 # Ship: Iteron Mark V
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonuscargoci.py

@@ -1,8 +1,8 @@
 # shipBonusCargoCI
 #
 # Used by:
-# Ships named like: Tayra (2 of 2)
 # Variations of ship: Badger (2 of 2)
+# Ship: Tayra
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Industrial").level

eos/effects/shipbonuscargomi.py

@@ -1,8 +1,8 @@
 # shipBonusCargoMI
 #
 # Used by:
-# Ships named like: Mammoth (2 of 2)
 # Variations of ship: Wreathe (2 of 2)
+# Ship: Mammoth
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Minmatar Industrial").level

eos/effects/shipbonusdreadcitadelcruiserofc1.py

@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelCruiseRofC1
 #
 # Used by:
-# Ships named like: Phoenix (2 of 2)
+# Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level

eos/effects/shipbonusdreadcitadeltorprofc1.py

@@ -1,7 +1,7 @@
 # shipBonusDreadCitadelTorpRofC1
 #
 # Used by:
-# Ships named like: Phoenix (2 of 2)
+# Ship: Phoenix
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Caldari Dreadnought").level

eos/effects/shipbonusdronedamagemultiplierabc2.py

@@ -1,7 +1,7 @@
 # shipBonusDroneDamageMultiplierABC2
 #
 # Used by:
-# Ships named like: Prophecy (2 of 2)
+# Ship: Prophecy
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shipbonusdronedamagemultipliergb2.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Variations of ship: Dominix (3 of 3)
-# Ship: Dominix Quafe Edition
 # Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonusdronedamagemultipliergc2.py

@@ -2,8 +2,8 @@
 #
 # Used by:
 # Ships named like: Stratios (2 of 2)
-# Variations of ship: Vexor (3 of 4)
-# Ship: Vexor Quafe Edition
+# Ship: Vexor
+# Ship: Vexor Navy Issue
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level

eos/effects/shipbonusdronehitpointsabc2.py

@@ -1,7 +1,7 @@
 # shipBonusDroneHitpointsABC2
 #
 # Used by:
-# Ships named like: Prophecy (2 of 2)
+# Ship: Prophecy
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Amarr Battlecruiser").level

eos/effects/shipbonusdronehitpointsgb2.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Variations of ship: Dominix (3 of 3)
-# Ship: Dominix Quafe Edition
 # Ship: Nestor
 type = "passive"
 def handler(fit, ship, context):

eos/effects/shipbonusdronehitpointsgc2.py

@@ -2,8 +2,8 @@
 #
 # Used by:
 # Ships named like: Stratios (2 of 2)
-# Variations of ship: Vexor (3 of 4)
-# Ship: Vexor Quafe Edition
+# Ship: Vexor
+# Ship: Vexor Navy Issue
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level

eos/effects/shipbonusdronehitpointsgf.py

@@ -1,8 +1,8 @@
 # shipBonusDroneHitpointsGF
 #
 # Used by:
-# Ships named like: Tristan (2 of 2)
 # Ship: Astero
+# Ship: Tristan
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Frigate").level

eos/effects/shipbonusdroneminingamountgc2.py

@@ -1,7 +1,8 @@
 # shipBonusDroneMiningAmountGC2
 #
 # Used by:
-# Ships named like: Vexor (3 of 4)
+# Ship: Vexor
+# Ship: Vexor Navy Issue
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Cruiser").level

eos/effects/shipbonusdroneoptimalrangegb.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Dominix
-# Ship: Dominix Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battleship").level

eos/effects/shipbonusdronetrackinggb.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Ship: Dominix
-# Ship: Dominix Quafe Edition
 type = "passive"
 def handler(fit, ship, context):
     level = fit.character.getSkill("Gallente Battleship").level