From f11f3bfb7949f1b8b07be259fa7e011285c21bb1 Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Thu, 15 Jan 2015 02:35:22 +0300 Subject: [PATCH] Implement recon effect changes --- eos/effects/agilitymultipliereffect.py | 6 +++--- eos/effects/capacitorcapacitymultiply.py | 4 ++-- eos/effects/cargocapacitymultiply.py | 6 +++--- .../elitebonusheavygunshipdronecontrolrange1.py | 1 + eos/effects/elitebonusheavygunshiphybriddmg2.py | 1 + eos/effects/elitebonusheavygunshiphybridoptimal1.py | 1 + eos/effects/elitereconbonusassaultlauncherrof1.py | 10 ---------- eos/effects/elitereconbonusheavyassaultlauncherrof1.py | 9 --------- eos/effects/elitereconbonusheavylauncherrof1.py | 10 ---------- eos/effects/elitereconbonusmhtoptimalrange1.py | 9 +++++++++ eos/effects/elitereconbonusmptdamage1.py | 9 +++++++++ eos/effects/elitereconbonusneutrange3.py | 9 +++++++++ eos/effects/elitereconbonusvamprange3.py | 9 +++++++++ ...vestcycletimemodulesrequiringiceharvestingonline.py | 2 +- eos/effects/iceminercpuusagepercent.py | 2 +- eos/effects/increasesignatureradiusonline.py | 2 +- eos/effects/minercpuusagemultiplypercent2.py | 2 +- eos/effects/mininglaser.py | 2 +- eos/effects/miningyieldmultiplypercent.py | 2 +- eos/effects/modifymaxvelocityofshippassive.py | 2 +- eos/effects/modifypowerrechargerate.py | 6 +++--- eos/effects/modifyshieldrechargerate.py | 4 ++-- eos/effects/mwdsignatureradiusrolebonus.py | 2 +- eos/effects/poweroutputmultiply.py | 4 ++-- eos/effects/shieldboostamplifier.py | 2 +- eos/effects/shieldcapacitymultiply.py | 4 ++-- eos/effects/shipbonusarmorresistab.py | 1 + eos/effects/shipbonusdronearmorhitpointsab.py | 1 + eos/effects/shipbonusdronedamagemultiplierab.py | 1 + eos/effects/shipbonusdronedamagemultipliergb2.py | 2 ++ eos/effects/shipbonusdronedamagemultipliergc2.py | 2 ++ eos/effects/shipbonusdronehitpointsgb2.py | 2 ++ eos/effects/shipbonusdronehitpointsgc2.py | 2 ++ eos/effects/shipbonusdronehitpointsgf.py | 2 +- eos/effects/shipbonusdroneminingamountgc2.py | 3 +-- eos/effects/shipbonusdroneoptimalrangegb.py | 2 ++ eos/effects/shipbonusdroneshieldhitpointsab.py | 1 + eos/effects/shipbonusdronestructurehitpointsab.py | 1 + eos/effects/shipbonusdronetrackinggb.py | 2 ++ eos/effects/shipbonusdronetrackinggf.py | 2 +- eos/effects/shipbonusemshieldresistancecb2.py | 1 + eos/effects/shipbonusenergyneutrangeab2.py | 1 + eos/effects/shipbonusenergyvampirerangeab2.py | 1 + eos/effects/shipbonusexplosiveshieldresistancecb2.py | 1 + .../shipbonusheavyassaultlauncherrateoffirecc2.py | 9 --------- .../shipbonusheavyassaultmissilekineticdamagecbc1.py | 1 + eos/effects/shipbonusheavydronearmorhppiratefaction.py | 1 + ...shipbonusheavydronedamagemultiplierpiratefaction.py | 1 + eos/effects/shipbonusheavydronehppiratefaction.py | 1 + .../shipbonusheavydroneshieldhppiratefaction.py | 1 + eos/effects/shipbonusheavydronespeedgc.py | 1 + eos/effects/shipbonusheavydronetrackinggc.py | 1 + eos/effects/shipbonusheavylauncherrateoffirecc2.py | 9 --------- eos/effects/shipbonusheavymissilekineticdamagecbc1.py | 1 + eos/effects/shipbonushybridtrackinggf2.py | 2 +- eos/effects/shipbonuskineticmissiledamagegb2.py | 1 + eos/effects/shipbonuskineticmissiledamagegc2.py | 1 + eos/effects/shipbonuskineticshieldresistancecb2.py | 1 + eos/effects/shipbonuslargeenergyturretmaxrangeab2.py | 1 + eos/effects/shipbonuslargeenergyturrettrackingab.py | 1 + eos/effects/shipbonuslargeenergyweapondamageab2.py | 1 + .../shipbonusmediumdronearmorhppiratefaction.py | 1 + ...hipbonusmediumdronedamagemultiplierpiratefaction.py | 1 + eos/effects/shipbonusmediumdronehppiratefaction.py | 1 + .../shipbonusmediumdroneshieldhppiratefaction.py | 1 + eos/effects/shipbonusrhmlrof2cb.py | 1 + .../shipbonussentrydronearmorhppiratefaction.py | 1 + ...hipbonussentrydronedamagemultiplierpiratefaction.py | 1 + eos/effects/shipbonussentrydronehppiratefaction.py | 1 + ...ussentrydroneoptimalrangeelitebonusheavygunship2.py | 1 + .../shipbonussentrydroneshieldhppiratefaction.py | 1 + ...pbonussentrydronetrackingelitebonusheavygunship2.py | 1 + eos/effects/shipbonusthermalmissiledamagegb2.py | 1 + eos/effects/shipbonusthermalmissiledamagegc2.py | 1 + eos/effects/shipbonusthermicshieldresistancecb2.py | 1 + eos/effects/shipcruiselauncherrofbonus2cb.py | 1 + eos/effects/shipcruisemissilevelocitybonuscb3.py | 1 + eos/effects/shiphrangebonuscc.py | 1 + eos/effects/shiphtdmgbonusfixedgc.py | 4 +--- eos/effects/shiphttrackingbonusgb2.py | 1 + eos/effects/shiphybridtrackinggc.py | 1 + eos/effects/shiplargehybridturretrofgb.py | 1 + eos/effects/shipmissilebonusemdmgmc.py | 9 +++++++++ eos/effects/shipmissilebonusexpdmgmc.py | 9 +++++++++ eos/effects/shipmissilebonuskindmgmc.py | 9 +++++++++ eos/effects/shipmissilebonusthermdmgmc.py | 9 +++++++++ eos/effects/shipmissilekindamagecc2.py | 1 + eos/effects/shipprojectilerofpiratebattleship.py | 1 + eos/effects/shipptdmgbonusmb.py | 1 + eos/effects/shippturretfalloffbonusgb.py | 1 + eos/effects/shippturretspeedbonusmc.py | 1 - eos/effects/shipshieldemresistance1cbc2.py | 1 + eos/effects/shipshieldemresistancecc2.py | 2 ++ eos/effects/shipshieldexplosiveresistance1cbc2.py | 1 + eos/effects/shipshieldexplosiveresistancecc2.py | 2 ++ eos/effects/shipshieldkineticresistance1cbc2.py | 1 + eos/effects/shipshieldkineticresistancecc2.py | 2 ++ eos/effects/shipshieldthermalresistance1cbc2.py | 1 + eos/effects/shipshieldthermalresistancecc2.py | 2 ++ eos/effects/shipsiegelauncherrofbonus2cb.py | 1 + eos/effects/shiptorpedosvelocitybonuscb3.py | 1 + eos/effects/structurehpmultiply.py | 4 ++-- eos/effects/structurehpmultiplypassive.py | 2 +- eos/effects/velocitybonusonline.py | 4 ++-- 104 files changed, 184 insertions(+), 87 deletions(-) delete mode 100644 eos/effects/elitereconbonusassaultlauncherrof1.py delete mode 100644 eos/effects/elitereconbonusheavyassaultlauncherrof1.py delete mode 100644 eos/effects/elitereconbonusheavylauncherrof1.py create mode 100644 eos/effects/elitereconbonusmhtoptimalrange1.py create mode 100644 eos/effects/elitereconbonusmptdamage1.py create mode 100644 eos/effects/elitereconbonusneutrange3.py create mode 100644 eos/effects/elitereconbonusvamprange3.py delete mode 100644 eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py delete mode 100644 eos/effects/shipbonusheavylauncherrateoffirecc2.py create mode 100644 eos/effects/shipmissilebonusemdmgmc.py create mode 100644 eos/effects/shipmissilebonusexpdmgmc.py create mode 100644 eos/effects/shipmissilebonuskindmgmc.py create mode 100644 eos/effects/shipmissilebonusthermdmgmc.py diff --git a/eos/effects/agilitymultipliereffect.py b/eos/effects/agilitymultipliereffect.py index 9478201f3..11306be36 100644 --- a/eos/effects/agilitymultipliereffect.py +++ b/eos/effects/agilitymultipliereffect.py @@ -1,9 +1,9 @@ # agilityMultiplierEffect # # Used by: -# Modules from group: Inertia Stabilizer (12 of 12) -# Modules from group: Nanofiber Internal Structure (14 of 14) -# Modules from group: Reinforced Bulkhead (12 of 12) +# Modules from group: Inertial Stabilizer (7 of 7) +# Modules from group: Nanofiber Internal Structure (7 of 7) +# Modules from group: Reinforced Bulkhead (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("agility", diff --git a/eos/effects/capacitorcapacitymultiply.py b/eos/effects/capacitorcapacitymultiply.py index d761c502c..17e9d1da4 100644 --- a/eos/effects/capacitorcapacitymultiply.py +++ b/eos/effects/capacitorcapacitymultiply.py @@ -2,8 +2,8 @@ # # Used by: # Modules from group: Capacitor Flux Coil (6 of 6) -# Modules from group: Capacitor Power Relay (26 of 26) -# Modules from group: Power Diagnostic System (31 of 31) +# Modules from group: Capacitor Power Relay (20 of 20) +# Modules from group: Power Diagnostic System (23 of 23) # Modules from group: Propulsion Module (107 of 107) # Modules from group: Reactor Control Unit (22 of 22) # Modules from group: Shield Flux Coil (11 of 11) diff --git a/eos/effects/cargocapacitymultiply.py b/eos/effects/cargocapacitymultiply.py index c98c31387..c476f9b79 100644 --- a/eos/effects/cargocapacitymultiply.py +++ b/eos/effects/cargocapacitymultiply.py @@ -1,9 +1,9 @@ # cargoCapacityMultiply # # Used by: -# Modules from group: Expanded Cargohold (13 of 13) -# Modules from group: Overdrive Injector System (14 of 14) -# Modules from group: Reinforced Bulkhead (12 of 12) +# Modules from group: Expanded Cargohold (7 of 7) +# Modules from group: Overdrive Injector System (7 of 7) +# Modules from group: Reinforced Bulkhead (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("capacity", module.getModifiedItemAttr("cargoCapacityMultiplier")) diff --git a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py index 50a9e1e7e..9317ba82d 100644 --- a/eos/effects/elitebonusheavygunshipdronecontrolrange1.py +++ b/eos/effects/elitebonusheavygunshipdronecontrolrange1.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Ishtar +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Heavy Assault Cruisers").level diff --git a/eos/effects/elitebonusheavygunshiphybriddmg2.py b/eos/effects/elitebonusheavygunshiphybriddmg2.py index 002156a4b..e7c0108e9 100644 --- a/eos/effects/elitebonusheavygunshiphybriddmg2.py +++ b/eos/effects/elitebonusheavygunshiphybriddmg2.py @@ -3,6 +3,7 @@ # Used by: # Ship: Deimos # Ship: Eagle +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Heavy Assault Cruisers").level diff --git a/eos/effects/elitebonusheavygunshiphybridoptimal1.py b/eos/effects/elitebonusheavygunshiphybridoptimal1.py index 983c3c420..fabe393e1 100644 --- a/eos/effects/elitebonusheavygunshiphybridoptimal1.py +++ b/eos/effects/elitebonusheavygunshiphybridoptimal1.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Eagle +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Heavy Assault Cruisers").level diff --git a/eos/effects/elitereconbonusassaultlauncherrof1.py b/eos/effects/elitereconbonusassaultlauncherrof1.py deleted file mode 100644 index b4237469e..000000000 --- a/eos/effects/elitereconbonusassaultlauncherrof1.py +++ /dev/null @@ -1,10 +0,0 @@ -# eliteReconBonusAssaultLauncherROF1 -# -# Used by: -# Ship: Huginn -# Ship: Lachesis -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) diff --git a/eos/effects/elitereconbonusheavyassaultlauncherrof1.py b/eos/effects/elitereconbonusheavyassaultlauncherrof1.py deleted file mode 100644 index 15c7c8e29..000000000 --- a/eos/effects/elitereconbonusheavyassaultlauncherrof1.py +++ /dev/null @@ -1,9 +0,0 @@ -# eliteReconBonusHeavyAssaultLauncherROF1 -# -# Used by: -# Ship: Huginn -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) diff --git a/eos/effects/elitereconbonusheavylauncherrof1.py b/eos/effects/elitereconbonusheavylauncherrof1.py deleted file mode 100644 index bbce42793..000000000 --- a/eos/effects/elitereconbonusheavylauncherrof1.py +++ /dev/null @@ -1,10 +0,0 @@ -# eliteReconBonusHeavyLauncherROF1 -# -# Used by: -# Ship: Huginn -# Ship: Lachesis -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Recon Ships").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) diff --git a/eos/effects/elitereconbonusmhtoptimalrange1.py b/eos/effects/elitereconbonusmhtoptimalrange1.py new file mode 100644 index 000000000..4f9ad6048 --- /dev/null +++ b/eos/effects/elitereconbonusmhtoptimalrange1.py @@ -0,0 +1,9 @@ +# eliteReconBonusMHTOptimalRange1 +# +# Used by: +# Ship: Lachesis +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Recon Ships").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), + "maxRange", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) diff --git a/eos/effects/elitereconbonusmptdamage1.py b/eos/effects/elitereconbonusmptdamage1.py new file mode 100644 index 000000000..1a8b12924 --- /dev/null +++ b/eos/effects/elitereconbonusmptdamage1.py @@ -0,0 +1,9 @@ +# eliteReconBonusMPTdamage1 +# +# Used by: +# Ship: Huginn +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Recon Ships").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusReconShip1") * level) diff --git a/eos/effects/elitereconbonusneutrange3.py b/eos/effects/elitereconbonusneutrange3.py new file mode 100644 index 000000000..88b6ecb03 --- /dev/null +++ b/eos/effects/elitereconbonusneutrange3.py @@ -0,0 +1,9 @@ +# eliteReconBonusNeutRange3 +# +# Used by: +# Ship: Pilgrim +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Recon Ships").level + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Destabilizer", + "energyDestabilizationRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level) diff --git a/eos/effects/elitereconbonusvamprange3.py b/eos/effects/elitereconbonusvamprange3.py new file mode 100644 index 000000000..dfafdd3a3 --- /dev/null +++ b/eos/effects/elitereconbonusvamprange3.py @@ -0,0 +1,9 @@ +# eliteReconBonusVampRange3 +# +# Used by: +# Ship: Pilgrim +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Recon Ships").level + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Energy Vampire", + "powerTransferRange", ship.getModifiedItemAttr("eliteBonusReconShip3") * level) diff --git a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py b/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py index 501ab9bd4..b495ccaaf 100644 --- a/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py +++ b/eos/effects/iceharvestcycletimemodulesrequiringiceharvestingonline.py @@ -1,7 +1,7 @@ # iceHarvestCycleTimeModulesRequiringIceHarvestingOnline # # Used by: -# Variations of module: Ice Harvester Upgrade I (6 of 6) +# Variations of module: Ice Harvester Upgrade I (5 of 5) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), diff --git a/eos/effects/iceminercpuusagepercent.py b/eos/effects/iceminercpuusagepercent.py index d14d89589..9a3f04694 100644 --- a/eos/effects/iceminercpuusagepercent.py +++ b/eos/effects/iceminercpuusagepercent.py @@ -1,7 +1,7 @@ # iceMinerCpuUsagePercent # # Used by: -# Variations of module: Ice Harvester Upgrade I (6 of 6) +# Variations of module: Ice Harvester Upgrade I (5 of 5) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Ice Harvesting"), diff --git a/eos/effects/increasesignatureradiusonline.py b/eos/effects/increasesignatureradiusonline.py index a4bd284b4..a67dc074f 100644 --- a/eos/effects/increasesignatureradiusonline.py +++ b/eos/effects/increasesignatureradiusonline.py @@ -1,7 +1,7 @@ # increaseSignatureRadiusOnline # # Used by: -# Modules from group: Inertia Stabilizer (12 of 12) +# Modules from group: Inertial Stabilizer (7 of 7) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("signatureRadius", module.getModifiedItemAttr("signatureRadiusBonus")) \ No newline at end of file diff --git a/eos/effects/minercpuusagemultiplypercent2.py b/eos/effects/minercpuusagemultiplypercent2.py index 6f1b9aa33..f76b5323b 100644 --- a/eos/effects/minercpuusagemultiplypercent2.py +++ b/eos/effects/minercpuusagemultiplypercent2.py @@ -1,7 +1,7 @@ # minerCpuUsageMultiplyPercent2 # # Used by: -# Variations of module: Mining Laser Upgrade I (6 of 6) +# Variations of module: Mining Laser Upgrade I (5 of 5) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), diff --git a/eos/effects/mininglaser.py b/eos/effects/mininglaser.py index a691775fa..a4095f4ed 100644 --- a/eos/effects/mininglaser.py +++ b/eos/effects/mininglaser.py @@ -2,7 +2,7 @@ # # Used by: # Modules from group: Frequency Mining Laser (3 of 3) -# Modules from group: Mining Laser (17 of 17) +# Modules from group: Mining Laser (12 of 12) # Modules from group: Strip Miner (5 of 5) type = 'active' def handler(fit, module, context): diff --git a/eos/effects/miningyieldmultiplypercent.py b/eos/effects/miningyieldmultiplypercent.py index 0ca493d0b..d00198ab4 100644 --- a/eos/effects/miningyieldmultiplypercent.py +++ b/eos/effects/miningyieldmultiplypercent.py @@ -1,7 +1,7 @@ # miningYieldMultiplyPercent # # Used by: -# Variations of module: Mining Laser Upgrade I (6 of 6) +# Variations of module: Mining Laser Upgrade I (5 of 5) type = "passive" def handler(fit, module, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining"), diff --git a/eos/effects/modifymaxvelocityofshippassive.py b/eos/effects/modifymaxvelocityofshippassive.py index 3c134f937..62670476a 100644 --- a/eos/effects/modifymaxvelocityofshippassive.py +++ b/eos/effects/modifymaxvelocityofshippassive.py @@ -1,7 +1,7 @@ # modifyMaxVelocityOfShipPassive # # Used by: -# Modules from group: Expanded Cargohold (13 of 13) +# Modules from group: Expanded Cargohold (7 of 7) type = "passive" def handler(fit, module, context): fit.ship.multiplyItemAttr("maxVelocity", module.getModifiedItemAttr("maxVelocityBonus"), diff --git a/eos/effects/modifypowerrechargerate.py b/eos/effects/modifypowerrechargerate.py index 9dcea33b5..4f1e35a4b 100644 --- a/eos/effects/modifypowerrechargerate.py +++ b/eos/effects/modifypowerrechargerate.py @@ -2,9 +2,9 @@ # # Used by: # Modules from group: Capacitor Flux Coil (6 of 6) -# Modules from group: Capacitor Power Relay (26 of 26) -# Modules from group: Capacitor Recharger (25 of 25) -# Modules from group: Power Diagnostic System (31 of 31) +# Modules from group: Capacitor Power Relay (20 of 20) +# Modules from group: Capacitor Recharger (18 of 18) +# Modules from group: Power Diagnostic System (23 of 23) # Modules from group: Reactor Control Unit (22 of 22) # Modules from group: Shield Flux Coil (11 of 11) # Modules from group: Shield Power Relay (11 of 11) diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/modifyshieldrechargerate.py index 1e1dbc192..1986cbb09 100644 --- a/eos/effects/modifyshieldrechargerate.py +++ b/eos/effects/modifyshieldrechargerate.py @@ -2,8 +2,8 @@ # # Used by: # Modules from group: Capacitor Flux Coil (6 of 6) -# Modules from group: Capacitor Power Relay (26 of 26) -# Modules from group: Power Diagnostic System (31 of 31) +# Modules from group: Capacitor Power Relay (20 of 20) +# Modules from group: Power Diagnostic System (23 of 23) # Modules from group: Reactor Control Unit (22 of 22) # Modules from group: Shield Flux Coil (11 of 11) # Modules from group: Shield Recharger (6 of 6) diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/mwdsignatureradiusrolebonus.py index b160c5b28..92f757399 100644 --- a/eos/effects/mwdsignatureradiusrolebonus.py +++ b/eos/effects/mwdsignatureradiusrolebonus.py @@ -2,7 +2,7 @@ # # Used by: # Ships from group: Assault Frigate (8 of 12) -# Ships from group: Heavy Assault Cruiser (8 of 11) +# Ships from group: Heavy Assault Cruiser (10 of 13) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), diff --git a/eos/effects/poweroutputmultiply.py b/eos/effects/poweroutputmultiply.py index e4f988ff8..e0ac4fe57 100644 --- a/eos/effects/poweroutputmultiply.py +++ b/eos/effects/poweroutputmultiply.py @@ -2,8 +2,8 @@ # # Used by: # Modules from group: Capacitor Flux Coil (6 of 6) -# Modules from group: Capacitor Power Relay (26 of 26) -# Modules from group: Power Diagnostic System (31 of 31) +# Modules from group: Capacitor Power Relay (20 of 20) +# Modules from group: Power Diagnostic System (23 of 23) # Modules from group: Reactor Control Unit (22 of 22) # Modules from group: Shield Flux Coil (11 of 11) # Modules from group: Shield Power Relay (11 of 11) diff --git a/eos/effects/shieldboostamplifier.py b/eos/effects/shieldboostamplifier.py index 164c39319..137df0af1 100644 --- a/eos/effects/shieldboostamplifier.py +++ b/eos/effects/shieldboostamplifier.py @@ -1,7 +1,7 @@ # shieldBoostAmplifier # # Used by: -# Modules from group: Capacitor Power Relay (26 of 26) +# Modules from group: Capacitor Power Relay (20 of 20) # Modules from group: Shield Boost Amplifier (25 of 25) type = "passive" def handler(fit, module, context): diff --git a/eos/effects/shieldcapacitymultiply.py b/eos/effects/shieldcapacitymultiply.py index 4f536da11..9cf482cc7 100644 --- a/eos/effects/shieldcapacitymultiply.py +++ b/eos/effects/shieldcapacitymultiply.py @@ -2,8 +2,8 @@ # # Used by: # Modules from group: Capacitor Flux Coil (6 of 6) -# Modules from group: Capacitor Power Relay (26 of 26) -# Modules from group: Power Diagnostic System (31 of 31) +# Modules from group: Capacitor Power Relay (20 of 20) +# Modules from group: Power Diagnostic System (23 of 23) # Modules from group: Reactor Control Unit (22 of 22) # Modules from group: Shield Flux Coil (11 of 11) # Modules from group: Shield Power Relay (11 of 11) diff --git a/eos/effects/shipbonusarmorresistab.py b/eos/effects/shipbonusarmorresistab.py index 74f6d6d02..a45d76e1e 100644 --- a/eos/effects/shipbonusarmorresistab.py +++ b/eos/effects/shipbonusarmorresistab.py @@ -3,6 +3,7 @@ # Used by: # Ships named like: Abaddon (3 of 3) # Ship: Nestor +# Ship: 地狱天使级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusdronearmorhitpointsab.py b/eos/effects/shipbonusdronearmorhitpointsab.py index c5214d90a..a96f50ebf 100644 --- a/eos/effects/shipbonusdronearmorhitpointsab.py +++ b/eos/effects/shipbonusdronearmorhitpointsab.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusdronedamagemultiplierab.py b/eos/effects/shipbonusdronedamagemultiplierab.py index 21a21ac90..137cc6e81 100644 --- a/eos/effects/shipbonusdronedamagemultiplierab.py +++ b/eos/effects/shipbonusdronedamagemultiplierab.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusdronedamagemultipliergb2.py b/eos/effects/shipbonusdronedamagemultipliergb2.py index c65feca5a..f67d7ec19 100644 --- a/eos/effects/shipbonusdronedamagemultipliergb2.py +++ b/eos/effects/shipbonusdronedamagemultipliergb2.py @@ -2,7 +2,9 @@ # # Used by: # Variations of ship: Dominix (3 of 3) +# Ship: Dominix Quafe Edition # Ship: Nestor +# Ship: 多米尼克斯级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdronedamagemultipliergc2.py b/eos/effects/shipbonusdronedamagemultipliergc2.py index 8c3aa4af0..9468f62d8 100644 --- a/eos/effects/shipbonusdronedamagemultipliergc2.py +++ b/eos/effects/shipbonusdronedamagemultipliergc2.py @@ -3,6 +3,8 @@ # Used by: # Ships named like: Stratios (2 of 2) # Variations of ship: Vexor (3 of 4) +# Ship: Vexor Quafe Edition +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdronehitpointsgb2.py b/eos/effects/shipbonusdronehitpointsgb2.py index 0a526d7e1..d2b67a20e 100644 --- a/eos/effects/shipbonusdronehitpointsgb2.py +++ b/eos/effects/shipbonusdronehitpointsgb2.py @@ -2,7 +2,9 @@ # # Used by: # Variations of ship: Dominix (3 of 3) +# Ship: Dominix Quafe Edition # Ship: Nestor +# Ship: 多米尼克斯级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdronehitpointsgc2.py b/eos/effects/shipbonusdronehitpointsgc2.py index 5e36004ae..8223830ab 100644 --- a/eos/effects/shipbonusdronehitpointsgc2.py +++ b/eos/effects/shipbonusdronehitpointsgc2.py @@ -3,6 +3,8 @@ # Used by: # Ships named like: Stratios (2 of 2) # Variations of ship: Vexor (3 of 4) +# Ship: Vexor Quafe Edition +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdronehitpointsgf.py b/eos/effects/shipbonusdronehitpointsgf.py index d1892d7c8..b5d838c4b 100644 --- a/eos/effects/shipbonusdronehitpointsgf.py +++ b/eos/effects/shipbonusdronehitpointsgf.py @@ -1,8 +1,8 @@ # shipBonusDroneHitpointsGF # # Used by: +# Ships named like: Tristan (2 of 2) # Ship: Astero -# Ship: Tristan type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusdroneminingamountgc2.py b/eos/effects/shipbonusdroneminingamountgc2.py index 60a66e282..643e7f522 100644 --- a/eos/effects/shipbonusdroneminingamountgc2.py +++ b/eos/effects/shipbonusdroneminingamountgc2.py @@ -1,8 +1,7 @@ # shipBonusDroneMiningAmountGC2 # # Used by: -# Ship: Vexor -# Ship: Vexor Navy Issue +# Ships named like: Vexor (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusdroneoptimalrangegb.py b/eos/effects/shipbonusdroneoptimalrangegb.py index 746b74c2a..40ad3f1b6 100644 --- a/eos/effects/shipbonusdroneoptimalrangegb.py +++ b/eos/effects/shipbonusdroneoptimalrangegb.py @@ -2,6 +2,8 @@ # # Used by: # Ship: Dominix +# Ship: Dominix Quafe Edition +# Ship: 多米尼克斯级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdroneshieldhitpointsab.py b/eos/effects/shipbonusdroneshieldhitpointsab.py index 0355cc00d..6c5dea3d9 100644 --- a/eos/effects/shipbonusdroneshieldhitpointsab.py +++ b/eos/effects/shipbonusdroneshieldhitpointsab.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusdronestructurehitpointsab.py b/eos/effects/shipbonusdronestructurehitpointsab.py index bdbe27916..79db793f3 100644 --- a/eos/effects/shipbonusdronestructurehitpointsab.py +++ b/eos/effects/shipbonusdronestructurehitpointsab.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusdronetrackinggb.py b/eos/effects/shipbonusdronetrackinggb.py index 192608c97..bc31ca829 100644 --- a/eos/effects/shipbonusdronetrackinggb.py +++ b/eos/effects/shipbonusdronetrackinggb.py @@ -2,6 +2,8 @@ # # Used by: # Ship: Dominix +# Ship: Dominix Quafe Edition +# Ship: 多米尼克斯级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusdronetrackinggf.py b/eos/effects/shipbonusdronetrackinggf.py index 9f666dfe4..8e172b68b 100644 --- a/eos/effects/shipbonusdronetrackinggf.py +++ b/eos/effects/shipbonusdronetrackinggf.py @@ -1,7 +1,7 @@ # shipBonusDroneTrackingGF # # Used by: -# Ship: Tristan +# Ships named like: Tristan (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonusemshieldresistancecb2.py b/eos/effects/shipbonusemshieldresistancecb2.py index 0470458f6..160b7fa16 100644 --- a/eos/effects/shipbonusemshieldresistancecb2.py +++ b/eos/effects/shipbonusemshieldresistancecb2.py @@ -4,6 +4,7 @@ # Ships named like: Rattlesnake (2 of 2) # Ships named like: Rokh (3 of 3) # Ship: Scorpion Navy Issue +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonusenergyneutrangeab2.py b/eos/effects/shipbonusenergyneutrangeab2.py index 3c54013fd..272a1c1bb 100644 --- a/eos/effects/shipbonusenergyneutrangeab2.py +++ b/eos/effects/shipbonusenergyneutrangeab2.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusenergyvampirerangeab2.py b/eos/effects/shipbonusenergyvampirerangeab2.py index e9e52f0a5..e95bc2744 100644 --- a/eos/effects/shipbonusenergyvampirerangeab2.py +++ b/eos/effects/shipbonusenergyvampirerangeab2.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Armageddon +# Ship: 末日沙场级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusexplosiveshieldresistancecb2.py b/eos/effects/shipbonusexplosiveshieldresistancecb2.py index 5421ea9eb..14c4dbb4f 100644 --- a/eos/effects/shipbonusexplosiveshieldresistancecb2.py +++ b/eos/effects/shipbonusexplosiveshieldresistancecb2.py @@ -4,6 +4,7 @@ # Ships named like: Rattlesnake (2 of 2) # Ships named like: Rokh (3 of 3) # Ship: Scorpion Navy Issue +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py b/eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py deleted file mode 100644 index 7edf68e60..000000000 --- a/eos/effects/shipbonusheavyassaultlauncherrateoffirecc2.py +++ /dev/null @@ -1,9 +0,0 @@ -# shipBonusHeavyAssaultLauncherRateOfFireCC2 -# -# Used by: -# Ship: Rook -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("shipBonusCC2") * level) diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py index f09d45143..67735a4d0 100644 --- a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py @@ -3,6 +3,7 @@ # Used by: # Ship: Drake # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipbonusheavydronearmorhppiratefaction.py b/eos/effects/shipbonusheavydronearmorhppiratefaction.py index d1d7189f5..198e2951a 100644 --- a/eos/effects/shipbonusheavydronearmorhppiratefaction.py +++ b/eos/effects/shipbonusheavydronearmorhppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), diff --git a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py index b6f76821d..1dc6c19c5 100644 --- a/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py +++ b/eos/effects/shipbonusheavydronedamagemultiplierpiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), diff --git a/eos/effects/shipbonusheavydronehppiratefaction.py b/eos/effects/shipbonusheavydronehppiratefaction.py index 18e142507..02c4f5aa0 100644 --- a/eos/effects/shipbonusheavydronehppiratefaction.py +++ b/eos/effects/shipbonusheavydronehppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), diff --git a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py index 654197505..eb1fed909 100644 --- a/eos/effects/shipbonusheavydroneshieldhppiratefaction.py +++ b/eos/effects/shipbonusheavydroneshieldhppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), diff --git a/eos/effects/shipbonusheavydronespeedgc.py b/eos/effects/shipbonusheavydronespeedgc.py index bbc357f51..660461a5f 100644 --- a/eos/effects/shipbonusheavydronespeedgc.py +++ b/eos/effects/shipbonusheavydronespeedgc.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Ishtar +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusheavydronetrackinggc.py b/eos/effects/shipbonusheavydronetrackinggc.py index a2576a1c5..fd0c48359 100644 --- a/eos/effects/shipbonusheavydronetrackinggc.py +++ b/eos/effects/shipbonusheavydronetrackinggc.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Ishtar +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusheavylauncherrateoffirecc2.py b/eos/effects/shipbonusheavylauncherrateoffirecc2.py deleted file mode 100644 index 5ca8c9393..000000000 --- a/eos/effects/shipbonusheavylauncherrateoffirecc2.py +++ /dev/null @@ -1,9 +0,0 @@ -# shipBonusHeavyLauncherRateOfFireCC2 -# -# Used by: -# Ship: Rook -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Cruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("shipBonusCC2") * level) diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py index 6920869c0..93cd826c8 100644 --- a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py @@ -3,6 +3,7 @@ # Used by: # Ship: Drake # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipbonushybridtrackinggf2.py b/eos/effects/shipbonushybridtrackinggf2.py index e0aabdeba..d50ab59b4 100644 --- a/eos/effects/shipbonushybridtrackinggf2.py +++ b/eos/effects/shipbonushybridtrackinggf2.py @@ -1,10 +1,10 @@ # shipBonusHybridTrackingGF2 # # Used by: +# Ships named like: Tristan (2 of 2) # Ship: Ares # Ship: Federation Navy Comet # Ship: Police Pursuit Comet -# Ship: Tristan type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Frigate").level diff --git a/eos/effects/shipbonuskineticmissiledamagegb2.py b/eos/effects/shipbonuskineticmissiledamagegb2.py index f3f327697..490bb612f 100644 --- a/eos/effects/shipbonuskineticmissiledamagegb2.py +++ b/eos/effects/shipbonuskineticmissiledamagegb2.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonuskineticmissiledamagegc2.py b/eos/effects/shipbonuskineticmissiledamagegc2.py index 5ca6f40a4..717337b3f 100644 --- a/eos/effects/shipbonuskineticmissiledamagegc2.py +++ b/eos/effects/shipbonuskineticmissiledamagegc2.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonuskineticshieldresistancecb2.py b/eos/effects/shipbonuskineticshieldresistancecb2.py index c076ea081..3be6df66f 100644 --- a/eos/effects/shipbonuskineticshieldresistancecb2.py +++ b/eos/effects/shipbonuskineticshieldresistancecb2.py @@ -4,6 +4,7 @@ # Ships named like: Rattlesnake (2 of 2) # Ships named like: Rokh (3 of 3) # Ship: Scorpion Navy Issue +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py index 6234e18aa..6928e8b3e 100644 --- a/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py +++ b/eos/effects/shipbonuslargeenergyturretmaxrangeab2.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Apocalypse (5 of 6) +# Ship: 灾难级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuslargeenergyturrettrackingab.py b/eos/effects/shipbonuslargeenergyturrettrackingab.py index af576a600..569fe39a8 100644 --- a/eos/effects/shipbonuslargeenergyturrettrackingab.py +++ b/eos/effects/shipbonuslargeenergyturrettrackingab.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Apocalypse (5 of 6) +# Ship: 灾难级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonuslargeenergyweapondamageab2.py b/eos/effects/shipbonuslargeenergyweapondamageab2.py index cd98d4304..03e8d63e5 100644 --- a/eos/effects/shipbonuslargeenergyweapondamageab2.py +++ b/eos/effects/shipbonuslargeenergyweapondamageab2.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Abaddon (3 of 3) +# Ship: 地狱天使级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Battleship").level diff --git a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py index b0afc2751..9259d9f2e 100644 --- a/eos/effects/shipbonusmediumdronearmorhppiratefaction.py +++ b/eos/effects/shipbonusmediumdronearmorhppiratefaction.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), diff --git a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py index 45a647b40..4d49a4169 100644 --- a/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py +++ b/eos/effects/shipbonusmediumdronedamagemultiplierpiratefaction.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), diff --git a/eos/effects/shipbonusmediumdronehppiratefaction.py b/eos/effects/shipbonusmediumdronehppiratefaction.py index 4c57126a5..7f8a3a0dd 100644 --- a/eos/effects/shipbonusmediumdronehppiratefaction.py +++ b/eos/effects/shipbonusmediumdronehppiratefaction.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), diff --git a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py index ea15603ab..aea3abc84 100644 --- a/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py +++ b/eos/effects/shipbonusmediumdroneshieldhppiratefaction.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Medium Drone Operation"), diff --git a/eos/effects/shipbonusrhmlrof2cb.py b/eos/effects/shipbonusrhmlrof2cb.py index 215c28ef0..4e4129728 100644 --- a/eos/effects/shipbonusrhmlrof2cb.py +++ b/eos/effects/shipbonusrhmlrof2cb.py @@ -4,6 +4,7 @@ # Ships named like: Raven Edition (3 of 3) # Ship: Raven # Ship: Widow +# Ship: 乌鸦级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipbonussentrydronearmorhppiratefaction.py b/eos/effects/shipbonussentrydronearmorhppiratefaction.py index 9e657cc30..65507d46a 100644 --- a/eos/effects/shipbonussentrydronearmorhppiratefaction.py +++ b/eos/effects/shipbonussentrydronearmorhppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), diff --git a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py index ed68433d5..dbec62ed3 100644 --- a/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py +++ b/eos/effects/shipbonussentrydronedamagemultiplierpiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), diff --git a/eos/effects/shipbonussentrydronehppiratefaction.py b/eos/effects/shipbonussentrydronehppiratefaction.py index d7933f658..1ca8ce244 100644 --- a/eos/effects/shipbonussentrydronehppiratefaction.py +++ b/eos/effects/shipbonussentrydronehppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), diff --git a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py index 8cec3fc77..63e6eaf88 100644 --- a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py +++ b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Ishtar +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Heavy Assault Cruisers").level diff --git a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py index 92e980074..c7c5c1f05 100644 --- a/eos/effects/shipbonussentrydroneshieldhppiratefaction.py +++ b/eos/effects/shipbonussentrydroneshieldhppiratefaction.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), diff --git a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py index 90a40a056..9c76a2c5a 100644 --- a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py +++ b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Ishtar +# Ship: 伊什塔级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Heavy Assault Cruisers").level diff --git a/eos/effects/shipbonusthermalmissiledamagegb2.py b/eos/effects/shipbonusthermalmissiledamagegb2.py index 67438e173..1335ccfa6 100644 --- a/eos/effects/shipbonusthermalmissiledamagegb2.py +++ b/eos/effects/shipbonusthermalmissiledamagegb2.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Rattlesnake (2 of 2) +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipbonusthermalmissiledamagegc2.py b/eos/effects/shipbonusthermalmissiledamagegc2.py index 05e602e20..09f9cdf75 100644 --- a/eos/effects/shipbonusthermalmissiledamagegc2.py +++ b/eos/effects/shipbonusthermalmissiledamagegc2.py @@ -3,6 +3,7 @@ # Used by: # Ship: Chameleon # Ship: Gila +# Ship: 毒蜥级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipbonusthermicshieldresistancecb2.py b/eos/effects/shipbonusthermicshieldresistancecb2.py index 29f7f07cf..9f67572b1 100644 --- a/eos/effects/shipbonusthermicshieldresistancecb2.py +++ b/eos/effects/shipbonusthermicshieldresistancecb2.py @@ -4,6 +4,7 @@ # Ships named like: Rattlesnake (2 of 2) # Ships named like: Rokh (3 of 3) # Ship: Scorpion Navy Issue +# Ship: 响尾蛇级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipcruiselauncherrofbonus2cb.py b/eos/effects/shipcruiselauncherrofbonus2cb.py index 8ad0ca847..aeca98975 100644 --- a/eos/effects/shipcruiselauncherrofbonus2cb.py +++ b/eos/effects/shipcruiselauncherrofbonus2cb.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Raven (5 of 6) +# Ship: 乌鸦级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shipcruisemissilevelocitybonuscb3.py b/eos/effects/shipcruisemissilevelocitybonuscb3.py index f9d3939da..f9a882aaf 100644 --- a/eos/effects/shipcruisemissilevelocitybonuscb3.py +++ b/eos/effects/shipcruisemissilevelocitybonuscb3.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Raven (6 of 6) +# Ship: 乌鸦级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shiphrangebonuscc.py b/eos/effects/shiphrangebonuscc.py index 499fcdbe7..1d25a1add 100644 --- a/eos/effects/shiphrangebonuscc.py +++ b/eos/effects/shiphrangebonuscc.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Eagle +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py index c0fac0f09..33ad961e3 100644 --- a/eos/effects/shiphtdmgbonusfixedgc.py +++ b/eos/effects/shiphtdmgbonusfixedgc.py @@ -2,13 +2,11 @@ # # Used by: # Ships named like: Thorax (3 of 3) +# Ships named like: Vexor (3 of 4) # Ship: Adrestia # Ship: Arazu # Ship: Deimos # Ship: Exequror Navy Issue -# Ship: Guardian-Vexor -# Ship: Lachesis -# Ship: Vexor type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shiphttrackingbonusgb2.py b/eos/effects/shiphttrackingbonusgb2.py index 3e527ca67..bd09cba9e 100644 --- a/eos/effects/shiphttrackingbonusgb2.py +++ b/eos/effects/shiphttrackingbonusgb2.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Megathron (6 of 6) +# Ship: 万王宝座级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shiphybridtrackinggc.py b/eos/effects/shiphybridtrackinggc.py index f99cea0b0..02215246a 100644 --- a/eos/effects/shiphybridtrackinggc.py +++ b/eos/effects/shiphybridtrackinggc.py @@ -1,6 +1,7 @@ # shipHybridTrackingGC # # Used by: +# Ship: Lachesis # Ship: Phobos type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiplargehybridturretrofgb.py b/eos/effects/shiplargehybridturretrofgb.py index 999b644ae..232103e33 100644 --- a/eos/effects/shiplargehybridturretrofgb.py +++ b/eos/effects/shiplargehybridturretrofgb.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Megathron (5 of 6) +# Ship: 万王宝座级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shipmissilebonusemdmgmc.py b/eos/effects/shipmissilebonusemdmgmc.py new file mode 100644 index 000000000..1230c3f94 --- /dev/null +++ b/eos/effects/shipmissilebonusemdmgmc.py @@ -0,0 +1,9 @@ +# shipMissileBonusEMdmgMC +# +# Used by: +# Ship: Rapier +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "emDamage", ship.getModifiedItemAttr("shipBonusMC") * level) diff --git a/eos/effects/shipmissilebonusexpdmgmc.py b/eos/effects/shipmissilebonusexpdmgmc.py new file mode 100644 index 000000000..cdaa2637d --- /dev/null +++ b/eos/effects/shipmissilebonusexpdmgmc.py @@ -0,0 +1,9 @@ +# shipMissileBonusExpdmgMC +# +# Used by: +# Ship: Rapier +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "explosiveDamage", ship.getModifiedItemAttr("shipBonusMC") * level) diff --git a/eos/effects/shipmissilebonuskindmgmc.py b/eos/effects/shipmissilebonuskindmgmc.py new file mode 100644 index 000000000..c4173ca36 --- /dev/null +++ b/eos/effects/shipmissilebonuskindmgmc.py @@ -0,0 +1,9 @@ +# shipMissileBonusKindmgMC +# +# Used by: +# Ship: Rapier +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "kineticDamage", ship.getModifiedItemAttr("shipBonusMC") * level) diff --git a/eos/effects/shipmissilebonusthermdmgmc.py b/eos/effects/shipmissilebonusthermdmgmc.py new file mode 100644 index 000000000..90a8c3daa --- /dev/null +++ b/eos/effects/shipmissilebonusthermdmgmc.py @@ -0,0 +1,9 @@ +# shipMissileBonusThermdmgMC +# +# Used by: +# Ship: Rapier +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), + "thermalDamage", ship.getModifiedItemAttr("shipBonusMC") * level) diff --git a/eos/effects/shipmissilekindamagecc2.py b/eos/effects/shipmissilekindamagecc2.py index eee63477c..97ff60cc1 100644 --- a/eos/effects/shipmissilekindamagecc2.py +++ b/eos/effects/shipmissilekindamagecc2.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Osprey Navy Issue +# Ship: Rook type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipprojectilerofpiratebattleship.py b/eos/effects/shipprojectilerofpiratebattleship.py index 7cf436feb..fff9e5a5c 100644 --- a/eos/effects/shipprojectilerofpiratebattleship.py +++ b/eos/effects/shipprojectilerofpiratebattleship.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Machariel +# Ship: 马克瑞级YC117年特别版 type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Large Projectile Turret"), diff --git a/eos/effects/shipptdmgbonusmb.py b/eos/effects/shipptdmgbonusmb.py index ef4e66b65..e6896cbc6 100644 --- a/eos/effects/shipptdmgbonusmb.py +++ b/eos/effects/shipptdmgbonusmb.py @@ -4,6 +4,7 @@ # Ships named like: Tempest (6 of 6) # Ship: Machariel # Ship: Panther +# Ship: 马克瑞级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battleship").level diff --git a/eos/effects/shippturretfalloffbonusgb.py b/eos/effects/shippturretfalloffbonusgb.py index 7088999a4..1aa311795 100644 --- a/eos/effects/shippturretfalloffbonusgb.py +++ b/eos/effects/shippturretfalloffbonusgb.py @@ -2,6 +2,7 @@ # # Used by: # Ship: Machariel +# Ship: 马克瑞级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battleship").level diff --git a/eos/effects/shippturretspeedbonusmc.py b/eos/effects/shippturretspeedbonusmc.py index 6a5ad4d5b..c561afc47 100644 --- a/eos/effects/shippturretspeedbonusmc.py +++ b/eos/effects/shippturretspeedbonusmc.py @@ -5,7 +5,6 @@ # Variations of ship: Rupture (3 of 3) # Variations of ship: Stabber (3 of 3) # Ship: Huginn -# Ship: Rapier # Ship: Scythe Fleet Issue type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipshieldemresistance1cbc2.py b/eos/effects/shipshieldemresistance1cbc2.py index 163b9e602..8d0283d8f 100644 --- a/eos/effects/shipshieldemresistance1cbc2.py +++ b/eos/effects/shipshieldemresistance1cbc2.py @@ -5,6 +5,7 @@ # Ship: Drake # Ship: Ferox Guristas Edition # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipshieldemresistancecc2.py b/eos/effects/shipshieldemresistancecc2.py index 4d5f640dd..cd8e9d0c8 100644 --- a/eos/effects/shipshieldemresistancecc2.py +++ b/eos/effects/shipshieldemresistancecc2.py @@ -2,6 +2,8 @@ # # Used by: # Variations of ship: Moa (3 of 4) +# Ship: 毒蜥级YC117年特别版 +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipshieldexplosiveresistance1cbc2.py b/eos/effects/shipshieldexplosiveresistance1cbc2.py index a16bfe29c..2f6f8298c 100644 --- a/eos/effects/shipshieldexplosiveresistance1cbc2.py +++ b/eos/effects/shipshieldexplosiveresistance1cbc2.py @@ -5,6 +5,7 @@ # Ship: Drake # Ship: Ferox Guristas Edition # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipshieldexplosiveresistancecc2.py b/eos/effects/shipshieldexplosiveresistancecc2.py index 4f2a117b3..44c03bf31 100644 --- a/eos/effects/shipshieldexplosiveresistancecc2.py +++ b/eos/effects/shipshieldexplosiveresistancecc2.py @@ -2,6 +2,8 @@ # # Used by: # Variations of ship: Moa (3 of 4) +# Ship: 毒蜥级YC117年特别版 +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipshieldkineticresistance1cbc2.py b/eos/effects/shipshieldkineticresistance1cbc2.py index 20d42c782..8406b6ea4 100644 --- a/eos/effects/shipshieldkineticresistance1cbc2.py +++ b/eos/effects/shipshieldkineticresistance1cbc2.py @@ -5,6 +5,7 @@ # Ship: Drake # Ship: Ferox Guristas Edition # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipshieldkineticresistancecc2.py b/eos/effects/shipshieldkineticresistancecc2.py index c64f38df8..4387e65b9 100644 --- a/eos/effects/shipshieldkineticresistancecc2.py +++ b/eos/effects/shipshieldkineticresistancecc2.py @@ -2,6 +2,8 @@ # # Used by: # Variations of ship: Moa (3 of 4) +# Ship: 毒蜥级YC117年特别版 +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipshieldthermalresistance1cbc2.py b/eos/effects/shipshieldthermalresistance1cbc2.py index 864f23b9a..cff4629d2 100644 --- a/eos/effects/shipshieldthermalresistance1cbc2.py +++ b/eos/effects/shipshieldthermalresistance1cbc2.py @@ -5,6 +5,7 @@ # Ship: Drake # Ship: Ferox Guristas Edition # Ship: Nighthawk +# Ship: 幼龙级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipshieldthermalresistancecc2.py b/eos/effects/shipshieldthermalresistancecc2.py index 85156dda0..a1294a283 100644 --- a/eos/effects/shipshieldthermalresistancecc2.py +++ b/eos/effects/shipshieldthermalresistancecc2.py @@ -2,6 +2,8 @@ # # Used by: # Variations of ship: Moa (3 of 4) +# Ship: 毒蜥级YC117年特别版 +# Ship: 银鹰级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Cruiser").level diff --git a/eos/effects/shipsiegelauncherrofbonus2cb.py b/eos/effects/shipsiegelauncherrofbonus2cb.py index af9ca6851..a06c91f23 100644 --- a/eos/effects/shipsiegelauncherrofbonus2cb.py +++ b/eos/effects/shipsiegelauncherrofbonus2cb.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Raven (5 of 6) +# Ship: 乌鸦级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/shiptorpedosvelocitybonuscb3.py b/eos/effects/shiptorpedosvelocitybonuscb3.py index 69de71c7c..29f9501ad 100644 --- a/eos/effects/shiptorpedosvelocitybonuscb3.py +++ b/eos/effects/shiptorpedosvelocitybonuscb3.py @@ -2,6 +2,7 @@ # # Used by: # Ships named like: Raven (6 of 6) +# Ship: 乌鸦级YC117年特别版 type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battleship").level diff --git a/eos/effects/structurehpmultiply.py b/eos/effects/structurehpmultiply.py index 502d67636..aa7d43c7c 100644 --- a/eos/effects/structurehpmultiply.py +++ b/eos/effects/structurehpmultiply.py @@ -1,8 +1,8 @@ # structureHPMultiply # # Used by: -# Modules from group: Nanofiber Internal Structure (14 of 14) -# Modules from group: Reinforced Bulkhead (12 of 12) +# Modules from group: Nanofiber Internal Structure (7 of 7) +# Modules from group: Reinforced Bulkhead (8 of 8) # Modules named like: QA Multiship Module Players (4 of 4) type = "passive" def handler(fit, module, context): diff --git a/eos/effects/structurehpmultiplypassive.py b/eos/effects/structurehpmultiplypassive.py index 60159c104..89ab600df 100644 --- a/eos/effects/structurehpmultiplypassive.py +++ b/eos/effects/structurehpmultiplypassive.py @@ -1,7 +1,7 @@ # structureHPMultiplyPassive # # Used by: -# Modules from group: Expanded Cargohold (13 of 13) +# Modules from group: Expanded Cargohold (7 of 7) 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/velocitybonusonline.py b/eos/effects/velocitybonusonline.py index ef6a5e458..1af6d4411 100644 --- a/eos/effects/velocitybonusonline.py +++ b/eos/effects/velocitybonusonline.py @@ -1,8 +1,8 @@ # velocityBonusOnline # # Used by: -# Modules from group: Nanofiber Internal Structure (14 of 14) -# Modules from group: Overdrive Injector System (14 of 14) +# Modules from group: Nanofiber Internal Structure (7 of 7) +# Modules from group: Overdrive Injector System (7 of 7) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("implantBonusVelocity"),