Merge branch 'master' into test-3

eos/effects/accessdifficultybonusmodifierrequiringhacking.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 type = "passive"

eos/effects/ammoinfluencecapneed.py

@@ -1,7 +1,7 @@
 # ammoInfluenceCapNeed
 #
 # Used by:
-# Items from category: Charge (478 of 924)
+# Items from category: Charge (478 of 925)
 type = "passive"
 
 

eos/effects/ammoinfluencerange.py

@@ -1,7 +1,7 @@
 # ammoInfluenceRange
 #
 # Used by:
-# Items from category: Charge (572 of 924)
+# Items from category: Charge (572 of 925)
 type = "passive"
 
 

eos/effects/ammospeedmultiplier.py

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

eos/effects/damagecontrol.py

@@ -1,8 +1,7 @@
 # damageControl
 #
 # Used by:
-# Variations of module: Damage Control I (16 of 16)
-# Module: Civilian Damage Control
+# Modules from group: Damage Control (22 of 27)
 type = "passive"
 
 

eos/effects/dohacking.py

@@ -1,7 +1,7 @@
 # doHacking
 #
 # Used by:
-# Modules from group: Data Miners (17 of 18)
+# Modules from group: Data Miners (9 of 9)
 type = "active"
 
 

eos/effects/elitebonusgunshipdronecapacity2.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipDroneCapacity2
-#
-# Used by:
-# Ship: Ishkur
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipdronetracking2.py

@@ -0,0 +1,4 @@
+# Not used by any item
+type = "passive"
+def handler(fit, src, context):
+    fit.drones.filteredItemBoost(lambda mod: mod.item.requiresSkill("Drones"), "trackingSpeed", src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")

eos/effects/elitebonusgunshipemmissiledamage1.py

@@ -0,0 +1,7 @@
+# eliteBonusGunshipEMMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "emDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipexplosionvelocity2.py

@@ -0,0 +1,7 @@
+# eliteBonusGunshipExplosionVelocity2
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "aoeVelocity", src.getModifiedItemAttr("eliteBonusGunship2"), stackingPenalties=True, skill="Assault Frigates")

eos/effects/elitebonusgunshipexplosivemissiledamage1.py

@@ -0,0 +1,7 @@
+# eliteBonusGunshipExplosiveMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "explosiveDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipkineticmissiledamage1.py

@@ -0,0 +1,7 @@
+# eliteBonusGunshipKineticMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "kineticDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/elitebonusgunshipprojectiledamage2.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipProjectileDamage2
-#
-# Used by:
-# Ship: Jaguar
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipprojectileoptimal1.py

@@ -1,7 +1,4 @@
-# eliteBonusGunshipProjectileOptimal1
-#
-# Used by:
-# Ship: Jaguar
+# Not used by any item
 type = "passive"
 
 

eos/effects/elitebonusgunshipthermalmissiledamage1.py

@@ -0,0 +1,7 @@
+# eliteBonusGunshipThermalMissileDamage1
+#
+# Used by:
+# Ship: Jaguar
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), "thermalDamage", src.getModifiedItemAttr("eliteBonusGunship1"), skill="Assault Frigates")

eos/effects/fighterabilitystasiswebifier.py

@@ -14,4 +14,5 @@ grouped = True
 def handler(fit, src, context):
     if "projected" not in context:
         return
-    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)) * src.amountActive)
+    fit.ship.boostItemAttr("maxVelocity", src.getModifiedItemAttr("{}SpeedPenalty".format(prefix)) * src.amountActive,
+                           stackingPenalties=True)

eos/effects/hackingskillvirusbonus.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Modules named like: Memetic Algorithm Bank (8 of 8)
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 # Implant: Poteque 'Prospector' Environmental Analysis EY-1005
 # Implant: Poteque 'Prospector' Hacking HC-905
 # Skill: Hacking

eos/effects/hackingvirusstrengthbonus.py

@@ -1,4 +1,7 @@
-# Not used by any item
+# hackingVirusStrengthBonus
+#
+# Used by:
+# Implant: Neural Lace 'Blackglass' Net Intrusion 920-40
 type = "passive"
 
 

eos/effects/modulebonusassaultdamagecontrol.py

@@ -0,0 +1,16 @@
+# moduleBonusAssaultDamageControl
+#
+# Used by:
+# Variations of module: Assault Damage Control I (5 of 5)
+type = "active"
+runTime = "early"
+
+def handler(fit, src, context):
+    for layer, attrPrefix in (('shield', 'shield'), ('armor', 'armor'), ('hull', '')):
+        for damageType in ('Kinetic', 'Thermal', 'Explosive', 'Em'):
+            bonus = "%s%sDamageResonance" % (attrPrefix, damageType)
+            bonus = "%s%s" % (bonus[0].lower(), bonus[1:])
+            booster = "%s%sDamageResonance" % (layer, damageType)
+
+            src.forceItemAttr(booster, src.getModifiedItemAttr("resistanceMultiplier"))
+

eos/effects/remotewebifiermaxrangebonus.py

@@ -0,0 +1,7 @@
+# remoteWebifierMaxRangeBonus
+#
+# Used by:
+# Implants named like: Inquest 'Eros' Stasis Webifier MR (3 of 3)
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Stasis Web", "maxRange", src.getModifiedItemAttr("stasisWebRangeBonus"), stackingPenalties=True)

eos/effects/shipmissilerofmf2.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Breacher
+# Ship: Jaguar
 type = "passive"
 
 

eos/effects/shippdmgbonusmf.py

@@ -1,11 +1,12 @@
 # shipPDmgBonusMF
 #
 # Used by:
-# Variations of ship: Rifter (3 of 3)
 # Variations of ship: Slasher (3 of 3)
 # Ship: Cheetah
 # Ship: Freki
 # Ship: Republic Fleet Firetail
+# Ship: Rifter
+# Ship: Wolf
 type = "passive"
 
 

eos/effects/shipprojectiletrackingmf2.py

@@ -2,7 +2,6 @@
 #
 # Used by:
 # Variations of ship: Slasher (3 of 3)
-# Ship: Jaguar
 # Ship: Republic Fleet Firetail
 # Ship: Wolf
 type = "passive"

eos/effects/shipsetrofaf.py

@@ -0,0 +1,7 @@
+# shipSETROFAF
+#
+# Used by:
+# Ship: Retribution
+type = "passive"
+def handler(fit, src, context):
+    fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Energy Turret"), "speed", src.getModifiedItemAttr("shipBonusAF"), stackingPenalties=True, skill="Amarr Frigate")

eos/effects/shipsettrackingbonusaf.py

@@ -1,7 +1,4 @@
-# shipSETTrackingBonusAF
-#
-# Used by:
-# Ship: Retribution
+# Not used by any item
 type = "passive"
 
 

eos/effects/shipshieldboostmf.py

@@ -2,6 +2,7 @@
 #
 # Used by:
 # Ship: Breacher
+# Ship: Jaguar
 type = "passive"