diff --git a/config.py b/config.py index fbcadfc51..6901ebbdd 100644 --- a/config.py +++ b/config.py @@ -14,9 +14,9 @@ saveInRoot = False # Version data version = "1.1.22" -tag = "git" +tag = "Stable" expansionName = "Rubicon" -expansionVersion = "1.1" +expansionVersion = "1.3" evemonMinVersion = "4081" pyfaPath = None diff --git a/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py b/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py index 55ea024d0..2faff7f3f 100755 --- a/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py +++ b/eos/effects/accerationcontrolcapneedbonuspostpercentcapacitorneedlocationshipgroupafterburner.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Valve (8 of 8) +# Modules named like: Dynamic Fuel Valve (8 of 8) type = "passive" def handler(fit, container, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module", diff --git a/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py b/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py index a78b141d3..ed14a4487 100755 --- a/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py +++ b/eos/effects/accerationcontrolspeedfbonuspostpercentspeedfactorlocationshipgroupafterburner.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr Acceleration Control AC (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' Acceleration Control AC (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module", diff --git a/eos/effects/accessdifficultybonusmodifierrequiringhacking.py b/eos/effects/accessdifficultybonusmodifierrequiringhacking.py index f9880f9a4..ebd4489bb 100755 --- a/eos/effects/accessdifficultybonusmodifierrequiringhacking.py +++ b/eos/effects/accessdifficultybonusmodifierrequiringhacking.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Algorithm (8 of 8) +# Modules named like: Memetic Algorithm Bank (8 of 8) # Implant: Poteque 'Prospector' Hacking HC-905 type = "passive" def handler(fit, container, context): diff --git a/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py b/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py index 5ca9e1ccc..5e96ff748 100755 --- a/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py +++ b/eos/effects/afterburnerdurationbonuspostpercentdurationlocationshipmodulesrequiringafterburner.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Rogue' Afterburner (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' Afterburner AB (6 of 6) # Implant: Zor's Custom Navigation Link # Skill: Afterburner type = "passive" diff --git a/eos/effects/agilitymultipliereffectpassive.py b/eos/effects/agilitymultipliereffectpassive.py index aebd6fdaf..70acc4df9 100755 --- a/eos/effects/agilitymultipliereffectpassive.py +++ b/eos/effects/agilitymultipliereffectpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Engine Housing (8 of 8) +# Modules named like: Polycarbon Engine Housing (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("agility", module.getModifiedItemAttr("agilityMultiplier"), stackingPenalties = True) diff --git a/eos/effects/ammoinfluencecapneed.py b/eos/effects/ammoinfluencecapneed.py index 883a4d154..ca2bb595b 100755 --- a/eos/effects/ammoinfluencecapneed.py +++ b/eos/effects/ammoinfluencecapneed.py @@ -1,15 +1,5 @@ # Used by: -# Charges from group: Advanced Pulse Laser Crystal (6 of 6) -# Charges from group: Advanced Railgun Charge (6 of 6) -# Charges from group: Capacitor Booster Charge (16 of 16) -# Charges from group: Frequency Crystal (185 of 185) -# Charges from group: Hybrid Charge (209 of 209) -# Charges from group: Mercoxit Mining Crystal (2 of 2) -# Charges from group: Mining Crystal (30 of 30) -# Charge: Focused Warp Disruption Script -# Charge: Void L -# Charge: Void M -# Charge: Void S +# Items from category: Charge (458 of 828) type = "passive" def handler(fit, module, context): # Dirty hack to work around cap charges setting cap booster diff --git a/eos/effects/ammoinfluencerange.py b/eos/effects/ammoinfluencerange.py index 9d8ffb822..ad2b87931 100755 --- a/eos/effects/ammoinfluencerange.py +++ b/eos/effects/ammoinfluencerange.py @@ -1,13 +1,5 @@ # Used by: -# Charges from group: Advanced Artillery Ammo (6 of 6) -# Charges from group: Advanced Autocannon Ammo (6 of 6) -# Charges from group: Advanced Beam Laser Crystal (6 of 6) -# Charges from group: Advanced Blaster Charge (6 of 6) -# Charges from group: Advanced Pulse Laser Crystal (6 of 6) -# Charges from group: Advanced Railgun Charge (6 of 6) -# Charges from group: Frequency Crystal (185 of 185) -# Charges from group: Hybrid Charge (209 of 209) -# Charges from group: Projectile Ammo (129 of 129) +# Items from category: Charge (559 of 828) type = "passive" def handler(fit, module, context): module.multiplyItemAttr("maxRange", module.getModifiedChargeAttr("weaponRangeMultiplier")) \ No newline at end of file diff --git a/eos/effects/armorallrepairsystemsamountbonuspassive.py b/eos/effects/armorallrepairsystemsamountbonuspassive.py index 092e8956e..7eabccea3 100755 --- a/eos/effects/armorallrepairsystemsamountbonuspassive.py +++ b/eos/effects/armorallrepairsystemsamountbonuspassive.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Improved Exile Booster -# Implant: Standard Exile Booster -# Implant: Strong Exile Booster -# Implant: Synth Exile Booster +# Implants named like: Exile Booster (4 of 4) type = "passive" def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems") or mod.item.requiresSkill("Capital Repair Systems"), diff --git a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py index d56cc25df..f084ae1aa 100644 --- a/eos/effects/armordamageamountbonuscapitalarmorrepairers.py +++ b/eos/effects/armordamageamountbonuscapitalarmorrepairers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Auxiliary Nano (8 of 8) +# Modules named like: Auxiliary Nano Pump (8 of 8) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capital Repair Systems"), diff --git a/eos/effects/armorhpmultiply.py b/eos/effects/armorhpmultiply.py index 2d8f833ef..6b912e140 100755 --- a/eos/effects/armorhpmultiply.py +++ b/eos/effects/armorhpmultiply.py @@ -1,10 +1,7 @@ # Used by: # Modules from group: Armor Coating (202 of 202) # Modules from group: Armor Plating Energized (187 of 187) -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players +# Modules named like: QA Multiship Module Players (4 of 4) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("armorHP", module.getModifiedItemAttr("armorHPMultiplier")) \ No newline at end of file diff --git a/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py b/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py index 81df2c925..78699021d 100755 --- a/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py +++ b/eos/effects/astrogeologyminingamountbonuspostpercentminingamountlocationshipmodulesrequiringmining.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Inherent Implants 'Highwall' Mining MX-1001 -# Implant: Inherent Implants 'Highwall' Mining MX-1003 -# Implant: Inherent Implants 'Highwall' Mining MX-1005 +# Implants named like: Inherent Implants 'Highwall' Mining MX (3 of 3) # Implant: Michi's Excavation Augmentor # Skill: Astrogeology # Skill: Mining diff --git a/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py b/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py index 5a740a288..418495810 100755 --- a/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py +++ b/eos/effects/basemaxscandeviationmodifierrequiringastrometrics.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Poteque 'Prospector' Astrometric Pinpointing AP-602 -# Implant: Poteque 'Prospector' Astrometric Pinpointing AP-606 -# Implant: Poteque 'Prospector' Astrometric Pinpointing AP-610 +# Implants named like: Poteque 'Prospector' Astrometric Pinpointing AP (3 of 3) # Skill: Astrometric Pinpointing # Skill: Astrometrics type = "passive" diff --git a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py index 8363150c2..573ab896e 100755 --- a/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py +++ b/eos/effects/basesensorstrengthmodifierrequiringastrometrics.py @@ -1,17 +1,8 @@ # Used by: +# Modules from group: Scan Probe Launcher (4 of 7) +# Implants named like: Low grade Virtue (5 of 6) +# Implants named like: Poteque 'Prospector' Astrometric Rangefinding AR (3 of 3) # Modules named like: Gravity Capacitor Upgrade (8 of 8) -# Implant: Low-grade Virtue Alpha -# Implant: Low-grade Virtue Beta -# Implant: Low-grade Virtue Delta -# Implant: Low-grade Virtue Epsilon -# Implant: Low-grade Virtue Gamma -# Implant: Poteque 'Prospector' Astrometric Rangefinding AR-802 -# Implant: Poteque 'Prospector' Astrometric Rangefinding AR-806 -# Implant: Poteque 'Prospector' Astrometric Rangefinding AR-810 -# Module: Core Probe Launcher II -# Module: Expanded Probe Launcher II -# Module: Sisters Core Probe Launcher -# Module: Sisters Expanded Probe Launcher # Skill: Astrometric Rangefinding # Skill: Astrometrics type = "passive" diff --git a/eos/effects/biologytimebonusfixed.py b/eos/effects/biologytimebonusfixed.py index 012da3495..b9939858f 100755 --- a/eos/effects/biologytimebonusfixed.py +++ b/eos/effects/biologytimebonusfixed.py @@ -1,6 +1,5 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Biology BY-805 -# Implant: Eifyr and Co. 'Alchemist' Biology BY-810 +# Implants named like: Eifyr and Co. 'Alchemist' Biology BY (2 of 2) # Skill: Biology type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boosterarmorhppenalty.py b/eos/effects/boosterarmorhppenalty.py index 0fe5ed48c..68f28a70c 100755 --- a/eos/effects/boosterarmorhppenalty.py +++ b/eos/effects/boosterarmorhppenalty.py @@ -1,16 +1,5 @@ # Used by: -# Implant: Improved Crash Booster -# Implant: Improved Exile Booster -# Implant: Improved Frentix Booster -# Implant: Improved X-Instinct Booster -# Implant: Standard Crash Booster -# Implant: Standard Exile Booster -# Implant: Standard Frentix Booster -# Implant: Standard X-Instinct Booster -# Implant: Strong Crash Booster -# Implant: Strong Exile Booster -# Implant: Strong Frentix Booster -# Implant: Strong X-Instinct Booster +# Implants from group: Booster (12 of 37) type = "boosterSideEffect" def handler(fit, booster, context): fit.ship.boostItemAttr("armorHP", booster.getModifiedItemAttr("boosterArmorHPPenalty")) diff --git a/eos/effects/boosterarmorrepairamountpenalty.py b/eos/effects/boosterarmorrepairamountpenalty.py index 17210b5a4..b27d75cac 100755 --- a/eos/effects/boosterarmorrepairamountpenalty.py +++ b/eos/effects/boosterarmorrepairamountpenalty.py @@ -1,13 +1,5 @@ # Used by: -# Implant: Improved Drop Booster -# Implant: Improved Mindflood Booster -# Implant: Improved Sooth Sayer Booster -# Implant: Standard Drop Booster -# Implant: Standard Mindflood Booster -# Implant: Standard Sooth Sayer Booster -# Implant: Strong Drop Booster -# Implant: Strong Mindflood Booster -# Implant: Strong Sooth Sayer Booster +# Implants from group: Booster (9 of 37) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Repair Unit", diff --git a/eos/effects/boostercapacitorcapacitypenalty.py b/eos/effects/boostercapacitorcapacitypenalty.py index 664858d32..333563b59 100755 --- a/eos/effects/boostercapacitorcapacitypenalty.py +++ b/eos/effects/boostercapacitorcapacitypenalty.py @@ -1,10 +1,6 @@ # Used by: -# Implant: Improved Blue Pill Booster -# Implant: Improved Exile Booster -# Implant: Standard Blue Pill Booster -# Implant: Standard Exile Booster -# Implant: Strong Blue Pill Booster -# Implant: Strong Exile Booster +# Implants named like: Blue Pill Booster (3 of 5) +# Implants named like: Exile Booster (3 of 4) type = "boosterSideEffect" def handler(fit, booster, context): fit.ship.boostItemAttr("capacitorCapacity", booster.getModifiedItemAttr("boosterCapacitorCapacityPenalty")) diff --git a/eos/effects/boostermaxvelocitypenalty.py b/eos/effects/boostermaxvelocitypenalty.py index 7bbddf6c1..96e6061f0 100755 --- a/eos/effects/boostermaxvelocitypenalty.py +++ b/eos/effects/boostermaxvelocitypenalty.py @@ -1,16 +1,5 @@ # Used by: -# Implant: Improved Crash Booster -# Implant: Improved Drop Booster -# Implant: Improved Frentix Booster -# Implant: Improved Sooth Sayer Booster -# Implant: Standard Crash Booster -# Implant: Standard Drop Booster -# Implant: Standard Frentix Booster -# Implant: Standard Sooth Sayer Booster -# Implant: Strong Crash Booster -# Implant: Strong Drop Booster -# Implant: Strong Frentix Booster -# Implant: Strong Sooth Sayer Booster +# Implants from group: Booster (12 of 37) type = "boosterSideEffect" def handler(fit, booster, context): fit.ship.boostItemAttr("maxVelocity", booster.getModifiedItemAttr("boosterMaxVelocityPenalty")) diff --git a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py index d0554f5f0..fba0930c1 100755 --- a/eos/effects/boostermissileexplosioncloudpenaltyfixed.py +++ b/eos/effects/boostermissileexplosioncloudpenaltyfixed.py @@ -1,10 +1,6 @@ # Used by: -# Implant: Improved Exile Booster -# Implant: Improved Mindflood Booster -# Implant: Standard Exile Booster -# Implant: Standard Mindflood Booster -# Implant: Strong Exile Booster -# Implant: Strong Mindflood Booster +# Implants named like: Exile Booster (3 of 4) +# Implants named like: Mindflood Booster (3 of 4) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), diff --git a/eos/effects/boostermissileexplosionvelocitypenalty.py b/eos/effects/boostermissileexplosionvelocitypenalty.py index 9596c4be7..cdefe1a20 100755 --- a/eos/effects/boostermissileexplosionvelocitypenalty.py +++ b/eos/effects/boostermissileexplosionvelocitypenalty.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Improved Blue Pill Booster -# Implant: Standard Blue Pill Booster -# Implant: Strong Blue Pill Booster +# Implants named like: Blue Pill Booster (3 of 5) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), diff --git a/eos/effects/boostermissilevelocitypenalty.py b/eos/effects/boostermissilevelocitypenalty.py index 360c99b30..db2918a35 100755 --- a/eos/effects/boostermissilevelocitypenalty.py +++ b/eos/effects/boostermissilevelocitypenalty.py @@ -1,10 +1,6 @@ # Used by: -# Implant: Improved Crash Booster -# Implant: Improved X-Instinct Booster -# Implant: Standard Crash Booster -# Implant: Standard X-Instinct Booster -# Implant: Strong Crash Booster -# Implant: Strong X-Instinct Booster +# Implants named like: Crash Booster (3 of 4) +# Implants named like: X Instinct Booster (3 of 4) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py index 840affd4c..a1fd83c72 100755 --- a/eos/effects/boostermodifyboosterarmorpenalties.py +++ b/eos/effects/boostermodifyboosterarmorpenalties.py @@ -1,11 +1,6 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-903 -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-905 -# Implant: Low-grade Edge Alpha -# Implant: Low-grade Edge Beta -# Implant: Low-grade Edge Delta -# Implant: Low-grade Edge Epsilon -# Implant: Low-grade Edge Gamma +# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Low grade Edge (5 of 6) # Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py index 93e75ad45..12310dff8 100755 --- a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py +++ b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py @@ -1,11 +1,6 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-903 -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-905 -# Implant: Low-grade Edge Alpha -# Implant: Low-grade Edge Beta -# Implant: Low-grade Edge Delta -# Implant: Low-grade Edge Epsilon -# Implant: Low-grade Edge Gamma +# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Low grade Edge (5 of 6) # Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/boostermodifyboostermissilepenalty.py index b6d44b128..ecf30a320 100755 --- a/eos/effects/boostermodifyboostermissilepenalty.py +++ b/eos/effects/boostermodifyboostermissilepenalty.py @@ -1,11 +1,6 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-903 -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-905 -# Implant: Low-grade Edge Alpha -# Implant: Low-grade Edge Beta -# Implant: Low-grade Edge Delta -# Implant: Low-grade Edge Epsilon -# Implant: Low-grade Edge Gamma +# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Low grade Edge (5 of 6) # Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/boostermodifyboostershieldpenalty.py index bee3b86d4..fe2d176b3 100755 --- a/eos/effects/boostermodifyboostershieldpenalty.py +++ b/eos/effects/boostermodifyboostershieldpenalty.py @@ -1,11 +1,6 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-903 -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-905 -# Implant: Low-grade Edge Alpha -# Implant: Low-grade Edge Beta -# Implant: Low-grade Edge Delta -# Implant: Low-grade Edge Epsilon -# Implant: Low-grade Edge Gamma +# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Low grade Edge (5 of 6) # Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/boostermodifyboosterturretpenalty.py index 069a0f684..595464043 100755 --- a/eos/effects/boostermodifyboosterturretpenalty.py +++ b/eos/effects/boostermodifyboosterturretpenalty.py @@ -1,11 +1,6 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-903 -# Implant: Eifyr and Co. 'Alchemist' Nanite Control NC-905 -# Implant: Low-grade Edge Alpha -# Implant: Low-grade Edge Beta -# Implant: Low-grade Edge Delta -# Implant: Low-grade Edge Epsilon -# Implant: Low-grade Edge Gamma +# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Low grade Edge (5 of 6) # Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): diff --git a/eos/effects/boostershieldcapacitypenalty.py b/eos/effects/boostershieldcapacitypenalty.py index 24aadf32b..c7b2d0bd7 100755 --- a/eos/effects/boostershieldcapacitypenalty.py +++ b/eos/effects/boostershieldcapacitypenalty.py @@ -1,16 +1,5 @@ # Used by: -# Implant: Improved Blue Pill Booster -# Implant: Improved Drop Booster -# Implant: Improved Sooth Sayer Booster -# Implant: Improved X-Instinct Booster -# Implant: Standard Blue Pill Booster -# Implant: Standard Drop Booster -# Implant: Standard Sooth Sayer Booster -# Implant: Standard X-Instinct Booster -# Implant: Strong Blue Pill Booster -# Implant: Strong Drop Booster -# Implant: Strong Sooth Sayer Booster -# Implant: Strong X-Instinct Booster +# Implants from group: Booster (12 of 37) type = "boosterSideEffect" def handler(fit, booster, context): fit.ship.boostItemAttr("shieldCapacity", booster.getModifiedItemAttr("boosterShieldCapacityPenalty")) diff --git a/eos/effects/boosterturretfalloffpenalty.py b/eos/effects/boosterturretfalloffpenalty.py index de51411d4..f2719f29d 100755 --- a/eos/effects/boosterturretfalloffpenalty.py +++ b/eos/effects/boosterturretfalloffpenalty.py @@ -1,10 +1,6 @@ # Used by: -# Implant: Improved Drop Booster -# Implant: Improved X-Instinct Booster -# Implant: Standard Drop Booster -# Implant: Standard X-Instinct Booster -# Implant: Strong Drop Booster -# Implant: Strong X-Instinct Booster +# Implants named like: Drop Booster (3 of 4) +# Implants named like: X Instinct Booster (3 of 4) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), diff --git a/eos/effects/boosterturretoptimalrangepenalty.py b/eos/effects/boosterturretoptimalrangepenalty.py index aae516dc9..c1603e555 100755 --- a/eos/effects/boosterturretoptimalrangepenalty.py +++ b/eos/effects/boosterturretoptimalrangepenalty.py @@ -1,13 +1,5 @@ # Used by: -# Implant: Improved Blue Pill Booster -# Implant: Improved Mindflood Booster -# Implant: Improved Sooth Sayer Booster -# Implant: Standard Blue Pill Booster -# Implant: Standard Mindflood Booster -# Implant: Standard Sooth Sayer Booster -# Implant: Strong Blue Pill Booster -# Implant: Strong Mindflood Booster -# Implant: Strong Sooth Sayer Booster +# Implants from group: Booster (9 of 37) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), diff --git a/eos/effects/boosterturrettrackingpenalty.py b/eos/effects/boosterturrettrackingpenalty.py index b56e90bd8..916f5f231 100755 --- a/eos/effects/boosterturrettrackingpenalty.py +++ b/eos/effects/boosterturrettrackingpenalty.py @@ -1,10 +1,6 @@ # Used by: -# Implant: Improved Exile Booster -# Implant: Improved Frentix Booster -# Implant: Standard Exile Booster -# Implant: Standard Frentix Booster -# Implant: Strong Exile Booster -# Implant: Strong Frentix Booster +# Implants named like: Exile Booster (3 of 4) +# Implants named like: Frentix Booster (3 of 4) type = "boosterSideEffect" def handler(fit, booster, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), diff --git a/eos/effects/caldarisetbonus3.py b/eos/effects/caldarisetbonus3.py index 53ee58303..6a491223d 100755 --- a/eos/effects/caldarisetbonus3.py +++ b/eos/effects/caldarisetbonus3.py @@ -1,10 +1,5 @@ # Used by: -# Implant: Talon Alpha -# Implant: Talon Beta -# Implant: Talon Delta -# Implant: Talon Epsilon -# Implant: Talon Gamma -# Implant: Talon Omega +# Implants named like: Talon (6 of 12) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/capacitoremissionsystemskill.py b/eos/effects/capacitoremissionsystemskill.py index 9f6914cdb..a91275659 100644 --- a/eos/effects/capacitoremissionsystemskill.py +++ b/eos/effects/capacitoremissionsystemskill.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: Inherent Implants Emission Systems ES (6 of 6) -# Modules named like: Egress (8 of 8) +# Implants named like: Inherent Implants 'Squire' Energy Emission Systems ES (6 of 6) +# Modules named like: Egress Port Maximizer (8 of 8) # Skill: Capacitor Emission Systems type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capitallauncherskillcitadelemdamage.py b/eos/effects/capitallauncherskillcitadelemdamage.py index 8922f20ee..dde2baa9a 100755 --- a/eos/effects/capitallauncherskillcitadelemdamage.py +++ b/eos/effects/capitallauncherskillcitadelemdamage.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Hardwiring Zainou 'Sharpshooter' (6 of 6) +# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6) # Skill: Citadel Torpedoes type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capitallauncherskillcitadelexplosivedamage.py b/eos/effects/capitallauncherskillcitadelexplosivedamage.py index cd4042a17..74a91dc79 100755 --- a/eos/effects/capitallauncherskillcitadelexplosivedamage.py +++ b/eos/effects/capitallauncherskillcitadelexplosivedamage.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Hardwiring Zainou 'Sharpshooter' (6 of 6) +# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6) # Skill: Citadel Torpedoes type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capitallauncherskillcitadelkineticdamage.py b/eos/effects/capitallauncherskillcitadelkineticdamage.py index 6d7528ec1..eef7e95c3 100755 --- a/eos/effects/capitallauncherskillcitadelkineticdamage.py +++ b/eos/effects/capitallauncherskillcitadelkineticdamage.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Hardwiring Zainou 'Sharpshooter' (6 of 6) +# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6) # Skill: Citadel Torpedoes type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capitallauncherskillcitadelthermaldamage.py b/eos/effects/capitallauncherskillcitadelthermaldamage.py index a21b626b4..115d0de40 100755 --- a/eos/effects/capitallauncherskillcitadelthermaldamage.py +++ b/eos/effects/capitallauncherskillcitadelthermaldamage.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Hardwiring Zainou 'Sharpshooter' (6 of 6) +# Implants named like: Hardwiring Zainou 'Sharpshooter' ZMX (6 of 6) # Skill: Citadel Torpedoes type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py b/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py index 0274984d5..c64970d8c 100755 --- a/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py +++ b/eos/effects/capitalshieldoperationskillcapacitorneedbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Core Safeguard (8 of 8) +# Modules named like: Core Defense Capacitor Safeguard (8 of 8) # Skill: Capital Shield Operation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/capneedbonuseffecthybrids.py b/eos/effects/capneedbonuseffecthybrids.py index b7e24958f..57924c71e 100755 --- a/eos/effects/capneedbonuseffecthybrids.py +++ b/eos/effects/capneedbonuseffecthybrids.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Discharge (8 of 8) +# Modules named like: Hybrid Discharge Elutriation (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/capneedbonuseffectlasers.py b/eos/effects/capneedbonuseffectlasers.py index 85a05d9ed..cfca86f0a 100755 --- a/eos/effects/capneedbonuseffectlasers.py +++ b/eos/effects/capneedbonuseffectlasers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Discharge (8 of 8) +# Modules named like: Energy Discharge Elutriation (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/cloaking.py b/eos/effects/cloaking.py index 15f6ad65e..f21d6b55a 100755 --- a/eos/effects/cloaking.py +++ b/eos/effects/cloaking.py @@ -1,12 +1,5 @@ # Used by: -# Modules named like: Modified Cloaking Device (5 of 5) -# Module: Caldari Navy Cloaking Device -# Module: Dread Guristas Cloaking Device -# Module: Improved 'Guise' Cloaking Device II -# Module: Improved Cloaking Device II -# Module: Prototype 'Poncho' Cloaking Device I -# Module: Prototype Cloaking Device I -# Module: Syndicate Cloaking Device +# Modules from group: Cloaking Device (12 of 14) type = "active" runTime = "early" #TODO: Rewrite this effect diff --git a/eos/effects/cloakingscanresolutionmultiplier.py b/eos/effects/cloakingscanresolutionmultiplier.py index ee3162eef..3b7648c2a 100755 --- a/eos/effects/cloakingscanresolutionmultiplier.py +++ b/eos/effects/cloakingscanresolutionmultiplier.py @@ -1,12 +1,5 @@ # Used by: -# Modules named like: Modified Cloaking Device (5 of 5) -# Module: Caldari Navy Cloaking Device -# Module: Dread Guristas Cloaking Device -# Module: Improved 'Guise' Cloaking Device II -# Module: Improved Cloaking Device II -# Module: Prototype 'Poncho' Cloaking Device I -# Module: Prototype Cloaking Device I -# Module: Syndicate Cloaking Device +# Modules from group: Cloaking Device (12 of 14) type = "offline" def handler(fit, module, context): fit.ship.multiplyItemAttr("scanResolution", diff --git a/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py b/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py index b9786ea93..d4fd4a1ec 100755 --- a/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py +++ b/eos/effects/cloakingtargetingdelaybonuslrsmcloakingpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Systems Stabilizer (8 of 8) +# Modules named like: Targeting Systems Stabilizer (8 of 8) type = "offline" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda module: module.item.requiresSkill("Cloaking"), diff --git a/eos/effects/cloakingwarpsafe.py b/eos/effects/cloakingwarpsafe.py index 206af21b5..29094714f 100755 --- a/eos/effects/cloakingwarpsafe.py +++ b/eos/effects/cloakingwarpsafe.py @@ -1,6 +1,5 @@ # Used by: -# Module: 'Smokescreen' Covert Ops Cloaking Device II -# Module: Covert Ops Cloaking Device II +# Modules named like: Covert Ops Cloaking Device II (2 of 2) type = "active" runTime = "early" def handler(fit, ship, context): diff --git a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py index 70be60af7..928746523 100755 --- a/eos/effects/commandbonustdmultiplywithcommandbonushidden.py +++ b/eos/effects/commandbonustdmultiplywithcommandbonushidden.py @@ -5,6 +5,5 @@ gangBoost = "ewarStrTD" type = "active", "gang" def handler(fit, module, context): for bonus in ("maxRangeBonus", "falloffBonus", "trackingSpeedBonus"): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", - bonus, module.getModifiedItemAttr("commandBonusTD"), - stackingPenalties = True) + fit.modules.filteredItemBoost(lambda mod: lambda mod: mod.item.requiresSkill("Weapon Disruption"), + bonus, module.getModifiedItemAttr("commandBonusTD")) diff --git a/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py b/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py index 1d7da6712..ceb7e76c5 100755 --- a/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py +++ b/eos/effects/controlledburstscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringgunnery.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Implants Bursts (6 of 6) +# Implants named like: Inherent Implants 'Lancer' Controlled Bursts CB (6 of 6) # Skill: Controlled Bursts type = "passive" def handler(fit, container, context): diff --git a/eos/effects/covertcloakcpuaddition.py b/eos/effects/covertcloakcpuaddition.py index f60304f18..b36d4da96 100644 --- a/eos/effects/covertcloakcpuaddition.py +++ b/eos/effects/covertcloakcpuaddition.py @@ -1,7 +1,6 @@ # Used by: -# Module: 'Smokescreen' Covert Ops Cloaking Device II +# Modules named like: Covert Ops Cloaking Device II (2 of 2) # Module: Covert Cynosural Field Generator I -# Module: Covert Ops Cloaking Device II type = "passive" def handler(fit, module, context): module.increaseItemAttr("cpu", module.getModifiedItemAttr("covertCloakCPUAdd") or 0) diff --git a/eos/effects/covertcynocpupenalty.py b/eos/effects/covertcynocpupenalty.py index d4864a30d..cc2b76a90 100755 --- a/eos/effects/covertcynocpupenalty.py +++ b/eos/effects/covertcynocpupenalty.py @@ -1,16 +1,5 @@ # Used by: -# Subsystem: Legion Offensive - Assault Optimization -# Subsystem: Legion Offensive - Drone Synthesis Projector -# Subsystem: Legion Offensive - Liquid Crystal Magnifiers -# Subsystem: Loki Offensive - Hardpoint Efficiency Configuration -# Subsystem: Loki Offensive - Projectile Scoping Array -# Subsystem: Loki Offensive - Turret Concurrence Registry -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Magnetic Infusion Basin -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Subsystems from group: Offensive Systems (12 of 16) type = "passive" def handler(fit, module, context): fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cynosural Field Theory"), diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py index 69c95eef6..e028d50f8 100755 --- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py +++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py @@ -4,13 +4,9 @@ # Ships from group: Covert Ops (5 of 5) # Ships from group: Force Recon Ship (5 of 5) # Ships from group: Stealth Bomber (4 of 4) +# Ships named like: Stratios (2 of 2) +# Subsystems named like: Offensive Covert Reconfiguration (4 of 4) # Ship: Astero -# Ship: Stratios -# Ship: Stratios Emergency Responder -# Subsystem: Legion Offensive - Covert Reconfiguration -# Subsystem: Loki Offensive - Covert Reconfiguration -# Subsystem: Proteus Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Covert Reconfiguration type = "passive" def handler(fit, container, context): fit.modules.filteredItemForce(lambda mod: mod.item.group.name == "Cloaking Device", diff --git a/eos/effects/covertopscloakcpupenalty.py b/eos/effects/covertopscloakcpupenalty.py index 3ae09a2d6..50a71b80e 100755 --- a/eos/effects/covertopscloakcpupenalty.py +++ b/eos/effects/covertopscloakcpupenalty.py @@ -1,16 +1,5 @@ # Used by: -# Subsystem: Legion Offensive - Assault Optimization -# Subsystem: Legion Offensive - Drone Synthesis Projector -# Subsystem: Legion Offensive - Liquid Crystal Magnifiers -# Subsystem: Loki Offensive - Hardpoint Efficiency Configuration -# Subsystem: Loki Offensive - Projectile Scoping Array -# Subsystem: Loki Offensive - Turret Concurrence Registry -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Magnetic Infusion Basin -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Subsystems from group: Offensive Systems (12 of 16) type = "passive" def handler(fit, module, context): fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Cloaking"), diff --git a/eos/effects/covertopscpubonus1.py b/eos/effects/covertopscpubonus1.py index 4a54e9bb3..1be6060a0 100755 --- a/eos/effects/covertopscpubonus1.py +++ b/eos/effects/covertopscpubonus1.py @@ -1,9 +1,6 @@ # Used by: # Ships from group: Stealth Bomber (4 of 4) -# Subsystem: Legion Offensive - Covert Reconfiguration -# Subsystem: Loki Offensive - Covert Reconfiguration -# Subsystem: Proteus Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Covert Reconfiguration +# Subsystems named like: Offensive Covert Reconfiguration (4 of 4) type = "passive" def handler(fit, container, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Cloaking Device", diff --git a/eos/effects/cpuneedbonuseffecthybrid.py b/eos/effects/cpuneedbonuseffecthybrid.py index aab14115e..4df8eb71e 100755 --- a/eos/effects/cpuneedbonuseffecthybrid.py +++ b/eos/effects/cpuneedbonuseffecthybrid.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Unit (8 of 8) +# Modules named like: Algid Hybrid Administrations Unit (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/cpuneedbonuseffectlasers.py b/eos/effects/cpuneedbonuseffectlasers.py index e56d36b64..4220f70aa 100755 --- a/eos/effects/cpuneedbonuseffectlasers.py +++ b/eos/effects/cpuneedbonuseffectlasers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Administrations Unit (8 of 8) +# Modules named like: Algid Energy Administrations Unit (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/cpuoutputaddcpuoutputpassive.py b/eos/effects/cpuoutputaddcpuoutputpassive.py index 84ae3d746..071551521 100755 --- a/eos/effects/cpuoutputaddcpuoutputpassive.py +++ b/eos/effects/cpuoutputaddcpuoutputpassive.py @@ -1,25 +1,5 @@ # Used by: -# Subsystems from group: Electronic Systems (16 of 16) -# Subsystems named like: Defensive Adaptive (5 of 5) -# Subsystem: Legion Defensive - Augmented Plating -# Subsystem: Legion Defensive - Nanobot Injector -# Subsystem: Legion Offensive - Assault Optimization -# Subsystem: Legion Offensive - Drone Synthesis Projector -# Subsystem: Legion Offensive - Liquid Crystal Magnifiers -# Subsystem: Loki Defensive - Amplification Node -# Subsystem: Loki Offensive - Hardpoint Efficiency Configuration -# Subsystem: Loki Offensive - Projectile Scoping Array -# Subsystem: Loki Offensive - Turret Concurrence Registry -# Subsystem: Proteus Defensive - Augmented Plating -# Subsystem: Proteus Defensive - Nanobot Injector -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature -# Subsystem: Tengu Defensive - Amplification Node -# Subsystem: Tengu Defensive - Supplemental Screening -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Magnetic Infusion Basin -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Items from category: Subsystem (40 of 80) type = "passive" def handler(fit, module, context): fit.ship.increaseItemAttr("cpuOutput", module.getModifiedItemAttr("cpuOutput")) diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py index f28c2ccf8..43f35d979 100755 --- a/eos/effects/cynosuraldurationbonus.py +++ b/eos/effects/cynosuraldurationbonus.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Arazu -# Ship: Falcon -# Ship: Pilgrim -# Ship: Rapier +# Ships from group: Force Recon Ship (4 of 5) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field", diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py index edaff06ea..270c56adb 100755 --- a/eos/effects/cynosuraltheoryconsumptionbonus.py +++ b/eos/effects/cynosuraltheoryconsumptionbonus.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Arazu -# Ship: Falcon -# Ship: Pilgrim -# Ship: Rapier +# Ships from group: Force Recon Ship (4 of 5) # Skill: Cynosural Field Theory type = "passive" def handler(fit, container, context): diff --git a/eos/effects/dohacking.py b/eos/effects/dohacking.py index 556a639d8..8457f0e6f 100755 --- a/eos/effects/dohacking.py +++ b/eos/effects/dohacking.py @@ -1,6 +1,5 @@ # Used by: -# Modules named like: Data Analyzer (11 of 11) -# Variations of module: Relic Analyzer I (2 of 2) +# Modules from group: Data Miners (13 of 14) # Module: QA Cross Protocol Analyzer type = "active" def handler(fit, module, context): diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py index 7e9c4768c..485ba06bd 100755 --- a/eos/effects/drawbackarmorhp.py +++ b/eos/effects/drawbackarmorhp.py @@ -1,10 +1,5 @@ # Used by: -# Modules named like: Auxiliary Thrusters (8 of 8) -# Modules named like: Cargohold Optimization (8 of 8) -# Modules named like: Engine I (8 of 8) -# Modules named like: Engine II (8 of 8) -# Modules named like: Low Nozzle (8 of 8) -# Modules named like: Valve (8 of 8) +# Modules from group: Rig Navigation (48 of 64) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback")) \ No newline at end of file diff --git a/eos/effects/drawbackmaxvelocity.py b/eos/effects/drawbackmaxvelocity.py index 94e9f7724..a81f69a57 100755 --- a/eos/effects/drawbackmaxvelocity.py +++ b/eos/effects/drawbackmaxvelocity.py @@ -1,8 +1,6 @@ # Used by: -# Modules named like: Anti Pump (32 of 32) -# Modules named like: Remote Augmentor (8 of 8) -# Modules named like: Salvage Tackle (8 of 8) -# Modules named like: Trimark Pump (8 of 8) +# Modules from group: Rig Armor (48 of 64) +# Modules from group: Rig Resource Processing (8 of 10) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("drawback"), diff --git a/eos/effects/drawbackrepairsystemspgneed.py b/eos/effects/drawbackrepairsystemspgneed.py index 7b4a1a757..828e8426a 100755 --- a/eos/effects/drawbackrepairsystemspgneed.py +++ b/eos/effects/drawbackrepairsystemspgneed.py @@ -1,10 +1,6 @@ # Used by: -# Variations of module: Large Auxiliary Nano Pump I (2 of 2) -# Variations of module: Large Nanobot Accelerator I (2 of 2) -# Variations of module: Medium Auxiliary Nano Pump I (2 of 2) -# Variations of module: Medium Nanobot Accelerator I (2 of 2) -# Variations of module: Small Auxiliary Nano Pump I (2 of 2) -# Variations of module: Small Nanobot Accelerator I (2 of 2) +# Modules named like: Auxiliary Nano Pump (6 of 8) +# Modules named like: Nanobot Accelerator (6 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), diff --git a/eos/effects/drawbackshieldcapacity.py b/eos/effects/drawbackshieldcapacity.py index d84650ad4..91a1951d2 100755 --- a/eos/effects/drawbackshieldcapacity.py +++ b/eos/effects/drawbackshieldcapacity.py @@ -1,10 +1,7 @@ # Used by: +# Modules from group: Rig Electronic Systems (40 of 48) # Modules from group: Rig Targeting (16 of 16) -# Modules named like: Diagnostic Subroutines (8 of 8) -# Modules named like: Dispersion (16 of 16) -# Modules named like: Inverted Signal Field Projector (8 of 8) -# Modules named like: Signal Focusing (8 of 8) -# Modules named like: Targeting Systems (8 of 8) +# Modules named like: Signal Focusing Kit (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("drawback")) diff --git a/eos/effects/dronebandwidthaddpassive.py b/eos/effects/dronebandwidthaddpassive.py index 0c70de8f6..44836fefe 100755 --- a/eos/effects/dronebandwidthaddpassive.py +++ b/eos/effects/dronebandwidthaddpassive.py @@ -1,15 +1,6 @@ # Used by: +# Subsystems from group: Engineering Systems (13 of 16) # Subsystems from group: Offensive Systems (16 of 16) -# Variations of subsystem: Loki Engineering - Power Core Multiplier (4 of 4) -# Subsystem: Legion Engineering - Augmented Capacitor Reservoir -# Subsystem: Legion Engineering - Capacitor Regeneration Matrix -# Subsystem: Legion Engineering - Power Core Multiplier -# Subsystem: Proteus Engineering - Augmented Capacitor Reservoir -# Subsystem: Proteus Engineering - Capacitor Regeneration Matrix -# Subsystem: Proteus Engineering - Power Core Multiplier -# Subsystem: Tengu Engineering - Augmented Capacitor Reservoir -# Subsystem: Tengu Engineering - Capacitor Regeneration Matrix -# Subsystem: Tengu Engineering - Power Core Multiplier type = "passive" def handler(fit, module, context): fit.ship.increaseItemAttr("droneBandwidth", module.getModifiedItemAttr("droneBandwidth")) diff --git a/eos/effects/dronecapacityadddronecapacitypassive.py b/eos/effects/dronecapacityadddronecapacitypassive.py index 28907000c..43d89fc33 100755 --- a/eos/effects/dronecapacityadddronecapacitypassive.py +++ b/eos/effects/dronecapacityadddronecapacitypassive.py @@ -1,25 +1,5 @@ # Used by: -# Subsystems from group: Defensive Systems (16 of 16) -# Variations of subsystem: Loki Engineering - Power Core Multiplier (4 of 4) -# Variations of subsystem: Loki Offensive - Turret Concurrence Registry (4 of 4) -# Subsystem: Legion Engineering - Augmented Capacitor Reservoir -# Subsystem: Legion Engineering - Capacitor Regeneration Matrix -# Subsystem: Legion Engineering - Power Core Multiplier -# Subsystem: Legion Offensive - Assault Optimization -# Subsystem: Legion Offensive - Drone Synthesis Projector -# Subsystem: Legion Offensive - Liquid Crystal Magnifiers -# Subsystem: Proteus Engineering - Augmented Capacitor Reservoir -# Subsystem: Proteus Engineering - Capacitor Regeneration Matrix -# Subsystem: Proteus Engineering - Power Core Multiplier -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature -# Subsystem: Tengu Engineering - Augmented Capacitor Reservoir -# Subsystem: Tengu Engineering - Capacitor Regeneration Matrix -# Subsystem: Tengu Engineering - Power Core Multiplier -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Magnetic Infusion Basin -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Items from category: Subsystem (42 of 80) type = "passive" def handler(fit, module, context): fit.ship.increaseItemAttr("droneCapacity", module.getModifiedItemAttr("droneCapacity")) diff --git a/eos/effects/dronedmgbonus.py b/eos/effects/dronedmgbonus.py index 24bf0cdc0..7e85625de 100755 --- a/eos/effects/dronedmgbonus.py +++ b/eos/effects/dronedmgbonus.py @@ -1,9 +1,6 @@ # Used by: -# Skill: Amarr Drone Specialization -# Skill: Caldari Drone Specialization -# Skill: Gallente Drone Specialization +# Skills named like: Drone Specialization (4 of 4) # Skill: Heavy Drone Operation -# Skill: Minmatar Drone Specialization # Skill: Sentry Drone Interfacing type = "passive" def handler(fit, skill, context): diff --git a/eos/effects/dronedurabilityarmorhpbonus.py b/eos/effects/dronedurabilityarmorhpbonus.py index 4fbcc5564..39bb7802a 100755 --- a/eos/effects/dronedurabilityarmorhpbonus.py +++ b/eos/effects/dronedurabilityarmorhpbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Durability Enhancer (8 of 8) +# Modules named like: Drone Durability Enhancer (8 of 8) type = "passive" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), diff --git a/eos/effects/dronedurabilityhpbonus.py b/eos/effects/dronedurabilityhpbonus.py index e3b00b4f8..3cff6fc2a 100755 --- a/eos/effects/dronedurabilityhpbonus.py +++ b/eos/effects/dronedurabilityhpbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Durability Enhancer (8 of 8) +# Modules named like: Drone Durability Enhancer (8 of 8) # Skill: Drone Durability type = "passive" def handler(fit, container, context): diff --git a/eos/effects/dronedurabilityshieldcapbonus.py b/eos/effects/dronedurabilityshieldcapbonus.py index a5cdc8998..dc586ad02 100755 --- a/eos/effects/dronedurabilityshieldcapbonus.py +++ b/eos/effects/dronedurabilityshieldcapbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Durability Enhancer (8 of 8) +# Modules named like: Drone Durability Enhancer (8 of 8) type = "passive" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), diff --git a/eos/effects/dronemaxrangebonus.py b/eos/effects/dronemaxrangebonus.py index 466c78d5a..321975046 100755 --- a/eos/effects/dronemaxrangebonus.py +++ b/eos/effects/dronemaxrangebonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Drone Scope (8 of 8) +# Modules named like: Drone Scope Chip (8 of 8) # Skill: Drone Sharpshooting type = "passive" def handler(fit, container, context): diff --git a/eos/effects/dronemaxvelocitybonus.py b/eos/effects/dronemaxvelocitybonus.py index 78de6237b..e92b0dc3c 100755 --- a/eos/effects/dronemaxvelocitybonus.py +++ b/eos/effects/dronemaxvelocitybonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Speed Augmentor (8 of 8) +# Modules named like: Drone Speed Augmentor (8 of 8) # Skill: Drone Navigation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/dronerigstasiswebspeedfactorbonus.py b/eos/effects/dronerigstasiswebspeedfactorbonus.py index 1e64a1dcf..83fe8eaf7 100755 --- a/eos/effects/dronerigstasiswebspeedfactorbonus.py +++ b/eos/effects/dronerigstasiswebspeedfactorbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Stasis Augmentor (8 of 8) +# Modules named like: Stasis Drone Augmentor (8 of 8) type = "passive" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Stasis Webifying Drone", diff --git a/eos/effects/droneshieldbonusbonuseffect.py b/eos/effects/droneshieldbonusbonuseffect.py index 36cfc642e..d1c6e3a70 100755 --- a/eos/effects/droneshieldbonusbonuseffect.py +++ b/eos/effects/droneshieldbonusbonuseffect.py @@ -1,8 +1,6 @@ # Used by: -# Ship: Basilisk -# Ship: Etana +# Ships from group: Logistics (3 of 5) # Ship: Exequror -# Ship: Scimitar # Ship: Scythe type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/durationbonusforgroupafterburner.py b/eos/effects/durationbonusforgroupafterburner.py index a93b698a3..096700c1d 100755 --- a/eos/effects/durationbonusforgroupafterburner.py +++ b/eos/effects/durationbonusforgroupafterburner.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Thermal Shielding (8 of 8) +# Modules named like: Engine Thermal Shielding (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Propulsion Module", diff --git a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py index e6a71bbf0..4bf205006 100755 --- a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py +++ b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py @@ -1,6 +1,6 @@ # Used by: # Implants named like: Zainou 'Gypsy' Electronics EE (6 of 6) -# Modules named like: Overclocking (8 of 8) +# Modules named like: Processor Overclocking Unit (8 of 8) # Implant: Genolution Core Augmentation CA-2 # Skill: CPU Management type = "passive" diff --git a/eos/effects/elitebonuscommandshiparmoredcs3.py b/eos/effects/elitebonuscommandshiparmoredcs3.py index 7f84528c7..f9bd9d69e 100644 --- a/eos/effects/elitebonuscommandshiparmoredcs3.py +++ b/eos/effects/elitebonuscommandshiparmoredcs3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Absolution -# Ship: Astarte -# Ship: Damnation -# Ship: Eos +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/elitebonuscommandshipinformationcs3.py b/eos/effects/elitebonuscommandshipinformationcs3.py index 2a74a872a..7b9184f7d 100644 --- a/eos/effects/elitebonuscommandshipinformationcs3.py +++ b/eos/effects/elitebonuscommandshipinformationcs3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Absolution -# Ship: Damnation -# Ship: Nighthawk -# Ship: Vulture +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/elitebonuscommandshipinformationhiddencs3.py b/eos/effects/elitebonuscommandshipinformationhiddencs3.py index 3bd6a37da..8cb875d03 100644 --- a/eos/effects/elitebonuscommandshipinformationhiddencs3.py +++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Absolution -# Ship: Damnation -# Ship: Nighthawk -# Ship: Vulture +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/elitebonuscommandshipsiegecs3.py b/eos/effects/elitebonuscommandshipsiegecs3.py index 37573a467..d87d92eaa 100644 --- a/eos/effects/elitebonuscommandshipsiegecs3.py +++ b/eos/effects/elitebonuscommandshipsiegecs3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Claymore -# Ship: Nighthawk -# Ship: Sleipnir -# Ship: Vulture +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/elitebonuscommandshipskirmishcs3.py b/eos/effects/elitebonuscommandshipskirmishcs3.py index 8feafd89a..80005cf38 100644 --- a/eos/effects/elitebonuscommandshipskirmishcs3.py +++ b/eos/effects/elitebonuscommandshipskirmishcs3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Astarte -# Ship: Claymore -# Ship: Eos -# Ship: Sleipnir +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py b/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py index 1fb1e4cf4..f503897fa 100755 --- a/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py +++ b/eos/effects/energygridupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringenergygridupgrades.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: 'Squire' Upgrades EU (6 of 6) -# Modules named like: Powergrid Subroutine (8 of 8) +# Implants named like: Inherent Implants 'Squire' Energy Grid Upgrades EU (6 of 6) +# Modules named like: Powergrid Subroutine Maximizer (8 of 8) # Skill: Energy Grid Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py index 9bf672136..73dd2c782 100755 --- a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py +++ b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py @@ -1,11 +1,8 @@ # Used by: -# Modules named like: Semiconductor Cell (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Engineering Implants > Implant Slot 08 (6 of 6) +# Implants named like: Inherent Implants 'Squire' Energy Management EM (6 of 6) +# Implants named like: Mindflood Booster (4 of 4) +# Modules named like: Semiconductor Memory Cell (8 of 8) # Implant: Genolution Core Augmentation CA-1 -# Implant: Improved Mindflood Booster -# Implant: Standard Mindflood Booster -# Implant: Strong Mindflood Booster -# Implant: Synth Mindflood Booster # Skill: Capacitor Management type = "passive" def handler(fit, container, context): diff --git a/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py b/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py index 54f96e1a3..41b004ecc 100755 --- a/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py +++ b/eos/effects/energypulseweaponsdurationbonuspostpercentdurationlocationshipmodulesrequiringenergypulseweapons.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Weapons EP (6 of 6) +# Implants named like: Inherent Implants 'Squire' Energy Pulse Weapons EP (6 of 6) # Skill: Energy Pulse Weapons type = "passive" def handler(fit, container, context): diff --git a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py index a8acba909..4fc03f2f1 100755 --- a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py +++ b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: Implants 'Squire' Energy Systems Operation (6 of 6) -# Modules named like: Capacitor Circuit (8 of 8) +# Implants named like: Inherent Implants 'Squire' Energy Systems Operation EO (6 of 6) +# Modules named like: Capacitor Control Circuit (8 of 8) # Implant: Genolution Core Augmentation CA-2 # Skill: Capacitor Systems Operation type = "passive" diff --git a/eos/effects/energytransferpowerneedbonuseffect.py b/eos/effects/energytransferpowerneedbonuseffect.py index c03133060..134309e4f 100755 --- a/eos/effects/energytransferpowerneedbonuseffect.py +++ b/eos/effects/energytransferpowerneedbonuseffect.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Basilisk -# Ship: Etana -# Ship: Guardian +# Ships from group: Logistics (3 of 5) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", diff --git a/eos/effects/energyweapondamagemultiply.py b/eos/effects/energyweapondamagemultiply.py index 1b027c50d..554bcc0b5 100755 --- a/eos/effects/energyweapondamagemultiply.py +++ b/eos/effects/energyweapondamagemultiply.py @@ -1,10 +1,7 @@ # Used by: # Modules from group: Heat Sink (25 of 25) +# Modules named like: QA Multiship Module Players (4 of 4) # Module: QA Damage Module -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/energyweapondamagemultiplypassive.py b/eos/effects/energyweapondamagemultiplypassive.py index ff0c04681..b79833675 100755 --- a/eos/effects/energyweapondamagemultiplypassive.py +++ b/eos/effects/energyweapondamagemultiplypassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Accelerator (8 of 8) +# Modules named like: Energy Collision Accelerator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py index d8fd34e6d..6f3294930 100755 --- a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py +++ b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: 'Squire' EG (6 of 6) -# Modules named like: Ancillary Router (8 of 8) +# Implants named like: Inherent Implants 'Squire' Engineering EG (6 of 6) +# Modules named like: Ancillary Current Router (8 of 8) # Implant: Genolution Core Augmentation CA-1 # Skill: Power Grid Management type = "passive" diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py index 82358b835..21a7bb63a 100755 --- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py +++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py @@ -1,12 +1,8 @@ # Used by: -# Implants named like: and 'Rogue' EM (6 of 6) -# Modules named like: Low Nozzle Joints (8 of 8) +# Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6) +# Implants named like: Low grade Nomad (5 of 6) +# Modules named like: Low Friction Nozzle Joints (8 of 8) # Implant: Genolution Core Augmentation CA-4 -# Implant: Low-grade Nomad Alpha -# Implant: Low-grade Nomad Beta -# Implant: Low-grade Nomad Delta -# Implant: Low-grade Nomad Epsilon -# Implant: Low-grade Nomad Gamma # Skill: Evasive Maneuvering # Skill: Spaceship Command type = "passive" diff --git a/eos/effects/ewgroupecmburstmaxrangebonus.py b/eos/effects/ewgroupecmburstmaxrangebonus.py index 122ca9757..8ec6ab7b1 100755 --- a/eos/effects/ewgroupecmburstmaxrangebonus.py +++ b/eos/effects/ewgroupecmburstmaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Centurion Alpha -# Implant: Low-grade Centurion Beta -# Implant: Low-grade Centurion Delta -# Implant: Low-grade Centurion Epsilon -# Implant: Low-grade Centurion Gamma +# Implants named like: Low grade Centurion (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote ECM Burst", diff --git a/eos/effects/ewgrouprsdmaxrangebonus.py b/eos/effects/ewgrouprsdmaxrangebonus.py index bbc2e79c8..6f0cb57bc 100755 --- a/eos/effects/ewgrouprsdmaxrangebonus.py +++ b/eos/effects/ewgrouprsdmaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Centurion Alpha -# Implant: Low-grade Centurion Beta -# Implant: Low-grade Centurion Delta -# Implant: Low-grade Centurion Epsilon -# Implant: Low-grade Centurion Gamma +# Implants named like: Low grade Centurion (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Sensor Damper", diff --git a/eos/effects/ewgrouptdmaxrangebonus.py b/eos/effects/ewgrouptdmaxrangebonus.py index 90ecb757d..7036ffa49 100755 --- a/eos/effects/ewgrouptdmaxrangebonus.py +++ b/eos/effects/ewgrouptdmaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Centurion Alpha -# Implant: Low-grade Centurion Beta -# Implant: Low-grade Centurion Delta -# Implant: Low-grade Centurion Epsilon -# Implant: Low-grade Centurion Gamma +# Implants named like: Low grade Centurion (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", diff --git a/eos/effects/ewgrouptpmaxrangebonus.py b/eos/effects/ewgrouptpmaxrangebonus.py index f7b5b3558..ef6ca3232 100755 --- a/eos/effects/ewgrouptpmaxrangebonus.py +++ b/eos/effects/ewgrouptpmaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Centurion Alpha -# Implant: Low-grade Centurion Beta -# Implant: Low-grade Centurion Delta -# Implant: Low-grade Centurion Epsilon -# Implant: Low-grade Centurion Gamma +# Implants named like: Low grade Centurion (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Target Painter", diff --git a/eos/effects/ewskillecmburstcapneedbonus.py b/eos/effects/ewskillecmburstcapneedbonus.py index 4e2b8b45a..c4f67d9d2 100755 --- a/eos/effects/ewskillecmburstcapneedbonus.py +++ b/eos/effects/ewskillecmburstcapneedbonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou 'Gypsy' Electronic Warfare (6 of 6) +# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6) # Modules named like: Signal Disruption Amplifier (8 of 8) # Skill: Electronic Warfare type = "passive" diff --git a/eos/effects/ewskillewcapneedskilllevel.py b/eos/effects/ewskillewcapneedskilllevel.py index 1d4911499..07b7f318f 100755 --- a/eos/effects/ewskillewcapneedskilllevel.py +++ b/eos/effects/ewskillewcapneedskilllevel.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou 'Gypsy' Electronic Warfare (6 of 6) +# Implants named like: Zainou 'Gypsy' Electronic Warfare EW (6 of 6) # Modules named like: Signal Disruption Amplifier (8 of 8) # Skill: Electronic Warfare type = "passive" diff --git a/eos/effects/ewskillewmaxrangebonus.py b/eos/effects/ewskillewmaxrangebonus.py index b9bebaf63..d56a72a8f 100755 --- a/eos/effects/ewskillewmaxrangebonus.py +++ b/eos/effects/ewskillewmaxrangebonus.py @@ -1,10 +1,6 @@ # Used by: +# Implants named like: Low grade Centurion (5 of 6) # Modules named like: Particle Dispersion Projector (8 of 8) -# Implant: Low-grade Centurion Alpha -# Implant: Low-grade Centurion Beta -# Implant: Low-grade Centurion Delta -# Implant: Low-grade Centurion Epsilon -# Implant: Low-grade Centurion Gamma # Skill: Long Distance Jamming type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskillrsdcapneedbonusskilllevel.py b/eos/effects/ewskillrsdcapneedbonusskilllevel.py index b32f19f87..1ad07b22b 100755 --- a/eos/effects/ewskillrsdcapneedbonusskilllevel.py +++ b/eos/effects/ewskillrsdcapneedbonusskilllevel.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Gypsy' Sensor (6 of 6) +# Implants named like: Zainou 'Gypsy' Sensor Linking SL (6 of 6) # Skill: Sensor Linking type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskillscanstrengthbonus.py b/eos/effects/ewskillscanstrengthbonus.py index 2e1e7a5ee..aceb14c33 100755 --- a/eos/effects/ewskillscanstrengthbonus.py +++ b/eos/effects/ewskillscanstrengthbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Particle Augmentor (8 of 8) +# Modules named like: Particle Dispersion Augmentor (8 of 8) # Skill: Signal Dispersion type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py b/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py index ae43a54d3..3ff0e750c 100755 --- a/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py +++ b/eos/effects/ewskillsignalsuppressionmaxtargetrangebonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Signal Projector (8 of 8) +# Modules named like: Inverted Signal Field Projector (8 of 8) # Skill: Signal Suppression type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py b/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py index 2a651489d..7861c5217 100755 --- a/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py +++ b/eos/effects/ewskillsignalsuppressionscanresolutionbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Signal Projector (8 of 8) +# Modules named like: Inverted Signal Field Projector (8 of 8) # Skill: Signal Suppression type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskilltdcapneedbonusskilllevel.py b/eos/effects/ewskilltdcapneedbonusskilllevel.py index f575346d0..ec98761e7 100755 --- a/eos/effects/ewskilltdcapneedbonusskilllevel.py +++ b/eos/effects/ewskilltdcapneedbonusskilllevel.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Gypsy' Disruption WD (6 of 6) +# Implants named like: Zainou 'Gypsy' Weapon Disruption WD (6 of 6) # Skill: Weapon Disruption type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskilltpcapneedbonusskilllevel.py b/eos/effects/ewskilltpcapneedbonusskilllevel.py index f829ed5cd..0ed38fa8e 100755 --- a/eos/effects/ewskilltpcapneedbonusskilllevel.py +++ b/eos/effects/ewskilltpcapneedbonusskilllevel.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou 'Gypsy' Target TG (6 of 6) +# Implants named like: Zainou 'Gypsy' Target Painting TG (6 of 6) # Skill: Target Painting type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewskilltrackingdisruptionmaxrangebonus.py b/eos/effects/ewskilltrackingdisruptionmaxrangebonus.py deleted file mode 100755 index 65f1a9722..000000000 --- a/eos/effects/ewskilltrackingdisruptionmaxrangebonus.py +++ /dev/null @@ -1,10 +0,0 @@ -# Used by: -# Modules named like: Tracking Diagnostic (8 of 8) -# Skill: Turret Destabilization -type = "passive" -def handler(fit, container, context): - level = container.level if "skill" in context else 1 - for attr in ("maxRangeBonus", "falloffBonus"): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", - attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level, - stackingPenalties = "skill" not in context) diff --git a/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py new file mode 100644 index 000000000..d9aab8d2d --- /dev/null +++ b/eos/effects/ewskilltrackingdisruptionrangedisruptionbonus.py @@ -0,0 +1,9 @@ +# Used by: +# Modules named like: Tracking Diagnostic Subroutines (8 of 8) +# Skill: Turret Destabilization +type = "passive" +def handler(fit, container, context): + level = container.level if "skill" in context else 1 + for attr in ("maxRangeBonus", "falloffBonus"): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), + attr, container.getModifiedItemAttr("scanSkillEwStrengthBonus") * level) diff --git a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py index f633156f0..8b282691d 100755 --- a/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py +++ b/eos/effects/ewskilltrackingdisruptiontrackingspeedbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Tracking Diagnostic (8 of 8) +# Modules named like: Tracking Diagnostic Subroutines (8 of 8) # Skill: Turret Destabilization type = "passive" def handler(fit, container, context): diff --git a/eos/effects/ewtargetpaint.py b/eos/effects/ewtargetpaint.py index 8f2f24ca1..9c16f8a32 100755 --- a/eos/effects/ewtargetpaint.py +++ b/eos/effects/ewtargetpaint.py @@ -1,8 +1,6 @@ # Used by: # Modules from group: Target Painter (9 of 9) -# Drone: Berserker TP-900 -# Drone: Valkyrie TP-600 -# Drone: Warrior TP-300 +# Drones named like: TP (3 of 3) type = "projected", "active" def handler(fit, container, context): if "projected" in context: diff --git a/eos/effects/ewtesteffectjam.py b/eos/effects/ewtesteffectjam.py index 34d22adc1..7c18b5682 100755 --- a/eos/effects/ewtesteffectjam.py +++ b/eos/effects/ewtesteffectjam.py @@ -1,8 +1,6 @@ # Used by: # Modules from group: ECM (44 of 44) -# Drone: Hornet EC-300 -# Drone: Vespa EC-600 -# Drone: Wasp EC-900 +# Drones named like: EC (3 of 3) type = "projected", "active" def handler(fit, container, context): pass diff --git a/eos/effects/falloffbonuseffecthybrids.py b/eos/effects/falloffbonuseffecthybrids.py index 8003a30c8..52cb481e6 100755 --- a/eos/effects/falloffbonuseffecthybrids.py +++ b/eos/effects/falloffbonuseffecthybrids.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Ambit (8 of 8) +# Modules named like: Hybrid Ambit Extension (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/falloffbonuseffectlasers.py b/eos/effects/falloffbonuseffectlasers.py index 91caa1a78..e33d7a83c 100755 --- a/eos/effects/falloffbonuseffectlasers.py +++ b/eos/effects/falloffbonuseffectlasers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Ambit (8 of 8) +# Modules named like: Energy Ambit Extension (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/federationsetbonus3.py b/eos/effects/federationsetbonus3.py index 486eb3dee..0b088a4f6 100755 --- a/eos/effects/federationsetbonus3.py +++ b/eos/effects/federationsetbonus3.py @@ -1,10 +1,5 @@ # Used by: -# Implant: Spur Alpha -# Implant: Spur Beta -# Implant: Spur Delta -# Implant: Spur Epsilon -# Implant: Spur Gamma -# Implant: Spur Omega +# Implants named like: Spur (6 of 12) type = "passive" runTime = "early" def handler(fit, implant, context): diff --git a/eos/effects/ganginformationwarfaresuperiority.py b/eos/effects/ganginformationwarfaresuperiorityall.py similarity index 100% rename from eos/effects/ganginformationwarfaresuperiority.py rename to eos/effects/ganginformationwarfaresuperiorityall.py diff --git a/eos/effects/gasharvestermaxrangebonus.py b/eos/effects/gasharvestermaxrangebonus.py index 8f0bc0e41..439b141ac 100755 --- a/eos/effects/gasharvestermaxrangebonus.py +++ b/eos/effects/gasharvestermaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Harvest Alpha -# Implant: Low-grade Harvest Beta -# Implant: Low-grade Harvest Delta -# Implant: Low-grade Harvest Epsilon -# Implant: Low-grade Harvest Gamma +# Implants named like: Low grade Harvest (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Gas Cloud Harvester", diff --git a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py index 27def99f3..1366c1aab 100755 --- a/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py +++ b/eos/effects/gasharvestingcycletimemodulesrequiringgascloudharvesting.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Gas Harvesting GH-801 -# Implant: Eifyr and Co. 'Alchemist' Gas Harvesting GH-803 -# Implant: Eifyr and Co. 'Alchemist' Gas Harvesting GH-805 +# Implants named like: Eifyr and Co. 'Alchemist' Gas Harvesting GH (3 of 3) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gas Cloud Harvesting"), diff --git a/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py b/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py index 9622d7713..703599837 100755 --- a/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py +++ b/eos/effects/gunneryturretspeebonuspostpercentspeedlocationshipmodulesrequiringgunnery.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Lancer' Gunnery (6 of 6) +# Implants named like: Inherent Implants 'Lancer' Gunnery RF (6 of 6) # Implant: Pashan's Turret Customization Mindlink # Skill: Gunnery type = "passive" diff --git a/eos/effects/hackingskillvirusbonus.py b/eos/effects/hackingskillvirusbonus.py index b5b07b6f4..089a1365c 100644 --- a/eos/effects/hackingskillvirusbonus.py +++ b/eos/effects/hackingskillvirusbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Algorithm (8 of 8) +# Modules named like: Memetic Algorithm Bank (8 of 8) # Implant: Poteque 'Prospector' Hacking HC-905 # Skill: Hacking type = "passive" diff --git a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py index e12198bb3..e0abd7d54 100755 --- a/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py +++ b/eos/effects/highspeedmanuveringcapacitorneedmultiplierpostpercentcapacitorneedlocationshipmodulesrequiringhighspeedmanuvering.py @@ -1,5 +1,5 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Navigation Implants > Implant Slot 09 (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' High Speed Maneuvering HS (6 of 6) # Skill: High Speed Maneuvering type = "passive" def handler(fit, container, context): diff --git a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py index fac890201..a8acdf1e1 100755 --- a/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py +++ b/eos/effects/hullupgradesarmorhpbonuspostpercenthplocationship.py @@ -1,16 +1,7 @@ # Used by: -# Modules named like: Armor Pump (8 of 8) -# Implant: Low-grade Slave Alpha -# Implant: Low-grade Slave Beta -# Implant: Low-grade Slave Delta -# Implant: Low-grade Slave Epsilon -# Implant: Low-grade Slave Gamma +# Implants named like: Slave (10 of 12) +# Modules named like: Trimark Armor Pump (8 of 8) # Implant: Low-grade Snake Epsilon -# Implant: Slave Alpha -# Implant: Slave Beta -# Implant: Slave Delta -# Implant: Slave Epsilon -# Implant: Slave Gamma # Skill: Hull Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/hybridweapondamagemultiply.py b/eos/effects/hybridweapondamagemultiply.py index e5d8babef..a34690cc7 100755 --- a/eos/effects/hybridweapondamagemultiply.py +++ b/eos/effects/hybridweapondamagemultiply.py @@ -1,10 +1,7 @@ # Used by: # Modules from group: Magnetic Field Stabilizer (20 of 20) +# Modules named like: QA Multiship Module Players (4 of 4) # Module: QA Damage Module -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/hybridweaponspeedmultiplypassive.py b/eos/effects/hybridweaponspeedmultiplypassive.py index 642a2ff7c..db053f183 100755 --- a/eos/effects/hybridweaponspeedmultiplypassive.py +++ b/eos/effects/hybridweaponspeedmultiplypassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Burst (8 of 8) +# Modules named like: Hybrid Burst Aerator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py b/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py index a4904b992..709b0c5a2 100755 --- a/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py +++ b/eos/effects/iceharvestcycletimemodulesrequiringiceharvesting.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Inherent Implants 'Yeti' Ice Harvesting IH-1001 -# Implant: Inherent Implants 'Yeti' Ice Harvesting IH-1003 -# Implant: Inherent Implants 'Yeti' Ice Harvesting IH-1005 +# Implants named like: Inherent Implants 'Yeti' Ice Harvesting IH (3 of 3) # Module: Medium Ice Harvester Accelerator I # Skill: Ice Harvesting type = "passive" diff --git a/eos/effects/imperialsetbonus3.py b/eos/effects/imperialsetbonus3.py index 160bb565f..a2b10dc66 100755 --- a/eos/effects/imperialsetbonus3.py +++ b/eos/effects/imperialsetbonus3.py @@ -1,10 +1,5 @@ # Used by: -# Implant: Grail Alpha -# Implant: Grail Beta -# Implant: Grail Delta -# Implant: Grail Epsilon -# Implant: Grail Gamma -# Implant: Grail Omega +# Implants named like: Grail (6 of 12) type = "passive" runTime = "early" def handler(fit, implant, context): diff --git a/eos/effects/implantarmorhpbonus2.py b/eos/effects/implantarmorhpbonus2.py index d34a9bc45..003fad4ff 100755 --- a/eos/effects/implantarmorhpbonus2.py +++ b/eos/effects/implantarmorhpbonus2.py @@ -1,6 +1,7 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Armor Implants > Implant Slot 10 (8 of 8) +# Implants named like: Inherent Implants 'Noble' Hull Upgrades HG (7 of 7) # Implant: Genolution Core Augmentation CA-4 +# Implant: Imperial Navy Modified 'Noble' Implant # Implant: Imperial Special Ops Field Enhancer - Standard type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/implanthardwiringabcapacitorneed.py b/eos/effects/implanthardwiringabcapacitorneed.py index 77086cc70..40e2548d4 100755 --- a/eos/effects/implanthardwiringabcapacitorneed.py +++ b/eos/effects/implanthardwiringabcapacitorneed.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: and Co. Fuel FC (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' Fuel Conservation FC (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Afterburner"), diff --git a/eos/effects/implantvelocitybonus.py b/eos/effects/implantvelocitybonus.py index 775c5b3f7..17dbead8d 100755 --- a/eos/effects/implantvelocitybonus.py +++ b/eos/effects/implantvelocitybonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Rogue' Navigation (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' Navigation NN (6 of 6) # Implant: Genolution Core Augmentation CA-3 # Implant: Shaqil's Speed Enhancer type = "passive" diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py index 18036472d..d4da3b926 100755 --- a/eos/effects/interceptor2warpscramblerange.py +++ b/eos/effects/interceptor2warpscramblerange.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Ares -# Ship: Crow -# Ship: Malediction -# Ship: Stiletto +# Ships from group: Interceptor (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Interceptors").level diff --git a/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py b/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py index dfe9441b4..ed35f830d 100755 --- a/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py +++ b/eos/effects/largeenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeenergyturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent 'Lancer' Large Turret LE (6 of 6) +# Implants named like: Inherent Implants 'Lancer' Large Energy Turret LE (6 of 6) # Implant: Pashan's Turret Handling Mindlink # Skill: Large Energy Turret type = "passive" diff --git a/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py b/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py index 93dbb5b66..91f1fff03 100755 --- a/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py +++ b/eos/effects/largehybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargehybridturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Large Hybrid Turret (6 of 6) +# Implants named like: Zainou 'Deadeye' Large Hybrid Turret LH (6 of 6) # Skill: Large Hybrid Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py b/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py index 51c78002a..5e9bad6d7 100755 --- a/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py +++ b/eos/effects/largeprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringlargeprojectileturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: and 'Gunslinger' Projectile Turret LP (6 of 6) +# Implants named like: Eifyr and Co. 'Gunslinger' Large Projectile Turret LP (6 of 6) # Skill: Large Projectile Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py b/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py index 00d037ed6..fde20a4cf 100755 --- a/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py +++ b/eos/effects/longrangetargetingmaxtargetrangebonuspostpercentmaxtargetrangelocationshipgroupelectronic.py @@ -1,5 +1,5 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Targeting Implants > Implant Slot 08 (6 of 6) +# Implants named like: Zainou 'Gypsy' Long Range Targeting LT (6 of 6) # Skill: Long Range Targeting type = "passive" def handler(fit, container, context): diff --git a/eos/effects/maraudermodeeffect25.py b/eos/effects/maraudermodeeffect26.py similarity index 96% rename from eos/effects/maraudermodeeffect25.py rename to eos/effects/maraudermodeeffect26.py index 2dbc2404f..2dcd57192 100644 --- a/eos/effects/maraudermodeeffect25.py +++ b/eos/effects/maraudermodeeffect26.py @@ -26,7 +26,8 @@ def handler(fit, module, context): # Missiles fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes") or \ - mod.charge.requiresSkill("Cruise Missiles"), + mod.charge.requiresSkill("Cruise Missiles") or \ + mod.charge.requiresSkill("Heavy Missiles"), "maxVelocity", module.getModifiedItemAttr("missileVelocityBonus")) # Tanking diff --git a/eos/effects/maxrangebonuseffecthybrids.py b/eos/effects/maxrangebonuseffecthybrids.py index 60644db01..144b66e99 100755 --- a/eos/effects/maxrangebonuseffecthybrids.py +++ b/eos/effects/maxrangebonuseffecthybrids.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Coordinator (8 of 8) +# Modules named like: Hybrid Locus Coordinator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/maxrangebonuseffectlasers.py b/eos/effects/maxrangebonuseffectlasers.py index 7f3ec8433..02e061b79 100755 --- a/eos/effects/maxrangebonuseffectlasers.py +++ b/eos/effects/maxrangebonuseffectlasers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Locus (8 of 8) +# Modules named like: Energy Locus Coordinator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/maxrangebonuseffectprojectiles.py b/eos/effects/maxrangebonuseffectprojectiles.py index 036ae169b..0e892c769 100755 --- a/eos/effects/maxrangebonuseffectprojectiles.py +++ b/eos/effects/maxrangebonuseffectprojectiles.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Projectile Coordinator (8 of 8) +# Modules named like: Projectile Locus Coordinator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon", diff --git a/eos/effects/mechanichullhpbonuspostpercenthpship.py b/eos/effects/mechanichullhpbonuspostpercenthpship.py index 68b299aac..3c5210609 100755 --- a/eos/effects/mechanichullhpbonuspostpercenthpship.py +++ b/eos/effects/mechanichullhpbonuspostpercenthpship.py @@ -1,5 +1,5 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Armor Implants > Implant Slot 08 (6 of 6) +# Implants named like: Inherent Implants 'Noble' Mechanic MC (6 of 6) # Skill: Mechanics type = "passive" def handler(fit, container, context): diff --git a/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py b/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py index 96643526a..bdcf0a681 100755 --- a/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py +++ b/eos/effects/mediumenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumenergyturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent 'Lancer' Medium Energy Turret (6 of 6) +# Implants named like: Inherent Implants 'Lancer' Medium Energy Turret ME (6 of 6) # Skill: Medium Energy Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py b/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py index 63fee233d..50e502488 100755 --- a/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py +++ b/eos/effects/mediumhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumhybridturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Medium Hybrid Turret MH (6 of 6) +# Implants named like: Zainou 'Deadeye' Medium Hybrid Turret MH (6 of 6) # Skill: Medium Hybrid Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py b/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py index 8098dd3cb..2547de21a 100755 --- a/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py +++ b/eos/effects/mediumprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringmediumprojectileturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: and Medium Projectile MP (6 of 6) +# Implants named like: Eifyr and Co. 'Gunslinger' Medium Projectile Turret MP (6 of 6) # Skill: Medium Projectile Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py index 048fb75a1..3d1c07904 100644 --- a/eos/effects/minigamevirusstrengthbonus.py +++ b/eos/effects/minigamevirusstrengthbonus.py @@ -1,22 +1,13 @@ # Used by: # 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: Inner Zone Shipping Imicus -# Ship: Magnate # Ship: Nestor -# Ship: Probe -# Ship: Sarum Magnate -# Ship: Stratios -# Ship: Stratios Emergency Responder -# Ship: Sukuuvestaa Heron -# Ship: Tash-Murkon Magnate -# Ship: Vherokior Probe -# Subsystem: Legion Electronics - Emergent Locus Analyzer -# Subsystem: Loki Electronics - Emergent Locus Analyzer -# Subsystem: Proteus Electronics - Emergent Locus Analyzer -# Subsystem: Tengu Electronics - Emergent Locus Analyzer type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/mininginfomultiplier.py b/eos/effects/mininginfomultiplier.py index 502205b1e..db55f82a9 100755 --- a/eos/effects/mininginfomultiplier.py +++ b/eos/effects/mininginfomultiplier.py @@ -1,6 +1,6 @@ # Used by: -# Charges from group: Mercoxit Mining Crystal (2 of 2) # Charges from group: Mining Crystal (30 of 30) +# Charges named like: Mining Crystal (32 of 32) type = "passive" def handler(fit, module, context): module.multiplyItemAttr("miningAmount", module.getModifiedChargeAttr("specialisationAsteroidYieldMultiplier")) \ No newline at end of file diff --git a/eos/effects/mininglaserrangebonus.py b/eos/effects/mininglaserrangebonus.py index 43bc189df..fe57c1e87 100755 --- a/eos/effects/mininglaserrangebonus.py +++ b/eos/effects/mininglaserrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Harvest Alpha -# Implant: Low-grade Harvest Beta -# Implant: Low-grade Harvest Delta -# Implant: Low-grade Harvest Epsilon -# Implant: Low-grade Harvest Gamma +# Implants named like: Low grade Harvest (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Mining Laser", diff --git a/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py b/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py index c47d47578..4b3516c53 100755 --- a/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py +++ b/eos/effects/miningupgradecpupenaltyreductionmodulesrequiringminingupgradepercent.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Inherent Implants 'Highwall' Mining Upgrades MU-1001 -# Implant: Inherent Implants 'Highwall' Mining Upgrades MU-1003 -# Implant: Inherent Implants 'Highwall' Mining Upgrades MU-1005 +# Implants named like: Inherent Implants 'Highwall' Mining Upgrades MU (3 of 3) # Skill: Mining Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py index 527c365e4..985c3713b 100755 --- a/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py +++ b/eos/effects/missilebombardmentmaxflighttimebonuspostpercentexplosiondelayownercharmodulesrequiringmissilelauncheroperation.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: Zainou Bombardment MB (6 of 6) -# Modules named like: Cache (8 of 8) +# Implants named like: Zainou 'Deadeye' Missile Bombardment MB (6 of 6) +# Modules named like: Rocket Fuel Cache Partition (8 of 8) # Skill: Missile Bombardment type = "passive" def handler(fit, container, context): diff --git a/eos/effects/missiledmgbonus.py b/eos/effects/missiledmgbonus.py index 8c304e1d8..2db4bed0f 100755 --- a/eos/effects/missiledmgbonus.py +++ b/eos/effects/missiledmgbonus.py @@ -1,9 +1,6 @@ # Used by: # Modules from group: Ballistic Control system (21 of 21) -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players +# Modules named like: QA Multiship Module Players (4 of 4) type = "passive" def handler(fit, container, context): for dmgType in ("em", "kinetic", "explosive", "thermal"): diff --git a/eos/effects/missileemdmgbonus.py b/eos/effects/missileemdmgbonus.py index 13217b07c..e9aacaa08 100755 --- a/eos/effects/missileemdmgbonus.py +++ b/eos/effects/missileemdmgbonus.py @@ -1,9 +1,5 @@ # Used by: -# Skill: Auto-Targeting Missiles -# Skill: Cruise Missiles -# Skill: Heavy Assault Missiles -# Skill: Heavy Missiles -# Skill: Light Missiles +# Skills named like: Missiles (5 of 7) # Skill: Rockets # Skill: Torpedoes type = "passive" diff --git a/eos/effects/missileemdmgbonuscruise3.py b/eos/effects/missileemdmgbonuscruise3.py index d4b406e12..9ed540764 100755 --- a/eos/effects/missileemdmgbonuscruise3.py +++ b/eos/effects/missileemdmgbonuscruise3.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Missiles CM (6 of 6) +# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), diff --git a/eos/effects/missileemdmgbonusham.py b/eos/effects/missileemdmgbonusham.py index 10b6aed6a..c67b108aa 100755 --- a/eos/effects/missileemdmgbonusham.py +++ b/eos/effects/missileemdmgbonusham.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Heavy AM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), diff --git a/eos/effects/missileemdmgbonusheavy.py b/eos/effects/missileemdmgbonusheavy.py index a00b330ea..408bfe595 100755 --- a/eos/effects/missileemdmgbonusheavy.py +++ b/eos/effects/missileemdmgbonusheavy.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Heavy Missiles HM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/missileemdmgbonusrocket.py b/eos/effects/missileemdmgbonusrocket.py index e63f225a0..5dadf0f18 100755 --- a/eos/effects/missileemdmgbonusrocket.py +++ b/eos/effects/missileemdmgbonusrocket.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Snapshot' RD (6 of 6) +# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), diff --git a/eos/effects/missileemdmgbonusstandard.py b/eos/effects/missileemdmgbonusstandard.py index 594901227..428ef04da 100755 --- a/eos/effects/missileemdmgbonusstandard.py +++ b/eos/effects/missileemdmgbonusstandard.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou LM (6 of 6) +# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), diff --git a/eos/effects/missileemdmgbonustorpedo.py b/eos/effects/missileemdmgbonustorpedo.py index 0436b18d1..f4aa779d8 100755 --- a/eos/effects/missileemdmgbonustorpedo.py +++ b/eos/effects/missileemdmgbonustorpedo.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Torpedoes TD (6 of 6) +# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), diff --git a/eos/effects/missileexplosivedmgbonus.py b/eos/effects/missileexplosivedmgbonus.py index b56e69c8f..1c421fda7 100755 --- a/eos/effects/missileexplosivedmgbonus.py +++ b/eos/effects/missileexplosivedmgbonus.py @@ -1,9 +1,5 @@ # Used by: -# Skill: Auto-Targeting Missiles -# Skill: Cruise Missiles -# Skill: Heavy Assault Missiles -# Skill: Heavy Missiles -# Skill: Light Missiles +# Skills named like: Missiles (5 of 7) # Skill: Rockets # Skill: Torpedoes type = "passive" diff --git a/eos/effects/missileexplosivedmgbonuscruise3.py b/eos/effects/missileexplosivedmgbonuscruise3.py index d29764b10..852e865e2 100755 --- a/eos/effects/missileexplosivedmgbonuscruise3.py +++ b/eos/effects/missileexplosivedmgbonuscruise3.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Missiles CM (6 of 6) +# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), diff --git a/eos/effects/missileexplosivedmgbonusham.py b/eos/effects/missileexplosivedmgbonusham.py index 5101a985c..2f5aa2b72 100755 --- a/eos/effects/missileexplosivedmgbonusham.py +++ b/eos/effects/missileexplosivedmgbonusham.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Heavy AM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), diff --git a/eos/effects/missileexplosivedmgbonusheavy.py b/eos/effects/missileexplosivedmgbonusheavy.py index b35f0c4af..44da3a6b1 100755 --- a/eos/effects/missileexplosivedmgbonusheavy.py +++ b/eos/effects/missileexplosivedmgbonusheavy.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Heavy Missiles HM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/missileexplosivedmgbonusrocket.py b/eos/effects/missileexplosivedmgbonusrocket.py index 8090588d9..dc31dbda2 100755 --- a/eos/effects/missileexplosivedmgbonusrocket.py +++ b/eos/effects/missileexplosivedmgbonusrocket.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Snapshot' RD (6 of 6) +# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), diff --git a/eos/effects/missileexplosivedmgbonusstandard.py b/eos/effects/missileexplosivedmgbonusstandard.py index 6df8ef065..68e5b41be 100755 --- a/eos/effects/missileexplosivedmgbonusstandard.py +++ b/eos/effects/missileexplosivedmgbonusstandard.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou LM (6 of 6) +# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), diff --git a/eos/effects/missileexplosivedmgbonustorpedo.py b/eos/effects/missileexplosivedmgbonustorpedo.py index fbd495550..2a6a68c5d 100755 --- a/eos/effects/missileexplosivedmgbonustorpedo.py +++ b/eos/effects/missileexplosivedmgbonustorpedo.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Torpedoes TD (6 of 6) +# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), diff --git a/eos/effects/missilekineticdmgbonus2.py b/eos/effects/missilekineticdmgbonus2.py index 8e30e0225..b669a1c56 100755 --- a/eos/effects/missilekineticdmgbonus2.py +++ b/eos/effects/missilekineticdmgbonus2.py @@ -1,9 +1,5 @@ # Used by: -# Skill: Auto-Targeting Missiles -# Skill: Cruise Missiles -# Skill: Heavy Assault Missiles -# Skill: Heavy Missiles -# Skill: Light Missiles +# Skills named like: Missiles (5 of 7) # Skill: Rockets # Skill: Torpedoes type = "passive" diff --git a/eos/effects/missilekineticdmgbonuscruise3.py b/eos/effects/missilekineticdmgbonuscruise3.py index 15cfd7f09..0c6585e12 100755 --- a/eos/effects/missilekineticdmgbonuscruise3.py +++ b/eos/effects/missilekineticdmgbonuscruise3.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Missiles CM (6 of 6) +# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), diff --git a/eos/effects/missilekineticdmgbonusham.py b/eos/effects/missilekineticdmgbonusham.py index 84345341c..815173698 100755 --- a/eos/effects/missilekineticdmgbonusham.py +++ b/eos/effects/missilekineticdmgbonusham.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Heavy AM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), diff --git a/eos/effects/missilekineticdmgbonusheavy.py b/eos/effects/missilekineticdmgbonusheavy.py index d5b441459..27a7475d8 100755 --- a/eos/effects/missilekineticdmgbonusheavy.py +++ b/eos/effects/missilekineticdmgbonusheavy.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Heavy Missiles HM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/missilekineticdmgbonusrocket.py b/eos/effects/missilekineticdmgbonusrocket.py index 2dcb09e58..33053245a 100755 --- a/eos/effects/missilekineticdmgbonusrocket.py +++ b/eos/effects/missilekineticdmgbonusrocket.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Snapshot' RD (6 of 6) +# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), diff --git a/eos/effects/missilekineticdmgbonusstandard.py b/eos/effects/missilekineticdmgbonusstandard.py index 63289546b..168bf67f5 100755 --- a/eos/effects/missilekineticdmgbonusstandard.py +++ b/eos/effects/missilekineticdmgbonusstandard.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou LM (6 of 6) +# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), diff --git a/eos/effects/missilekineticdmgbonustorpedo.py b/eos/effects/missilekineticdmgbonustorpedo.py index 3cfab323e..5301a2db6 100755 --- a/eos/effects/missilekineticdmgbonustorpedo.py +++ b/eos/effects/missilekineticdmgbonustorpedo.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Torpedoes TD (6 of 6) +# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), diff --git a/eos/effects/missilelauncherspeedmultiplierpassive.py b/eos/effects/missilelauncherspeedmultiplierpassive.py index cfde5f5bf..ec79a28d9 100755 --- a/eos/effects/missilelauncherspeedmultiplierpassive.py +++ b/eos/effects/missilelauncherspeedmultiplierpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Bay Accelerator (8 of 8) +# Modules named like: Bay Loading Accelerator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), diff --git a/eos/effects/missileskillaoecloudsizebonus.py b/eos/effects/missileskillaoecloudsizebonus.py index 4ca0b1ac1..2d96d0e60 100755 --- a/eos/effects/missileskillaoecloudsizebonus.py +++ b/eos/effects/missileskillaoecloudsizebonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Guided Missile (6 of 6) +# Implants named like: Zainou 'Deadeye' Guided Missile Precision GP (6 of 6) # Modules named like: Warhead Rigor Catalyst (8 of 8) # Skill: Guided Missile Precision type = "passive" diff --git a/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py b/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py index 49d4bc9b2..852be7003 100755 --- a/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py +++ b/eos/effects/missileskillaoecloudsizebonusallincludingcapitals.py @@ -1,9 +1,6 @@ # Used by: -# Implant: Improved Crash Booster -# Implant: Standard Crash Booster -# Implant: Strong Crash Booster -# Implant: Synth Crash Booster -type = "passive" -def handler(fit, implant, context): - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus")) +# Implants named like: Crash Booster (4 of 4) +type = "passive" +def handler(fit, implant, context): + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "aoeCloudSize", implant.getModifiedItemAttr("aoeCloudSizeBonus")) diff --git a/eos/effects/missileskillaoevelocitybonus.py b/eos/effects/missileskillaoevelocitybonus.py index 097953103..2d2c598a5 100755 --- a/eos/effects/missileskillaoevelocitybonus.py +++ b/eos/effects/missileskillaoevelocitybonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: TN (6 of 6) +# Implants named like: Zainou 'Deadeye' Target Navigation Prediction TN (6 of 6) # Modules named like: Warhead Flare Catalyst (8 of 8) # Skill: Target Navigation Prediction type = "passive" diff --git a/eos/effects/missileskillfofaoecloudsizebonus.py b/eos/effects/missileskillfofaoecloudsizebonus.py index d195e3c91..f0d1151d4 100755 --- a/eos/effects/missileskillfofaoecloudsizebonus.py +++ b/eos/effects/missileskillfofaoecloudsizebonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Snapshot' FOF Explosion (6 of 6) +# Implants named like: Zainou 'Snapshot' FOF Explosion Radius FR (6 of 6) type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/missileskillmissileprojectilevelocitybonus.py b/eos/effects/missileskillmissileprojectilevelocitybonus.py index f3f192d6d..90bfef25d 100755 --- a/eos/effects/missileskillmissileprojectilevelocitybonus.py +++ b/eos/effects/missileskillmissileprojectilevelocitybonus.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: Zainou 'Deadeye' MP (6 of 6) -# Modules named like: Bay Thrusters (8 of 8) +# Implants named like: Zainou 'Deadeye' Missile Projection MP (6 of 6) +# Modules named like: Hydraulic Bay Thrusters (8 of 8) # Skill: Missile Projection type = "passive" def handler(fit, container, context): diff --git a/eos/effects/missileskillrapidlauncherrof.py b/eos/effects/missileskillrapidlauncherrof.py index ed4d9e468..d6d2111ce 100755 --- a/eos/effects/missileskillrapidlauncherrof.py +++ b/eos/effects/missileskillrapidlauncherrof.py @@ -1,8 +1,6 @@ # Used by: -# Implants named like: Zainou RL (6 of 6) -# Implant: Advanced Cerebral Accelerator -# Implant: Prototype Cerebral Accelerator -# Implant: Standard Cerebral Accelerator +# Implants named like: Cerebral Accelerator (3 of 3) +# Implants named like: Zainou 'Deadeye' Rapid Launch RL (6 of 6) # Implant: Whelan Machorin's Ballistic Smartlink # Skill: Missile Launcher Operation # Skill: Rapid Launch diff --git a/eos/effects/missilethermaldmgbonus.py b/eos/effects/missilethermaldmgbonus.py index b9902c870..dde01e669 100755 --- a/eos/effects/missilethermaldmgbonus.py +++ b/eos/effects/missilethermaldmgbonus.py @@ -1,9 +1,5 @@ # Used by: -# Skill: Auto-Targeting Missiles -# Skill: Cruise Missiles -# Skill: Heavy Assault Missiles -# Skill: Heavy Missiles -# Skill: Light Missiles +# Skills named like: Missiles (5 of 7) # Skill: Rockets # Skill: Torpedoes type = "passive" diff --git a/eos/effects/missilethermaldmgbonuscruise3.py b/eos/effects/missilethermaldmgbonuscruise3.py index 9bd178460..d66ec5ecd 100755 --- a/eos/effects/missilethermaldmgbonuscruise3.py +++ b/eos/effects/missilethermaldmgbonuscruise3.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Missiles CM (6 of 6) +# Implants named like: Zainou 'Snapshot' Cruise Missiles CM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Cruise Missiles"), diff --git a/eos/effects/missilethermaldmgbonusham.py b/eos/effects/missilethermaldmgbonusham.py index 9b6a48789..d4edee79e 100755 --- a/eos/effects/missilethermaldmgbonusham.py +++ b/eos/effects/missilethermaldmgbonusham.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Heavy AM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Assault Missiles AM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), diff --git a/eos/effects/missilethermaldmgbonusheavy.py b/eos/effects/missilethermaldmgbonusheavy.py index cd99f5f0e..11f74bee5 100755 --- a/eos/effects/missilethermaldmgbonusheavy.py +++ b/eos/effects/missilethermaldmgbonusheavy.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Heavy Missiles HM (6 of 6) +# Implants named like: Zainou 'Snapshot' Heavy Missiles HM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), diff --git a/eos/effects/missilethermaldmgbonusrocket.py b/eos/effects/missilethermaldmgbonusrocket.py index 221b578c3..3abe8fe14 100755 --- a/eos/effects/missilethermaldmgbonusrocket.py +++ b/eos/effects/missilethermaldmgbonusrocket.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Snapshot' RD (6 of 6) +# Implants named like: Zainou 'Snapshot' Rockets RD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets"), diff --git a/eos/effects/missilethermaldmgbonusstandard.py b/eos/effects/missilethermaldmgbonusstandard.py index a53d1eb2b..18ba9620d 100755 --- a/eos/effects/missilethermaldmgbonusstandard.py +++ b/eos/effects/missilethermaldmgbonusstandard.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou LM (6 of 6) +# Implants named like: Zainou 'Snapshot' Light Missiles LM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Light Missiles"), diff --git a/eos/effects/missilethermaldmgbonustorpedo.py b/eos/effects/missilethermaldmgbonustorpedo.py index 27efe8f2c..ecb4c1ad8 100755 --- a/eos/effects/missilethermaldmgbonustorpedo.py +++ b/eos/effects/missilethermaldmgbonustorpedo.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Torpedoes TD (6 of 6) +# Implants named like: Zainou 'Snapshot' Torpedoes TD (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Torpedoes"), diff --git a/eos/effects/missilevelocitybonusdefender.py b/eos/effects/missilevelocitybonusdefender.py index 2cbc27125..270e20566 100755 --- a/eos/effects/missilevelocitybonusdefender.py +++ b/eos/effects/missilevelocitybonusdefender.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Defender Missiles (6 of 6) +# Implants named like: Zainou 'Snapshot' Defender Missiles DM (6 of 6) type = "passive" def handler(fit, container, context): fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Defender Missiles"), diff --git a/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py b/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py index 504402ca6..aa604edc2 100755 --- a/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py +++ b/eos/effects/modifyboostereffectchancewithboosterchancebonuspostpercent.py @@ -1,6 +1,5 @@ # Used by: -# Implant: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR-1003 -# Implant: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR-1005 +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Recovery NR (2 of 2) # Skill: Neurotoxin Recovery type = "passive" def handler(fit, container, context): diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/modifyshieldrechargerate.py index c04769c76..07a8bfbc1 100755 --- a/eos/effects/modifyshieldrechargerate.py +++ b/eos/effects/modifyshieldrechargerate.py @@ -5,10 +5,7 @@ # Modules from group: Reactor Control Unit (28 of 28) # Modules from group: Shield Flux Coil (11 of 11) # Modules from group: Shield Recharger (6 of 6) -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players +# Modules named like: QA Multiship Module Players (4 of 4) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier") or 1) diff --git a/eos/effects/modifyshieldrechargeratepassive.py b/eos/effects/modifyshieldrechargeratepassive.py index 584e8982c..2b0c43ab2 100644 --- a/eos/effects/modifyshieldrechargeratepassive.py +++ b/eos/effects/modifyshieldrechargeratepassive.py @@ -1,8 +1,5 @@ # Used by: -# Module: Capital Processor Overclocking Unit II -# Module: Large Processor Overclocking Unit II -# Module: Medium Processor Overclocking Unit II -# Module: Small Processor Overclocking Unit II +# Modules named like: Processor Overclocking Unit (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("shieldRechargeRate", module.getModifiedItemAttr("shieldRechargeRateMultiplier")) diff --git a/eos/effects/modifyshieldresonancepostpercentpassive.py b/eos/effects/modifyshieldresonancepostpercentpassive.py index b1464adf6..1f9e53288 100755 --- a/eos/effects/modifyshieldresonancepostpercentpassive.py +++ b/eos/effects/modifyshieldresonancepostpercentpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Reinforcer (32 of 32) +# Modules named like: Anti Screen Reinforcer (32 of 32) type = "passive" def handler(fit, module, context): for type in ("kinetic", "thermal", "explosive", "em"): diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/mwdsignatureradiusrolebonus.py index 69c17caae..d686592b7 100755 --- a/eos/effects/mwdsignatureradiusrolebonus.py +++ b/eos/effects/mwdsignatureradiusrolebonus.py @@ -1,6 +1,6 @@ # Used by: -# Items from market group: Ships > Cruisers > Advanced Cruisers > Heavy Assault Cruisers (8 of 8) -# Items from market group: Ships > Frigates > Advanced Frigates > Assault Frigates (8 of 8) +# Ships from group: Assault Frigate (8 of 12) +# 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"), diff --git a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py index 9cb020bc9..97ad7d562 100755 --- a/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py +++ b/eos/effects/navigationvelocitybonuspostpercentmaxvelocityship.py @@ -1,17 +1,7 @@ # Used by: +# Implants named like: Snake (11 of 12) # Modules named like: Auxiliary Thrusters (8 of 8) -# Implant: Low-grade Snake Beta -# Implant: Low-grade Snake Delta -# Implant: Low-grade Snake Epsilon -# Implant: Low-grade Snake Gamma -# Implant: Low-grade Snake Omega # Implant: Quafe Zero -# Implant: Snake Alpha -# Implant: Snake Beta -# Implant: Snake Delta -# Implant: Snake Epsilon -# Implant: Snake Gamma -# Implant: Snake Omega # Skill: Navigation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/offensivedefensivereduction.py b/eos/effects/offensivedefensivereduction.py index de19d903a..e4edf3a32 100755 --- a/eos/effects/offensivedefensivereduction.py +++ b/eos/effects/offensivedefensivereduction.py @@ -1,7 +1,5 @@ # Used by: -# Celestial: Incursion ship attributes effects Assault -# Celestial: Incursion ship attributes effects HQ -# Celestial: Incursion ship attributes effects Vanguard +# Celestials named like: Incursion ship attributes effects (3 of 3) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/overloadrofbonus.py b/eos/effects/overloadrofbonus.py index 02e8c91a7..bcb2988ec 100755 --- a/eos/effects/overloadrofbonus.py +++ b/eos/effects/overloadrofbonus.py @@ -1,10 +1,11 @@ # Used by: -# Items from market group: Ship Equipment > Turrets & Bays > Hybrid Turrets > Railguns (110 of 110) -# Items from market group: Ship Equipment > Turrets & Bays > Laser Turrets > Beam Lasers (100 of 100) -# Items from market group: Ship Equipment > Turrets & Bays > Missile Launchers (126 of 126) -# Items from market group: Ship Equipment > Turrets & Bays > Projectile Turrets > Artillery Cannons (60 of 60) -# Module: Interdiction Sphere Launcher I -# Module: Khanid Navy Torpedo Launcher +# Modules from group: Energy Weapon (100 of 183) +# Modules from group: Hybrid Weapon (110 of 199) +# Modules from group: Missile Launcher Citadel (4 of 4) +# Modules from group: Missile Launcher Heavy (12 of 12) +# Modules from group: Missile Launcher Rocket (14 of 14) +# Modules from group: Projectile Weapon (60 of 143) +# Modules named like: Launcher (124 of 137) type = "overheat" def handler(fit, module, context): module.boostItemAttr("speed", module.getModifiedItemAttr("overloadRofBonus")) diff --git a/eos/effects/overloadselfdamagebonus.py b/eos/effects/overloadselfdamagebonus.py index 0fdbcad52..bf1ffc82a 100755 --- a/eos/effects/overloadselfdamagebonus.py +++ b/eos/effects/overloadselfdamagebonus.py @@ -1,7 +1,7 @@ # Used by: -# Items from market group: Ship Equipment > Turrets & Bays > Hybrid Turrets > Blasters (89 of 89) -# Items from market group: Ship Equipment > Turrets & Bays > Laser Turrets > Pulse Lasers (83 of 83) -# Items from market group: Ship Equipment > Turrets & Bays > Projectile Turrets > Autocannons (83 of 83) +# Modules from group: Energy Weapon (83 of 183) +# Modules from group: Hybrid Weapon (89 of 199) +# Modules from group: Projectile Weapon (83 of 143) type = "overheat" def handler(fit, module, context): module.boostItemAttr("damageMultiplier", module.getModifiedItemAttr("overloadDamageModifier")) \ No newline at end of file diff --git a/eos/effects/overloadselfrangebonus.py b/eos/effects/overloadselfrangebonus.py index 6c1bf68ce..359693da5 100755 --- a/eos/effects/overloadselfrangebonus.py +++ b/eos/effects/overloadselfrangebonus.py @@ -1,7 +1,6 @@ # Used by: # Modules from group: Stasis Web (19 of 19) -# Variations of module: Warp Disruptor I (19 of 19) -# Variations of module: Warp Scrambler I (19 of 19) +# Modules from group: Warp Scrambler (38 of 39) type = "overheat" def handler(fit, module, context): module.boostItemAttr("maxRange", module.getModifiedItemAttr("overloadRangeBonus"), diff --git a/eos/effects/poweroutputaddpassive.py b/eos/effects/poweroutputaddpassive.py index 18dbf5b45..8a51057a2 100755 --- a/eos/effects/poweroutputaddpassive.py +++ b/eos/effects/poweroutputaddpassive.py @@ -1,25 +1,5 @@ # Used by: -# Subsystems from group: Engineering Systems (16 of 16) -# Subsystems named like: Defensive Adaptive (5 of 5) -# Subsystem: Legion Defensive - Augmented Plating -# Subsystem: Legion Defensive - Nanobot Injector -# Subsystem: Legion Offensive - Assault Optimization -# Subsystem: Legion Offensive - Drone Synthesis Projector -# Subsystem: Legion Offensive - Liquid Crystal Magnifiers -# Subsystem: Loki Defensive - Amplification Node -# Subsystem: Loki Offensive - Hardpoint Efficiency Configuration -# Subsystem: Loki Offensive - Projectile Scoping Array -# Subsystem: Loki Offensive - Turret Concurrence Registry -# Subsystem: Proteus Defensive - Augmented Plating -# Subsystem: Proteus Defensive - Nanobot Injector -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature -# Subsystem: Tengu Defensive - Amplification Node -# Subsystem: Tengu Defensive - Supplemental Screening -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Magnetic Infusion Basin -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Items from category: Subsystem (40 of 80) type = "passive" def handler(fit, module, context): fit.ship.increaseItemAttr("powerOutput", module.getModifiedItemAttr("powerOutput")) diff --git a/eos/effects/projectileweapondamagemultiply.py b/eos/effects/projectileweapondamagemultiply.py index 3a5eb216b..bc5a28ebf 100755 --- a/eos/effects/projectileweapondamagemultiply.py +++ b/eos/effects/projectileweapondamagemultiply.py @@ -1,10 +1,7 @@ # Used by: # Modules from group: Gyrostabilizer (20 of 20) +# Modules named like: QA Multiship Module Players (4 of 4) # Module: QA Damage Module -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon", diff --git a/eos/effects/projectileweaponspeedmultiplypassive.py b/eos/effects/projectileweaponspeedmultiplypassive.py index 8fb8df06f..9df646e4d 100755 --- a/eos/effects/projectileweaponspeedmultiplypassive.py +++ b/eos/effects/projectileweaponspeedmultiplypassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Projectile Burst (8 of 8) +# Modules named like: Projectile Burst Aerator (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Projectile Weapon", diff --git a/eos/effects/propulsionskillcapneedbonusskilllevel.py b/eos/effects/propulsionskillcapneedbonusskilllevel.py index 5fe105f02..f71c33b54 100755 --- a/eos/effects/propulsionskillcapneedbonusskilllevel.py +++ b/eos/effects/propulsionskillcapneedbonusskilllevel.py @@ -1,5 +1,5 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Electronic Systems Implants > Implant Slot 08 (6 of 6) +# Implants named like: Zainou 'Gypsy' Propulsion Jamming PJ (6 of 6) # Skill: Propulsion Jamming type = "passive" def handler(fit, container, context): diff --git a/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py b/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py index 46435c317..4e1acf6cc 100755 --- a/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py +++ b/eos/effects/remotearmorsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringremotearmorsystems.py @@ -1,8 +1,6 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Armor Implants > Implant Slot 07 (6 of 6) -# Variations of module: Large Remote Repair Augmentor I (2 of 2) -# Variations of module: Medium Remote Repair Augmentor I (2 of 2) -# Variations of module: Small Remote Repair Augmentor I (2 of 2) +# Implants named like: Inherent Implants 'Noble' Remote Armor Repair Systems RA (6 of 6) +# Modules named like: Remote Repair Augmentor (6 of 8) # Skill: Remote Armor Repair Systems type = "passive" def handler(fit, container, context): diff --git a/eos/effects/remotehullrepair.py b/eos/effects/remotehullrepair.py index 807c2527f..9508102f2 100755 --- a/eos/effects/remotehullrepair.py +++ b/eos/effects/remotehullrepair.py @@ -1,5 +1,6 @@ # Used by: # Modules from group: Remote Hull Repairer (7 of 7) +# Drones named like: Hull Maintenance Bot (6 of 6) type = "projected", "active" runTime = "late" def handler(fit, module, context): diff --git a/eos/effects/repairdronearmordamageamountbonus.py b/eos/effects/repairdronearmordamageamountbonus.py index faebd5da5..4a20e0dcb 100755 --- a/eos/effects/repairdronearmordamageamountbonus.py +++ b/eos/effects/repairdronearmordamageamountbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Drone Repair (8 of 8) +# Modules named like: Drone Repair Augmentor (8 of 8) # Skill: Repair Drone Operation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/repairdronehullbonusbonus.py b/eos/effects/repairdronehullbonusbonus.py new file mode 100644 index 000000000..3fe49d28f --- /dev/null +++ b/eos/effects/repairdronehullbonusbonus.py @@ -0,0 +1,8 @@ +# Used by: +# Modules named like: Drone Repair Augmentor (8 of 8) +# Skill: Repair Drone Operation +type = "passive" +def handler(fit, container, context): + level = container.level if "skill" in context else 1 + fit.drones.filteredItemBoost(lambda drone: drone.item.group.name == "Logistic Drone", + "structureDamageAmount", container.getModifiedItemAttr("damageHP") * level) diff --git a/eos/effects/repairdroneshieldbonusbonus.py b/eos/effects/repairdroneshieldbonusbonus.py index caa1e8798..3bff7d660 100755 --- a/eos/effects/repairdroneshieldbonusbonus.py +++ b/eos/effects/repairdroneshieldbonusbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Drone Repair (8 of 8) +# Modules named like: Drone Repair Augmentor (8 of 8) # Skill: Repair Drone Operation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py index 3e943e4f0..60a131580 100755 --- a/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py +++ b/eos/effects/repairsystemsdurationbonuspostpercentdurationlocationshipmodulesrequiringrepairsystems.py @@ -1,6 +1,7 @@ # Used by: -# Modules named like: Nanobot (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Armor Implants > Implant Slot 06 (7 of 7) +# Implants named like: Inherent Implants 'Noble' Repair Systems RS (6 of 6) +# Modules named like: Nanobot Accelerator (8 of 8) +# Implant: Numon Family Heirloom # Skill: Repair Systems type = "passive" def handler(fit, container, context): diff --git a/eos/effects/republicsetbonus3.py b/eos/effects/republicsetbonus3.py index b5a782e82..9849cc487 100755 --- a/eos/effects/republicsetbonus3.py +++ b/eos/effects/republicsetbonus3.py @@ -1,10 +1,5 @@ # Used by: -# Implant: Jackal Alpha -# Implant: Jackal Beta -# Implant: Jackal Delta -# Implant: Jackal Epsilon -# Implant: Jackal Gamma -# Implant: Jackal Omega +# Implants named like: Jackal (6 of 12) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/republicsetlgbonus.py b/eos/effects/republicsetlgbonus.py index bb95d044a..cfc557e6d 100755 --- a/eos/effects/republicsetlgbonus.py +++ b/eos/effects/republicsetlgbonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: grade Jackal (6 of 6) +# Implants named like: Low grade Jackal (6 of 6) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/rigdrawbackbonuseffect.py b/eos/effects/rigdrawbackbonuseffect.py index 8732c3c0b..65e34097a 100755 --- a/eos/effects/rigdrawbackbonuseffect.py +++ b/eos/effects/rigdrawbackbonuseffect.py @@ -1,13 +1,5 @@ # Used by: -# Skill: Armor Rigging -# Skill: Astronautics Rigging -# Skill: Drones Rigging -# Skill: Electronic Superiority Rigging -# Skill: Energy Weapon Rigging -# Skill: Hybrid Weapon Rigging -# Skill: Launcher Rigging -# Skill: Projectile Weapon Rigging -# Skill: Shield Rigging +# Skills from group: Rigging (9 of 10) type = "passive" def handler(fit, skill, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), diff --git a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py index a9c016c5b..4361612f3 100755 --- a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py +++ b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Salvage (8 of 8) +# Modules from group: Rig Resource Processing (8 of 10) # Implant: Poteque 'Prospector' Salvaging SV-905 type = "passive" def handler(fit, container, context): diff --git a/eos/effects/scangravimetricstrengthmodifiereffect.py b/eos/effects/scangravimetricstrengthmodifiereffect.py index 3cfc2fef2..d9c5ad58c 100755 --- a/eos/effects/scangravimetricstrengthmodifiereffect.py +++ b/eos/effects/scangravimetricstrengthmodifiereffect.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Talon Alpha -# Implant: Low-grade Talon Beta -# Implant: Low-grade Talon Delta -# Implant: Low-grade Talon Epsilon -# Implant: Low-grade Talon Gamma +# Implants named like: Low grade Talon (5 of 6) type = "passive" def handler(fit, implant, context): fit.ship.increaseItemAttr("scanGravimetricStrength", implant.getModifiedItemAttr("scanGravimetricStrengthModifier")) \ No newline at end of file diff --git a/eos/effects/scanladarstrengthmodifiereffect.py b/eos/effects/scanladarstrengthmodifiereffect.py index 0b721a9ee..269e9d4c2 100755 --- a/eos/effects/scanladarstrengthmodifiereffect.py +++ b/eos/effects/scanladarstrengthmodifiereffect.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Jackal Alpha -# Implant: Low-grade Jackal Beta -# Implant: Low-grade Jackal Delta -# Implant: Low-grade Jackal Epsilon -# Implant: Low-grade Jackal Gamma +# Implants named like: Low grade Jackal (5 of 6) type = "passive" def handler(fit, implant, context): fit.ship.increaseItemAttr("scanLadarStrength", implant.getModifiedItemAttr("scanLadarStrengthModifier")) \ No newline at end of file diff --git a/eos/effects/scanmagnetometricstrengthmodifiereffect.py b/eos/effects/scanmagnetometricstrengthmodifiereffect.py index a8924e47c..6e5abe632 100755 --- a/eos/effects/scanmagnetometricstrengthmodifiereffect.py +++ b/eos/effects/scanmagnetometricstrengthmodifiereffect.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Spur Alpha -# Implant: Low-grade Spur Beta -# Implant: Low-grade Spur Delta -# Implant: Low-grade Spur Epsilon -# Implant: Low-grade Spur Gamma +# Implants named like: Low grade Spur (5 of 6) type = "passive" def handler(fit, implant, context): fit.ship.increaseItemAttr("scanMagnetometricStrength", implant.getModifiedItemAttr("scanMagnetometricStrengthModifier")) \ No newline at end of file diff --git a/eos/effects/scanradarstrengthmodifiereffect.py b/eos/effects/scanradarstrengthmodifiereffect.py index 6c5e3b537..c3b6474f6 100755 --- a/eos/effects/scanradarstrengthmodifiereffect.py +++ b/eos/effects/scanradarstrengthmodifiereffect.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Grail Alpha -# Implant: Low-grade Grail Beta -# Implant: Low-grade Grail Delta -# Implant: Low-grade Grail Epsilon -# Implant: Low-grade Grail Gamma +# Implants named like: Low grade Grail (5 of 6) type = "passive" def handler(fit, implant, context): fit.ship.increaseItemAttr("scanRadarStrength", implant.getModifiedItemAttr("scanRadarStrengthModifier")) \ No newline at end of file diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/scanstrengthbonuspercentpassive.py index f07f54055..418291860 100755 --- a/eos/effects/scanstrengthbonuspercentpassive.py +++ b/eos/effects/scanstrengthbonuspercentpassive.py @@ -1,24 +1,5 @@ # Used by: -# Implant: Grail Alpha -# Implant: Grail Beta -# Implant: Grail Delta -# Implant: Grail Epsilon -# Implant: Grail Gamma -# Implant: Jackal Alpha -# Implant: Jackal Beta -# Implant: Jackal Delta -# Implant: Jackal Epsilon -# Implant: Jackal Gamma -# Implant: Spur Alpha -# Implant: Spur Beta -# Implant: Spur Delta -# Implant: Spur Epsilon -# Implant: Spur Gamma -# Implant: Talon Alpha -# Implant: Talon Beta -# Implant: Talon Delta -# Implant: Talon Epsilon -# Implant: Talon Gamma +# Implants from group: Cyberimplant (20 of 157) type = "passive" def handler(fit, implant, context): for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"): diff --git a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py index f97d6e3e0..378abf61a 100755 --- a/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py +++ b/eos/effects/scoutdroneoperationdronerangebonusmodadddronecontroldistancechar.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Drone Range Augmentor (8 of 8) +# Modules named like: Drone Control Range Augmentor (8 of 8) # Skill: Electronic Warfare Drone Interfacing # Skill: Scout Drone Operation type = "passive" diff --git a/eos/effects/selfrof.py b/eos/effects/selfrof.py index 5bbd74a22..cbd493be0 100755 --- a/eos/effects/selfrof.py +++ b/eos/effects/selfrof.py @@ -1,8 +1,5 @@ # Used by: -# Skill: Cruise Missile Specialization -# Skill: Heavy Assault Missile Specialization -# Skill: Heavy Missile Specialization -# Skill: Light Missile Specialization +# Skills named like: Missile Specialization (4 of 4) # Skill: Rocket Specialization # Skill: Torpedo Specialization type = "passive" diff --git a/eos/effects/sensorboosttargetedhostile.py b/eos/effects/sensorboosttargetedhostile.py index e4c0b525a..e02221d9b 100644 --- a/eos/effects/sensorboosttargetedhostile.py +++ b/eos/effects/sensorboosttargetedhostile.py @@ -1,7 +1,5 @@ # Used by: -# Drone: Hammerhead SD-600 -# Drone: Hobgoblin SD-300 -# Drone: Ogre SD-900 +# Drones named like: SD (3 of 3) type = "projected", "active" def handler(fit, container, context): if "projected" in context: diff --git a/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py b/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py index 8c54946ea..a434917fc 100755 --- a/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py +++ b/eos/effects/sensorupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringsensorupgrades.py @@ -1,6 +1,6 @@ # Used by: -# Implants named like: Electronics Upgrades (6 of 6) -# Modules named like: Liquid (8 of 8) +# Implants named like: Zainou 'Gypsy' Electronics Upgrades EU (6 of 6) +# Modules named like: Liquid Cooled Electronics (8 of 8) # Skill: Electronics Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/sentrydronedamagebonus.py b/eos/effects/sentrydronedamagebonus.py index 109300f88..577e94a5c 100755 --- a/eos/effects/sentrydronedamagebonus.py +++ b/eos/effects/sentrydronedamagebonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Sentry Augmentor (8 of 8) +# Modules named like: Sentry Damage Augmentor (8 of 8) type = "passive" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), diff --git a/eos/effects/setbonusbloodraidernosferatu.py b/eos/effects/setbonusbloodraidernosferatu.py index db44e4ffc..b61393109 100755 --- a/eos/effects/setbonusbloodraidernosferatu.py +++ b/eos/effects/setbonusbloodraidernosferatu.py @@ -1,14 +1,5 @@ # Used by: -# Implant: Low-grade Talisman Alpha -# Implant: Low-grade Talisman Beta -# Implant: Low-grade Talisman Delta -# Implant: Low-grade Talisman Epsilon -# Implant: Low-grade Talisman Gamma -# Implant: Talisman Alpha -# Implant: Talisman Beta -# Implant: Talisman Delta -# Implant: Talisman Epsilon -# Implant: Talisman Gamma +# Implants named like: Talisman (10 of 12) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Capacitor Emission Systems"), diff --git a/eos/effects/setbonuschristmasagilitybonus.py b/eos/effects/setbonuschristmasagilitybonus.py index f746ce9d0..4457de398 100644 --- a/eos/effects/setbonuschristmasagilitybonus.py +++ b/eos/effects/setbonuschristmasagilitybonus.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmasarmorhpbonus2.py b/eos/effects/setbonuschristmasarmorhpbonus2.py index da3388870..3dccd849f 100644 --- a/eos/effects/setbonuschristmasarmorhpbonus2.py +++ b/eos/effects/setbonuschristmasarmorhpbonus2.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmasbonusvelocity.py b/eos/effects/setbonuschristmasbonusvelocity.py index 00c8f23c1..38a355eea 100644 --- a/eos/effects/setbonuschristmasbonusvelocity.py +++ b/eos/effects/setbonuschristmasbonusvelocity.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/setbonuschristmascapacitorcapacity.py index edf1d5419..609bd3e77 100755 --- a/eos/effects/setbonuschristmascapacitorcapacity.py +++ b/eos/effects/setbonuschristmascapacitorcapacity.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/setbonuschristmascapacitorrecharge2.py index 12d2b2b42..95e9efa75 100755 --- a/eos/effects/setbonuschristmascapacitorrecharge2.py +++ b/eos/effects/setbonuschristmascapacitorrecharge2.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/setbonuschristmascpuoutput.py index 2e1cc81bf..ff239728a 100755 --- a/eos/effects/setbonuschristmascpuoutput.py +++ b/eos/effects/setbonuschristmascpuoutput.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/setbonuschristmaspowergrid.py index 310ec9d22..6a656d0cc 100755 --- a/eos/effects/setbonuschristmaspowergrid.py +++ b/eos/effects/setbonuschristmaspowergrid.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmasshieldcapacitybonus.py b/eos/effects/setbonuschristmasshieldcapacitybonus.py index c32ac9e5a..1776423d0 100644 --- a/eos/effects/setbonuschristmasshieldcapacitybonus.py +++ b/eos/effects/setbonuschristmasshieldcapacitybonus.py @@ -1,8 +1,5 @@ # Used by: -# Implant: Genolution Core Augmentation CA-1 -# Implant: Genolution Core Augmentation CA-2 -# Implant: Genolution Core Augmentation CA-3 -# Implant: Genolution Core Augmentation CA-4 +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonusmordus.py b/eos/effects/setbonusmordus.py index 2ac252025..7c4424097 100755 --- a/eos/effects/setbonusmordus.py +++ b/eos/effects/setbonusmordus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Low Centurion (6 of 6) +# Implants named like: Low grade Centurion (6 of 6) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonussisters.py b/eos/effects/setbonussisters.py index 6c79fc875..f7f22b137 100755 --- a/eos/effects/setbonussisters.py +++ b/eos/effects/setbonussisters.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: grade Virtue (6 of 6) +# Implants named like: Low grade Virtue (6 of 6) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonusthukker.py b/eos/effects/setbonusthukker.py index efc6c5570..519edf196 100755 --- a/eos/effects/setbonusthukker.py +++ b/eos/effects/setbonusthukker.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Low Nomad (6 of 6) +# Implants named like: Low grade Nomad (6 of 6) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py b/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py index 8ec129868..275e3cdaf 100755 --- a/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py +++ b/eos/effects/sharpshooterrangeskillbonuspostpercentmaxrangelocationshipmodulesrequiringgunnery.py @@ -1,9 +1,6 @@ # Used by: -# Implants named like: ST (6 of 6) -# Implant: Improved Frentix Booster -# Implant: Standard Frentix Booster -# Implant: Strong Frentix Booster -# Implant: Synth Frentix Booster +# Implants named like: Frentix Booster (4 of 4) +# Implants named like: Zainou 'Deadeye' Sharpshooter ST (6 of 6) # Skill: Sharpshooter type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shieldboostamplifierpassive.py b/eos/effects/shieldboostamplifierpassive.py index dafd17c96..ed0c65fb2 100755 --- a/eos/effects/shieldboostamplifierpassive.py +++ b/eos/effects/shieldboostamplifierpassive.py @@ -1,14 +1,5 @@ # Used by: -# Implant: Crystal Alpha -# Implant: Crystal Beta -# Implant: Crystal Delta -# Implant: Crystal Epsilon -# Implant: Crystal Gamma -# Implant: Low-grade Crystal Alpha -# Implant: Low-grade Crystal Beta -# Implant: Low-grade Crystal Delta -# Implant: Low-grade Crystal Epsilon -# Implant: Low-grade Crystal Gamma +# Implants named like: Crystal (10 of 12) type = "passive" def handler(fit, container, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), diff --git a/eos/effects/shieldboostamplifierpassivebooster.py b/eos/effects/shieldboostamplifierpassivebooster.py index 6ab4ce799..859d23ec0 100755 --- a/eos/effects/shieldboostamplifierpassivebooster.py +++ b/eos/effects/shieldboostamplifierpassivebooster.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Blue (5 of 5) +# Implants named like: Blue Pill Booster (5 of 5) type = "passive" def handler(fit, container, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation") or mod.item.requiresSkill("Capital Shield Operation"), diff --git a/eos/effects/shieldboosterdurationbonusshieldskills.py b/eos/effects/shieldboosterdurationbonusshieldskills.py index 3576ece30..b8dd94017 100755 --- a/eos/effects/shieldboosterdurationbonusshieldskills.py +++ b/eos/effects/shieldboosterdurationbonusshieldskills.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Core Operational Solidifier (8 of 8) +# Modules named like: Core Defense Operational Solidifier (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), diff --git a/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py b/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py index fc9adb96d..0b76d35a4 100755 --- a/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py +++ b/eos/effects/shieldemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringshieldemmisionsystems.py @@ -1,5 +1,5 @@ # Used by: -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Shield Implants > Implant Slot 08 (6 of 6) +# Implants named like: Zainou 'Gnome' Shield Emission Systems SE (6 of 6) # Skill: Shield Emission Systems type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py index 98f2940bb..d6151694f 100755 --- a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py +++ b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py @@ -1,11 +1,9 @@ # Used by: -# Modules named like: Field Extender (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Shield Implants > Implant Slot 07 (7 of 7) +# Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6) +# Modules named like: Core Defense Field Extender (8 of 8) +# Modules named like: QA Multiship Module Players (4 of 4) # Implant: Genolution Core Augmentation CA-3 -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players +# Implant: Sansha Modified 'Gnome' Implant # Skill: Shield Management type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py b/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py index a1c421b41..61813a757 100755 --- a/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py +++ b/eos/effects/shieldoperationrechargeratebonuspostpercentrechargeratelocationshipgroupshield.py @@ -1,6 +1,6 @@ # Used by: -# Modules named like: Core Defense Purger (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Shield Implants > Implant Slot 09 (6 of 6) +# Implants named like: Zainou 'Gnome' Shield Operation SP (6 of 6) +# Modules named like: Core Defense Field Purger (8 of 8) # Implant: Sansha Modified 'Gnome' Implant # Skill: Shield Operation type = "passive" diff --git a/eos/effects/shieldoperationskillboostcapacitorneedbonus.py b/eos/effects/shieldoperationskillboostcapacitorneedbonus.py index b171987d3..9140e2749 100755 --- a/eos/effects/shieldoperationskillboostcapacitorneedbonus.py +++ b/eos/effects/shieldoperationskillboostcapacitorneedbonus.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Core Safeguard (8 of 8) +# Modules named like: Core Defense Capacitor Safeguard (8 of 8) # Skill: Shield Compensation type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shieldtransportcpuneedbonuseffect.py b/eos/effects/shieldtransportcpuneedbonuseffect.py index b606e1ecb..9eb91a65c 100755 --- a/eos/effects/shieldtransportcpuneedbonuseffect.py +++ b/eos/effects/shieldtransportcpuneedbonuseffect.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Basilisk -# Ship: Etana -# Ship: Scimitar +# Ships from group: Logistics (3 of 5) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Remote Shield Booster", diff --git a/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py b/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py index a5896b9f4..3691f4ced 100755 --- a/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py +++ b/eos/effects/shieldupgradespowerneedbonuspostpercentpowerlocationshipmodulesrequiringshieldupgrades.py @@ -1,6 +1,6 @@ # Used by: -# Modules named like: Core Charge Economizer (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Shield Implants > Implant Slot 06 (6 of 6) +# Implants named like: Zainou 'Gnome' Shield Upgrades SU (6 of 6) +# Modules named like: Core Defense Charge Economizer (8 of 8) # Skill: Shield Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py index 42e9bb599..edcd05dfd 100755 --- a/eos/effects/shipadvancedspaceshipcommandagilitybonus.py +++ b/eos/effects/shipadvancedspaceshipcommandagilitybonus.py @@ -1,11 +1,5 @@ # Used by: -# Ships from group: Carrier (4 of 4) -# Ships from group: Dreadnought (4 of 4) -# Ships from group: Freighter (4 of 4) -# Ships from group: Jump Freighter (4 of 4) -# Ships from group: Supercarrier (5 of 5) -# Ships from group: Titan (4 of 4) -# Ship: Rorqual +# Items from market group: Ships > Capital Ships (26 of 27) type = "passive" def handler(fit, ship, context): skill = fit.character.getSkill("Advanced Spaceship Command") diff --git a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py index dd7628e1d..c386fe6c7 100755 --- a/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py +++ b/eos/effects/shiparmoremandexpandkinandthmresistanceac2.py @@ -1,7 +1,6 @@ # Used by: +# Ships named like: Stratios (2 of 2) # Ship: Sacrilege -# Ship: Stratios -# Ship: Stratios Emergency Responder # Ship: Vangel type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiparmoremresistanceaf1.py b/eos/effects/shiparmoremresistanceaf1.py index 32e37d9c1..3f5dcd213 100755 --- a/eos/effects/shiparmoremresistanceaf1.py +++ b/eos/effects/shiparmoremresistanceaf1.py @@ -1,7 +1,7 @@ # Used by: +# Ships named like: Punisher (2 of 2) # Ship: Astero # Ship: Malice -# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorexresistanceaf1.py b/eos/effects/shiparmorexresistanceaf1.py index 947227534..2b6d218de 100755 --- a/eos/effects/shiparmorexresistanceaf1.py +++ b/eos/effects/shiparmorexresistanceaf1.py @@ -1,7 +1,7 @@ # Used by: +# Ships named like: Punisher (2 of 2) # Ship: Astero # Ship: Malice -# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorknresistanceaf1.py b/eos/effects/shiparmorknresistanceaf1.py index 76dd6a839..9efe56017 100755 --- a/eos/effects/shiparmorknresistanceaf1.py +++ b/eos/effects/shiparmorknresistanceaf1.py @@ -1,7 +1,7 @@ # Used by: +# Ships named like: Punisher (2 of 2) # Ship: Astero # Ship: Malice -# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shiparmorrepairinggf2.py b/eos/effects/shiparmorrepairinggf2.py index a692d85fd..909807a07 100755 --- a/eos/effects/shiparmorrepairinggf2.py +++ b/eos/effects/shiparmorrepairinggf2.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Incursus -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level) +# Ships named like: Incursus (2 of 2) +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Frigate").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGF2") * level) diff --git a/eos/effects/shiparmorthresistanceaf1.py b/eos/effects/shiparmorthresistanceaf1.py index 68df1d744..19f9f4483 100755 --- a/eos/effects/shiparmorthresistanceaf1.py +++ b/eos/effects/shiparmorthresistanceaf1.py @@ -1,7 +1,7 @@ # Used by: +# Ships named like: Punisher (2 of 2) # Ship: Astero # Ship: Malice -# Ship: Punisher type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/shipbonusarmorresistab.py index 439410585..0f1e87126 100755 --- a/eos/effects/shipbonusarmorresistab.py +++ b/eos/effects/shipbonusarmorresistab.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Abaddon +# Ships named like: Abaddon (2 of 2) # Ship: Nestor type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/shipbonuscargo2gi.py index 78212e5ae..3ffb05abd 100755 --- a/eos/effects/shipbonuscargo2gi.py +++ b/eos/effects/shipbonuscargo2gi.py @@ -1,9 +1,7 @@ # Used by: +# Variations of ship: Miasmos (3 of 4) # Variations of ship: Nereus (2 of 2) # Ship: Iteron Mark V -# Ship: Miasmos Amastris Edition -# Ship: Miasmos Quafe Ultra Edition -# Ship: Miasmos Quafe Ultramarine Edition # Ship: Occator type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/shipbonuscargomi.py index e522b7ff4..a6fc00341 100755 --- a/eos/effects/shipbonuscargomi.py +++ b/eos/effects/shipbonuscargomi.py @@ -1,6 +1,7 @@ # Used by: # Variations of ship: Mammoth (2 of 2) # Variations of ship: Wreathe (2 of 2) +# Ship: Mammoth Nefantar Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Industrial").level diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py index f3ebbf155..0b88dd648 100755 --- a/eos/effects/shipbonusdronedamagemultipliergc2.py +++ b/eos/effects/shipbonusdronedamagemultipliergc2.py @@ -1,10 +1,7 @@ # Used by: +# Ships named like: Stratios (2 of 2) +# Variations of ship: Vexor (3 of 4) # Ship: Gila -# Ship: Ishtar -# Ship: Stratios -# Ship: Stratios Emergency Responder -# Ship: Vexor -# Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py index a728c90d9..7ca902d43 100755 --- a/eos/effects/shipbonusdronehitpointsgc2.py +++ b/eos/effects/shipbonusdronehitpointsgc2.py @@ -1,10 +1,7 @@ # Used by: +# Ships named like: Stratios (2 of 2) +# Variations of ship: Vexor (3 of 4) # Ship: Gila -# Ship: Ishtar -# Ship: Stratios -# Ship: Stratios Emergency Responder -# Ship: Vexor -# Ship: Vexor Navy Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py index ede4bdd6e..11c3cdc0b 100755 --- a/eos/effects/shipbonusemshieldresistancecb2.py +++ b/eos/effects/shipbonusemshieldresistancecb2.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Rokh (2 of 2) # Ship: Rattlesnake -# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusewweapondisruptionmaxrangebonusaf1.py b/eos/effects/shipbonusewweapondisruptionmaxrangebonusaf1.py deleted file mode 100755 index 7b84161ef..000000000 --- a/eos/effects/shipbonusewweapondisruptionmaxrangebonusaf1.py +++ /dev/null @@ -1,9 +0,0 @@ -# Used by: -# Ship: Crucifier -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Amarr Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", - "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAF") * level) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", - "falloffBonus", ship.getModifiedItemAttr("shipBonusAF") * level) diff --git a/eos/effects/shipbonusewweapondisruptionmaxrangebonusac1.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py old mode 100755 new mode 100644 similarity index 66% rename from eos/effects/shipbonusewweapondisruptionmaxrangebonusac1.py rename to eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py index 3ef364d02..c5af110d4 --- a/eos/effects/shipbonusewweapondisruptionmaxrangebonusac1.py +++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusac1.py @@ -3,7 +3,7 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", ship.getModifiedItemAttr("shipBonusAC") * level) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonusewweapondisruptionmaxrangebonusaf2.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py old mode 100755 new mode 100644 similarity index 58% rename from eos/effects/shipbonusewweapondisruptionmaxrangebonusaf2.py rename to eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py index e17472222..5a9f02fbd --- a/eos/effects/shipbonusewweapondisruptionmaxrangebonusaf2.py +++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionbonusaf2.py @@ -1,9 +1,9 @@ # Used by: -# Ship: Sentinel +# Variations of ship: Crucifier (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", ship.getModifiedItemAttr("shipBonus2AF") * level) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", ship.getModifiedItemAttr("shipBonus2AF") * level) diff --git a/eos/effects/shipbonusewweapondisruptionmaxrangebonusrookie.py b/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py old mode 100755 new mode 100644 similarity index 61% rename from eos/effects/shipbonusewweapondisruptionmaxrangebonusrookie.py rename to eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py index ab6f44cd5..2b7600097 --- a/eos/effects/shipbonusewweapondisruptionmaxrangebonusrookie.py +++ b/eos/effects/shipbonusewweapondisruptionrangedisruptionrookie.py @@ -2,7 +2,7 @@ # Ship: Impairor type = "passive" def handler(fit, ship, context): - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "maxRangeBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus")) - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Tracking Disruptor", + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Weapon Disruption"), "falloffBonus", ship.getModifiedItemAttr("rookieWeaponDisruptionBonus")) diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py index dce81a58e..ff555f959 100755 --- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py +++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Rokh (2 of 2) # Ship: Rattlesnake -# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonushybridoptimalcb.py b/eos/effects/shipbonushybridoptimalcb.py index 986a14868..cf68e945a 100755 --- a/eos/effects/shipbonushybridoptimalcb.py +++ b/eos/effects/shipbonushybridoptimalcb.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Rokh +# Ships named like: Rokh (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py index b79d891d1..a3733328e 100755 --- a/eos/effects/shipbonushybridtrackinggf2.py +++ b/eos/effects/shipbonushybridtrackinggf2.py @@ -1,6 +1,7 @@ # Used by: # Ship: Ares # Ship: Federation Navy Comet +# Ship: Police Pursuit Comet # Ship: Tristan type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py index b0780f386..c3ae15b2c 100755 --- a/eos/effects/shipbonuskineticshieldresistancecb2.py +++ b/eos/effects/shipbonuskineticshieldresistancecb2.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Rokh (2 of 2) # Ship: Rattlesnake -# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/shipbonuslargeenergyweapondamageab2.py index dc61807fe..3404e7531 100755 --- a/eos/effects/shipbonuslargeenergyweapondamageab2.py +++ b/eos/effects/shipbonuslargeenergyweapondamageab2.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Abaddon +# Ships named like: Abaddon (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusmetoptimalrangepiratefaction.py b/eos/effects/shipbonusmetoptimalrangepiratefaction.py index 339d29a11..3425b2bf4 100644 --- a/eos/effects/shipbonusmetoptimalrangepiratefaction.py +++ b/eos/effects/shipbonusmetoptimalrangepiratefaction.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Stratios -# Ship: Stratios Emergency Responder +# Ships named like: Stratios (2 of 2) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Energy Turret"), diff --git a/eos/effects/shipbonusprojectiledamagembc1.py b/eos/effects/shipbonusprojectiledamagembc1.py index 1feed5194..947eb19f5 100755 --- a/eos/effects/shipbonusprojectiledamagembc1.py +++ b/eos/effects/shipbonusprojectiledamagembc1.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Hurricane -# Ship: Hurricane Fleet Issue +# Ships named like: Hurricane (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battlecruiser").level diff --git a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py index 8c881ab1f..3a1a688a1 100755 --- a/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py +++ b/eos/effects/shipbonusrepairsystemsarmorrepairamountgb2.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Hyperion -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Battleship").level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), - "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2") * level) +# Ships named like: Hyperion (2 of 2) +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Battleship").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGB2") * level) diff --git a/eos/effects/shipbonussalvagecycleaf.py b/eos/effects/shipbonussalvagecycleaf.py index 7161bb72a..0cef3eba4 100755 --- a/eos/effects/shipbonussalvagecycleaf.py +++ b/eos/effects/shipbonussalvagecycleaf.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Magnate -# Ship: Sarum Magnate -# Ship: Tash-Murkon Magnate +# Variations of ship: Magnate (3 of 6) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonussalvagecyclecf.py b/eos/effects/shipbonussalvagecyclecf.py index 86a308612..07c68189d 100755 --- a/eos/effects/shipbonussalvagecyclecf.py +++ b/eos/effects/shipbonussalvagecyclecf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Heron -# Ship: Sukuuvestaa Heron +# Ships named like: Heron (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipbonussalvagecyclegf.py b/eos/effects/shipbonussalvagecyclegf.py index a082e162c..e3a615e13 100755 --- a/eos/effects/shipbonussalvagecyclegf.py +++ b/eos/effects/shipbonussalvagecyclegf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Imicus -# Ship: Inner Zone Shipping Imicus +# Ships named like: Imicus (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonussalvagecyclemf.py b/eos/effects/shipbonussalvagecyclemf.py index e6131e268..85a3ad9c8 100755 --- a/eos/effects/shipbonussalvagecyclemf.py +++ b/eos/effects/shipbonussalvagecyclemf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Probe -# Ship: Vherokior Probe +# Ships named like: Probe (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipbonusscanprobestrength2af.py b/eos/effects/shipbonusscanprobestrength2af.py index dd25f17f2..4ecdca824 100755 --- a/eos/effects/shipbonusscanprobestrength2af.py +++ b/eos/effects/shipbonusscanprobestrength2af.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Magnate -# Ship: Sarum Magnate -# Ship: Tash-Murkon Magnate +# Variations of ship: Magnate (3 of 6) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthcf.py b/eos/effects/shipbonusscanprobestrengthcf.py index 8cfe18db3..fa87f0953 100755 --- a/eos/effects/shipbonusscanprobestrengthcf.py +++ b/eos/effects/shipbonusscanprobestrengthcf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Heron -# Ship: Sukuuvestaa Heron +# Ships named like: Heron (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthgf.py b/eos/effects/shipbonusscanprobestrengthgf.py index 070b549d0..0095b4fd0 100755 --- a/eos/effects/shipbonusscanprobestrengthgf.py +++ b/eos/effects/shipbonusscanprobestrengthgf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Imicus -# Ship: Inner Zone Shipping Imicus +# Ships named like: Imicus (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusscanprobestrengthmf.py b/eos/effects/shipbonusscanprobestrengthmf.py index 2a47d44dc..ba089f60a 100755 --- a/eos/effects/shipbonusscanprobestrengthmf.py +++ b/eos/effects/shipbonusscanprobestrengthmf.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Probe -# Ship: Vherokior Probe +# Ships named like: Probe (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipbonusshieldboostermb1a.py b/eos/effects/shipbonusshieldboostermb1a.py index 4d4cee22b..987f773f1 100755 --- a/eos/effects/shipbonusshieldboostermb1a.py +++ b/eos/effects/shipbonusshieldboostermb1a.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Maelstrom +# Ships named like: Maelstrom (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battleship").level diff --git a/eos/effects/shipbonussptfalloffmf2.py b/eos/effects/shipbonussptfalloffmf2.py new file mode 100644 index 000000000..f5dfdcd67 --- /dev/null +++ b/eos/effects/shipbonussptfalloffmf2.py @@ -0,0 +1,7 @@ +# Used by: +# Ships named like: Rifter (2 of 2) +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Frigate").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), + "falloff", ship.getModifiedItemAttr("shipBonusMF2") * level) diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py index 12f403930..165afdb71 100755 --- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py +++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py @@ -1,8 +1,5 @@ # Used by: -# Ship: Anathema -# Ship: Buzzard -# Ship: Cheetah -# Ship: Helios +# Ships from group: Covert Ops (4 of 5) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Covert Ops").level diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py index c2fba8800..36d08d10f 100755 --- a/eos/effects/shipbonusthermicshieldresistancecb2.py +++ b/eos/effects/shipbonusthermicshieldresistancecb2.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Rokh (2 of 2) # Ship: Rattlesnake -# Ship: Rokh # Ship: Scorpion Navy Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipcapneedbonusab.py b/eos/effects/shipcapneedbonusab.py index 3a054a610..7b3ff82d9 100755 --- a/eos/effects/shipcapneedbonusab.py +++ b/eos/effects/shipcapneedbonusab.py @@ -1,8 +1,6 @@ # Used by: +# Variations of ship: Armageddon (3 of 5) # Ship: Apocalypse Imperial Issue -# Ship: Armageddon Imperial Issue -# Ship: Armageddon Navy Issue -# Ship: Redeemer type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py index 6d3ec0681..5282dfe5a 100755 --- a/eos/effects/shipcruisemissilevelocitybonuscb3.py +++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Raven -# Ship: Raven Navy Issue -# Ship: Raven State Issue +# Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipetspeedbonusab2.py b/eos/effects/shipetspeedbonusab2.py index fc40d35f4..e34d87576 100755 --- a/eos/effects/shipetspeedbonusab2.py +++ b/eos/effects/shipetspeedbonusab2.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Armageddon Imperial Issue -# Ship: Armageddon Navy Issue -# Ship: Redeemer +# Variations of ship: Armageddon (3 of 5) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py index caeb142f0..35d7c487a 100755 --- a/eos/effects/shiphtdmgbonusfixedgc.py +++ b/eos/effects/shiphtdmgbonusfixedgc.py @@ -1,12 +1,10 @@ # Used by: +# Variations of ship: Thorax (3 of 4) # Ship: Adrestia # Ship: Arazu -# Ship: Deimos # Ship: Exequror Navy Issue # Ship: Guardian-Vexor # Ship: Lachesis -# Ship: Phobos -# Ship: Thorax # Ship: Vexor type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiphtdmgbonusgb.py b/eos/effects/shiphtdmgbonusgb.py index 75fa77f9c..87d40a768 100755 --- a/eos/effects/shiphtdmgbonusgb.py +++ b/eos/effects/shiphtdmgbonusgb.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Hyperion (2 of 2) # Ship: Dominix Navy Issue -# Ship: Hyperion # Ship: Kronos # Ship: Megathron Federate Issue # Ship: Sin diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py index cc418056d..a13ea08c3 100755 --- a/eos/effects/shiphttrackingbonusgb2.py +++ b/eos/effects/shiphttrackingbonusgb2.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Megathron -# Ship: Megathron Federate Issue -# Ship: Megathron Navy Issue +# Ships named like: Megathron (3 of 3) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shiphybriddamagebonuscf2.py b/eos/effects/shiphybriddamagebonuscf2.py index 39ec765d2..fa8819c0f 100755 --- a/eos/effects/shiphybriddamagebonuscf2.py +++ b/eos/effects/shiphybriddamagebonuscf2.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Merlin +# Ships named like: Merlin (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shiphybridfalloff1gd1.py b/eos/effects/shiphybridfalloff1gd1.py index 39ac99ffe..130816ecc 100755 --- a/eos/effects/shiphybridfalloff1gd1.py +++ b/eos/effects/shiphybridfalloff1gd1.py @@ -1,5 +1,5 @@ # Used by: -# Ships named like: Catalyst (6 of 6) +# Variations of ship: Catalyst (6 of 7) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Destroyer").level diff --git a/eos/effects/shiplaserdamagebonusabc2.py b/eos/effects/shiplaserdamagebonusabc2.py index 353795e17..25d1f8990 100755 --- a/eos/effects/shiplaserdamagebonusabc2.py +++ b/eos/effects/shiplaserdamagebonusabc2.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Harbinger -# Ship: Harbinger Navy Issue +# Ships named like: Harbinger (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battlecruiser").level diff --git a/eos/effects/shipmissilerofcc.py b/eos/effects/shipmissilerofcc.py index 5c32d9671..57953a243 100755 --- a/eos/effects/shipmissilerofcc.py +++ b/eos/effects/shipmissilerofcc.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Caracal -# Ship: Caracal Navy Issue +# Ships named like: Caracal (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipmissilerofmf2.py b/eos/effects/shipmissilerofmf2.py new file mode 100644 index 000000000..2ae7c8402 --- /dev/null +++ b/eos/effects/shipmissilerofmf2.py @@ -0,0 +1,9 @@ +# Used by: +# Ship: Breacher +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Frigate").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Missile Launcher Operation"), + "speed", ship.getModifiedItemAttr("shipBonusMF2") * level) + + diff --git a/eos/effects/shippdmgbonusmf.py b/eos/effects/shippdmgbonusmf.py index 480938de0..23de564c4 100755 --- a/eos/effects/shippdmgbonusmf.py +++ b/eos/effects/shippdmgbonusmf.py @@ -4,6 +4,7 @@ # Ship: Cheetah # Ship: Freki # Ship: Republic Fleet Firetail +# Ship: Rifter Krusual Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py index 4d691f8e3..be101574e 100755 --- a/eos/effects/shipprojectilerof1mbc2.py +++ b/eos/effects/shipprojectilerof1mbc2.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Hurricane -# Ship: Hurricane Fleet Issue +# Ships named like: Hurricane (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battlecruiser").level diff --git a/eos/effects/shipprojectiletrackingmf2.py b/eos/effects/shipprojectiletrackingmf2.py index 7d87b1fae..5715292e6 100755 --- a/eos/effects/shipprojectiletrackingmf2.py +++ b/eos/effects/shipprojectiletrackingmf2.py @@ -1,7 +1,8 @@ # Used by: -# Variations of ship: Rifter (3 of 3) # Variations of ship: Slasher (3 of 3) +# Ship: Jaguar # Ship: Republic Fleet Firetail +# Ship: Wolf type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Frigate").level diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py index d66a0af7f..09810e80f 100755 --- a/eos/effects/shipptdmgbonusmb.py +++ b/eos/effects/shipptdmgbonusmb.py @@ -1,9 +1,7 @@ # Used by: +# Variations of ship: Tempest (3 of 4) # Ship: Machariel # Ship: Panther -# Ship: Tempest -# Ship: Tempest Fleet Issue -# Ship: Tempest Tribal Issue type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battleship").level diff --git a/eos/effects/shipptspeedbonusmb2.py b/eos/effects/shipptspeedbonusmb2.py index 302d474aa..29e481bf5 100755 --- a/eos/effects/shipptspeedbonusmb2.py +++ b/eos/effects/shipptspeedbonusmb2.py @@ -1,6 +1,6 @@ # Used by: +# Ships named like: Maelstrom (2 of 2) # Variations of ship: Tempest (4 of 4) -# Ship: Maelstrom # Ship: Panther # Ship: Typhoon Fleet Issue type = "passive" diff --git a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py index 3876e204e..9fb9007de 100755 --- a/eos/effects/shipscanprobestrengthbonuspiratecruiser.py +++ b/eos/effects/shipscanprobestrengthbonuspiratecruiser.py @@ -1,8 +1,7 @@ # Used by: +# Ships named like: Stratios (2 of 2) # Ship: Astero # Ship: Gnosis -# Ship: Stratios -# Ship: Stratios Emergency Responder type = "passive" def handler(fit, container, context): fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Astrometrics"), diff --git a/eos/effects/shipsetdmgbonus2af.py b/eos/effects/shipsetdmgbonus2af.py index 200931ff9..d37c6a558 100755 --- a/eos/effects/shipsetdmgbonus2af.py +++ b/eos/effects/shipsetdmgbonus2af.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Punisher +# Ships named like: Punisher (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Frigate").level diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/shipshieldemresistancecf2.py index 892f6ebe5..546443253 100755 --- a/eos/effects/shipshieldemresistancecf2.py +++ b/eos/effects/shipshieldemresistancecf2.py @@ -1,8 +1,7 @@ # Used by: +# Variations of ship: Merlin (3 of 4) # Ship: Cambion -# Ship: Harpy -# Ship: Merlin -# Ship: Worm +# Ship: Merlin Nugoeihuvi Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipshieldexplosiveresistancecf2.py b/eos/effects/shipshieldexplosiveresistancecf2.py index e8206dfa3..d999d6d5e 100755 --- a/eos/effects/shipshieldexplosiveresistancecf2.py +++ b/eos/effects/shipshieldexplosiveresistancecf2.py @@ -1,8 +1,7 @@ # Used by: +# Variations of ship: Merlin (3 of 4) # Ship: Cambion -# Ship: Harpy -# Ship: Merlin -# Ship: Worm +# Ship: Merlin Nugoeihuvi Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipshieldkineticresistancecf2.py b/eos/effects/shipshieldkineticresistancecf2.py index fba2ac378..b9b7b4dd3 100755 --- a/eos/effects/shipshieldkineticresistancecf2.py +++ b/eos/effects/shipshieldkineticresistancecf2.py @@ -1,8 +1,7 @@ # Used by: +# Variations of ship: Merlin (3 of 4) # Ship: Cambion -# Ship: Harpy -# Ship: Merlin -# Ship: Worm +# Ship: Merlin Nugoeihuvi Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipshieldthermalresistancecf2.py b/eos/effects/shipshieldthermalresistancecf2.py index 4544ec229..060842091 100755 --- a/eos/effects/shipshieldthermalresistancecf2.py +++ b/eos/effects/shipshieldthermalresistancecf2.py @@ -1,8 +1,7 @@ # Used by: +# Variations of ship: Merlin (3 of 4) # Ship: Cambion -# Ship: Harpy -# Ship: Merlin -# Ship: Worm +# Ship: Merlin Nugoeihuvi Edition type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/shipshtdmgbonusgf.py b/eos/effects/shipshtdmgbonusgf.py index 675e21af8..480d68dc9 100755 --- a/eos/effects/shipshtdmgbonusgf.py +++ b/eos/effects/shipshtdmgbonusgf.py @@ -3,6 +3,8 @@ # Ship: Atron # Ship: Federation Navy Comet # Ship: Helios +# Ship: Incursus Aliastra Edition +# Ship: Police Pursuit Comet # Ship: Taranis type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipsmallmissileemdmgmf2.py b/eos/effects/shipsmallmissileemdmgmf2.py deleted file mode 100755 index d598f706a..000000000 --- a/eos/effects/shipsmallmissileemdmgmf2.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Breacher -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "emDamage", ship.getModifiedItemAttr("shipBonusMF2") * level) diff --git a/eos/effects/shipsmallmissileexpdmgmf2.py b/eos/effects/shipsmallmissileexpdmgmf2.py deleted file mode 100755 index 8e2eed170..000000000 --- a/eos/effects/shipsmallmissileexpdmgmf2.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Breacher -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "explosiveDamage", ship.getModifiedItemAttr("shipBonusMF2") * level) diff --git a/eos/effects/shipsmallmissilekindmgmf2.py b/eos/effects/shipsmallmissilekindmgmf2.py deleted file mode 100755 index 9173cab91..000000000 --- a/eos/effects/shipsmallmissilekindmgmf2.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Breacher -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "kineticDamage", ship.getModifiedItemAttr("shipBonusMF2") * level) diff --git a/eos/effects/shipsmallmissilethermdmgmf2.py b/eos/effects/shipsmallmissilethermdmgmf2.py deleted file mode 100755 index 05115ea2e..000000000 --- a/eos/effects/shipsmallmissilethermdmgmf2.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Breacher -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Frigate").level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Rockets") or mod.charge.requiresSkill("Light Missiles"), - "thermalDamage", ship.getModifiedItemAttr("shipBonusMF2") * level) diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py index 213de7817..8a940dbf1 100755 --- a/eos/effects/shiptorpedosvelocitybonuscb3.py +++ b/eos/effects/shiptorpedosvelocitybonuscb3.py @@ -1,7 +1,5 @@ # Used by: -# Ship: Raven -# Ship: Raven Navy Issue -# Ship: Raven State Issue +# Variations of ship: Raven (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/shipvelocitybonusmi.py index f885e366b..9afaaa623 100755 --- a/eos/effects/shipvelocitybonusmi.py +++ b/eos/effects/shipvelocitybonusmi.py @@ -1,6 +1,7 @@ # Used by: # Variations of ship: Mammoth (2 of 2) # Ship: Hoarder +# Ship: Mammoth Nefantar Edition # Ship: Prowler type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py b/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py index 0ce5503a7..2562f86b2 100755 --- a/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py +++ b/eos/effects/signatureanalysisscanresolutionbonuspostpercentscanresolutionship.py @@ -1,6 +1,6 @@ # Used by: -# Modules named like: Targeting Subcontroller (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Targeting Implants > Implant Slot 07 (6 of 6) +# Implants named like: Zainou 'Gypsy' Signature Analysis SA (6 of 6) +# Modules named like: Targeting System Subcontroller (8 of 8) # Implant: Quafe Zero # Skill: Signature Analysis type = "passive" diff --git a/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py b/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py index e970eb118..9c8795274 100755 --- a/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py +++ b/eos/effects/smallenergyturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallenergyturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Implants Energy Turret SE (6 of 6) +# Implants named like: Inherent Implants 'Lancer' Small Energy Turret SE (6 of 6) # Skill: Small Energy Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/smallhybridmaxrangebonus.py b/eos/effects/smallhybridmaxrangebonus.py index a6766b85f..1e2ef1349 100755 --- a/eos/effects/smallhybridmaxrangebonus.py +++ b/eos/effects/smallhybridmaxrangebonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships named like: Catalyst (6 of 6) +# Variations of ship: Catalyst (6 of 7) # Ship: Cormorant type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py b/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py index 3bcfa17a5..56bf3470b 100755 --- a/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py +++ b/eos/effects/smallhybridturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallhybridturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou Small SH (6 of 6) +# Implants named like: Zainou 'Deadeye' Small Hybrid Turret SH (6 of 6) # Skill: Small Hybrid Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/smallprojectilemaxrangebonus.py b/eos/effects/smallprojectilemaxrangebonus.py index ef14dcf0a..ca3d53925 100755 --- a/eos/effects/smallprojectilemaxrangebonus.py +++ b/eos/effects/smallprojectilemaxrangebonus.py @@ -1,6 +1,5 @@ # Used by: -# Ship: Nefantar Thrasher -# Ship: Thrasher +# Ships named like: Thrasher (2 of 2) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Small Projectile Turret"), diff --git a/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py b/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py index ca52135e4..ff35bea0b 100755 --- a/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py +++ b/eos/effects/smallprojectileturretdamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringsmallprojectileturret.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: and 'Gunslinger' Turret SP (6 of 6) +# Implants named like: Eifyr and Co. 'Gunslinger' Small Projectile Turret SP (6 of 6) # Skill: Small Projectile Turret type = "passive" def handler(fit, container, context): diff --git a/eos/effects/stripminermaxrangebonus.py b/eos/effects/stripminermaxrangebonus.py index c95d00e5e..08f976e0a 100755 --- a/eos/effects/stripminermaxrangebonus.py +++ b/eos/effects/stripminermaxrangebonus.py @@ -1,9 +1,5 @@ # Used by: -# Implant: Low-grade Harvest Alpha -# Implant: Low-grade Harvest Beta -# Implant: Low-grade Harvest Delta -# Implant: Low-grade Harvest Epsilon -# Implant: Low-grade Harvest Gamma +# Implants named like: Low grade Harvest (5 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Strip Miner", diff --git a/eos/effects/structuralanalysiseffect.py b/eos/effects/structuralanalysiseffect.py index 8ac4ca9c1..29995bc7f 100755 --- a/eos/effects/structuralanalysiseffect.py +++ b/eos/effects/structuralanalysiseffect.py @@ -1,11 +1,8 @@ # Used by: -# Modules named like: Auxiliary Nano (8 of 8) -# Items from market group: Implants & Boosters > Implants > Skill Hardwiring > Armor Implants > Implant Slot 09 (6 of 6) +# Implants named like: Inherent Implants 'Noble' Repair Proficiency RP (6 of 6) +# Modules named like: Auxiliary Nano Pump (8 of 8) +# Modules named like: QA Multiship Module Players (4 of 4) # Implant: Imperial Navy Modified 'Noble' Implant -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players type = "passive" def handler(fit, container, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), diff --git a/eos/effects/structurehpmultiply.py b/eos/effects/structurehpmultiply.py index 1e47751ca..224a44145 100755 --- a/eos/effects/structurehpmultiply.py +++ b/eos/effects/structurehpmultiply.py @@ -1,10 +1,7 @@ # Used by: # Modules from group: Nanofiber Internal Structure (14 of 14) # Modules from group: Reinforced Bulkhead (12 of 12) -# Module: QA Multiship Module - 10 Players -# Module: QA Multiship Module - 20 Players -# Module: QA Multiship Module - 40 Players -# Module: QA Multiship Module - 5 Players +# Modules named like: QA Multiship Module Players (4 of 4) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("hp", module.getModifiedItemAttr("structureHPMultiplier")) \ No newline at end of file diff --git a/eos/effects/structurestealthemitterarraysigdecrease.py b/eos/effects/structurestealthemitterarraysigdecrease.py index a978f24e5..290f9e3ac 100755 --- a/eos/effects/structurestealthemitterarraysigdecrease.py +++ b/eos/effects/structurestealthemitterarraysigdecrease.py @@ -1,18 +1,6 @@ # Used by: -# Implant: Halo Alpha -# Implant: Halo Beta -# Implant: Halo Delta -# Implant: Halo Epsilon -# Implant: Halo Gamma -# Implant: Improved X-Instinct Booster -# Implant: Low-grade Halo Alpha -# Implant: Low-grade Halo Beta -# Implant: Low-grade Halo Delta -# Implant: Low-grade Halo Epsilon -# Implant: Low-grade Halo Gamma -# Implant: Standard X-Instinct Booster -# Implant: Strong X-Instinct Booster -# Implant: Synth X-Instinct Booster +# Implants named like: Halo (10 of 12) +# Implants named like: X Instinct Booster (4 of 4) type = "passive" def handler(fit, implant, context): fit.ship.boostItemAttr("signatureRadius", implant.getModifiedItemAttr("signatureRadiusBonus")) diff --git a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py index a851b669b..a4830192c 100755 --- a/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveassaultmissilelauncherrof.py @@ -1,7 +1,5 @@ # Used by: -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Offensive Systems").level diff --git a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py index 06c617641..eb531dd91 100755 --- a/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveheavyassaultmissilelauncherrof.py @@ -1,7 +1,5 @@ # Used by: -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Offensive Systems").level diff --git a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py index 8c268a51f..d59e600e0 100755 --- a/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py +++ b/eos/effects/subsystembonuscaldarioffensiveheavymissilelauncherrof.py @@ -1,7 +1,5 @@ # Used by: -# Subsystem: Tengu Offensive - Accelerated Ejection Bay -# Subsystem: Tengu Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Rifling Launcher Pattern +# Variations of subsystem: Tengu Offensive - Accelerated Ejection Bay (3 of 4) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Caldari Offensive Systems").level diff --git a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py index 68bc28234..770c3220d 100755 --- a/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py +++ b/eos/effects/subsystembonusgallenteoffensive2hybridweapondamagemultiplier.py @@ -1,7 +1,5 @@ # Used by: -# Subsystem: Proteus Offensive - Dissonic Encoding Platform -# Subsystem: Proteus Offensive - Drone Synthesis Projector -# Subsystem: Proteus Offensive - Hybrid Propulsion Armature +# Variations of subsystem: Proteus Offensive - Dissonic Encoding Platform (3 of 4) type = "passive" def handler(fit, module, context): level = fit.character.getSkill("Gallente Offensive Systems").level diff --git a/eos/effects/subsystembonusoffensivejumpharmonics.py b/eos/effects/subsystembonusoffensivejumpharmonics.py index ed9d749b7..baf2e360c 100755 --- a/eos/effects/subsystembonusoffensivejumpharmonics.py +++ b/eos/effects/subsystembonusoffensivejumpharmonics.py @@ -1,8 +1,5 @@ # Used by: -# Subsystem: Legion Offensive - Covert Reconfiguration -# Subsystem: Loki Offensive - Covert Reconfiguration -# Subsystem: Proteus Offensive - Covert Reconfiguration -# Subsystem: Tengu Offensive - Covert Reconfiguration +# Subsystems named like: Offensive Covert Reconfiguration (4 of 4) type = "passive" def handler(fit, module, context): fit.ship.forceItemAttr("jumpHarmonics", module.getModifiedItemAttr("jumpHarmonicsModifier")) diff --git a/eos/effects/subsystembonusscanprobelaunchercpu.py b/eos/effects/subsystembonusscanprobelaunchercpu.py index 237f262c7..7ef5d8341 100755 --- a/eos/effects/subsystembonusscanprobelaunchercpu.py +++ b/eos/effects/subsystembonusscanprobelaunchercpu.py @@ -1,8 +1,5 @@ # Used by: -# Subsystem: Legion Electronics - Emergent Locus Analyzer -# Subsystem: Loki Electronics - Emergent Locus Analyzer -# Subsystem: Proteus Electronics - Emergent Locus Analyzer -# Subsystem: Tengu Electronics - Emergent Locus Analyzer +# Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Scan Probe Launcher", diff --git a/eos/effects/subsystembonuswarpbubbleimmune.py b/eos/effects/subsystembonuswarpbubbleimmune.py index f126e9fe1..e1b9af590 100755 --- a/eos/effects/subsystembonuswarpbubbleimmune.py +++ b/eos/effects/subsystembonuswarpbubbleimmune.py @@ -1,8 +1,5 @@ # Used by: -# Subsystem: Legion Propulsion - Interdiction Nullifier -# Subsystem: Loki Propulsion - Interdiction Nullifier -# Subsystem: Proteus Propulsion - Interdiction Nullifier -# Subsystem: Tengu Propulsion - Interdiction Nullifier +# Subsystems named like: Propulsion Interdiction Nullifier (4 of 4) type = "passive" def handler(fit, module, context): fit.ship.forceItemAttr("warpBubbleImmune", module.getModifiedItemAttr("warpBubbleImmuneModifier")) diff --git a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py index e403d59b9..7aa2e92a0 100755 --- a/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py +++ b/eos/effects/surgicalstrikedamagemultiplierbonuspostpercentdamagemultiplierlocationshipmodulesrequiringgunnery.py @@ -1,8 +1,6 @@ # Used by: -# Implants named like: Eifyr Strike (6 of 6) -# Implant: Advanced Cerebral Accelerator -# Implant: Prototype Cerebral Accelerator -# Implant: Standard Cerebral Accelerator +# Implants named like: Cerebral Accelerator (3 of 3) +# Implants named like: Eifyr and Co. 'Gunslinger' Surgical Strike SS (6 of 6) type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Gunnery"), diff --git a/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py b/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py index 11576c30b..3b0e82729 100755 --- a/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py +++ b/eos/effects/surgicalstrikefalloffbonuspostpercentfallofflocationshipmodulesrequiringgunnery.py @@ -1,9 +1,6 @@ # Used by: -# Implants named like: Trajectory TA (6 of 6) -# Implant: Improved Sooth Sayer Booster -# Implant: Standard Sooth Sayer Booster -# Implant: Strong Sooth Sayer Booster -# Implant: Synth Sooth Sayer Booster +# Implants named like: Sooth Sayer Booster (4 of 4) +# Implants named like: Zainou 'Deadeye' Trajectory Analysis TA (6 of 6) # Skill: Trajectory Analysis type = "passive" def handler(fit, container, context): diff --git a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py index 513d978ff..9064736bd 100755 --- a/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py +++ b/eos/effects/surveyscanspeedbonuspostpercentdurationlocationshipmodulesrequiringelectronics.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Signal Focusing (8 of 8) +# Modules named like: Signal Focusing Kit (8 of 8) # Skill: Survey type = "passive" def handler(fit, container, context): diff --git a/eos/effects/systemagility.py b/eos/effects/systemagility.py index 824d2ce09..a1a1c4baa 100755 --- a/eos/effects/systemagility.py +++ b/eos/effects/systemagility.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemaoevelocity.py b/eos/effects/systemaoevelocity.py index 166d28875..55ba48437 100755 --- a/eos/effects/systemaoevelocity.py +++ b/eos/effects/systemaoevelocity.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmoremresistance.py b/eos/effects/systemarmoremresistance.py index 47e8f8cb0..83b8073f8 100755 --- a/eos/effects/systemarmoremresistance.py +++ b/eos/effects/systemarmoremresistance.py @@ -1,8 +1,7 @@ # Used by: +# Celestials named like: Incursion Effect (2 of 2) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) -# Celestials named like: Wolf Rayet Beacon (6 of 6) -# Celestial: Incursion Effect Assault -# Celestial: Incursion Effect HQ +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmorexplosiveresistance.py b/eos/effects/systemarmorexplosiveresistance.py index d87e0a14b..b3e7abc8a 100755 --- a/eos/effects/systemarmorexplosiveresistance.py +++ b/eos/effects/systemarmorexplosiveresistance.py @@ -1,8 +1,7 @@ # Used by: +# Celestials named like: Incursion Effect (2 of 2) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) -# Celestials named like: Wolf Rayet Beacon (6 of 6) -# Celestial: Incursion Effect Assault -# Celestial: Incursion Effect HQ +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmorkineticresistance.py b/eos/effects/systemarmorkineticresistance.py index 7036890dd..850929406 100755 --- a/eos/effects/systemarmorkineticresistance.py +++ b/eos/effects/systemarmorkineticresistance.py @@ -1,8 +1,7 @@ # Used by: +# Celestials named like: Incursion Effect (2 of 2) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) -# Celestials named like: Wolf Rayet Beacon (6 of 6) -# Celestial: Incursion Effect Assault -# Celestial: Incursion Effect HQ +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmorremoterepairamount.py b/eos/effects/systemarmorremoterepairamount.py index c3dbca6b7..8946bc20f 100755 --- a/eos/effects/systemarmorremoterepairamount.py +++ b/eos/effects/systemarmorremoterepairamount.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemarmorrepairamount.py b/eos/effects/systemarmorrepairamount.py index d94d4db0c..b759a5312 100755 --- a/eos/effects/systemarmorrepairamount.py +++ b/eos/effects/systemarmorrepairamount.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemarmorthermalresistance.py b/eos/effects/systemarmorthermalresistance.py index 8a4a33775..bdd602dc1 100755 --- a/eos/effects/systemarmorthermalresistance.py +++ b/eos/effects/systemarmorthermalresistance.py @@ -1,8 +1,7 @@ # Used by: +# Celestials named like: Incursion Effect (2 of 2) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) -# Celestials named like: Wolf Rayet Beacon (6 of 6) -# Celestial: Incursion Effect Assault -# Celestial: Incursion Effect HQ +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemcapacitorcapacity.py b/eos/effects/systemcapacitorcapacity.py index 1ee8b6e9c..c3660e9b8 100755 --- a/eos/effects/systemcapacitorcapacity.py +++ b/eos/effects/systemcapacitorcapacity.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemcapacitorrecharge.py b/eos/effects/systemcapacitorrecharge.py index 13121b2e7..91c47942e 100755 --- a/eos/effects/systemcapacitorrecharge.py +++ b/eos/effects/systemcapacitorrecharge.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") diff --git a/eos/effects/systemdamagedrones.py b/eos/effects/systemdamagedrones.py index e1ba9dfbd..e466beeea 100755 --- a/eos/effects/systemdamagedrones.py +++ b/eos/effects/systemdamagedrones.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamageemmissiles.py b/eos/effects/systemdamageemmissiles.py index 65e1a8a63..913dc9cf5 100755 --- a/eos/effects/systemdamageemmissiles.py +++ b/eos/effects/systemdamageemmissiles.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamageexplosivemissiles.py b/eos/effects/systemdamageexplosivemissiles.py index d7aaac0b8..6a58f3b98 100755 --- a/eos/effects/systemdamageexplosivemissiles.py +++ b/eos/effects/systemdamageexplosivemissiles.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamagefighters.py b/eos/effects/systemdamagefighters.py index c9a18e2e2..07ef55f1d 100755 --- a/eos/effects/systemdamagefighters.py +++ b/eos/effects/systemdamagefighters.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamagekineticmissiles.py b/eos/effects/systemdamagekineticmissiles.py index 8f6310b1e..d72737643 100755 --- a/eos/effects/systemdamagekineticmissiles.py +++ b/eos/effects/systemdamagekineticmissiles.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamagemultipliergunnery.py b/eos/effects/systemdamagemultipliergunnery.py index 1612d9014..606412de1 100755 --- a/eos/effects/systemdamagemultipliergunnery.py +++ b/eos/effects/systemdamagemultipliergunnery.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamagethermalmissiles.py b/eos/effects/systemdamagethermalmissiles.py index 7e29d4007..84ede14dc 100755 --- a/eos/effects/systemdamagethermalmissiles.py +++ b/eos/effects/systemdamagethermalmissiles.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdronecontrolrange.py b/eos/effects/systemdronecontrolrange.py index 319dc883c..25042b4f8 100755 --- a/eos/effects/systemdronecontrolrange.py +++ b/eos/effects/systemdronecontrolrange.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdronespeed.py b/eos/effects/systemdronespeed.py index d1a4f1846..ac8517fde 100755 --- a/eos/effects/systemdronespeed.py +++ b/eos/effects/systemdronespeed.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemfalloffrangegunnery.py b/eos/effects/systemfalloffrangegunnery.py index fd7d3593b..dbce30d32 100755 --- a/eos/effects/systemfalloffrangegunnery.py +++ b/eos/effects/systemfalloffrangegunnery.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemheatdamage.py b/eos/effects/systemheatdamage.py index f195d76d9..e909a370e 100755 --- a/eos/effects/systemheatdamage.py +++ b/eos/effects/systemheatdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemmaxvelocity.py b/eos/effects/systemmaxvelocity.py index c8781d68f..e8c0dda29 100755 --- a/eos/effects/systemmaxvelocity.py +++ b/eos/effects/systemmaxvelocity.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemmissilevelocity.py b/eos/effects/systemmissilevelocity.py index 54e264ad7..af1cc379b 100755 --- a/eos/effects/systemmissilevelocity.py +++ b/eos/effects/systemmissilevelocity.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemoptimalrangegunnery.py b/eos/effects/systemoptimalrangegunnery.py index b87d22e9b..43dad5885 100755 --- a/eos/effects/systemoptimalrangegunnery.py +++ b/eos/effects/systemoptimalrangegunnery.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Black Hole Effect Class (6 of 6) +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadarmor.py b/eos/effects/systemoverloadarmor.py index 05a8622ec..f0b3b2a96 100755 --- a/eos/effects/systemoverloadarmor.py +++ b/eos/effects/systemoverloadarmor.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloaddamagemodifier.py b/eos/effects/systemoverloaddamagemodifier.py index 94f6d546d..fd46ecb58 100755 --- a/eos/effects/systemoverloaddamagemodifier.py +++ b/eos/effects/systemoverloaddamagemodifier.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloaddurationbonus.py b/eos/effects/systemoverloaddurationbonus.py index fd984d143..7bfd2768b 100755 --- a/eos/effects/systemoverloaddurationbonus.py +++ b/eos/effects/systemoverloaddurationbonus.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadeccmstrength.py b/eos/effects/systemoverloadeccmstrength.py index a5ad4c873..979cdeb45 100755 --- a/eos/effects/systemoverloadeccmstrength.py +++ b/eos/effects/systemoverloadeccmstrength.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadecmstrength.py b/eos/effects/systemoverloadecmstrength.py index 35ddf93d7..b78d32757 100755 --- a/eos/effects/systemoverloadecmstrength.py +++ b/eos/effects/systemoverloadecmstrength.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadhardening.py b/eos/effects/systemoverloadhardening.py index d5b75015f..348e679c0 100755 --- a/eos/effects/systemoverloadhardening.py +++ b/eos/effects/systemoverloadhardening.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadrange.py b/eos/effects/systemoverloadrange.py index b7efcd14b..6245be9da 100755 --- a/eos/effects/systemoverloadrange.py +++ b/eos/effects/systemoverloadrange.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadrof.py b/eos/effects/systemoverloadrof.py index b68e3705a..757590488 100755 --- a/eos/effects/systemoverloadrof.py +++ b/eos/effects/systemoverloadrof.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadselfduration.py b/eos/effects/systemoverloadselfduration.py index fd984d143..7bfd2768b 100755 --- a/eos/effects/systemoverloadselfduration.py +++ b/eos/effects/systemoverloadselfduration.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadshieldbonus.py b/eos/effects/systemoverloadshieldbonus.py index ba5192b5d..b88dee809 100755 --- a/eos/effects/systemoverloadshieldbonus.py +++ b/eos/effects/systemoverloadshieldbonus.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemoverloadspeedfactor.py b/eos/effects/systemoverloadspeedfactor.py index 662de44db..aaf53e831 100755 --- a/eos/effects/systemoverloadspeedfactor.py +++ b/eos/effects/systemoverloadspeedfactor.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemrocketemdamage.py b/eos/effects/systemrocketemdamage.py index dfbe7cf01..39cfa352b 100755 --- a/eos/effects/systemrocketemdamage.py +++ b/eos/effects/systemrocketemdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemrocketexplosivedamage.py b/eos/effects/systemrocketexplosivedamage.py index 67a1ceb9c..53440959c 100755 --- a/eos/effects/systemrocketexplosivedamage.py +++ b/eos/effects/systemrocketexplosivedamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemrocketkineticdamage.py b/eos/effects/systemrocketkineticdamage.py index 1d64072c1..1e64e6355 100755 --- a/eos/effects/systemrocketkineticdamage.py +++ b/eos/effects/systemrocketkineticdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemrocketthermaldamage.py b/eos/effects/systemrocketthermaldamage.py index aeb3bed12..5590f3995 100755 --- a/eos/effects/systemrocketthermaldamage.py +++ b/eos/effects/systemrocketthermaldamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemscandurationskillastrometrics.py b/eos/effects/systemscandurationskillastrometrics.py index 5e638355b..c2ef318e4 100644 --- a/eos/effects/systemscandurationskillastrometrics.py +++ b/eos/effects/systemscandurationskillastrometrics.py @@ -1,7 +1,5 @@ # Used by: -# Implant: Poteque 'Prospector' Astrometric Acquisition AQ-702 -# Implant: Poteque 'Prospector' Astrometric Acquisition AQ-706 -# Implant: Poteque 'Prospector' Astrometric Acquisition AQ-710 +# Implants named like: Poteque 'Prospector' Astrometric Acquisition AQ (3 of 3) # Skill: Astrometric Acquisition # Skill: Astrometrics type = "passive" diff --git a/eos/effects/systemshieldemresistance.py b/eos/effects/systemshieldemresistance.py index eb034ad3a..4b25d168d 100755 --- a/eos/effects/systemshieldemresistance.py +++ b/eos/effects/systemshieldemresistance.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemshieldexplosiveresistance.py b/eos/effects/systemshieldexplosiveresistance.py index d552ce7bf..a9c51dbb1 100755 --- a/eos/effects/systemshieldexplosiveresistance.py +++ b/eos/effects/systemshieldexplosiveresistance.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemshieldkineticresistance.py b/eos/effects/systemshieldkineticresistance.py index ddd2cb877..5661a9bff 100755 --- a/eos/effects/systemshieldkineticresistance.py +++ b/eos/effects/systemshieldkineticresistance.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemshieldremoterepairamount.py b/eos/effects/systemshieldremoterepairamount.py index cd75da07c..118ce90d4 100755 --- a/eos/effects/systemshieldremoterepairamount.py +++ b/eos/effects/systemshieldremoterepairamount.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemshieldrepairamountshieldskills.py b/eos/effects/systemshieldrepairamountshieldskills.py index 660848254..e825f3dc8 100644 --- a/eos/effects/systemshieldrepairamountshieldskills.py +++ b/eos/effects/systemshieldrepairamountshieldskills.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Cataclysmic Variable Beacon Class (6 of 6) +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemshieldthermalresistance.py b/eos/effects/systemshieldthermalresistance.py index ea12e5126..4d9febe86 100755 --- a/eos/effects/systemshieldthermalresistance.py +++ b/eos/effects/systemshieldthermalresistance.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemsignatureradius.py b/eos/effects/systemsignatureradius.py index 2e77e6851..14f8e4ae5 100755 --- a/eos/effects/systemsignatureradius.py +++ b/eos/effects/systemsignatureradius.py @@ -1,6 +1,6 @@ # Used by: # Celestials named like: Pulsar Effect Beacon Class (6 of 6) -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemsmallenergydamage.py b/eos/effects/systemsmallenergydamage.py index 9a75f2a97..203e77640 100755 --- a/eos/effects/systemsmallenergydamage.py +++ b/eos/effects/systemsmallenergydamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmallhybriddamage.py b/eos/effects/systemsmallhybriddamage.py index 95b3bd846..21ce24ec9 100755 --- a/eos/effects/systemsmallhybriddamage.py +++ b/eos/effects/systemsmallhybriddamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmallprojectiledamage.py b/eos/effects/systemsmallprojectiledamage.py index 161574a09..11632a7c0 100755 --- a/eos/effects/systemsmallprojectiledamage.py +++ b/eos/effects/systemsmallprojectiledamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmartbombemdamage.py b/eos/effects/systemsmartbombemdamage.py index 2be6fac19..81ee6e8e7 100755 --- a/eos/effects/systemsmartbombemdamage.py +++ b/eos/effects/systemsmartbombemdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmartbombexplosivedamage.py b/eos/effects/systemsmartbombexplosivedamage.py index 0960b916d..b998ec2a8 100755 --- a/eos/effects/systemsmartbombexplosivedamage.py +++ b/eos/effects/systemsmartbombexplosivedamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmartbombkineticdamage.py b/eos/effects/systemsmartbombkineticdamage.py index 1783eeba4..4ba13d3ef 100755 --- a/eos/effects/systemsmartbombkineticdamage.py +++ b/eos/effects/systemsmartbombkineticdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmartbombrange.py b/eos/effects/systemsmartbombrange.py index 0827e0a59..9b2d52e79 100755 --- a/eos/effects/systemsmartbombrange.py +++ b/eos/effects/systemsmartbombrange.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemsmartbombthermaldamage.py b/eos/effects/systemsmartbombthermaldamage.py index 1ccf47102..5ecfbbabf 100755 --- a/eos/effects/systemsmartbombthermaldamage.py +++ b/eos/effects/systemsmartbombthermaldamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Red (6 of 6) +# Celestials named like: Red Giant Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/systemstandardmissileemdamage.py b/eos/effects/systemstandardmissileemdamage.py index c2de2544e..8466e9ff6 100755 --- a/eos/effects/systemstandardmissileemdamage.py +++ b/eos/effects/systemstandardmissileemdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemstandardmissileexplosivedamage.py b/eos/effects/systemstandardmissileexplosivedamage.py index 657b44870..f5aaa26bd 100755 --- a/eos/effects/systemstandardmissileexplosivedamage.py +++ b/eos/effects/systemstandardmissileexplosivedamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemstandardmissilekineticdamage.py b/eos/effects/systemstandardmissilekineticdamage.py index d66871246..708895b0f 100755 --- a/eos/effects/systemstandardmissilekineticdamage.py +++ b/eos/effects/systemstandardmissilekineticdamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemstandardmissilethermaldamage.py b/eos/effects/systemstandardmissilethermaldamage.py index 533206bc1..e1ce06e11 100755 --- a/eos/effects/systemstandardmissilethermaldamage.py +++ b/eos/effects/systemstandardmissilethermaldamage.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Wolf Rayet Beacon (6 of 6) +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemtargetingrange.py b/eos/effects/systemtargetingrange.py index 0bc837210..3d3269d47 100755 --- a/eos/effects/systemtargetingrange.py +++ b/eos/effects/systemtargetingrange.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) # Celestials named like: Pulsar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") diff --git a/eos/effects/systemtracking.py b/eos/effects/systemtracking.py index 7d0046e52..7e4422747 100755 --- a/eos/effects/systemtracking.py +++ b/eos/effects/systemtracking.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Class (6 of 6) +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, module, context): diff --git a/eos/effects/targetarmorrepair.py b/eos/effects/targetarmorrepair.py index b4955fea0..b38b959c0 100755 --- a/eos/effects/targetarmorrepair.py +++ b/eos/effects/targetarmorrepair.py @@ -1,6 +1,6 @@ # Used by: # Modules from group: Remote Armor Repairer (38 of 38) -# Drones named like: Armor (6 of 6) +# Drones named like: Armor Maintenance Bot (6 of 6) # Module: QA Remote Armor Repair System - 5 Players type = "projected", "active" def handler(fit, container, context): diff --git a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py index ccc6eb9a5..2568e0ace 100755 --- a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py +++ b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py @@ -1,6 +1,5 @@ # Used by: -# Skill: Advanced Target Management -# Skill: Target Management +# Skills named like: Target Management (2 of 2) type = "passive" def handler(fit, skill, context): amount = skill.getModifiedItemAttr("maxTargetBonus") * skill.level diff --git a/eos/effects/trackingspeedbonuseffecthybrids.py b/eos/effects/trackingspeedbonuseffecthybrids.py index 04f9b83c8..16db38c78 100755 --- a/eos/effects/trackingspeedbonuseffecthybrids.py +++ b/eos/effects/trackingspeedbonuseffecthybrids.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Hybrid Metastasis (8 of 8) +# Modules named like: Hybrid Metastasis Adjuster (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Hybrid Weapon", diff --git a/eos/effects/trackingspeedbonuseffectlasers.py b/eos/effects/trackingspeedbonuseffectlasers.py index f7fe5e763..50b721401 100755 --- a/eos/effects/trackingspeedbonuseffectlasers.py +++ b/eos/effects/trackingspeedbonuseffectlasers.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Energy Adjuster (8 of 8) +# Modules named like: Energy Metastasis Adjuster (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Weapon", diff --git a/eos/effects/trackingspeedbonuseffectprojectiles.py b/eos/effects/trackingspeedbonuseffectprojectiles.py index dc840cb37..06db8d14e 100755 --- a/eos/effects/trackingspeedbonuseffectprojectiles.py +++ b/eos/effects/trackingspeedbonuseffectprojectiles.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Projectile Metastasis (8 of 8) +# Modules named like: Projectile Metastasis Adjuster (8 of 8) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Projectile Weapon", diff --git a/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py b/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py index 46a5263dc..6baee36c8 100755 --- a/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py +++ b/eos/effects/trackingspeedbonuspassiverequiringgunnerytrackingspeedbonus.py @@ -1,10 +1,7 @@ # Used by: -# Implants named like: Eifyr and Co. Prediction MR (6 of 6) -# Implant: Improved Drop Booster +# Implants named like: Drop Booster (4 of 4) +# Implants named like: Eifyr and Co. 'Gunslinger' Motion Prediction MR (6 of 6) # Implant: Ogdin's Eye Coordination Enhancer -# Implant: Standard Drop Booster -# Implant: Strong Drop Booster -# Implant: Synth Drop Booster # Skill: Motion Prediction type = "passive" def handler(fit, container, context): diff --git a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py index 9a9785a0b..39958d82f 100644 --- a/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py +++ b/eos/effects/turretweaponrangefallofftrackingspeedmultiplytargethostile.py @@ -1,7 +1,5 @@ # Used by: -# Drone: Acolyte TD-300 -# Drone: Infiltrator TD-600 -# Drone: Praetor TD-900 +# Drones named like: TD (3 of 3) type = "projected", "active" def handler(fit, container, context): if "projected" in context: diff --git a/eos/effects/usemissiles.py b/eos/effects/usemissiles.py index 70bd3bbde..c3adb07b3 100755 --- a/eos/effects/usemissiles.py +++ b/eos/effects/usemissiles.py @@ -1,12 +1,8 @@ # Used by: -# Modules from group: Missile Launcher Bomb (2 of 2) -# Modules from group: Scan Probe Launcher (7 of 7) -# Modules from group: Survey Probe Launcher (2 of 2) -# Items from market group: Ship Equipment > Turrets & Bays > Missile Launchers (126 of 126) -# Module: Civilian Light Missile Launcher -# Module: Festival Launcher -# Module: Interdiction Sphere Launcher I -# Module: Khanid Navy Torpedo Launcher +# Modules from group: Missile Launcher Citadel (4 of 4) +# Modules from group: Missile Launcher Heavy (12 of 12) +# Modules from group: Missile Launcher Rocket (14 of 14) +# Modules named like: Launcher (137 of 137) type = 'active' def handler(fit, module, context): # Set reload time to 10 seconds diff --git a/eos/effects/velocitybonuspassive.py b/eos/effects/velocitybonuspassive.py index 16f1882ff..fe5d1d757 100755 --- a/eos/effects/velocitybonuspassive.py +++ b/eos/effects/velocitybonuspassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Engine Housing (8 of 8) +# Modules named like: Polycarbon Engine Housing (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"), diff --git a/eos/effects/warfarelinkcpuaddition.py b/eos/effects/warfarelinkcpuaddition.py index a12d32578..d1415ee95 100644 --- a/eos/effects/warfarelinkcpuaddition.py +++ b/eos/effects/warfarelinkcpuaddition.py @@ -1,6 +1,5 @@ # Used by: -# Items from market group: Ship Equipment > Fleet Assistance Modules > Mining Foreman Links (6 of 6) -# Items from market group: Ship Equipment > Fleet Assistance Modules > Warfare Links (24 of 24) +# Modules from group: Gang Coordinator (30 of 31) type = "passive" def handler(fit, module, context): module.increaseItemAttr("cpu", module.getModifiedItemAttr("warfareLinkCPUAdd") or 0) diff --git a/eos/effects/warfarelinkcpupenalty.py b/eos/effects/warfarelinkcpupenalty.py index 76dd3c836..ac36347b3 100755 --- a/eos/effects/warfarelinkcpupenalty.py +++ b/eos/effects/warfarelinkcpupenalty.py @@ -1,12 +1,5 @@ # Used by: -# Subsystems named like: Adaptive (5 of 5) -# Subsystem: Legion Defensive - Augmented Plating -# Subsystem: Legion Defensive - Nanobot Injector -# Subsystem: Loki Defensive - Amplification Node -# Subsystem: Proteus Defensive - Augmented Plating -# Subsystem: Proteus Defensive - Nanobot Injector -# Subsystem: Tengu Defensive - Amplification Node -# Subsystem: Tengu Defensive - Supplemental Screening +# Subsystems from group: Defensive Systems (12 of 16) type = "passive" def handler(fit, module, context): fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("Leadership"), diff --git a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py index 2d9586bcb..4e2103834 100755 --- a/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py +++ b/eos/effects/warpdriveoperationwarpcapacitorneedbonuspostpercentwarpcapacitorneedlocationship.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. WD (6 of 6) +# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Operation WD (6 of 6) type = "passive" def handler(fit, implant, context): fit.ship.boostItemAttr("warpCapacitorNeed", implant.getModifiedItemAttr("warpCapacitorNeedBonus")) diff --git a/eos/effects/warpskillspeed.py b/eos/effects/warpskillspeed.py index 6fd915e9b..4eae764aa 100755 --- a/eos/effects/warpskillspeed.py +++ b/eos/effects/warpskillspeed.py @@ -1,16 +1,7 @@ # Used by: -# Implants named like: Warp WS (6 of 6) -# Modules named like: Velocity Optimizer (8 of 8) -# Implant: Ascendancy Alpha -# Implant: Ascendancy Beta -# Implant: Ascendancy Delta -# Implant: Ascendancy Epsilon -# Implant: Ascendancy Gamma -# Implant: Low-grade Ascendancy Alpha -# Implant: Low-grade Ascendancy Beta -# Implant: Low-grade Ascendancy Delta -# Implant: Low-grade Ascendancy Epsilon -# Implant: Low-grade Ascendancy Gamma +# Implants named like: Ascendancy (10 of 12) +# Implants named like: Eifyr and Co. 'Rogue' Warp Drive Speed WS (6 of 6) +# Modules named like: Hyperspatial Velocity Optimizer (8 of 8) type = "passive" def handler(fit, container, context): fit.ship.boostItemAttr("baseWarpSpeed", container.getModifiedItemAttr("WarpSBonus")) diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py index a0a33e5ef..2dbf14d62 100755 --- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py +++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringgunnery.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: 'Gnome' Weapon WU (6 of 6) +# Implants named like: Zainou 'Gnome' Weapon Upgrades WU (6 of 6) # Skill: Weapon Upgrades type = "passive" def handler(fit, container, context): diff --git a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py index 4e59b063a..3528fb52d 100755 --- a/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py +++ b/eos/effects/weaponupgradescpuneedbonuspostpercentcpulocationshipmodulesrequiringmissilelauncheroperation.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Launcher CPU LE (6 of 6) +# Implants named like: Zainou 'Gnome' Launcher CPU Efficiency LE (6 of 6) # Skill: Weapon Upgrades type = "passive" def handler(fit, container, context): diff --git a/gui/builtinViewColumns/misc.py b/gui/builtinViewColumns/misc.py index 0a5cc5e14..9baa06b1d 100644 --- a/gui/builtinViewColumns/misc.py +++ b/gui/builtinViewColumns/misc.py @@ -375,13 +375,16 @@ class Miscellanea(ViewColumn): elif itemGroup == "Logistic Drone": armorAmount = stuff.getModifiedItemAttr("armorDamageAmount") shieldAmount = stuff.getModifiedItemAttr("shieldBonus") - repAmount = armorAmount or shieldAmount + hullAmount = stuff.getModifiedItemAttr("structureDamageAmount") + repAmount = armorAmount or shieldAmount or hullAmount cycleTime = stuff.getModifiedItemAttr("duration") if not repAmount or not cycleTime: return "", None repPerSec = float(repAmount) * 1000 / cycleTime text = "{0}/s".format(formatAmount(repPerSec, 3, 0, 3)) ttEntries = [] + if hullAmount is not None and repAmount == hullAmount: + ttEntries.append("structure") if armorAmount is not None and repAmount == armorAmount: ttEntries.append("armor") if shieldAmount is not None and repAmount == shieldAmount: diff --git a/service/market.py b/service/market.py index 6a8313051..8fd701b71 100644 --- a/service/market.py +++ b/service/market.py @@ -225,7 +225,17 @@ class Market(): "Goru's Shuttle": False, # Vanity "Guristas Shuttle": False, # Vanity "Tash-Murkon Magnate": False, # Vanity - "Scorpion Ishukone Watch": False } # Vanity + "Scorpion Ishukone Watch": False, # Vanity + "Incursus Aliastra Edition": False, # Vanity + "Merlin Nugoeihuvi Edition": False, # Vanity + "Police Pursuit Comet": False, # Vanity + "Punisher Kador Edition": False, # Vanity + "Rifter Krusual Edition": False, # Vanity + "Abaddon Kador Edition": False, # Vanity + "Hyperion Aliastra Edition": False, # Vanity + "Maelstrom Krusual Edition": False, # Vanity + "Rokh Nugoeihuvi Edition": False, # Vanity + "Mammoth Nefantar Edition": False } # Vanity # List of groups which are forcibly published self.GROUPS_FORCEPUBLISHED = { diff --git a/staticdata/eve.db b/staticdata/eve.db index b12cc2f0a..5cdf69349 100644 Binary files a/staticdata/eve.db and b/staticdata/eve.db differ