From ae02e214f0bcf07ef2ec0e6542802d7686370a63 Mon Sep 17 00:00:00 2001 From: Ryan Holmes Date: Mon, 11 Aug 2014 21:06:09 +0000 Subject: [PATCH] Add effects up to 8.47.816656 --- eos/effects/boostermodifyboosterarmorpenalties.py | 2 +- .../boostermodifyboostermaxvelocityandcapacitorpenalty.py | 2 +- eos/effects/boostermodifyboostermissilepenalty.py | 2 +- eos/effects/boostermodifyboostershieldpenalty.py | 2 +- eos/effects/boostermodifyboosterturretpenalty.py | 2 +- eos/effects/caldarishipewcapacitorneedcc.py | 1 + eos/effects/capacitoremissionsystemskill.py | 2 +- eos/effects/covertopsandreconopscloakmoduledelaybonus.py | 2 +- eos/effects/cynosuraldurationbonus.py | 2 +- eos/effects/cynosuraltheoryconsumptionbonus.py | 2 +- eos/effects/dronetrackingcomputerbonus.py | 2 +- eos/effects/dronetrackingenhancerbonus.py | 2 +- ...tbonuspostpercentcpuoutputlocationshipgroupcomputer.py | 2 +- eos/effects/elitereconbonusgravimetricstrength2.py | 1 + eos/effects/elitereconbonusladarstrength2.py | 1 + eos/effects/elitereconbonusmagnetometricstrength2.py | 1 + eos/effects/elitereconbonusradarstrength2.py | 1 + ...centcapacitylocationshipgroupcapacitorcapacitybonus.py | 2 +- ...uspostpercentrechargeratelocationshipgroupcapacitor.py | 2 +- ...nuspostpercentpoweroutputlocationshipgrouppowercore.py | 2 +- eos/effects/interceptor2warpscramblerange.py | 2 +- eos/effects/interceptormwdsignatureradiusbonus.py | 2 +- .../onlinejumpdriveconsumptionamountbonuspercentage.py | 6 ++++++ eos/effects/overloadselftrackingmodulebonus.py | 2 +- eos/effects/reconshipcloakcpubonus1.py | 2 +- eos/effects/shipbonuskineticmissiledamagegc2.py | 1 + eos/effects/shipbonuskineticmissiledamagegf.py | 1 + eos/effects/shipbonuslightdronearmorhppiratefaction.py | 1 + .../shipbonuslightdronedamagemultiplierpiratefaction.py | 1 + eos/effects/shipbonuslightdronehppiratefaction.py | 1 + eos/effects/shipbonuslightdroneshieldhppiratefaction.py | 1 + eos/effects/shipbonusmediumdronearmorhppiratefaction.py | 1 + .../shipbonusmediumdronedamagemultiplierpiratefaction.py | 1 + eos/effects/shipbonusmediumdronehppiratefaction.py | 1 + eos/effects/shipbonusmediumdroneshieldhppiratefaction.py | 1 + eos/effects/shipbonusthermalmissiledamagegc2.py | 1 + eos/effects/shipbonusthermalmissiledamagegf.py | 1 + eos/effects/shipcappropulsionjamming.py | 2 +- eos/effects/shipshieldemresistancecf2.py | 1 + eos/effects/shipshieldexplosiveresistancecf2.py | 1 + eos/effects/shipshieldkineticresistancecf2.py | 1 + eos/effects/shipshieldthermalresistancecf2.py | 1 + eos/effects/systemaoecloudsize.py | 8 ++++++++ eos/effects/systemaoevelocity.py | 2 +- eos/effects/systemarmoremresistance.py | 1 - eos/effects/systemarmorexplosiveresistance.py | 1 - eos/effects/systemarmorhp.py | 6 ++++++ eos/effects/systemarmorkineticresistance.py | 1 - eos/effects/systemarmorthermalresistance.py | 1 - eos/effects/systemdamageembombs.py | 8 ++++++++ eos/effects/systemdamageexplosivebombs.py | 8 ++++++++ eos/effects/systemdamagekineticbombs.py | 8 ++++++++ eos/effects/systemdamagethermalbombs.py | 8 ++++++++ eos/effects/systemdronecontrolrange.py | 7 ------- eos/effects/systemenergyneutmultiplier.py | 8 ++++++++ eos/effects/systemenergyvampiremultiplier.py | 8 ++++++++ eos/effects/systemfalloffrangegunnery.py | 7 ------- eos/effects/systemgravimetricecmbomb.py | 8 ++++++++ eos/effects/systemladarecmbomb.py | 8 ++++++++ eos/effects/systemmagnetrometricecmbomb.py | 8 ++++++++ eos/effects/systemneutbombs.py | 8 ++++++++ eos/effects/systemoptimalrangegunnery.py | 7 ------- eos/effects/systemradarecmbomb.py | 8 ++++++++ eos/effects/systemremotecaptransmitteramount.py | 8 ++++++++ eos/effects/systemtargetingrange.py | 2 +- eos/effects/systemtargetpaintermultiplier.py | 8 ++++++++ eos/effects/systemwebifierstrengthmultiplier.py | 8 ++++++++ 67 files changed, 175 insertions(+), 47 deletions(-) create mode 100644 eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py create mode 100644 eos/effects/systemaoecloudsize.py create mode 100644 eos/effects/systemarmorhp.py create mode 100644 eos/effects/systemdamageembombs.py create mode 100644 eos/effects/systemdamageexplosivebombs.py create mode 100644 eos/effects/systemdamagekineticbombs.py create mode 100644 eos/effects/systemdamagethermalbombs.py delete mode 100644 eos/effects/systemdronecontrolrange.py create mode 100644 eos/effects/systemenergyneutmultiplier.py create mode 100644 eos/effects/systemenergyvampiremultiplier.py delete mode 100644 eos/effects/systemfalloffrangegunnery.py create mode 100644 eos/effects/systemgravimetricecmbomb.py create mode 100644 eos/effects/systemladarecmbomb.py create mode 100644 eos/effects/systemmagnetrometricecmbomb.py create mode 100644 eos/effects/systemneutbombs.py delete mode 100644 eos/effects/systemoptimalrangegunnery.py create mode 100644 eos/effects/systemradarecmbomb.py create mode 100644 eos/effects/systemremotecaptransmitteramount.py create mode 100644 eos/effects/systemtargetpaintermultiplier.py create mode 100644 eos/effects/systemwebifierstrengthmultiplier.py diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py index b9a469b97..6adbea146 100644 --- a/eos/effects/boostermodifyboosterarmorpenalties.py +++ b/eos/effects/boostermodifyboosterarmorpenalties.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control type = "passive" diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py index 12f06c2bb..1aea9442f 100644 --- a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py +++ b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control type = "passive" diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/boostermodifyboostermissilepenalty.py index 6523d5c6f..0f5149f8b 100644 --- a/eos/effects/boostermodifyboostermissilepenalty.py +++ b/eos/effects/boostermodifyboostermissilepenalty.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control type = "passive" diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/boostermodifyboostershieldpenalty.py index 9498d005f..060e27a90 100644 --- a/eos/effects/boostermodifyboostershieldpenalty.py +++ b/eos/effects/boostermodifyboostershieldpenalty.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control type = "passive" diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/boostermodifyboosterturretpenalty.py index 8f10e8e08..b9f57b95b 100644 --- a/eos/effects/boostermodifyboosterturretpenalty.py +++ b/eos/effects/boostermodifyboosterturretpenalty.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) +# Implants named like: Eifyr and Co. 'Alchemist' Neurotoxin Control NC (2 of 2) # Implants named like: grade Edge (10 of 12) # Skill: Neurotoxin Control type = "passive" diff --git a/eos/effects/caldarishipewcapacitorneedcc.py b/eos/effects/caldarishipewcapacitorneedcc.py index 3cf02ab7d..ac865688f 100644 --- a/eos/effects/caldarishipewcapacitorneedcc.py +++ b/eos/effects/caldarishipewcapacitorneedcc.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Falcon # Ship: Rook type = "passive" diff --git a/eos/effects/capacitoremissionsystemskill.py b/eos/effects/capacitoremissionsystemskill.py index a91275659..18b9913ac 100644 --- a/eos/effects/capacitoremissionsystemskill.py +++ b/eos/effects/capacitoremissionsystemskill.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent Implants 'Squire' Energy Emission Systems ES (6 of 6) +# Implants named like: Inherent Implants 'Squire' Capacitor Emission Systems ES (6 of 6) # Modules named like: Egress Port Maximizer (8 of 8) # Skill: Capacitor Emission Systems type = "passive" diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py index 2d6f6ea72..448c08b35 100644 --- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py +++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py @@ -2,7 +2,7 @@ # Ships from group: Black Ops (4 of 4) # Ships from group: Blockade Runner (4 of 4) # Ships from group: Covert Ops (5 of 5) -# Ships from group: Force Recon Ship (5 of 5) +# Ships from group: Force Recon Ship (6 of 6) # Ships from group: Stealth Bomber (4 of 4) # Ships named like: Stratios (2 of 2) # Subsystems named like: Offensive Covert Reconfiguration (4 of 4) diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py index 43f35d979..8e9907e35 100644 --- a/eos/effects/cynosuraldurationbonus.py +++ b/eos/effects/cynosuraldurationbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (4 of 5) +# Ships from group: Force Recon Ship (5 of 6) 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 270c56adb..c764d9557 100644 --- a/eos/effects/cynosuraltheoryconsumptionbonus.py +++ b/eos/effects/cynosuraltheoryconsumptionbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (4 of 5) +# Ships from group: Force Recon Ship (5 of 6) # Skill: Cynosural Field Theory type = "passive" def handler(fit, container, context): diff --git a/eos/effects/dronetrackingcomputerbonus.py b/eos/effects/dronetrackingcomputerbonus.py index 1cc55be2c..93c907eda 100644 --- a/eos/effects/dronetrackingcomputerbonus.py +++ b/eos/effects/dronetrackingcomputerbonus.py @@ -1,5 +1,5 @@ # Used by: -# Variations of module: Omnidirectional Tracking Link I (8 of 8) +# Modules from group: Drone Tracking Modules (8 of 8) type = "active" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), diff --git a/eos/effects/dronetrackingenhancerbonus.py b/eos/effects/dronetrackingenhancerbonus.py index e74472c76..3f8263b5d 100644 --- a/eos/effects/dronetrackingenhancerbonus.py +++ b/eos/effects/dronetrackingenhancerbonus.py @@ -1,5 +1,5 @@ # Used by: -# Variations of module: Omnidirectional Tracking Enhancer I (9 of 9) +# Modules from group: Drone Tracking Enhancer (9 of 9) type = "passive" def handler(fit, module, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Drones"), diff --git a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py index 4bf205006..b9d3d630f 100644 --- a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py +++ b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Zainou 'Gypsy' Electronics EE (6 of 6) +# Implants named like: Zainou 'Gypsy' CPU Management EE (6 of 6) # Modules named like: Processor Overclocking Unit (8 of 8) # Implant: Genolution Core Augmentation CA-2 # Skill: CPU Management diff --git a/eos/effects/elitereconbonusgravimetricstrength2.py b/eos/effects/elitereconbonusgravimetricstrength2.py index 1c3134077..1a09ccbba 100644 --- a/eos/effects/elitereconbonusgravimetricstrength2.py +++ b/eos/effects/elitereconbonusgravimetricstrength2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Falcon # Ship: Rook type = "passive" diff --git a/eos/effects/elitereconbonusladarstrength2.py b/eos/effects/elitereconbonusladarstrength2.py index fb8051783..d5499aa28 100644 --- a/eos/effects/elitereconbonusladarstrength2.py +++ b/eos/effects/elitereconbonusladarstrength2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Falcon # Ship: Rook type = "passive" diff --git a/eos/effects/elitereconbonusmagnetometricstrength2.py b/eos/effects/elitereconbonusmagnetometricstrength2.py index f11e9aa22..44b852f97 100644 --- a/eos/effects/elitereconbonusmagnetometricstrength2.py +++ b/eos/effects/elitereconbonusmagnetometricstrength2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Falcon # Ship: Rook type = "passive" diff --git a/eos/effects/elitereconbonusradarstrength2.py b/eos/effects/elitereconbonusradarstrength2.py index 5db4d230d..df69a8aa1 100644 --- a/eos/effects/elitereconbonusradarstrength2.py +++ b/eos/effects/elitereconbonusradarstrength2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Falcon # Ship: Rook type = "passive" diff --git a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py index 73dd2c782..0ff1f2484 100644 --- a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py +++ b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent Implants 'Squire' Energy Management EM (6 of 6) +# Implants named like: Inherent Implants 'Squire' Capacitor Management EM (6 of 6) # Implants named like: Mindflood Booster (4 of 4) # Modules named like: Semiconductor Memory Cell (8 of 8) # Implant: Genolution Core Augmentation CA-1 diff --git a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py index 4fc03f2f1..000fa8fb9 100644 --- a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py +++ b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent Implants 'Squire' Energy Systems Operation EO (6 of 6) +# Implants named like: Inherent Implants 'Squire' Capacitor 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 diff --git a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py index 6f3294930..eccc87018 100644 --- a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py +++ b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Inherent Implants 'Squire' Engineering EG (6 of 6) +# Implants named like: Inherent Implants 'Squire' Power Grid Management EG (6 of 6) # Modules named like: Ancillary Current Router (8 of 8) # Implant: Genolution Core Augmentation CA-1 # Skill: Power Grid Management diff --git a/eos/effects/interceptor2warpscramblerange.py b/eos/effects/interceptor2warpscramblerange.py index d4da3b926..23a1ecc29 100644 --- a/eos/effects/interceptor2warpscramblerange.py +++ b/eos/effects/interceptor2warpscramblerange.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Interceptor (4 of 8) +# Ships from group: Interceptor (5 of 9) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Interceptors").level diff --git a/eos/effects/interceptormwdsignatureradiusbonus.py b/eos/effects/interceptormwdsignatureradiusbonus.py index a0d98074f..3b18ac7a6 100644 --- a/eos/effects/interceptormwdsignatureradiusbonus.py +++ b/eos/effects/interceptormwdsignatureradiusbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Interceptor (8 of 8) +# Ships from group: Interceptor (9 of 9) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Interceptors").level diff --git a/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py b/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py new file mode 100644 index 000000000..6db99d581 --- /dev/null +++ b/eos/effects/onlinejumpdriveconsumptionamountbonuspercentage.py @@ -0,0 +1,6 @@ +# Used by: +# Modules from group: Jump Drive Economizer (3 of 3) +runTime = "early" +type = ("projected", "offline") +def handler(fit, module, context): + fit.ship.boostItemAttr("jumpDriveConsumptionAmount", module.getModifiedItemAttr("consumptionQuantityBonusPercentage"), stackingPenalties=True) diff --git a/eos/effects/overloadselftrackingmodulebonus.py b/eos/effects/overloadselftrackingmodulebonus.py index f8ce8e23a..63bb0dc41 100644 --- a/eos/effects/overloadselftrackingmodulebonus.py +++ b/eos/effects/overloadselftrackingmodulebonus.py @@ -1,8 +1,8 @@ # Used by: +# Modules from group: Drone Tracking Modules (8 of 8) # Modules from group: Remote Tracking Computer (10 of 10) # Modules from group: Tracking Computer (14 of 14) # Modules from group: Tracking Disruptor (10 of 10) -# Variations of module: Omnidirectional Tracking Link I (8 of 8) type = "overheat" def handler(fit, module, context): module.boostItemAttr("maxRangeBonus", module.getModifiedItemAttr("overloadTrackingModuleStrengthBonus")) diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py index ea8478809..54dab92c1 100644 --- a/eos/effects/reconshipcloakcpubonus1.py +++ b/eos/effects/reconshipcloakcpubonus1.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (5 of 5) +# Ships from group: Force Recon Ship (6 of 6) type = "passive" runTime = "early" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuskineticmissiledamagegc2.py b/eos/effects/shipbonuskineticmissiledamagegc2.py index 9bb111c97..f9c088387 100644 --- a/eos/effects/shipbonuskineticmissiledamagegc2.py +++ b/eos/effects/shipbonuskineticmissiledamagegc2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuskineticmissiledamagegf.py b/eos/effects/shipbonuskineticmissiledamagegf.py index ade33f76e..9436e9460 100644 --- a/eos/effects/shipbonuskineticmissiledamagegf.py +++ b/eos/effects/shipbonuskineticmissiledamagegf.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslightdronearmorhppiratefaction.py b/eos/effects/shipbonuslightdronearmorhppiratefaction.py index 8d3bc5abe..6954b29e6 100644 --- a/eos/effects/shipbonuslightdronearmorhppiratefaction.py +++ b/eos/effects/shipbonuslightdronearmorhppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py index b32738969..20c146264 100644 --- a/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py +++ b/eos/effects/shipbonuslightdronedamagemultiplierpiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslightdronehppiratefaction.py b/eos/effects/shipbonuslightdronehppiratefaction.py index d17415975..659f8c056 100644 --- a/eos/effects/shipbonuslightdronehppiratefaction.py +++ b/eos/effects/shipbonuslightdronehppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py index 46af165d7..3fd4f9e50 100644 --- a/eos/effects/shipbonuslightdroneshieldhppiratefaction.py +++ b/eos/effects/shipbonuslightdroneshieldhppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py index 984b0c158..0d2fa0015 100644 --- a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py +++ b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py index 6ca16a880..1dfe999a7 100644 --- a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py +++ b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusmediumdronehppiratefaction.py b/eos/effects/shipbonusmediumdronehppiratefaction.py index 213e422bd..8f34d3d31 100644 --- a/eos/effects/shipbonusmediumdronehppiratefaction.py +++ b/eos/effects/shipbonusmediumdronehppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py index cc3e9f748..94cf5ac3d 100644 --- a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py +++ b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusthermalmissiledamagegc2.py b/eos/effects/shipbonusthermalmissiledamagegc2.py index 3118eda47..a0a403f24 100644 --- a/eos/effects/shipbonusthermalmissiledamagegc2.py +++ b/eos/effects/shipbonusthermalmissiledamagegc2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chameleon # Ship: Gila type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusthermalmissiledamagegf.py b/eos/effects/shipbonusthermalmissiledamagegf.py index 54cb34bf1..09e8200ca 100644 --- a/eos/effects/shipbonusthermalmissiledamagegf.py +++ b/eos/effects/shipbonusthermalmissiledamagegf.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Whiptail # Ship: Worm type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipcappropulsionjamming.py b/eos/effects/shipcappropulsionjamming.py index 3beb44b7a..d3472456c 100644 --- a/eos/effects/shipcappropulsionjamming.py +++ b/eos/effects/shipcappropulsionjamming.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Interceptor (8 of 8) +# Ships from group: Interceptor (9 of 9) # Ship: Atron # Ship: Condor # Ship: Executioner diff --git a/eos/effects/shipshieldemresistancecf2.py b/eos/effects/shipshieldemresistancecf2.py index 0e67bee51..3d2f73634 100644 --- a/eos/effects/shipshieldemresistancecf2.py +++ b/eos/effects/shipshieldemresistancecf2.py @@ -2,6 +2,7 @@ # Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion +# Ship: Whiptail 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 e8def6e2f..d820f2c41 100644 --- a/eos/effects/shipshieldexplosiveresistancecf2.py +++ b/eos/effects/shipshieldexplosiveresistancecf2.py @@ -2,6 +2,7 @@ # Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion +# Ship: Whiptail 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 c72f4b470..d3c04728a 100644 --- a/eos/effects/shipshieldkineticresistancecf2.py +++ b/eos/effects/shipshieldkineticresistancecf2.py @@ -2,6 +2,7 @@ # Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion +# Ship: Whiptail 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 b86239d38..821334aa4 100644 --- a/eos/effects/shipshieldthermalresistancecf2.py +++ b/eos/effects/shipshieldthermalresistancecf2.py @@ -2,6 +2,7 @@ # Ships named like: Merlin (3 of 3) # Variations of ship: Merlin (3 of 4) # Ship: Cambion +# Ship: Whiptail type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Frigate").level diff --git a/eos/effects/systemaoecloudsize.py b/eos/effects/systemaoecloudsize.py new file mode 100644 index 000000000..0bc10969f --- /dev/null +++ b/eos/effects/systemaoecloudsize.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "aoeCloudSize", beacon.getModifiedItemAttr("aoeCloudSizeMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemaoevelocity.py b/eos/effects/systemaoevelocity.py index 55ba48437..30c13b99b 100644 --- a/eos/effects/systemaoevelocity.py +++ b/eos/effects/systemaoevelocity.py @@ -1,5 +1,5 @@ # Used by: -# Celestials named like: Magnetar Effect Beacon 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/systemarmoremresistance.py b/eos/effects/systemarmoremresistance.py index 83b8073f8..b59d75a9d 100644 --- a/eos/effects/systemarmoremresistance.py +++ b/eos/effects/systemarmoremresistance.py @@ -1,7 +1,6 @@ # 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 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 b3e7abc8a..2add341d8 100644 --- a/eos/effects/systemarmorexplosiveresistance.py +++ b/eos/effects/systemarmorexplosiveresistance.py @@ -1,7 +1,6 @@ # 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 Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmorhp.py b/eos/effects/systemarmorhp.py new file mode 100644 index 000000000..0dbbe579d --- /dev/null +++ b/eos/effects/systemarmorhp.py @@ -0,0 +1,6 @@ +# Used by: +# Celestials named like: Wolf Rayet Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.ship.multiplyItemAttr("armorHP", beacon.getModifiedItemAttr("armorHPMultiplier")) diff --git a/eos/effects/systemarmorkineticresistance.py b/eos/effects/systemarmorkineticresistance.py index 850929406..8a3237cc6 100644 --- a/eos/effects/systemarmorkineticresistance.py +++ b/eos/effects/systemarmorkineticresistance.py @@ -1,7 +1,6 @@ # 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 Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemarmorthermalresistance.py b/eos/effects/systemarmorthermalresistance.py index bdd602dc1..d6e07c420 100644 --- a/eos/effects/systemarmorthermalresistance.py +++ b/eos/effects/systemarmorthermalresistance.py @@ -1,7 +1,6 @@ # 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 Effect Beacon Class (6 of 6) runTime = "early" type = ("projected", "offline") def handler(fit, beacon, context): diff --git a/eos/effects/systemdamageembombs.py b/eos/effects/systemdamageembombs.py new file mode 100644 index 000000000..9cba57db7 --- /dev/null +++ b/eos/effects/systemdamageembombs.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "emDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemdamageexplosivebombs.py b/eos/effects/systemdamageexplosivebombs.py new file mode 100644 index 000000000..c9213c35e --- /dev/null +++ b/eos/effects/systemdamageexplosivebombs.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "explosiveDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemdamagekineticbombs.py b/eos/effects/systemdamagekineticbombs.py new file mode 100644 index 000000000..a09784fd0 --- /dev/null +++ b/eos/effects/systemdamagekineticbombs.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "kineticDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemdamagethermalbombs.py b/eos/effects/systemdamagethermalbombs.py new file mode 100644 index 000000000..cd38c712c --- /dev/null +++ b/eos/effects/systemdamagethermalbombs.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "thermalDamage", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemdronecontrolrange.py b/eos/effects/systemdronecontrolrange.py deleted file mode 100644 index 25042b4f8..000000000 --- a/eos/effects/systemdronecontrolrange.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Celestials named like: Black Hole Effect Beacon Class (6 of 6) -runTime = "early" -type = ("projected", "offline") -def handler(fit, beacon, context): - amount = beacon.getModifiedItemAttr("droneRangeMultiplier") - fit.extraAttributes.multiply("droneControlRange", amount) diff --git a/eos/effects/systemenergyneutmultiplier.py b/eos/effects/systemenergyneutmultiplier.py new file mode 100644 index 000000000..a04fe19e1 --- /dev/null +++ b/eos/effects/systemenergyneutmultiplier.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Pulsar Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Destabilizer", + "energyDestabilizationAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemenergyvampiremultiplier.py b/eos/effects/systemenergyvampiremultiplier.py new file mode 100644 index 000000000..7120479c1 --- /dev/null +++ b/eos/effects/systemenergyvampiremultiplier.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Pulsar Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Energy Vampire", + "powerTransferAmount", beacon.getModifiedItemAttr("energyWarfareStrengthMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemfalloffrangegunnery.py b/eos/effects/systemfalloffrangegunnery.py deleted file mode 100644 index dbce30d32..000000000 --- a/eos/effects/systemfalloffrangegunnery.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Celestials named like: Black Hole Effect Beacon Class (6 of 6) -runTime = "early" -type = ("projected", "offline") -def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"), - "falloff", module.getModifiedItemAttr("fallofMultiplier")) diff --git a/eos/effects/systemgravimetricecmbomb.py b/eos/effects/systemgravimetricecmbomb.py new file mode 100644 index 000000000..225e9ec70 --- /dev/null +++ b/eos/effects/systemgravimetricecmbomb.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "scanGravimetricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemladarecmbomb.py b/eos/effects/systemladarecmbomb.py new file mode 100644 index 000000000..76f45cabd --- /dev/null +++ b/eos/effects/systemladarecmbomb.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "scanLadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemmagnetrometricecmbomb.py b/eos/effects/systemmagnetrometricecmbomb.py new file mode 100644 index 000000000..9acae418c --- /dev/null +++ b/eos/effects/systemmagnetrometricecmbomb.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "scanMagnetometricStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemneutbombs.py b/eos/effects/systemneutbombs.py new file mode 100644 index 000000000..fe7a45de3 --- /dev/null +++ b/eos/effects/systemneutbombs.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "energyDestabilizationAmount", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemoptimalrangegunnery.py b/eos/effects/systemoptimalrangegunnery.py deleted file mode 100644 index 43dad5885..000000000 --- a/eos/effects/systemoptimalrangegunnery.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Celestials named like: Black Hole Effect Beacon Class (6 of 6) -runTime = "early" -type = ("projected", "offline") -def handler(fit, module, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Gunnery"), - "maxRange", module.getModifiedItemAttr("maxRangeMultiplier")) diff --git a/eos/effects/systemradarecmbomb.py b/eos/effects/systemradarecmbomb.py new file mode 100644 index 000000000..4e6cf3a8f --- /dev/null +++ b/eos/effects/systemradarecmbomb.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Red Giant Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredChargeMultiply(lambda mod: mod.charge.requiresSkill("Bomb Deployment"), + "scanRadarStrengthBonus", beacon.getModifiedItemAttr("smartbombDamageMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemremotecaptransmitteramount.py b/eos/effects/systemremotecaptransmitteramount.py new file mode 100644 index 000000000..32be8aba6 --- /dev/null +++ b/eos/effects/systemremotecaptransmitteramount.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Cataclysmic Variable Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Remote Capacitor Transmitter", + "powerTransferAmount", beacon.getModifiedItemAttr("energyTransferAmountBonus"), + penaltyGroup="postMul") diff --git a/eos/effects/systemtargetingrange.py b/eos/effects/systemtargetingrange.py index 3d3269d47..859c65a80 100644 --- a/eos/effects/systemtargetingrange.py +++ b/eos/effects/systemtargetingrange.py @@ -1,6 +1,6 @@ # Used by: +# Celestials named like: Black Hole Effect Beacon 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") def handler(fit, beacon, context): diff --git a/eos/effects/systemtargetpaintermultiplier.py b/eos/effects/systemtargetpaintermultiplier.py new file mode 100644 index 000000000..497ef4623 --- /dev/null +++ b/eos/effects/systemtargetpaintermultiplier.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Magnetar Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill("Target Painting"), + "signatureRadiusBonus", beacon.getModifiedItemAttr("targetPainterStrengthMultiplier"), + penaltyGroup="postMul") diff --git a/eos/effects/systemwebifierstrengthmultiplier.py b/eos/effects/systemwebifierstrengthmultiplier.py new file mode 100644 index 000000000..dacfeedd2 --- /dev/null +++ b/eos/effects/systemwebifierstrengthmultiplier.py @@ -0,0 +1,8 @@ +# Used by: +# Celestials named like: Black Hole Effect Beacon Class (6 of 6) +runTime = "early" +type = ("projected", "offline") +def handler(fit, beacon, context): + fit.modules.filteredItemMultiply(lambda mod: mod.item.group.name == "Stasis Web", + "speedFactor", beacon.getModifiedItemAttr("stasisWebStrengthMultiplier"), + stackingPenalties = True, penaltyGroup="postMul")