From 942649c589dffc97eb147f971cbd1dab823125cd Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Fri, 23 Aug 2013 01:27:52 +0400 Subject: [PATCH] Add effects for most of new items --- eos/effects/armoredsquadroncommand.py | 7 +++++++ eos/effects/armoredwarfaremindlink.py | 2 ++ eos/effects/armortankinggang2.py | 2 ++ .../armorupgradesmasspenaltyreductionbonus.py | 14 +++++++------- eos/effects/boostermodifyboosterarmorpenalties.py | 2 +- ...rmodifyboostermaxvelocityandcapacitorpenalty.py | 2 +- eos/effects/boostermodifyboostermissilepenalty.py | 2 +- eos/effects/boostermodifyboostershieldpenalty.py | 2 +- eos/effects/boostermodifyboosterturretpenalty.py | 2 +- eos/effects/commandmultiplier.py | 7 ------- ...multiplierinformationwarfarespecialisthidden.py | 7 ------- .../covertopsandreconopscloakmoduledelaybonus.py | 4 ++-- eos/effects/covertopscloakcpupercentbonus1.py | 2 +- .../covertopsstealthbombertargettingdelaybonus.py | 1 + eos/effects/cynosuraldurationbonus.py | 2 +- eos/effects/cynosuraltheoryconsumptionbonus.py | 2 +- eos/effects/drawbackarmorhp.py | 2 +- eos/effects/drawbackmaxvelocity.py | 3 ++- eos/effects/drawbackshieldcapacity.py | 4 +++- ...ostpercentcpuoutputlocationshipgroupcomputer.py | 2 +- ...edcs2.py => elitebonuscommandshiparmoredcs3.py} | 4 ++-- ...ofcbc1.py => elitebonuscommandshiphamrofcs1.py} | 5 +++-- ...bonuscommandshipheavyassaultmissiledamagecs2.py | 9 +++++++++ .../elitebonuscommandshipheavydronetrackingcs2.py | 7 +++++++ .../elitebonuscommandshipheavydronevelocitycs2.py | 7 +++++++ .../elitebonuscommandshipheavymissiledamagecs2.py | 9 +++++++++ ...rofcbc1.py => elitebonuscommandshiphmrofcs1.py} | 5 +++-- ...2.py => elitebonuscommandshipinformationcs3.py} | 6 +++--- .../elitebonuscommandshipinformationhiddencs3.py | 7 +++++++ ... elitebonuscommandshipmediumhybriddamagecs2.py} | 4 ++-- ... => elitebonuscommandshipmediumhybridrofcs1.py} | 6 +++--- ...litebonuscommandshipmediumhybridtrackingcs1.py} | 4 ++-- ...dshipsheavyassaultmissileexplosionradiuscs2.py} | 4 ++-- ...shipsheavyassaultmissileexplosionvelocitycs2.py | 7 +++++++ ...uscommandshipsheavymissileexplosionradiuscs2.py | 7 +++++++ ...commandshipsheavymissileexplosionvelocitycs2.py | 2 +- ...iegecs2.py => elitebonuscommandshipsiegecs3.py} | 4 ++-- ...hcs2.py => elitebonuscommandshipskirmishcs3.py} | 4 ++-- .../elitebonuscoveropsscanprobestrength2.py | 2 +- eos/effects/elitebonusheavygunshipcaprecharge1.py | 6 ------ .../elitebonusheavygunshipdronecapacity2.py | 6 ------ eos/effects/eliteelitebonuscommandshipdronebay1.py | 6 ------ eos/effects/elitereconstasiswebbonus2.py | 1 + ...ionshipmodulesrequiringenergyemmisionsystems.py | 2 +- ...acitylocationshipgroupcapacitorcapacitybonus.py | 2 +- ...ercentrechargeratelocationshipgroupcapacitor.py | 2 +- eos/effects/energytransfer.py | 2 +- ...percentpoweroutputlocationshipgrouppowercore.py | 2 +- ...aneuveringagilitybonuspostpercentagilityship.py | 1 + .../{gangeccmfixed.py => gangsensorintegrity.py} | 2 ++ eos/effects/implantarmorhpbonus2.py | 1 + eos/effects/implantvelocitybonus.py | 1 + eos/effects/informationsquadroncommand.py | 7 +++++++ eos/effects/informationsquadroncommandhidden.py | 7 +++++++ eos/effects/informationwarfaremindlinkhidden.py | 2 ++ eos/effects/minigamevirusstrengthbonus.py | 2 +- eos/effects/miningsquadroncommand.py | 7 +++++++ eos/effects/modifyshieldrechargerate.py | 1 - eos/effects/mwdsignatureradiusrolebonus.py | 1 + eos/effects/openspawncontainer.py | 1 + eos/effects/overloadselfdurationbonus.py | 6 +++--- ...rangebonuspostpercentmaxtargetrangegangships.py | 2 ++ eos/effects/reconshipcloakcpubonus1.py | 2 +- eos/effects/rigdrawbackbonuseffect.py | 2 +- .../salvagingaccessdifficultybonuseffectpassive.py | 2 +- eos/effects/scanstrengthbonuspercentpassive.py | 2 +- eos/effects/setbonuschristmascapacitorcapacity.py | 2 +- eos/effects/setbonuschristmascapacitorrecharge2.py | 2 +- eos/effects/setbonuschristmascpuoutput.py | 2 +- eos/effects/setbonuschristmaspowergrid.py | 2 +- ...acitybonuspostpercentshieldcapacitygangships.py | 2 ++ ...uspostpercentcapacitylocationshipgroupshield.py | 1 + ...doperationrechargeratebonuspostpercentonline.py | 5 +++++ eos/effects/shieldtransfer.py | 2 +- eos/effects/shipbonusagilityai2.py | 6 ++++++ eos/effects/shipbonusagilityci2.py | 6 ++++++ eos/effects/shipbonusagilitygi2.py | 6 ++++++ eos/effects/shipbonusagilitymi2.py | 6 ++++++ eos/effects/shipbonusammobaymi2.py | 6 ++++++ eos/effects/shipbonusarmorrepamountgc2.py | 7 +++++++ eos/effects/shipbonuscargo2gi.py | 5 +++-- eos/effects/shipbonuscargoci.py | 2 +- eos/effects/shipbonuscargomi.py | 1 - eos/effects/shipbonusdronedamagemultipliergbc1.py | 1 + eos/effects/shipbonusdronehitpointsgbc1.py | 1 + .../shipbonushamvelocityelitebonusheavygunship1.py | 7 +++++++ ...hipbonusheavyassaultmissilekineticdamagecbc1.py | 1 + .../shipbonusheavyassaultmissilelauncherrofmbc2.py | 1 + eos/effects/shipbonusheavydronespeedgc.py | 7 +++++++ eos/effects/shipbonusheavydronetrackinggc.py | 7 +++++++ .../shipbonusheavymissilekineticdamagecbc1.py | 1 + .../shipbonusheavymissilelauncherrofmbc2.py | 1 + eos/effects/shipbonushmlemdamageac.py | 7 +++++++ eos/effects/shipbonushmlexplodamageac.py | 7 +++++++ eos/effects/shipbonushmlkineticdamageac.py | 7 +++++++ eos/effects/shipbonushmlthermdamageac.py | 7 +++++++ .../shipbonushmlvelocityelitebonusheavygunship1.py | 7 +++++++ eos/effects/shipbonusmineralbaygi2.py | 6 ++++++ eos/effects/shipbonusmwdcapneedgc2.py | 7 ------- eos/effects/shipbonusorecapacitygi2.py | 6 ++++++ eos/effects/shipbonuspicommoditiesholdgi2.py | 6 ++++++ eos/effects/shipbonuspiratefrigateprojdamage.py | 1 + eos/effects/shipbonusprojectiledamagembc2.py | 7 +++++++ ...ntrydroneoptimalrangeelitebonusheavygunship2.py | 7 +++++++ ...ussentrydronetrackingelitebonusheavygunship2.py | 7 +++++++ eos/effects/shipbonusshieldboostamountmc2.py | 7 +++++++ ...rveyprobeexplosiondelayskillsurveycovertops3.py | 2 +- eos/effects/shipbonusvelocityci.py | 4 ++-- eos/effects/shipbonusvelocitygi.py | 8 +++++--- eos/effects/shipfalloffbonusmf.py | 1 + eos/effects/shiphtdmgbonusfixedgc.py | 3 ++- eos/effects/shiphybriddmg1gbc1.py | 2 +- eos/effects/shipmaxvelocitymc2.py | 6 ------ eos/effects/shipmissilerapidlightrofcbc1.py | 7 ------- eos/effects/shipprojectiledmgmc2.py | 1 + eos/effects/shipprojectilerof1mbc2.py | 2 -- eos/effects/shipprojectilerofpiratecruiser.py | 1 + eos/effects/shipprojectiletrackinggf.py | 1 + eos/effects/shippturretfalloffbonusgc.py | 1 + eos/effects/shipvelocitybonusai.py | 2 +- eos/effects/shipvelocitybonusmi.py | 2 +- eos/effects/shirmishwarfaremindlink.py | 2 ++ eos/effects/siegesquadroncommand.py | 7 +++++++ eos/effects/siegewarfaremindlink.py | 2 ++ eos/effects/skirmishsquadroncommand.py | 7 +++++++ eos/effects/skirmishwarfareagilitybonus.py | 2 ++ ...stembonusgallentedefensiveinformationwarfare.py | 2 -- ...nusgallentedefensiveinformationwarfarehidden.py | 7 +++++++ eos/effects/targetarmorrepair.py | 2 +- ...ymaxrangefallofftrackingspeedbonusassistance.py | 2 +- ...argetbonusmodaddmaxlockedtargetslocationchar.py | 3 +-- service/market.py | 3 ++- 132 files changed, 374 insertions(+), 139 deletions(-) create mode 100644 eos/effects/armoredsquadroncommand.py delete mode 100755 eos/effects/commandmultiplier.py delete mode 100755 eos/effects/commandmultiplierinformationwarfarespecialisthidden.py rename eos/effects/{elitebonuscommandshiparmoredcs2.py => elitebonuscommandshiparmoredcs3.py} (76%) mode change 100755 => 100644 rename eos/effects/{shipmissileheavyassaultrofcbc1.py => elitebonuscommandshiphamrofcs1.py} (68%) create mode 100644 eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py create mode 100644 eos/effects/elitebonuscommandshipheavydronetrackingcs2.py create mode 100644 eos/effects/elitebonuscommandshipheavydronevelocitycs2.py create mode 100644 eos/effects/elitebonuscommandshipheavymissiledamagecs2.py rename eos/effects/{shipmissileheavyrofcbc1.py => elitebonuscommandshiphmrofcs1.py} (67%) rename eos/effects/{elitebonuscommandshipinfohiddencs2.py => elitebonuscommandshipinformationcs3.py} (50%) mode change 100755 => 100644 create mode 100644 eos/effects/elitebonuscommandshipinformationhiddencs3.py rename eos/effects/{elitebonuscommandshiphybriddamagecs1.py => elitebonuscommandshipmediumhybriddamagecs2.py} (80%) mode change 100755 => 100644 rename eos/effects/{elitebonuscommandshipinfocs2.py => elitebonuscommandshipmediumhybridrofcs1.py} (52%) mode change 100755 => 100644 rename eos/effects/{elitebonuscommandshipprojectiletrackingcs1.py => elitebonuscommandshipmediumhybridtrackingcs1.py} (85%) mode change 100755 => 100644 rename eos/effects/{elitebonuscommandshipmissilekineticdamagecs1.py => elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py} (56%) mode change 100755 => 100644 create mode 100644 eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py create mode 100644 eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py rename eos/effects/{elitebonuscommandshipsiegecs2.py => elitebonuscommandshipsiegecs3.py} (75%) mode change 100755 => 100644 rename eos/effects/{elitebonuscommandshipskirmishcs2.py => elitebonuscommandshipskirmishcs3.py} (76%) mode change 100755 => 100644 delete mode 100755 eos/effects/elitebonusheavygunshipcaprecharge1.py delete mode 100755 eos/effects/elitebonusheavygunshipdronecapacity2.py delete mode 100755 eos/effects/eliteelitebonuscommandshipdronebay1.py rename eos/effects/{gangeccmfixed.py => gangsensorintegrity.py} (77%) mode change 100755 => 100644 create mode 100644 eos/effects/informationsquadroncommand.py create mode 100644 eos/effects/informationsquadroncommandhidden.py create mode 100644 eos/effects/miningsquadroncommand.py create mode 100644 eos/effects/shieldoperationrechargeratebonuspostpercentonline.py create mode 100644 eos/effects/shipbonusagilityai2.py create mode 100644 eos/effects/shipbonusagilityci2.py create mode 100644 eos/effects/shipbonusagilitygi2.py create mode 100644 eos/effects/shipbonusagilitymi2.py create mode 100644 eos/effects/shipbonusammobaymi2.py create mode 100644 eos/effects/shipbonusarmorrepamountgc2.py create mode 100644 eos/effects/shipbonushamvelocityelitebonusheavygunship1.py create mode 100644 eos/effects/shipbonusheavydronespeedgc.py create mode 100644 eos/effects/shipbonusheavydronetrackinggc.py create mode 100644 eos/effects/shipbonushmlemdamageac.py create mode 100644 eos/effects/shipbonushmlexplodamageac.py create mode 100644 eos/effects/shipbonushmlkineticdamageac.py create mode 100644 eos/effects/shipbonushmlthermdamageac.py create mode 100644 eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py create mode 100644 eos/effects/shipbonusmineralbaygi2.py delete mode 100755 eos/effects/shipbonusmwdcapneedgc2.py create mode 100644 eos/effects/shipbonusorecapacitygi2.py create mode 100644 eos/effects/shipbonuspicommoditiesholdgi2.py create mode 100644 eos/effects/shipbonusprojectiledamagembc2.py create mode 100644 eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py create mode 100644 eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py create mode 100644 eos/effects/shipbonusshieldboostamountmc2.py delete mode 100755 eos/effects/shipmaxvelocitymc2.py delete mode 100644 eos/effects/shipmissilerapidlightrofcbc1.py create mode 100644 eos/effects/siegesquadroncommand.py create mode 100644 eos/effects/skirmishsquadroncommand.py create mode 100644 eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py diff --git a/eos/effects/armoredsquadroncommand.py b/eos/effects/armoredsquadroncommand.py new file mode 100644 index 000000000..c5799feaa --- /dev/null +++ b/eos/effects/armoredsquadroncommand.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Armored Warfare Specialist +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), + "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/armoredwarfaremindlink.py b/eos/effects/armoredwarfaremindlink.py index a23616908..0d599b062 100755 --- a/eos/effects/armoredwarfaremindlink.py +++ b/eos/effects/armoredwarfaremindlink.py @@ -1,5 +1,7 @@ # Used by: # Implant: Armored Warfare Mindlink +# Implant: Federation Navy Warfare Mindlink +# Implant: Imperial Navy Warfare Mindlink type = "passive" def handler(fit, implant, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), diff --git a/eos/effects/armortankinggang2.py b/eos/effects/armortankinggang2.py index 84d4fdf8b..ab4025bba 100755 --- a/eos/effects/armortankinggang2.py +++ b/eos/effects/armortankinggang2.py @@ -1,5 +1,7 @@ # Used by: # Implant: Armored Warfare Mindlink +# Implant: Federation Navy Warfare Mindlink +# Implant: Imperial Navy Warfare Mindlink type = "gang", "active" gangBonus = "armorHpBonus2" gangBoost = "armorHP" diff --git a/eos/effects/armorupgradesmasspenaltyreductionbonus.py b/eos/effects/armorupgradesmasspenaltyreductionbonus.py index f7f7cec12..9c63071c3 100755 --- a/eos/effects/armorupgradesmasspenaltyreductionbonus.py +++ b/eos/effects/armorupgradesmasspenaltyreductionbonus.py @@ -1,7 +1,7 @@ -# Used by: -# Skill: Armor Honeycombing -type = "passive" -def handler(fit, container, context): - level = container.level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer", - "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level) +# Used by: +# Skill: Armor Layering +type = "passive" +def handler(fit, container, context): + level = container.level + fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Armor Reinforcer", + "massAddition", container.getModifiedItemAttr("massPenaltyReduction") * level) diff --git a/eos/effects/boostermodifyboosterarmorpenalties.py b/eos/effects/boostermodifyboosterarmorpenalties.py index 396f42504..a1fd83c72 100755 --- a/eos/effects/boostermodifyboosterarmorpenalties.py +++ b/eos/effects/boostermodifyboosterarmorpenalties.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) # Implants named like: Low grade Edge (5 of 6) -# Skill: Nanite Control +# Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py index a92bef005..12310dff8 100755 --- a/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py +++ b/eos/effects/boostermodifyboostermaxvelocityandcapacitorpenalty.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) # Implants named like: Low grade Edge (5 of 6) -# Skill: Nanite Control +# Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/boostermodifyboostermissilepenalty.py b/eos/effects/boostermodifyboostermissilepenalty.py index 5a9f912b4..ecf30a320 100755 --- a/eos/effects/boostermodifyboostermissilepenalty.py +++ b/eos/effects/boostermodifyboostermissilepenalty.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) # Implants named like: Low grade Edge (5 of 6) -# Skill: Nanite Control +# Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/boostermodifyboostershieldpenalty.py b/eos/effects/boostermodifyboostershieldpenalty.py index 15b015f71..fe2d176b3 100755 --- a/eos/effects/boostermodifyboostershieldpenalty.py +++ b/eos/effects/boostermodifyboostershieldpenalty.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) # Implants named like: Low grade Edge (5 of 6) -# Skill: Nanite Control +# Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/boostermodifyboosterturretpenalty.py b/eos/effects/boostermodifyboosterturretpenalty.py index 2a6e0a427..595464043 100755 --- a/eos/effects/boostermodifyboosterturretpenalty.py +++ b/eos/effects/boostermodifyboosterturretpenalty.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Eifyr and Co. 'Alchemist' Nanite Control NC (2 of 2) # Implants named like: Low grade Edge (5 of 6) -# Skill: Nanite Control +# Skill: Neurotoxin Control type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/commandmultiplier.py b/eos/effects/commandmultiplier.py deleted file mode 100755 index d0a69f359..000000000 --- a/eos/effects/commandmultiplier.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Skills named like: Warfare Specialist (4 of 5) -# Skill: Mining Director -type = "passive" -def handler(fit, skill, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), - "commandBonus", skill.level) diff --git a/eos/effects/commandmultiplierinformationwarfarespecialisthidden.py b/eos/effects/commandmultiplierinformationwarfarespecialisthidden.py deleted file mode 100755 index 6b459e0f1..000000000 --- a/eos/effects/commandmultiplierinformationwarfarespecialisthidden.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Skill: Information Warfare Specialist -runTime = "early" -type = "passive" -def handler(fit, skill, context): - fit.modules.filteredItemMultiply(lambda mod: mod.item.requiresSkill(skill), - "commandBonusHidden", skill.level) diff --git a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py index 596651f3d..30f04b90b 100755 --- a/eos/effects/covertopsandreconopscloakmoduledelaybonus.py +++ b/eos/effects/covertopsandreconopscloakmoduledelaybonus.py @@ -1,8 +1,8 @@ # Used by: # Ships from group: Black Ops (4 of 4) # Ships from group: Blockade Runner (4 of 4) -# Ships from group: Covert Ops (4 of 4) -# Ships from group: Force Recon Ship (4 of 4) +# Ships from group: Covert Ops (5 of 5) +# Ships from group: Force Recon Ship (5 of 5) # Ships from group: Stealth Bomber (4 of 4) # Subsystems named like: Offensive Covert Reconfiguration (4 of 4) type = "passive" diff --git a/eos/effects/covertopscloakcpupercentbonus1.py b/eos/effects/covertopscloakcpupercentbonus1.py index 89a6fc2ce..de8ce6fac 100755 --- a/eos/effects/covertopscloakcpupercentbonus1.py +++ b/eos/effects/covertopscloakcpupercentbonus1.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Covert Ops (4 of 4) +# Ships from group: Covert Ops (5 of 5) type = "passive" runTime = "early" def handler(fit, ship, context): diff --git a/eos/effects/covertopsstealthbombertargettingdelaybonus.py b/eos/effects/covertopsstealthbombertargettingdelaybonus.py index cdc678887..3cbad76e2 100755 --- a/eos/effects/covertopsstealthbombertargettingdelaybonus.py +++ b/eos/effects/covertopsstealthbombertargettingdelaybonus.py @@ -1,6 +1,7 @@ # Used by: # Ships from group: Black Ops (4 of 4) # Ships from group: Stealth Bomber (4 of 4) +# Ship: Chremoas # Ship: Etana type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/cynosuraldurationbonus.py b/eos/effects/cynosuraldurationbonus.py index 597c34daa..43f35d979 100755 --- a/eos/effects/cynosuraldurationbonus.py +++ b/eos/effects/cynosuraldurationbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (4 of 4) +# Ships from group: Force Recon Ship (4 of 5) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Cynosural Field", diff --git a/eos/effects/cynosuraltheoryconsumptionbonus.py b/eos/effects/cynosuraltheoryconsumptionbonus.py index fd2c83f1c..270c56adb 100755 --- a/eos/effects/cynosuraltheoryconsumptionbonus.py +++ b/eos/effects/cynosuraltheoryconsumptionbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (4 of 4) +# Ships from group: Force Recon Ship (4 of 5) # Skill: Cynosural Field Theory type = "passive" def handler(fit, container, context): diff --git a/eos/effects/drawbackarmorhp.py b/eos/effects/drawbackarmorhp.py index 8be21214a..ca286f0de 100755 --- a/eos/effects/drawbackarmorhp.py +++ b/eos/effects/drawbackarmorhp.py @@ -1,5 +1,5 @@ # Used by: -# Modules from group: Rig Astronautic (64 of 64) +# Modules from group: Rig Navigation (64 of 64) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("armorHP", module.getModifiedItemAttr("drawback")) \ No newline at end of file diff --git a/eos/effects/drawbackmaxvelocity.py b/eos/effects/drawbackmaxvelocity.py index 962e9ed5f..a81f69a57 100755 --- a/eos/effects/drawbackmaxvelocity.py +++ b/eos/effects/drawbackmaxvelocity.py @@ -1,5 +1,6 @@ # Used by: -# Modules from group: Rig Armor (56 of 72) +# Modules from group: Rig Armor (48 of 64) +# Modules from group: Rig Resource Processing (8 of 10) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("maxVelocity", module.getModifiedItemAttr("drawback"), diff --git a/eos/effects/drawbackshieldcapacity.py b/eos/effects/drawbackshieldcapacity.py index d5a23d21c..91a1951d2 100755 --- a/eos/effects/drawbackshieldcapacity.py +++ b/eos/effects/drawbackshieldcapacity.py @@ -1,5 +1,7 @@ # Used by: -# Modules from group: Rig Electronics Superiority (64 of 64) +# Modules from group: Rig Electronic Systems (40 of 48) +# Modules from group: Rig Targeting (16 of 16) +# Modules named like: Signal Focusing Kit (8 of 8) type = "passive" def handler(fit, module, context): fit.ship.boostItemAttr("shieldCapacity", module.getModifiedItemAttr("drawback")) diff --git a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py index 7a31228b9..4bf205006 100755 --- a/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py +++ b/eos/effects/electronicscpuoutputbonuspostpercentcpuoutputlocationshipgroupcomputer.py @@ -2,7 +2,7 @@ # Implants named like: Zainou 'Gypsy' Electronics EE (6 of 6) # Modules named like: Processor Overclocking Unit (8 of 8) # Implant: Genolution Core Augmentation CA-2 -# Skill: Electronics +# Skill: CPU Management type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/elitebonuscommandshiparmoredcs2.py b/eos/effects/elitebonuscommandshiparmoredcs3.py old mode 100755 new mode 100644 similarity index 76% rename from eos/effects/elitebonuscommandshiparmoredcs2.py rename to eos/effects/elitebonuscommandshiparmoredcs3.py index 01de7115e..f9bd9d69e --- a/eos/effects/elitebonuscommandshiparmoredcs2.py +++ b/eos/effects/elitebonuscommandshiparmoredcs3.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Damnation +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Armored Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) diff --git a/eos/effects/shipmissileheavyassaultrofcbc1.py b/eos/effects/elitebonuscommandshiphamrofcs1.py similarity index 68% rename from eos/effects/shipmissileheavyassaultrofcbc1.py rename to eos/effects/elitebonuscommandshiphamrofcs1.py index 36c1ea2a6..af95fb47f 100644 --- a/eos/effects/shipmissileheavyassaultrofcbc1.py +++ b/eos/effects/elitebonuscommandshiphamrofcs1.py @@ -1,7 +1,8 @@ # Used by: +# Ship: Claymore # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level + level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy Assault", - "speed", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) diff --git a/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py new file mode 100644 index 000000000..0ffa11ad9 --- /dev/null +++ b/eos/effects/elitebonuscommandshipheavyassaultmissiledamagecs2.py @@ -0,0 +1,9 @@ +# Used by: +# Ship: Damnation +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + damageTypes = ("em", "explosive", "kinetic", "thermal") + for damageType in damageTypes: + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), + "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py new file mode 100644 index 000000000..c00864692 --- /dev/null +++ b/eos/effects/elitebonuscommandshipheavydronetrackingcs2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Eos +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py new file mode 100644 index 000000000..ad4dc5a60 --- /dev/null +++ b/eos/effects/elitebonuscommandshipheavydronevelocitycs2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Eos +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), + "maxVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py new file mode 100644 index 000000000..b280e1c7c --- /dev/null +++ b/eos/effects/elitebonuscommandshipheavymissiledamagecs2.py @@ -0,0 +1,9 @@ +# Used by: +# Ship: Damnation +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + damageTypes = ("em", "explosive", "kinetic", "thermal") + for damageType in damageTypes: + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "{0}Damage".format(damageType), ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/shipmissileheavyrofcbc1.py b/eos/effects/elitebonuscommandshiphmrofcs1.py similarity index 67% rename from eos/effects/shipmissileheavyrofcbc1.py rename to eos/effects/elitebonuscommandshiphmrofcs1.py index 7cce90790..4a1310931 100644 --- a/eos/effects/shipmissileheavyrofcbc1.py +++ b/eos/effects/elitebonuscommandshiphmrofcs1.py @@ -1,7 +1,8 @@ # Used by: +# Ship: Claymore # Ship: Nighthawk type = "passive" def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level + level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Heavy", - "speed", ship.getModifiedItemAttr("shipBonusCBC1") * level) + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) diff --git a/eos/effects/elitebonuscommandshipinfohiddencs2.py b/eos/effects/elitebonuscommandshipinformationcs3.py old mode 100755 new mode 100644 similarity index 50% rename from eos/effects/elitebonuscommandshipinfohiddencs2.py rename to eos/effects/elitebonuscommandshipinformationcs3.py index 071188eaf..7b9184f7d --- a/eos/effects/elitebonuscommandshipinfohiddencs2.py +++ b/eos/effects/elitebonuscommandshipinformationcs3.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Eos +# Ships from group: Command Ship (4 of 8) type = "passive" -def handler(fit, ship, context): +def handler(fit, module, context): level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "commandBonus", module.getModifiedItemAttr("eliteBonusCommandShips3") * level) diff --git a/eos/effects/elitebonuscommandshipinformationhiddencs3.py b/eos/effects/elitebonuscommandshipinformationhiddencs3.py new file mode 100644 index 000000000..8cb875d03 --- /dev/null +++ b/eos/effects/elitebonuscommandshipinformationhiddencs3.py @@ -0,0 +1,7 @@ +# Used by: +# Ships from group: Command Ship (4 of 8) +type = "passive" +def handler(fit, module, context): + level = fit.character.getSkill("Command Ships").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), + "commandBonusHidden", module.getModifiedItemAttr("eliteBonusCommandShips3") * level) diff --git a/eos/effects/elitebonuscommandshiphybriddamagecs1.py b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py old mode 100755 new mode 100644 similarity index 80% rename from eos/effects/elitebonuscommandshiphybriddamagecs1.py rename to eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py index 2ac0ebd06..361088a5c --- a/eos/effects/elitebonuscommandshiphybriddamagecs1.py +++ b/eos/effects/elitebonuscommandshipmediumhybriddamagecs2.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Astarte +# Ship: Vulture type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), - "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + "damageMultiplier", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipinfocs2.py b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py old mode 100755 new mode 100644 similarity index 52% rename from eos/effects/elitebonuscommandshipinfocs2.py rename to eos/effects/elitebonuscommandshipmediumhybridrofcs1.py index 046cf6024..d46d3b81f --- a/eos/effects/elitebonuscommandshipinfocs2.py +++ b/eos/effects/elitebonuscommandshipmediumhybridrofcs1.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Eos +# Ship: Astarte type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), + "speed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) diff --git a/eos/effects/elitebonuscommandshipprojectiletrackingcs1.py b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py old mode 100755 new mode 100644 similarity index 85% rename from eos/effects/elitebonuscommandshipprojectiletrackingcs1.py rename to eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py index 705d8f69e..1724cc372 --- a/eos/effects/elitebonuscommandshipprojectiletrackingcs1.py +++ b/eos/effects/elitebonuscommandshipmediumhybridtrackingcs1.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Claymore +# Ship: Eos type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Hybrid Turret"), "trackingSpeed", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) diff --git a/eos/effects/elitebonuscommandshipmissilekineticdamagecs1.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py old mode 100755 new mode 100644 similarity index 56% rename from eos/effects/elitebonuscommandshipmissilekineticdamagecs1.py rename to eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py index c97eec1ef..f688fecd0 --- a/eos/effects/elitebonuscommandshipmissilekineticdamagecs1.py +++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionradiuscs2.py @@ -3,5 +3,5 @@ type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level - fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Missile Launcher Operation"), - "kineticDamage", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), + "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py new file mode 100644 index 000000000..d1c08fdbb --- /dev/null +++ b/eos/effects/elitebonuscommandshipsheavyassaultmissileexplosionvelocitycs2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Claymore +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), + "aoeVelocity", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py new file mode 100644 index 000000000..3bbc19be2 --- /dev/null +++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionradiuscs2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Nighthawk +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Command Ships").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "aoeCloudSize", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) diff --git a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py index 35aabbcca..f37871fb9 100755 --- a/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py +++ b/eos/effects/elitebonuscommandshipsheavymissileexplosionvelocitycs2.py @@ -1,5 +1,5 @@ # Used by: -# Ship: Nighthawk +# Ship: Claymore type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level diff --git a/eos/effects/elitebonuscommandshipsiegecs2.py b/eos/effects/elitebonuscommandshipsiegecs3.py old mode 100755 new mode 100644 similarity index 75% rename from eos/effects/elitebonuscommandshipsiegecs2.py rename to eos/effects/elitebonuscommandshipsiegecs3.py index 0bff2972b..d87d92eaa --- a/eos/effects/elitebonuscommandshipsiegecs2.py +++ b/eos/effects/elitebonuscommandshipsiegecs3.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Vulture +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) diff --git a/eos/effects/elitebonuscommandshipskirmishcs2.py b/eos/effects/elitebonuscommandshipskirmishcs3.py old mode 100755 new mode 100644 similarity index 76% rename from eos/effects/elitebonuscommandshipskirmishcs2.py rename to eos/effects/elitebonuscommandshipskirmishcs3.py index ae1202117..80005cf38 --- a/eos/effects/elitebonuscommandshipskirmishcs2.py +++ b/eos/effects/elitebonuscommandshipskirmishcs3.py @@ -1,7 +1,7 @@ # Used by: -# Ship: Claymore +# Ships from group: Command Ship (4 of 8) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Command Ships").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), - "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips2") * level) + "commandBonus", ship.getModifiedItemAttr("eliteBonusCommandShips3") * level) diff --git a/eos/effects/elitebonuscoveropsscanprobestrength2.py b/eos/effects/elitebonuscoveropsscanprobestrength2.py index 368b2b456..51bf41485 100755 --- a/eos/effects/elitebonuscoveropsscanprobestrength2.py +++ b/eos/effects/elitebonuscoveropsscanprobestrength2.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Covert Ops (4 of 4) +# Ships from group: Covert Ops (5 of 5) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Covert Ops").level diff --git a/eos/effects/elitebonusheavygunshipcaprecharge1.py b/eos/effects/elitebonusheavygunshipcaprecharge1.py deleted file mode 100755 index d6ef32a52..000000000 --- a/eos/effects/elitebonusheavygunshipcaprecharge1.py +++ /dev/null @@ -1,6 +0,0 @@ -# Used by: -# Ship: Sacrilege -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level - fit.ship.boostItemAttr("rechargeRate", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) diff --git a/eos/effects/elitebonusheavygunshipdronecapacity2.py b/eos/effects/elitebonusheavygunshipdronecapacity2.py deleted file mode 100755 index b3686024f..000000000 --- a/eos/effects/elitebonusheavygunshipdronecapacity2.py +++ /dev/null @@ -1,6 +0,0 @@ -# Used by: -# Ship: Ishtar -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Heavy Assault Cruisers").level - fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) diff --git a/eos/effects/eliteelitebonuscommandshipdronebay1.py b/eos/effects/eliteelitebonuscommandshipdronebay1.py deleted file mode 100755 index 5c63da1b7..000000000 --- a/eos/effects/eliteelitebonuscommandshipdronebay1.py +++ /dev/null @@ -1,6 +0,0 @@ -# Used by: -# Ship: Eos -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Command Ships").level - fit.ship.increaseItemAttr("droneCapacity", ship.getModifiedItemAttr("eliteBonusCommandShips1") * level) diff --git a/eos/effects/elitereconstasiswebbonus2.py b/eos/effects/elitereconstasiswebbonus2.py index b8239e55d..dba9f815b 100755 --- a/eos/effects/elitereconstasiswebbonus2.py +++ b/eos/effects/elitereconstasiswebbonus2.py @@ -1,5 +1,6 @@ # Used by: # Ship: Huginn +# Ship: Moracha # Ship: Rapier type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py b/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py index 31601ad9f..a91275659 100755 --- a/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py +++ b/eos/effects/energyemmisionsystemscapneedbonuspostpercentcapacitorneedlocationshipmodulesrequiringenergyemmisionsystems.py @@ -1,7 +1,7 @@ # Used by: # Implants named like: Inherent Implants 'Squire' Energy Emission Systems ES (6 of 6) # Modules named like: Egress Port Maximizer (8 of 8) -# Skill: Energy Emission Systems +# Skill: Capacitor Emission Systems type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py index b6f65ac07..73dd2c782 100755 --- a/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py +++ b/eos/effects/energymanagementcapacitorbonuspostpercentcapacitylocationshipgroupcapacitorcapacitybonus.py @@ -3,7 +3,7 @@ # Implants named like: Mindflood Booster (4 of 4) # Modules named like: Semiconductor Memory Cell (8 of 8) # Implant: Genolution Core Augmentation CA-1 -# Skill: Energy Management +# Skill: Capacitor Management type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py index f5042d690..4fc03f2f1 100755 --- a/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py +++ b/eos/effects/energysystemsoperationcaprechargebonuspostpercentrechargeratelocationshipgroupcapacitor.py @@ -2,7 +2,7 @@ # Implants named like: Inherent Implants 'Squire' Energy Systems Operation EO (6 of 6) # Modules named like: Capacitor Control Circuit (8 of 8) # Implant: Genolution Core Augmentation CA-2 -# Skill: Energy Systems Operation +# Skill: Capacitor Systems Operation type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/energytransfer.py b/eos/effects/energytransfer.py index 8c1904ab2..296d63b57 100755 --- a/eos/effects/energytransfer.py +++ b/eos/effects/energytransfer.py @@ -1,5 +1,5 @@ # Used by: -# Modules from group: Energy Transfer Array (38 of 38) +# Modules from group: Remote Capacitor Transmitter (38 of 38) type = "projected", "active" def handler(fit, module, context): if "projected" in context: diff --git a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py index 43a85bb58..6f3294930 100755 --- a/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py +++ b/eos/effects/engineeringpowerengineeringoutputbonuspostpercentpoweroutputlocationshipgrouppowercore.py @@ -2,7 +2,7 @@ # Implants named like: Inherent Implants 'Squire' Engineering EG (6 of 6) # Modules named like: Ancillary Current Router (8 of 8) # Implant: Genolution Core Augmentation CA-1 -# Skill: Engineering +# Skill: Power Grid Management type = "passive" def handler(fit, container, context): level = container.level if "skill" in context else 1 diff --git a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py index 3a6c1254b..21a7bb63a 100755 --- a/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py +++ b/eos/effects/evasivemaneuveringagilitybonuspostpercentagilityship.py @@ -2,6 +2,7 @@ # Implants named like: Eifyr and Co. 'Rogue' Evasive Maneuvering EM (6 of 6) # Implants named like: Low grade Nomad (5 of 6) # Modules named like: Low Friction Nozzle Joints (8 of 8) +# Implant: Genolution Core Augmentation CA-4 # Skill: Evasive Maneuvering # Skill: Spaceship Command type = "passive" diff --git a/eos/effects/gangeccmfixed.py b/eos/effects/gangsensorintegrity.py old mode 100755 new mode 100644 similarity index 77% rename from eos/effects/gangeccmfixed.py rename to eos/effects/gangsensorintegrity.py index c1d3fdf86..e3fe05ba4 --- a/eos/effects/gangeccmfixed.py +++ b/eos/effects/gangsensorintegrity.py @@ -4,6 +4,8 @@ type = "gang", "active" gangBoost = "scanTypeStrength" def handler(fit, module, context): if "gang" not in context: return + fit.ship.boostItemAttr("maxTargetRange", module.getModifiedItemAttr("commandBonus"), + stackingPenalties = True) for scanType in ("Gravimetric", "Radar", "Ladar", "Magnetometric"): fit.ship.boostItemAttr("scan%sStrength" % scanType, module.getModifiedItemAttr("commandBonus"), diff --git a/eos/effects/implantarmorhpbonus2.py b/eos/effects/implantarmorhpbonus2.py index 860622208..003fad4ff 100755 --- a/eos/effects/implantarmorhpbonus2.py +++ b/eos/effects/implantarmorhpbonus2.py @@ -1,5 +1,6 @@ # Used by: # Implants named like: Inherent Implants 'Noble' Hull Upgrades HG (7 of 7) +# Implant: Genolution Core Augmentation CA-4 # Implant: Imperial Navy Modified 'Noble' Implant # Implant: Imperial Special Ops Field Enhancer - Standard type = "passive" diff --git a/eos/effects/implantvelocitybonus.py b/eos/effects/implantvelocitybonus.py index b5b8c0c95..17dbead8d 100755 --- a/eos/effects/implantvelocitybonus.py +++ b/eos/effects/implantvelocitybonus.py @@ -1,5 +1,6 @@ # Used by: # Implants named like: Eifyr and Co. 'Rogue' Navigation NN (6 of 6) +# Implant: Genolution Core Augmentation CA-3 # Implant: Shaqil's Speed Enhancer type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/informationsquadroncommand.py b/eos/effects/informationsquadroncommand.py new file mode 100644 index 000000000..350d0ecb1 --- /dev/null +++ b/eos/effects/informationsquadroncommand.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Information Warfare Specialist +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), + "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/informationsquadroncommandhidden.py b/eos/effects/informationsquadroncommandhidden.py new file mode 100644 index 000000000..d42c93a01 --- /dev/null +++ b/eos/effects/informationsquadroncommandhidden.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Information Warfare Specialist +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), + "commandBonusHidden", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/informationwarfaremindlinkhidden.py b/eos/effects/informationwarfaremindlinkhidden.py index e7d000886..31869d0d8 100755 --- a/eos/effects/informationwarfaremindlinkhidden.py +++ b/eos/effects/informationwarfaremindlinkhidden.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Caldari Navy Warfare Mindlink +# Implant: Imperial Navy Warfare Mindlink # Implant: Information Warfare Mindlink type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/minigamevirusstrengthbonus.py b/eos/effects/minigamevirusstrengthbonus.py index 2a3cd9557..0e5f14e69 100644 --- a/eos/effects/minigamevirusstrengthbonus.py +++ b/eos/effects/minigamevirusstrengthbonus.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Covert Ops (4 of 4) +# Ships from group: Covert Ops (5 of 5) # Subsystems named like: Electronics Emergent Locus Analyzer (4 of 4) # Variations of ship: Heron (3 of 3) # Variations of ship: Imicus (3 of 3) diff --git a/eos/effects/miningsquadroncommand.py b/eos/effects/miningsquadroncommand.py new file mode 100644 index 000000000..5acdbfd8d --- /dev/null +++ b/eos/effects/miningsquadroncommand.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Mining Director +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Mining Director"), + "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/modifyshieldrechargerate.py b/eos/effects/modifyshieldrechargerate.py index 179149d35..257e9680d 100755 --- a/eos/effects/modifyshieldrechargerate.py +++ b/eos/effects/modifyshieldrechargerate.py @@ -4,7 +4,6 @@ # Modules from group: Power Diagnostic System (31 of 31) # Modules from group: Reactor Control Unit (28 of 28) # Modules from group: Shield Flux Coil (11 of 11) -# Modules from group: Shield Power Relay (11 of 11) # Modules from group: Shield Recharger (6 of 6) # Modules named like: QA Multiship Module Players (4 of 4) type = "passive" diff --git a/eos/effects/mwdsignatureradiusrolebonus.py b/eos/effects/mwdsignatureradiusrolebonus.py index be5fffe44..d686592b7 100755 --- a/eos/effects/mwdsignatureradiusrolebonus.py +++ b/eos/effects/mwdsignatureradiusrolebonus.py @@ -1,5 +1,6 @@ # Used by: # Ships from group: Assault Frigate (8 of 12) +# Ships from group: Heavy Assault Cruiser (8 of 11) type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), diff --git a/eos/effects/openspawncontainer.py b/eos/effects/openspawncontainer.py index dc92eb636..8457f0e6f 100755 --- a/eos/effects/openspawncontainer.py +++ b/eos/effects/openspawncontainer.py @@ -1,5 +1,6 @@ # Used by: # Modules from group: Data Miners (13 of 14) +# Module: QA Cross Protocol Analyzer type = "active" def handler(fit, module, context): pass \ No newline at end of file diff --git a/eos/effects/overloadselfdurationbonus.py b/eos/effects/overloadselfdurationbonus.py index b8a4b498f..268e1aed5 100755 --- a/eos/effects/overloadselfdurationbonus.py +++ b/eos/effects/overloadselfdurationbonus.py @@ -1,11 +1,11 @@ # Used by: -# Modules from group: Armor Repair Projector (38 of 38) # Modules from group: Capacitor Booster (54 of 54) # Modules from group: Energy Destabilizer (41 of 41) -# Modules from group: Energy Transfer Array (38 of 38) # Modules from group: Energy Vampire (52 of 52) # Modules from group: Hull Repair Unit (21 of 21) -# Modules from group: Shield Transporter (39 of 39) +# Modules from group: Remote Armor Repairer (38 of 38) +# Modules from group: Remote Capacitor Transmitter (38 of 38) +# Modules from group: Remote Shield Booster (39 of 39) # Module: QA Remote Armor Repair System - 5 Players # Module: QA Shield Transporter - 5 Players # Module: Reactive Armor Hardener diff --git a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py index 13a938391..4c6ebf6f4 100755 --- a/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py +++ b/eos/effects/reconoperationsmaxtargetrangebonuspostpercentmaxtargetrangegangships.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Caldari Navy Warfare Mindlink +# Implant: Imperial Navy Warfare Mindlink # Implant: Information Warfare Mindlink # Skill: Information Warfare type = "gang" diff --git a/eos/effects/reconshipcloakcpubonus1.py b/eos/effects/reconshipcloakcpubonus1.py index 59e11506d..ea8478809 100755 --- a/eos/effects/reconshipcloakcpubonus1.py +++ b/eos/effects/reconshipcloakcpubonus1.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Force Recon Ship (4 of 4) +# Ships from group: Force Recon Ship (5 of 5) type = "passive" runTime = "early" def handler(fit, ship, context): diff --git a/eos/effects/rigdrawbackbonuseffect.py b/eos/effects/rigdrawbackbonuseffect.py index 3762dd7bf..65e34097a 100755 --- a/eos/effects/rigdrawbackbonuseffect.py +++ b/eos/effects/rigdrawbackbonuseffect.py @@ -1,5 +1,5 @@ # Used by: -# Skills named like: Rigging (9 of 10) +# Skills from group: Rigging (9 of 10) type = "passive" def handler(fit, skill, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill(skill), diff --git a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py index 0d125a6e6..4361612f3 100755 --- a/eos/effects/salvagingaccessdifficultybonuseffectpassive.py +++ b/eos/effects/salvagingaccessdifficultybonuseffectpassive.py @@ -1,5 +1,5 @@ # Used by: -# Modules named like: Salvage Tackle (8 of 8) +# Modules from group: Rig Resource Processing (8 of 10) # Implant: Poteque 'Prospector' Salvaging SV-905 type = "passive" def handler(fit, container, context): diff --git a/eos/effects/scanstrengthbonuspercentpassive.py b/eos/effects/scanstrengthbonuspercentpassive.py index ad1803f38..ccf9feac1 100755 --- a/eos/effects/scanstrengthbonuspercentpassive.py +++ b/eos/effects/scanstrengthbonuspercentpassive.py @@ -1,5 +1,5 @@ # Used by: -# Implants from group: Cyberimplant (20 of 141) +# Implants from group: Cyberimplant (20 of 143) type = "passive" def handler(fit, implant, context): for type in ("Gravimetric", "Magnetometric", "Radar", "Ladar"): diff --git a/eos/effects/setbonuschristmascapacitorcapacity.py b/eos/effects/setbonuschristmascapacitorcapacity.py index d7401da74..d7f91a285 100755 --- a/eos/effects/setbonuschristmascapacitorcapacity.py +++ b/eos/effects/setbonuschristmascapacitorcapacity.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Genolution Core Augmentation CA (2 of 2) +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmascapacitorrecharge2.py b/eos/effects/setbonuschristmascapacitorrecharge2.py index 0d031bf78..5b250bbf4 100755 --- a/eos/effects/setbonuschristmascapacitorrecharge2.py +++ b/eos/effects/setbonuschristmascapacitorrecharge2.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Genolution Core Augmentation CA (2 of 2) +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmascpuoutput.py b/eos/effects/setbonuschristmascpuoutput.py index 169c5abc0..29b2c744c 100755 --- a/eos/effects/setbonuschristmascpuoutput.py +++ b/eos/effects/setbonuschristmascpuoutput.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Genolution Core Augmentation CA (2 of 2) +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/setbonuschristmaspowergrid.py b/eos/effects/setbonuschristmaspowergrid.py index 615191253..588847dfe 100755 --- a/eos/effects/setbonuschristmaspowergrid.py +++ b/eos/effects/setbonuschristmaspowergrid.py @@ -1,5 +1,5 @@ # Used by: -# Implants named like: Genolution Core Augmentation CA (2 of 2) +# Implants named like: Genolution Core Augmentation CA (4 of 4) runTime = "early" type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py index 645fc1d6a..1552f14a2 100755 --- a/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py +++ b/eos/effects/shielddefensiveoperationsshieldcapacitybonuspostpercentshieldcapacitygangships.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Caldari Navy Warfare Mindlink +# Implant: Republic Fleet Warfare Mindlink # Implant: Siege Warfare Mindlink # Skill: Siege Warfare type = "gang" diff --git a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py index e963f437a..d6151694f 100755 --- a/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py +++ b/eos/effects/shieldmanagementshieldcapacitybonuspostpercentcapacitylocationshipgroupshield.py @@ -2,6 +2,7 @@ # Implants named like: Zainou 'Gnome' Shield Management SM (6 of 6) # Modules named like: Core Defense Field Extender (8 of 8) # Modules named like: QA Multiship Module Players (4 of 4) +# Implant: Genolution Core Augmentation CA-3 # Implant: Sansha Modified 'Gnome' Implant # Skill: Shield Management type = "passive" diff --git a/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py new file mode 100644 index 000000000..16de0fe5c --- /dev/null +++ b/eos/effects/shieldoperationrechargeratebonuspostpercentonline.py @@ -0,0 +1,5 @@ +# Used by: +# Modules from group: Shield Power Relay (11 of 11) +type = "passive" +def handler(fit, module, context): + fit.ship.boostItemAttr("shieldRechargeRate", module.getModifiedItemAttr("rechargeratebonus") or 0) diff --git a/eos/effects/shieldtransfer.py b/eos/effects/shieldtransfer.py index 176e50e7f..7e82e2be6 100755 --- a/eos/effects/shieldtransfer.py +++ b/eos/effects/shieldtransfer.py @@ -1,5 +1,5 @@ # Used by: -# Modules from group: Shield Transporter (39 of 39) +# Modules from group: Remote Shield Booster (39 of 39) # Drones named like: Shield Maintenance Bot (6 of 6) # Module: QA Shield Transporter - 5 Players type = "projected", "active" diff --git a/eos/effects/shipbonusagilityai2.py b/eos/effects/shipbonusagilityai2.py new file mode 100644 index 000000000..e860b83e1 --- /dev/null +++ b/eos/effects/shipbonusagilityai2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Sigil +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Amarr Industrial").level + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusAI2") * level) diff --git a/eos/effects/shipbonusagilityci2.py b/eos/effects/shipbonusagilityci2.py new file mode 100644 index 000000000..2a337808c --- /dev/null +++ b/eos/effects/shipbonusagilityci2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Badger +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Caldari Industrial").level + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusCI2") * level) diff --git a/eos/effects/shipbonusagilitygi2.py b/eos/effects/shipbonusagilitygi2.py new file mode 100644 index 000000000..77ef2e561 --- /dev/null +++ b/eos/effects/shipbonusagilitygi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Nereus +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Industrial").level + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusGI2") * level) diff --git a/eos/effects/shipbonusagilitymi2.py b/eos/effects/shipbonusagilitymi2.py new file mode 100644 index 000000000..effdf806e --- /dev/null +++ b/eos/effects/shipbonusagilitymi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Wreathe +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Industrial").level + fit.ship.boostItemAttr("agility", ship.getModifiedItemAttr("shipBonusMI2") * level) diff --git a/eos/effects/shipbonusammobaymi2.py b/eos/effects/shipbonusammobaymi2.py new file mode 100644 index 000000000..854e9cd06 --- /dev/null +++ b/eos/effects/shipbonusammobaymi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Hoarder +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Industrial").level + fit.ship.boostItemAttr("specialAmmoHoldCapacity", ship.getModifiedItemAttr("shipBonusMI2") * level) diff --git a/eos/effects/shipbonusarmorrepamountgc2.py b/eos/effects/shipbonusarmorrepamountgc2.py new file mode 100644 index 000000000..0b1e795f9 --- /dev/null +++ b/eos/effects/shipbonusarmorrepamountgc2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Deimos +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Cruiser").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Repair Systems"), + "armorDamageAmount", ship.getModifiedItemAttr("shipBonusGC2") * level) diff --git a/eos/effects/shipbonuscargo2gi.py b/eos/effects/shipbonuscargo2gi.py index b51f9b77a..3ffb05abd 100755 --- a/eos/effects/shipbonuscargo2gi.py +++ b/eos/effects/shipbonuscargo2gi.py @@ -1,6 +1,7 @@ # Used by: -# Ships named like: Iteron Mark (7 of 7) -# Variations of ship: Iteron (2 of 2) +# Variations of ship: Miasmos (3 of 4) +# Variations of ship: Nereus (2 of 2) +# Ship: Iteron Mark V # Ship: Occator type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonuscargoci.py b/eos/effects/shipbonuscargoci.py index 90038a824..24f8ceb96 100755 --- a/eos/effects/shipbonuscargoci.py +++ b/eos/effects/shipbonuscargoci.py @@ -1,6 +1,6 @@ # Used by: # Variations of ship: Badger (2 of 2) -# Variations of ship: Badger Mark II (2 of 2) +# Variations of ship: Tayra (2 of 2) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Industrial").level diff --git a/eos/effects/shipbonuscargomi.py b/eos/effects/shipbonuscargomi.py index 85c0b7620..e522b7ff4 100755 --- a/eos/effects/shipbonuscargomi.py +++ b/eos/effects/shipbonuscargomi.py @@ -1,7 +1,6 @@ # Used by: # Variations of ship: Mammoth (2 of 2) # Variations of ship: Wreathe (2 of 2) -# Ship: Hoarder type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Industrial").level diff --git a/eos/effects/shipbonusdronedamagemultipliergbc1.py b/eos/effects/shipbonusdronedamagemultipliergbc1.py index cfc4dc678..401c22ea6 100755 --- a/eos/effects/shipbonusdronedamagemultipliergbc1.py +++ b/eos/effects/shipbonusdronedamagemultipliergbc1.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Eos # Ship: Myrmidon type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusdronehitpointsgbc1.py b/eos/effects/shipbonusdronehitpointsgbc1.py index 79d3d02db..da9ade8c2 100755 --- a/eos/effects/shipbonusdronehitpointsgbc1.py +++ b/eos/effects/shipbonusdronehitpointsgbc1.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Eos # Ship: Myrmidon type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py new file mode 100644 index 000000000..096aeef1a --- /dev/null +++ b/eos/effects/shipbonushamvelocityelitebonusheavygunship1.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Heavy Assault Cruisers").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Assault Missiles"), + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) diff --git a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py index 0d2741b53..5bbd082f3 100644 --- a/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavyassaultmissilekineticdamagecbc1.py @@ -1,5 +1,6 @@ # Used by: # Ship: Drake +# Ship: Nighthawk type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py index e70ff91be..7681a814d 100644 --- a/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavyassaultmissilelauncherrofmbc2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Claymore # Ship: Cyclone type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusheavydronespeedgc.py b/eos/effects/shipbonusheavydronespeedgc.py new file mode 100644 index 000000000..25fc75538 --- /dev/null +++ b/eos/effects/shipbonusheavydronespeedgc.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Ishtar +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Cruiser").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), + "maxVelocity", ship.getModifiedItemAttr("shipBonusGC") * level) diff --git a/eos/effects/shipbonusheavydronetrackinggc.py b/eos/effects/shipbonusheavydronetrackinggc.py new file mode 100644 index 000000000..d3c2cf9f7 --- /dev/null +++ b/eos/effects/shipbonusheavydronetrackinggc.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Ishtar +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Cruiser").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Heavy Drone Operation"), + "trackingSpeed", ship.getModifiedItemAttr("shipBonusGC") * level) diff --git a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py index bed6710d1..877be0e19 100644 --- a/eos/effects/shipbonusheavymissilekineticdamagecbc1.py +++ b/eos/effects/shipbonusheavymissilekineticdamagecbc1.py @@ -1,5 +1,6 @@ # Used by: # Ship: Drake +# Ship: Nighthawk type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Battlecruiser").level diff --git a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py index 20cc37c39..43a07f21b 100644 --- a/eos/effects/shipbonusheavymissilelauncherrofmbc2.py +++ b/eos/effects/shipbonusheavymissilelauncherrofmbc2.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Claymore # Ship: Cyclone type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonushmlemdamageac.py b/eos/effects/shipbonushmlemdamageac.py new file mode 100644 index 000000000..7ccf7fd63 --- /dev/null +++ b/eos/effects/shipbonushmlemdamageac.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Amarr Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "emDamage", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonushmlexplodamageac.py b/eos/effects/shipbonushmlexplodamageac.py new file mode 100644 index 000000000..921dbd9fc --- /dev/null +++ b/eos/effects/shipbonushmlexplodamageac.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Amarr Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "explosiveDamage", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonushmlkineticdamageac.py b/eos/effects/shipbonushmlkineticdamageac.py new file mode 100644 index 000000000..0f06f138c --- /dev/null +++ b/eos/effects/shipbonushmlkineticdamageac.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Amarr Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "kineticDamage", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonushmlthermdamageac.py b/eos/effects/shipbonushmlthermdamageac.py new file mode 100644 index 000000000..484c9eb5e --- /dev/null +++ b/eos/effects/shipbonushmlthermdamageac.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Amarr Cruiser").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "thermalDamage", ship.getModifiedItemAttr("shipBonusAC") * level) diff --git a/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py new file mode 100644 index 000000000..6c6ef137d --- /dev/null +++ b/eos/effects/shipbonushmlvelocityelitebonusheavygunship1.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sacrilege +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Heavy Assault Cruisers").level + fit.modules.filteredChargeBoost(lambda mod: mod.charge.requiresSkill("Heavy Missiles"), + "maxVelocity", ship.getModifiedItemAttr("eliteBonusHeavyGunship1") * level) diff --git a/eos/effects/shipbonusmineralbaygi2.py b/eos/effects/shipbonusmineralbaygi2.py new file mode 100644 index 000000000..365e64c5e --- /dev/null +++ b/eos/effects/shipbonusmineralbaygi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Kryos +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Industrial").level + fit.ship.boostItemAttr("specialMineralHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) diff --git a/eos/effects/shipbonusmwdcapneedgc2.py b/eos/effects/shipbonusmwdcapneedgc2.py deleted file mode 100755 index ebaba29a6..000000000 --- a/eos/effects/shipbonusmwdcapneedgc2.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Deimos -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Gallente Cruiser").level - fit.modules.filteredItemIncrease(lambda mod: mod.item.requiresSkill("High Speed Maneuvering"), - "capacitorCapacityMultiplier", ship.getModifiedItemAttr("shipBonusGC2") * level) diff --git a/eos/effects/shipbonusorecapacitygi2.py b/eos/effects/shipbonusorecapacitygi2.py new file mode 100644 index 000000000..49d723726 --- /dev/null +++ b/eos/effects/shipbonusorecapacitygi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Miasmos +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Industrial").level + fit.ship.boostItemAttr("specialOreHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) diff --git a/eos/effects/shipbonuspicommoditiesholdgi2.py b/eos/effects/shipbonuspicommoditiesholdgi2.py new file mode 100644 index 000000000..a8401dac6 --- /dev/null +++ b/eos/effects/shipbonuspicommoditiesholdgi2.py @@ -0,0 +1,6 @@ +# Used by: +# Ship: Epithal +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Gallente Industrial").level + fit.ship.boostItemAttr("specialPlanetaryCommoditiesHoldCapacity", ship.getModifiedItemAttr("shipBonusGI2") * level) diff --git a/eos/effects/shipbonuspiratefrigateprojdamage.py b/eos/effects/shipbonuspiratefrigateprojdamage.py index 96391b4c0..994e34de6 100755 --- a/eos/effects/shipbonuspiratefrigateprojdamage.py +++ b/eos/effects/shipbonuspiratefrigateprojdamage.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chremoas # Ship: Dramiel type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shipbonusprojectiledamagembc2.py b/eos/effects/shipbonusprojectiledamagembc2.py new file mode 100644 index 000000000..063a4f1bf --- /dev/null +++ b/eos/effects/shipbonusprojectiledamagembc2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Sleipnir +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Battlecruiser").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), + "damageMultiplier", ship.getModifiedItemAttr("shipBonusMBC2") * level) diff --git a/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py new file mode 100644 index 000000000..3507ad09e --- /dev/null +++ b/eos/effects/shipbonussentrydroneoptimalrangeelitebonusheavygunship2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Ishtar +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Heavy Assault Cruisers").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), + "maxRange", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) diff --git a/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py new file mode 100644 index 000000000..a758d002c --- /dev/null +++ b/eos/effects/shipbonussentrydronetrackingelitebonusheavygunship2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Ishtar +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Heavy Assault Cruisers").level + fit.drones.filteredItemBoost(lambda drone: drone.item.requiresSkill("Sentry Drone Interfacing"), + "trackingSpeed", ship.getModifiedItemAttr("eliteBonusHeavyGunship2") * level) diff --git a/eos/effects/shipbonusshieldboostamountmc2.py b/eos/effects/shipbonusshieldboostamountmc2.py new file mode 100644 index 000000000..1c9ebaf17 --- /dev/null +++ b/eos/effects/shipbonusshieldboostamountmc2.py @@ -0,0 +1,7 @@ +# Used by: +# Ship: Vagabond +type = "passive" +def handler(fit, ship, context): + level = fit.character.getSkill("Minmatar Cruiser").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Shield Operation"), + "shieldBonus", ship.getModifiedItemAttr("shipBonusMC2") * level) diff --git a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py index 2188f2cb4..165afdb71 100755 --- a/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py +++ b/eos/effects/shipbonussurveyprobeexplosiondelayskillsurveycovertops3.py @@ -1,5 +1,5 @@ # Used by: -# Ships from group: Covert Ops (4 of 4) +# Ships from group: Covert Ops (4 of 5) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Covert Ops").level diff --git a/eos/effects/shipbonusvelocityci.py b/eos/effects/shipbonusvelocityci.py index 5ef356b6f..a87b417ed 100755 --- a/eos/effects/shipbonusvelocityci.py +++ b/eos/effects/shipbonusvelocityci.py @@ -1,6 +1,6 @@ # Used by: -# Variations of ship: Badger (2 of 2) -# Variations of ship: Badger Mark II (2 of 2) +# Variations of ship: Tayra (2 of 2) +# Ship: Crane type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Caldari Industrial").level diff --git a/eos/effects/shipbonusvelocitygi.py b/eos/effects/shipbonusvelocitygi.py index 074181b99..21ea96d95 100755 --- a/eos/effects/shipbonusvelocitygi.py +++ b/eos/effects/shipbonusvelocitygi.py @@ -1,7 +1,9 @@ # Used by: -# Ships named like: Iteron Mark (7 of 7) -# Variations of ship: Iteron (2 of 2) -# Ship: Occator +# Variations of ship: Epithal (2 of 2) +# Variations of ship: Miasmos (4 of 4) +# Ship: Iteron Mark V +# Ship: Kryos +# Ship: Viator type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Industrial").level diff --git a/eos/effects/shipfalloffbonusmf.py b/eos/effects/shipfalloffbonusmf.py index 2184b18b2..357e73ca8 100755 --- a/eos/effects/shipfalloffbonusmf.py +++ b/eos/effects/shipfalloffbonusmf.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chremoas # Ship: Dramiel type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shiphtdmgbonusfixedgc.py b/eos/effects/shiphtdmgbonusfixedgc.py index 00f8a2a10..35d7c487a 100755 --- a/eos/effects/shiphtdmgbonusfixedgc.py +++ b/eos/effects/shiphtdmgbonusfixedgc.py @@ -1,10 +1,11 @@ # Used by: # Variations of ship: Thorax (3 of 4) -# Variations of ship: Vexor (3 of 4) # Ship: Adrestia # Ship: Arazu # 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/shiphybriddmg1gbc1.py b/eos/effects/shiphybriddmg1gbc1.py index e49c2fe78..069d6f800 100755 --- a/eos/effects/shiphybriddmg1gbc1.py +++ b/eos/effects/shiphybriddmg1gbc1.py @@ -1,5 +1,5 @@ # Used by: -# Variations of ship: Brutix (4 of 4) +# Variations of ship: Brutix (3 of 4) type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Battlecruiser").level diff --git a/eos/effects/shipmaxvelocitymc2.py b/eos/effects/shipmaxvelocitymc2.py deleted file mode 100755 index d6040a587..000000000 --- a/eos/effects/shipmaxvelocitymc2.py +++ /dev/null @@ -1,6 +0,0 @@ -# Used by: -# Ship: Vagabond -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Minmatar Cruiser").level - fit.ship.boostItemAttr("maxVelocity", ship.getModifiedItemAttr("shipBonusMC2") * level) diff --git a/eos/effects/shipmissilerapidlightrofcbc1.py b/eos/effects/shipmissilerapidlightrofcbc1.py deleted file mode 100644 index e2c536d36..000000000 --- a/eos/effects/shipmissilerapidlightrofcbc1.py +++ /dev/null @@ -1,7 +0,0 @@ -# Used by: -# Ship: Nighthawk -type = "passive" -def handler(fit, ship, context): - level = fit.character.getSkill("Caldari Battlecruiser").level - fit.modules.filteredItemBoost(lambda mod: mod.item.group.name == "Missile Launcher Rapid Light", - "speed", ship.getModifiedItemAttr("shipBonusCBC1") * level) diff --git a/eos/effects/shipprojectiledmgmc2.py b/eos/effects/shipprojectiledmgmc2.py index 5299ed545..8f96d11ba 100755 --- a/eos/effects/shipprojectiledmgmc2.py +++ b/eos/effects/shipprojectiledmgmc2.py @@ -1,5 +1,6 @@ # Used by: # Ship: Cynabal +# Ship: Moracha # Ship: Muninn # Ship: Rupture type = "passive" diff --git a/eos/effects/shipprojectilerof1mbc2.py b/eos/effects/shipprojectilerof1mbc2.py index 2efb33515..4989ed37a 100755 --- a/eos/effects/shipprojectilerof1mbc2.py +++ b/eos/effects/shipprojectilerof1mbc2.py @@ -1,7 +1,5 @@ # Used by: # Variations of ship: Hurricane (2 of 2) -# Ship: Claymore -# Ship: Sleipnir type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Battlecruiser").level diff --git a/eos/effects/shipprojectilerofpiratecruiser.py b/eos/effects/shipprojectilerofpiratecruiser.py index ce1f87db6..cdaade847 100755 --- a/eos/effects/shipprojectilerofpiratecruiser.py +++ b/eos/effects/shipprojectilerofpiratecruiser.py @@ -1,5 +1,6 @@ # Used by: # Ship: Cynabal +# Ship: Moracha type = "passive" def handler(fit, ship, context): fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Medium Projectile Turret"), diff --git a/eos/effects/shipprojectiletrackinggf.py b/eos/effects/shipprojectiletrackinggf.py index eb6183485..c2179e121 100755 --- a/eos/effects/shipprojectiletrackinggf.py +++ b/eos/effects/shipprojectiletrackinggf.py @@ -1,4 +1,5 @@ # Used by: +# Ship: Chremoas # Ship: Dramiel type = "passive" def handler(fit, ship, context): diff --git a/eos/effects/shippturretfalloffbonusgc.py b/eos/effects/shippturretfalloffbonusgc.py index 1f7781df1..a83c56265 100755 --- a/eos/effects/shippturretfalloffbonusgc.py +++ b/eos/effects/shippturretfalloffbonusgc.py @@ -1,5 +1,6 @@ # Used by: # Ship: Cynabal +# Ship: Moracha type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Gallente Cruiser").level diff --git a/eos/effects/shipvelocitybonusai.py b/eos/effects/shipvelocitybonusai.py index c8577f4f5..117614882 100755 --- a/eos/effects/shipvelocitybonusai.py +++ b/eos/effects/shipvelocitybonusai.py @@ -1,6 +1,6 @@ # Used by: # Variations of ship: Bestower (2 of 2) -# Variations of ship: Sigil (2 of 2) +# Ship: Prorator type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Amarr Industrial").level diff --git a/eos/effects/shipvelocitybonusmi.py b/eos/effects/shipvelocitybonusmi.py index 7f18a0b63..f885e366b 100755 --- a/eos/effects/shipvelocitybonusmi.py +++ b/eos/effects/shipvelocitybonusmi.py @@ -1,7 +1,7 @@ # Used by: # Variations of ship: Mammoth (2 of 2) -# Variations of ship: Wreathe (2 of 2) # Ship: Hoarder +# Ship: Prowler type = "passive" def handler(fit, ship, context): level = fit.character.getSkill("Minmatar Industrial").level diff --git a/eos/effects/shirmishwarfaremindlink.py b/eos/effects/shirmishwarfaremindlink.py index 87fedb77b..d05a1c9f7 100755 --- a/eos/effects/shirmishwarfaremindlink.py +++ b/eos/effects/shirmishwarfaremindlink.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Federation Navy Warfare Mindlink +# Implant: Republic Fleet Warfare Mindlink # Implant: Skirmish Warfare Mindlink type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/siegesquadroncommand.py b/eos/effects/siegesquadroncommand.py new file mode 100644 index 000000000..790bf571b --- /dev/null +++ b/eos/effects/siegesquadroncommand.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Siege Warfare Specialist +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Siege Warfare Specialist"), + "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/siegewarfaremindlink.py b/eos/effects/siegewarfaremindlink.py index 90edae621..e8d8f8f29 100755 --- a/eos/effects/siegewarfaremindlink.py +++ b/eos/effects/siegewarfaremindlink.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Caldari Navy Warfare Mindlink +# Implant: Republic Fleet Warfare Mindlink # Implant: Siege Warfare Mindlink type = "passive" def handler(fit, implant, context): diff --git a/eos/effects/skirmishsquadroncommand.py b/eos/effects/skirmishsquadroncommand.py new file mode 100644 index 000000000..dc5d59f5f --- /dev/null +++ b/eos/effects/skirmishsquadroncommand.py @@ -0,0 +1,7 @@ +# Used by: +# Skill: Skirmish Warfare Specialist +runTime = "early" +type = "passive" +def handler(fit, skill, context): + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Skirmish Warfare Specialist"), + "commandBonus", skill.getModifiedItemAttr("squadronCommandBonus") * skill.level) diff --git a/eos/effects/skirmishwarfareagilitybonus.py b/eos/effects/skirmishwarfareagilitybonus.py index f3db880bc..712cf9a50 100755 --- a/eos/effects/skirmishwarfareagilitybonus.py +++ b/eos/effects/skirmishwarfareagilitybonus.py @@ -1,4 +1,6 @@ # Used by: +# Implant: Federation Navy Warfare Mindlink +# Implant: Republic Fleet Warfare Mindlink # Implant: Skirmish Warfare Mindlink # Skill: Skirmish Warfare type = "gang" diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py index f258bc8cf..0b0d68721 100755 --- a/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py +++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfare.py @@ -5,5 +5,3 @@ def handler(fit, module, context): level = fit.character.getSkill("Gallente Defensive Systems").level fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), "commandBonus", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) - fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), - "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) diff --git a/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py new file mode 100644 index 000000000..2645ed28e --- /dev/null +++ b/eos/effects/subsystembonusgallentedefensiveinformationwarfarehidden.py @@ -0,0 +1,7 @@ +# Used by: +# Subsystem: Proteus Defensive - Warfare Processor +type = "passive" +def handler(fit, module, context): + level = fit.character.getSkill("Gallente Defensive Systems").level + fit.modules.filteredItemBoost(lambda mod: mod.item.requiresSkill("Information Warfare Specialist"), + "commandBonusHidden", module.getModifiedItemAttr("subsystemBonusGallenteDefensive") * level) diff --git a/eos/effects/targetarmorrepair.py b/eos/effects/targetarmorrepair.py index 87fe5921a..b38b959c0 100755 --- a/eos/effects/targetarmorrepair.py +++ b/eos/effects/targetarmorrepair.py @@ -1,5 +1,5 @@ # Used by: -# Modules from group: Armor Repair Projector (38 of 38) +# Modules from group: Remote Armor Repairer (38 of 38) # Drones named like: Armor Maintenance Bot (6 of 6) # Module: QA Remote Armor Repair System - 5 Players type = "projected", "active" diff --git a/eos/effects/targetgunnerymaxrangefallofftrackingspeedbonusassistance.py b/eos/effects/targetgunnerymaxrangefallofftrackingspeedbonusassistance.py index d62d05969..517c81f88 100755 --- a/eos/effects/targetgunnerymaxrangefallofftrackingspeedbonusassistance.py +++ b/eos/effects/targetgunnerymaxrangefallofftrackingspeedbonusassistance.py @@ -1,5 +1,5 @@ # Used by: -# Modules from group: Tracking Link (10 of 10) +# Modules from group: Remote Tracking Computer (10 of 10) type= "projected", "active" def handler(fit, module, context): if "projected" in context: diff --git a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py index 5d5ed1a2a..2568e0ace 100755 --- a/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py +++ b/eos/effects/targetingmaxtargetbonusmodaddmaxlockedtargetslocationchar.py @@ -1,6 +1,5 @@ # Used by: -# Skill: Multitasking -# Skill: Targeting +# Skills named like: Target Management (2 of 2) type = "passive" def handler(fit, skill, context): amount = skill.getModifiedItemAttr("maxTargetBonus") * skill.level diff --git a/service/market.py b/service/market.py index b80f14303..2c6cf80f1 100644 --- a/service/market.py +++ b/service/market.py @@ -194,7 +194,8 @@ class Market(): self.ITEMS_FORCEPUBLISHED = { "Data Subverter I": False, # Not used in EVE, probably will appear with Dust link "Ghost Heavy Missile": False, # Missile used by Sansha - "QA Damage Module": False, # QA modules used by CCP internally + "QA Cross Protocol Analyzer": False, # QA modules used by CCP internally + "QA Damage Module": False, "QA ECCM": False, "QA Immunity Module": False, "QA Multiship Module - 10 Players": False,