Merge branch 'master' into development

Conflicts:
	eos/effects/usemissiles.py
	eos/saveddata/fit.py

config.py

@@ -18,10 +18,10 @@ debug = False
 saveInRoot = False
 
 # Version data
-version = "1.25.2"
+version = "1.26.1"
 tag = "git"
-expansionName = "Ascension"
-expansionVersion = "1.9"
+expansionName = "YC118.10"
+expansionVersion = "1.2"
 evemonMinVersion = "4081"
 
 pyfaPath = None

eos/effects/ammospeedmultiplier.py

@@ -1,7 +1,7 @@
 # ammoSpeedMultiplier
 #
 # Used by:
-# Charges from group: Festival Charges (8 of 8)
+# Charges from group: Festival Charges (9 of 9)
 # Charges from group: Interdiction Probe (2 of 2)
 # Charges from group: Survey Probe (3 of 3)
 type = "passive"

eos/effects/boosterarmorhppenalty.py

@@ -1,7 +1,7 @@
 # boosterArmorHpPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False
 

eos/effects/boostermaxvelocitypenalty.py

@@ -1,7 +1,7 @@
 # boosterMaxVelocityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False
 

eos/effects/boostershieldcapacitypenalty.py

@@ -1,7 +1,7 @@
 # boosterShieldCapacityPenalty
 #
 # Used by:
-# Implants from group: Booster (12 of 47)
+# Implants from group: Booster (12 of 48)
 type = "boosterSideEffect"
 activeByDefault = False
 

eos/effects/chargebonuswarfarecharge.py

@@ -2,105 +2,9 @@
 #
 # Used by:
 # Items from market group: Ammunition & Charges > Command Burst Charges (15 of 15)
+type = "active"
 
-
-'''
-Some documentation:
-When the fit is calculated, we gather up all the gang effects and stick them onto the fit. We don't run the actual
-effect yet, only give the fit details so that it can run the effect at a later time. We need to do this so that we can
-only run the strongest effect. When we are done, one of the last things that we do with the fit is to loop through those
-bonuses and actually run the effect. To do this, we have a special argument passed into the effect handler that tells it
-which warfareBuffID to run (shouldn't need this right now, but better safe than sorry)
-'''
-
-type = "active", "gang"
-def handler(fit, module, context, **kwargs):
-    def runEffect(id, value):
-        if id == 10:  # Shield Burst: Shield Harmonizing: Shield Resistance
-            for damageType in ("Em", "Explosive", "Thermal", "Kinetic"):
-                fit.ship.boostItemAttr("shield%sDamageResonance" % damageType, value)
-
-        if id == 11:  # Shield Burst: Active Shielding: Repair Duration/Capacitor
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), "capacitorNeed", value)
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Shield Emission Systems"), "duration", value)
-
-        if id == 12:  # Shield Burst: Shield Extension: Shield HP
-            fit.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
-
-        if id == 13:  # Armor Burst: Armor Energizing: Armor Resistance
-            for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
-                fit.ship.boostItemAttr("armor%sDamageResonance" % damageType, value)
-
-        if id == 14:  # Armor Burst: Rapid Repair: Repair Duration/Capacitor
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "capacitorNeed", value)
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "duration", value)
-
-        if id == 15:  # Armor Burst: Armor Reinforcement: Armor HP
-            fit.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
-
-        if id == 16:  # Information Burst: Sensor Optimization: Scan Resolution
-            fit.ship.boostItemAttr("scanResolution", value, stackingPenalties=True)
-
-        if id == 17:  # Information Burst: Electronic Superiority: EWAR Range and Strength
-            groups = ("ECM", "Sensor Dampener", "Weapon Disruptor", "Target Painter")
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value, stackingPenalties=True)
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "falloffEffectiveness", value, stackingPenalties=True)
-
-            for scanType in ("Magnetometric", "Radar", "Ladar", "Gravimetric"):
-                fit.modules.filteredItemBoost(lambda mod: mod.item.group.nam == "ECM", "scan%sStrengthBonus" % scanType, value, stackingPenalties=True)
-
-            for attr in ("missileVelocityBonus", "explosionDelayBonus", "aoeVelocityBonus", "falloffBonus",
-                         "maxRangeBonus", "aoeCloudSizeBonus", "trackingSpeedBonus"):
-                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor", attr, value)
-
-            for attr in ("maxTargetRangeBonus", "scanResolutionBonus"):
-                fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener", attr, value)
-
-            fit.modules.filteredItemBoost(lambda mod: mod.item.gorup.name == "Target Painter", "signatureRadiusBonus", value, stackingPenalties=True)
-
-        if id == 18:  # Information Burst: Electronic Hardening: Scan Strength
-            for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"):
-                fit.ship.boostItemAttr("scan%sStrength" % scanType, value, stackingPenalties=True)
-
-        if id == 19:  # Information Burst: Electronic Hardening: RSD/RWD Resistance
-            fit.ship.boostItemAttr("sensorDampenerResistance", value)
-            fit.ship.boostItemAttr("weaponDisruptionResistance", value)
-
-        if id == 26:  # Information Burst: Sensor Optimization: Targeting Range
-            fit.ship.boostItemAttr("maxTargetRange", value)
-
-        if id == 20:  # Skirmish Burst: Evasive Maneuvers: Signature Radius
-            fit.ship.boostItemAttr("signatureRadius", value, stackingPenalties=True)
-
-        if id == 21:  # Skirmish Burst: Interdiction Maneuvers: Tackle Range
-            groups = ("Stasis Web", "Warp Scrambler")
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value, stackingPenalties=True)
-
-        if id == 22:  # Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill("High Speed Maneuvering"), "speedFactor", value, stackingPenalties=True)
-
-        if id == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "maxRange", value, stackingPenalties=True)
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"), "surveyScanRange", value, stackingPenalties=True)
-
-        if id == 24:  # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "capacitorNeed", value, stackingPenalties=True)
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill("Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "duration", value, stackingPenalties = True)
-
-        if id == 25:  # Mining Burst: Mining Equipment Preservation: Crystal Volatility
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), "crystalVolatilityChance", value, stackingPenalties=True)
-
-        if id == 60:  # Skirmish Burst: Evasive Maneuvers: Agility
-            fit.ship.boostItemAttr("agility", value, stackingPenalties=True)
-
+def handler(fit, module, context):
     for x in xrange(1, 4):
-        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
-            value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
-            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
-
-            if id:
-                if 'commandRun' not in context:
-                    fit.addCommandBonus(id, value, module, kwargs['effect'])
-                elif kwargs['warfareBuffID'] is not None and kwargs['warfareBuffID'] == id:
-                    runEffect(kwargs['warfareBuffID'], value)
-
+        value = module.getModifiedChargeAttr("warfareBuff{}Multiplier".format(x))
+        module.multiplyItemAttr("warfareBuff{}Value".format(x), value)

eos/effects/covertopsandreconopscloakmoduledelaybonus.py

@@ -10,6 +10,7 @@
 # Ships named like: Stratios (2 of 2)
 # Subsystems named like: Offensive Covert Reconfiguration (4 of 4)
 # Ship: Astero
+# Ship: Rabisu
 type = "passive"
 
 

eos/effects/energyweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # energyWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Heat Sink (17 of 17)
+# 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 (17 of 17)
+# Modules from group: Heat Sink (18 of 18)
 type = "passive"
 
 

eos/effects/hybridweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # hybridWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Magnetic Field Stabilizer (12 of 12)
+# Modules from group: Magnetic Field Stabilizer (14 of 14)
 # 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 (12 of 12)
+# Modules from group: Magnetic Field Stabilizer (14 of 14)
 type = "passive"
 
 

eos/effects/miningforemanstrengthbonus.py

@@ -5,7 +5,7 @@
 type = "passive"
 def handler(fit, src, context):
     lvl = src.level
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Multiplier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Multiplier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Multiplier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
-    fit.modules.filteredChargeBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Multiplier", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff4Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff3Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff2Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Foreman"), "warfareBuff1Value", src.getModifiedItemAttr("commandStrengthBonus") * lvl)

eos/effects/modulebonusfightersupportunit.py

@@ -6,16 +6,16 @@ type = "passive"
 
 
 def handler(fit, src, context):
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldCapacity",
                                    src.getModifiedItemAttr("fighterBonusShieldCapacityPercent"))
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "maxVelocity",
                                    src.getModifiedItemAttr("fighterBonusVelocityPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"),
                                    "fighterAbilityAttackMissileDuration",
                                    src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityAttackTurretDuration",
                                    src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "fighterAbilityMissilesDuration",
                                    src.getModifiedItemAttr("fighterBonusROFPercent"), stackingPenalties=True)
-    fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
+    fit.fighters.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Fighters"), "shieldRechargeRate",
                                    src.getModifiedItemAttr("fighterBonusShieldRechargePercent"))

eos/effects/modulebonuswarfarelinkarmor.py

@@ -2,10 +2,24 @@
 #
 # Used by:
 # Variations of module: Armor Command Burst I (2 of 2)
-type = "active"
-runTime = "early"
 
-def handler(fit, module, context):
-    for x in xrange(1, 4):
-        value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-        module.multiplyChargeAttr("warfareBuff{}Multiplier".format(x), value)
+'''
+Some documentation:
+When the fit is calculated, we gather up all the gang effects and stick them onto the fit. We don't run the actual
+effect yet, only give the fit details so that it can run the effect at a later time. We need to do this so that we can
+only run the strongest effect. When we are done, one of the last things that we do with the fit is to loop through those
+bonuses and actually run the effect. To do this, we have a special argument passed into the effect handler that tells it
+which warfareBuffID to run (shouldn't need this right now, but better safe than sorry)
+'''
+
+type = "active", "gang"
+def handler(fit, module, context, **kwargs):
+    for x in xrange(1, 5):
+        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
+            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+

eos/effects/modulebonuswarfarelinkinfo.py

@@ -2,10 +2,13 @@
 #
 # Used by:
 # Variations of module: Information Command Burst I (2 of 2)
-type = "active"
-runTime = "early"
 
-def handler(fit, module, context):
-    for x in xrange(1, 4):
-        value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-        module.multiplyChargeAttr("warfareBuff{}Multiplier".format(x), value)
+type = "active", "gang"
+def handler(fit, module, context, **kwargs):
+    for x in xrange(1, 5):
+        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
+            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkmining.py

@@ -2,10 +2,13 @@
 #
 # Used by:
 # Variations of module: Mining Foreman Burst I (2 of 2)
-type = "active"
-runTime = "late"
 
-def handler(fit, module, context):
-    for x in xrange(1, 4):
-        value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-        module.multiplyChargeAttr("warfareBuff{}Multiplier".format(x), value)
+type = "active", "gang"
+def handler(fit, module, context, **kwargs):
+    for x in xrange(1, 5):
+        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
+            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkshield.py

@@ -2,10 +2,13 @@
 #
 # Used by:
 # Variations of module: Shield Command Burst I (2 of 2)
-type = "active"
-runTime = "early"
 
-def handler(fit, module, context):
-    for x in xrange(1, 4):
-        value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-        module.multiplyChargeAttr("warfareBuff{}Multiplier".format(x), value)
+type = "active", "gang"
+def handler(fit, module, context, **kwargs):
+    for x in xrange(1, 5):
+        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
+            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/modulebonuswarfarelinkskirmish.py

@@ -2,10 +2,13 @@
 #
 # Used by:
 # Variations of module: Skirmish Command Burst I (2 of 2)
-type = "active"
-runTime = "early"
 
-def handler(fit, module, context):
-    for x in xrange(1, 4):
-        value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
-        module.multiplyChargeAttr("warfareBuff{}Multiplier".format(x), value)
+type = "active", "gang"
+def handler(fit, module, context, **kwargs):
+    for x in xrange(1, 5):
+        if module.getModifiedChargeAttr("warfareBuff{}ID".format(x)):
+            value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
+            id = module.getModifiedChargeAttr("warfareBuff{}ID".format(x))
+
+            if id:
+                fit.addCommandBonus(id, value, module, kwargs['effect'])

eos/effects/moduletitaneffectgenerator.py

@@ -2,75 +2,16 @@
 #
 # Used by:
 # Modules from group: Titan Phenomena Generator (4 of 4)
-
 type = "active", "gang"
 def handler(fit, module, context, **kwargs):
-    def runEffect(id, value):
-        if id == 39:  # Avatar Effect Generator : Capacitor Recharge bonus
-            fit.ship.boostItemAttr("rechargeRate", value, stackingPenalties=True)
-
-        if id == 40:  # Avatar Effect Generator : Kinetic resistance bonus
-            for attr in ("armorKineticDamageResonance", "shieldKineticDamageResonance", "hullKineticDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 41:  # Avatar Effect Generator : EM resistance penalty
-            for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "hullEmDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 42:  # Erebus Effect Generator : Armor HP bonus
-            fit.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
-
-        if id == 43:  # Erebus Effect Generator : Explosive resistance bonus
-            for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "hullExplosiveDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 44:  # Erebus Effect Generator : Thermal resistance penalty
-            for attr in ("armorThermalDamageResonance", "shieldThermalDamageResonance", "hullThermalDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 45:  # Ragnarok Effect Generator : Signature Radius bonus
-            fit.ship.boostItemAttr("signatureRadius", value, stackingPenalties=True)
-
-        if id == 46:  # Ragnarok Effect Generator : Thermal resistance bonus
-            for attr in ("armorThermalDamageResonance", "shieldThermalDamageResonance", "hullThermalDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 47:  # Ragnarok Effect Generator : Explosive resistance penaly
-            for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "hullExplosiveDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 48:  # Leviathan Effect Generator : Shield HP bonus
-            fit.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
-
-        if id == 49:  # Leviathan Effect Generator : EM resistance bonus
-            for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "hullEmDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 50:  # Leviathan Effect Generator : Kinetic resistance penalty
-            for attr in ("armorKineticDamageResonance", "shieldKineticDamageResonance", "hullKineticDamageResonance"):
-                fit.ship.boostItemAttr(attr, value)
-
-        if id == 51:  # Avatar Effect Generator : Velocity penalty
-            fit.ship.boostItemAttr("maxVelocity", value, stackingPenalties=True)
-
-        if id == 52:  # Erebus Effect Generator : Shield RR penalty
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "shieldBonus", value, stackingPenalties=True)
-
-        if id == 53:  # Leviathan Effect Generator : Armor RR penalty
-            fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", value, stackingPenalties=True)
-
-        if id == 54:  # Ragnarok Effect Generator : Laser and Hybrid Optimal penalty
-            groups = ("Energy Weapon", "Hybrid Weapon")
-            fit.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value, stackingPenalties=True)
-
-    for x in xrange(1, 4):
+    for x in xrange(1, 5):
         if module.getModifiedItemAttr("warfareBuff{}ID".format(x)):
             value = module.getModifiedItemAttr("warfareBuff{}Value".format(x))
             id = module.getModifiedItemAttr("warfareBuff{}ID".format(x))
 
             if id:
-                if 'commandRun' not in context:
-                    fit.addCommandBonus(id, value, module, kwargs['effect'])
-                elif kwargs['warfareBuffID'] is not None and kwargs['warfareBuffID'] == id:
-                    runEffect(kwargs['warfareBuffID'], value)
+                fit.addCommandBonus(id, value, module, kwargs['effect'])
+
+
+
 

eos/effects/overloadrofbonus.py

@@ -2,7 +2,7 @@
 #
 # Used by:
 # Modules from group: Missile Launcher Torpedo (22 of 22)
-# Items from market group: Ship Equipment > Turrets & Bays (428 of 854)
+# Items from market group: Ship Equipment > Turrets & Bays (428 of 859)
 # Module: Interdiction Sphere Launcher I
 type = "overheat"
 

eos/effects/projectileweapondamagemultiply.py

@@ -1,7 +1,7 @@
 # projectileWeaponDamageMultiply
 #
 # Used by:
-# Modules from group: Gyrostabilizer (12 of 12)
+# Modules from group: Gyrostabilizer (13 of 13)
 # 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 (12 of 12)
+# Modules from group: Gyrostabilizer (13 of 13)
 type = "passive"
 
 

eos/effects/setbonusasklepian.py

@@ -1,8 +1,8 @@
 # setBonusAsklepian
 #
 # Used by:
+# Implants named like: Asklepian Omega (3 of 3)
 # Implants named like: Grade Asklepian (16 of 16)
-# Implants named like: grade Asklepian Omega (2 of 2)
 runTime = "early"
 type = "passive"
 

eos/effects/shipbonuscommanddestroyerrole1defenderbonus.py

@@ -0,0 +1,10 @@
+# shipBonusCommandDestroyerRole1DefenderBonus
+#
+# Used by:
+# Ships from group: Command Destroyer (4 of 4)
+type = "passive"
+
+
+def handler(fit, ship, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Defender Missiles"),
+                                  "moduleReactivationDelay", ship.getModifiedItemAttr("shipBonusRole1"))

eos/effects/skillbonusdroneinterfacing.py

@@ -18,5 +18,5 @@ def handler(fit, src, context):
     fit.fighters.filteredItemBoost(lambda mod: mod.item.requiresSkill("Fighters"),
                                    "fighterAbilityMissilesDamageMultiplier",
                                    src.getModifiedItemAttr("damageMultiplierBonus") * lvl)
-    fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Mining Drone", "miningDroneAmountPercent",
+    fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Mining Drone Operation"), "miningDroneAmountPercent",
                                  src.getModifiedItemAttr("miningAmountBonus") * lvl)

eos/effects/skillmultiplierdefendermissilevelocity.py

@@ -0,0 +1,10 @@
+# skillMultiplierDefenderMissileVelocity
+#
+# Used by:
+# Skill: Defender Missiles
+type = "passive"
+
+
+def handler(fit, skill, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Defender Missiles"),
+                                    "maxVelocity", skill.getModifiedItemAttr("missileVelocityBonus") * skill.level)

eos/saveddata/fit.py

@@ -460,15 +460,176 @@ class Fit(object):
             if runTime != effect_runTime:
                 continue
 
-            context = ("commandRun", thing.__class__.__name__.lower())
-            if isinstance(thing, Module):
-                # This should always be a gang effect, otherwise it wouldn't be added to commandBonuses
-                # @todo: Check this
-                if effect.isType("gang"):
-                    # todo: ensure that these are run with the module is active only
-                    context += ("commandRun",)
-                    self.register(thing)
-                    effect.handler(self, thing, context, warfareBuffID = warfareBuffID)
+            # This should always be a gang effect, otherwise it wouldn't be added to commandBonuses
+            # @todo: Check this
+            if effect.isType("gang"):
+                self.register(thing)
+
+                if warfareBuffID == 10:  # Shield Burst: Shield Harmonizing: Shield Resistance
+                    for damageType in ("Em", "Explosive", "Thermal", "Kinetic"):
+                        self.ship.boostItemAttr("shield%sDamageResonance" % damageType, value)
+
+                if warfareBuffID == 11:  # Shield Burst: Active Shielding: Repair Duration/Capacitor
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill(
+                            "Shield Emission Systems"), "capacitorNeed", value)
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill(
+                            "Shield Emission Systems"), "duration", value)
+
+                if warfareBuffID == 12:  # Shield Burst: Shield Extension: Shield HP
+                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+
+                if warfareBuffID == 13:  # Armor Burst: Armor Energizing: Armor Resistance
+                    for damageType in ("Em", "Thermal", "Explosive", "Kinetic"):
+                        self.ship.boostItemAttr("armor%sDamageResonance" % damageType, value)
+
+                if warfareBuffID == 14:  # Armor Burst: Rapid Repair: Repair Duration/Capacitor
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(
+                        "Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"),
+                                                  "capacitorNeed", value)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(
+                        "Remote Armor Repair Systems") or mod.item.requiresSkill("Repair Systems"), "duration",
+                                                  value)
+
+                if warfareBuffID == 15:  # Armor Burst: Armor Reinforcement: Armor HP
+                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+
+                if warfareBuffID == 16:  # Information Burst: Sensor Optimization: Scan Resolution
+                    self.ship.boostItemAttr("scanResolution", value, stackingPenalties=True)
+
+                if warfareBuffID == 17:  # Information Burst: Electronic Superiority: EWAR Range and Strength
+                    groups = ("ECM", "Sensor Dampener", "Weapon Disruptor", "Target Painter")
+                    self.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value,
+                                                  stackingPenalties=True)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups,
+                                                  "falloffEffectiveness", value, stackingPenalties=True)
+
+                    for scanType in ("Magnetometric", "Radar", "Ladar", "Gravimetric"):
+                        self.modules.filteredItemBoost(lambda mod: mod.item.group.name == "ECM",
+                                                      "scan%sStrengthBonus" % scanType, value,
+                                                      stackingPenalties=True)
+
+                    for attr in (
+                    "missileVelocityBonus", "explosionDelayBonus", "aoeVelocityBonus", "falloffBonus",
+                    "maxRangeBonus", "aoeCloudSizeBonus", "trackingSpeedBonus"):
+                        self.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Weapon Disruptor",
+                                                      attr, value)
+
+                    for attr in ("maxTargetRangeBonus", "scanResolutionBonus"):
+                        self.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Sensor Dampener",
+                                                      attr, value)
+
+                    self.modules.filteredItemBoost(lambda mod: mod.item.gorup.name == "Target Painter",
+                                                  "signatureRadiusBonus", value, stackingPenalties=True)
+
+                if warfareBuffID == 18:  # Information Burst: Electronic Hardening: Scan Strength
+                    for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"):
+                        self.ship.boostItemAttr("scan%sStrength" % scanType, value, stackingPenalties=True)
+
+                if warfareBuffID == 19:  # Information Burst: Electronic Hardening: RSD/RWD Resistance
+                    self.ship.boostItemAttr("sensorDampenerResistance", value)
+                    self.ship.boostItemAttr("weaponDisruptionResistance", value)
+
+                if warfareBuffID == 26:  # Information Burst: Sensor Optimization: Targeting Range
+                    self.ship.boostItemAttr("maxTargetRange", value)
+
+                if warfareBuffID == 20:  # Skirmish Burst: Evasive Maneuvers: Signature Radius
+                    self.ship.boostItemAttr("signatureRadius", value, stackingPenalties=True)
+
+                if warfareBuffID == 21:  # Skirmish Burst: Interdiction Maneuvers: Tackle Range
+                    groups = ("Stasis Web", "Warp Scrambler")
+                    self.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value,
+                                                  stackingPenalties=True)
+
+                if warfareBuffID == 22:  # Skirmish Burst: Rapid Deployment: AB/MWD Speed Increase
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Afterburner") or mod.item.requiresSkill(
+                            "High Speed Maneuvering"), "speedFactor", value, stackingPenalties=True)
+
+                if warfareBuffID == 23:  # Mining Burst: Mining Laser Field Enhancement: Mining/Survey Range
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill(
+                            "Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "maxRange",
+                        value, stackingPenalties=True)
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("CPU Management"),
+                                                  "surveyScanRange", value, stackingPenalties=True)
+
+                if warfareBuffID == 24:  # Mining Burst: Mining Laser Optimization: Mining Capacitor/Duration
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill(
+                            "Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"),
+                        "capacitorNeed", value, stackingPenalties=True)
+                    self.modules.filteredItemBoost(
+                        lambda mod: mod.item.requiresSkill("Mining") or mod.item.requiresSkill(
+                            "Ice Harvesting") or mod.item.requiresSkill("Gas Cloud Harvesting"), "duration",
+                        value, stackingPenalties=True)
+
+                if warfareBuffID == 25:  # Mining Burst: Mining Equipment Preservation: Crystal Volatility
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"),
+                                                  "crystalVolatilityChance", value, stackingPenalties=True)
+
+                if warfareBuffID == 60:  # Skirmish Burst: Evasive Maneuvers: Agility
+                    self.ship.boostItemAttr("agility", value, stackingPenalties=True)
+
+                # Titan effects
+
+                if warfareBuffID == 39:  # Avatar Effect Generator : Capacitor Recharge bonus
+                    self.ship.boostItemAttr("rechargeRate", value, stackingPenalties=True)
+
+                if warfareBuffID == 40:  # Avatar Effect Generator : Kinetic resistance bonus
+                    for attr in ("armorKineticDamageResonance", "shieldKineticDamageResonance", "kineticDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 41:  # Avatar Effect Generator : EM resistance penalty
+                    for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "emDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 42:  # Erebus Effect Generator : Armor HP bonus
+                    self.ship.boostItemAttr("armorHP", value, stackingPenalties=True)
+
+                if warfareBuffID == 43:  # Erebus Effect Generator : Explosive resistance bonus
+                    for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "explosiveDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 44:  # Erebus Effect Generator : Thermal resistance penalty
+                    for attr in ("armorThermalDamageResonance", "shieldThermalDamageResonance", "thermalDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 45:  # Ragnarok Effect Generator : Signature Radius bonus
+                    self.ship.boostItemAttr("signatureRadius", value, stackingPenalties=True)
+
+                if warfareBuffID == 46:  # Ragnarok Effect Generator : Thermal resistance bonus
+                    for attr in ("armorThermalDamageResonance", "shieldThermalDamageResonance", "thermalDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 47:  # Ragnarok Effect Generator : Explosive resistance penaly
+                    for attr in ("armorExplosiveDamageResonance", "shieldExplosiveDamageResonance", "explosiveDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 48:  # Leviathan Effect Generator : Shield HP bonus
+                    self.ship.boostItemAttr("shieldCapacity", value, stackingPenalties=True)
+
+                if warfareBuffID == 49:  # Leviathan Effect Generator : EM resistance bonus
+                    for attr in ("armorEmDamageResonance", "shieldEmDamageResonance", "emDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 50:  # Leviathan Effect Generator : Kinetic resistance penalty
+                    for attr in ("armorKineticDamageResonance", "shieldKineticDamageResonance", "kineticDamageResonance"):
+                        self.ship.boostItemAttr(attr, value, stackingPenalties=True)
+
+                if warfareBuffID == 51:  # Avatar Effect Generator : Velocity penalty
+                    self.ship.boostItemAttr("maxVelocity", value, stackingPenalties=True)
+
+                if warfareBuffID == 52:  # Erebus Effect Generator : Shield RR penalty
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Emission Systems"), "shieldBonus", value, stackingPenalties=True)
+
+                if warfareBuffID == 53:  # Leviathan Effect Generator : Armor RR penalty
+                    self.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Remote Armor Repair Systems"), "armorDamageAmount", value, stackingPenalties=True)
+
+                if warfareBuffID == 54:  # Ragnarok Effect Generator : Laser and Hybrid Optimal penalty
+                    groups = ("Energy Weapon", "Hybrid Weapon")
+                    self.modules.filteredItemBoost(lambda mod: mod.item.group.name in groups, "maxRange", value, stackingPenalties=True)
 
             else:
                 # Run effect, and get proper bonuses applied

eos/saveddata/module.py

@@ -265,7 +265,7 @@ class Module(HandledItem, HandledCharge, ItemAttrShortcut, ChargeAttrShortcut):
             flightTime = self.getModifiedChargeAttr("explosionDelay") / 1000.0
             mass = self.getModifiedChargeAttr("mass")
             agility = self.getModifiedChargeAttr("agility")
-            if maxVelocity and flightTime and mass and agility:
+            if maxVelocity and (flightTime or mass or agility):
                 accelTime = min(flightTime, mass * agility / 1000000)
                 # Average distance done during acceleration
                 duringAcceleration = maxVelocity / 2 * accelTime

fun.py

@@ -0,0 +1,5 @@
+problem 15
+
+number of moves: XxY
+
+each block added introduces two possible moves